diff --git a/ReleaseNotes/ReleaseNotes4.3.1.txt b/ReleaseNotes/ReleaseNotes4.3.1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0f213e34435b2becacc121c056697edfb5b1caed
--- /dev/null
+++ b/ReleaseNotes/ReleaseNotes4.3.1.txt
@@ -0,0 +1,446 @@
+
+                 Geant4 3.1 Release Notes
+                 ------------------------
+
+                                                      6th April 2001
+
+These are the main new features/fixes included in this release since
+release 3.0 (for the detailed list of fixes/additions, please refer to the
+related History files):
+
+  o Configuration:
+    -------------
+    - Added/enabled code in configuration files to store path to dynamic
+      library from example/test directory in the executable.
+
+  o Digits+Hits:
+    -----------
+    - Migrated classes to use STL <vector> instead of RW wrappers.
+
+  o Event:
+    -----
+    - Migrated classes to use STL <vector> instead of RW wrappers.
+    - Added proper time to G4PrimaryParticle.
+    - Fixed bug in G4GeneralParticleSource.
+
+  o Electromagnetic Processes (Low-energy):
+    --------------------------------------
+    - Changes for STL migration of G4OrderedTable and G4DataVector.
+    - Removed obsolete class G4Data.
+
+  o Electromagnetic Processes (Standard):
+    ------------------------------------
+    - Small corrections in e/hEnergyLoss to ensure consistency between
+      cut in range and step limitation due to energy loss (finalRange
+      data member <-> cut in range)
+    - Change in energy loss computation in eBrems process.
+      Parametrisation of energy loss due to soft brems has been corrected
+      for big cut values.
+    - Bug-fix in e/hEnergyLoss processes for AlongStepDoIt().
+      Do not use PostStep information in AlongStepDoIt() when generating
+      sub-cutoff delta rays.
+    - Small corrections in MuEnergyLoss process.
+    - Bug fixed in MultipleScattering: there was an error in computation
+      of the transport cross section, the cross section was too small for
+      low energy (below few MeV for electrons).
+    - Bug fixed in G4MuBremstrahlung::PostStepDoIt() in sampling energy
+      of generated photons. Fixes the problem sometimes occuring of
+      negative interaction length detected.
+    - Fix at small cut value for error in loss fluctuations 
+      (for example in Al 100 microns).
+    - Suppressed protection in PhotoElectric process.
+    - Adopt fStopButAlive in eplusAnnihilation process.
+    - Introduced new module 'integral' for integral processes: moved
+      existing integral processes (G4I*, G4VI*) therein.
+
+  o General Processes, Parameterisation, Decay, Optical:
+    ---------------------------------------------------
+    - Modified G4OpRayleigh to allow for Rayleigh scattering length to
+      be defined for arbitrary material through the use of 
+      G4MaterialPropertyTable. This deals with bug report #199.
+    - Fixes in the DoIt of G4OpRayleigh: to allow for positive and negative
+      CosTheta and to force the new momentum direction of the photon after
+      scattering to be in the same plane as the new and old polarization 
+      vectors. Deals with bug report #207.
+    - Added abstract class G4VExtDecayer for external decayer and modified
+      G4Decay accordingly.
+    - Modified Store/RetrievePhysicsTable() methods: added a bool argument
+      to specify ascii/binary mode.
+
+  o Geometry:
+    --------
+    - Boolean solids:
+      o Minor fix to labels in G4Exception calls.
+        Fixes problem report #200. 
+      o G4IntersectionSolid:
+        - Fix in CalculateExtent() for computation of 'pMin'
+          and 'pMax', to avoid assignment in case CalculateExtent() of
+          one component solid fails. 
+        - Fix in Inside() to return 'kOutside' in case first component
+          solid's Inside() returns 'kOutside'. 
+      o G4UnionSolid:
+        - Fix in DistanceToOut(p,v,...) for assignment of argument *n to
+          happen only if calcNorm is false. 
+        - Fix in CalculateExtent() for computation of 'pMin' and 'pMax'.
+
+    - CSG solids
+      o G4Tubs:
+        - Corrections in phi-section algorithm of Inside(p). 
+        - Fixed condition from (pPhi<0) to (pPhi<-0.5*kAngleTolerance) 
+          in Inside(p). Fixes problem report #198.
+        - Fixed bug in function Inside(p) in computation of pPhi 
+          for points at phi = 0 if the (start phi)+(delta phi) is
+	  at phi = 0. 
+        - Temporarly modified CalculateExtent(...), now simply based
+          on G4Box::CalculateExtent(...).
+      o G4Box:
+        - Introduced checks against negative (or <2*kCarTolerance)
+          dimensions in methods SetXHalfLength(), SetYHalfLength() and
+          SetZHalfLength().
+        - Fixes to algorithm for computation of rotated vertices in
+	  CalculateExtent(). 
+      o G4Torus:
+        - Extracted logic for G4PolynomialSolver now included
+          in global/HEPNumerics. 
+
+    - Specific solids:
+      o Fix in G4Hype::DistanceToOut(p,v,...): added protection against
+        zero v.z.
+      o G4IntersectingCone: make small adjustment to help with roundoff
+        error in LineHitsCone1() and LineHitsCone2(). 
+
+    - Magnetic Field
+      o Minor fix to G4MagneticField.hh: added explicit call to G4Field()
+        in copy constructor. Fixes problem report #205.
+      o Fixed G4MagHelicalStepper::AdvanceHelix for momentum, allowing
+        the possibility of (correct) use of all Helical Steppers. 
+      o Corrected field components in G4UniformElectricField. 
+
+    - Management
+      o Introduced G4AssemblyVolume: helper class to combine
+        volumes together in an arbitrary way in the 3D space. 
+
+    - Volumes
+      o Fix in G4ReplicaNavigation::ComputeTransformation() to consider
+        'pVol' for SetPhiTransformation() in the kPhi case.
+      o Fix in G4ReplicaNavigation::ComputeStep() to initialise 'ourStep'
+        to kCarTolerance.
+
+  o Global:
+    ------
+    - Migrated G4PhysicsTable, G4PhysicsVector and all related classes
+      to use STL <vector> instead of RW wrappers.
+    - Fix to G4Allocator destructor: bug report #181.
+    - Added generic class G4PolynomialSolver in HEPNumerics module.
+    - Removed from G4PhysicsVector dependency over G4PhysicsTable. 
+      Removed methods: LinkPhysicsTable(), IsLinkedTableExist() and 
+      GetNextTable(). Removed data-member ptrNextTable. 
+    - Added new unit 'parsec' to SystemOfUnits.h 
+    - Fixed bug in constructor of G4PhysicsLnVector: initialised
+      'dataVector' to zero. 
+    - Added Store/RetrievePhysicsTable methods in G4PhysicsTable. 
+    - Added Store/Retrieve and GetType methods in G4PhysicsVector and
+      related. 
+    - Introduced G4PhysicsVectorType class (enumeration). 
+    - G4UnitsTable: resolved ambiguity of old/new style iostream for
+      formatting in operator<<. 
+
+  o Graphics Representations:
+    ------------------------
+    - Tidying for CodeWizard. Added virtual destructors to
+      HepPolyhedronBox, etc. Also made all constructors non-inline. 
+    - Removed G4Circle.icc and G4VVisPrim.icc.
+
+  o Hadronic Processes:
+    ------------------
+    - Bug fix for very low energy ion cross-sections; should have no
+      visible effect.
+    - Moved inline implementation of G4Solver to G4Solver.icc. 
+
+  o Materials:
+    ---------
+    - Bug fixed in G4IonisParamMat.cc : E100eV instead of E100keV
+      This bug affected the values of the density correction parameters
+      in the energy loss (dE/dx) computation: ~3-5 % error in dE/dx in
+      the energy range 1 MeV - 50 MeV !
+    - Added new method G4Material::GetNuclearInterLength().
+    - Bug fix concerning units in G4SandiaTable::GetSandiaCofPerAtom().
+      Reimplemented G4SandiaTable::ComputeMatSandiaMatrix().
+    - Added protection in GetSandiaCofForMaterial().
+    - fnulcof added as data member in G4SandiaTable. 
+    - Revision of destructor, copy constructor, assignement operator in 
+      G4IonisParam, G4Isotope, G4Element and G4Material, according to
+      problem report #106.
+    - Removed warning to cerr in GetIsotope(name), GetElement(name), 
+      and GetMaterial(name). 
+
+  o Particles:
+    ---------
+    - Added pre-assignedDecayTime to G4DynamicParticle.
+    - Bug fix in calculation of electron energy in G4MuDecayChannel.
+      Fixes problem report #224.
+    - Fixed a bug in G4DynamicParticle::SetDefinition() for problem
+      report #228.
+    - Added RestoreCuts() methods to G4ParticleWithCuts class.
+
+  o Persistency:
+    -----------
+    - G4PDCofThisEvent.ddl: fixed a bug in GetNumberOfCollections(). 
+
+  o Readout:
+    -------
+    - Migrated classes to use STL <vector> instead of RW wrappers.
+
+  o Run and Intercoms:
+    -----------------
+    - Migrated classes to use STL <vector> instead of RW wrappers.
+
+  o Tracking & Track:
+    ----------------
+    - Changes for STL migration of G4OrderedTable and G4DataVector.
+    - Migrated classes to use STL <vector> instead of RW wrappers.
+    - Added comments to headers for the Software Reference Manual. 
+    - Added copy constructor for G4Track.
+    - Fix in G4Track::GetVelocity() for Gamma
+    - Fixes to G4StepPoint::GetVelocity() for problem report #208
+      and to return correct value in case of optical-photon.
+    - Added call to SetVelocity() in G4Step::InitializeStep().
+    - G4PArticleChange: fix in case momentum is zero, (even if
+      energy>0.0 and very small) to overcome problems due to
+      precision issues.
+
+  o Transportation:
+    --------------
+    - Improved calculation of energy at the end of the field.
+    - G4Transportation modified to use new FieldTrack, and get Kinetic
+      Energy from it. This implements integration in Momentum (*c-light)
+      instead of velocity. 
+
+  o Visualization:
+    -------------
+    - Changed rotation of phi-replicas in G4PhysicalVolumeModel.cc to
+      ensure correspondence with rule that phi=0 bisects the replica. 
+
+      WARNING: Prior to this fix the graphics did NOT correspond to the
+      replica navigation. If you have been relying on the graphics to
+      position daughter volumes in a phi-replica, navigation will have
+      been incorrect, possibly without causing a crash. The above fix
+      will change the apparent position as shown by the graphics and you
+      will have to correct the positioning of daughters. Make sure the 
+      daughters are all properly enclosed within the replica. Graphics 
+      and navigation now correspond. 
+    - Added auto-refresh facility for OpenGL. 
+    - Bug fixes for problems: 
+      #120: improved up vector calculation to avoid view "flipping"
+            at (90, 90). 
+      #157: fixed crash when viewer was defined before scene. 
+      #204: fixed failure to change number of sides per circle. 
+    - Fixed problem when requested physical volume was at depth 2 or more. 
+    - Migrated classes to use STL <vector> instead of RW wrappers.
+    - Introduced many new commands (listed below). Old commands print a
+      DEPRECATED warning. 
+      o New compound command: 
+        /vis/drawView [<theta-deg>] [<phi-deg>] 
+                      [<pan-right>] [<pan-up>] [<pan-unit>] 
+                      [<zoom-factor>] [<dolly>] [<dolly-unit>]
+      o New primitive commands: 
+        /vis/enable [true|false] 
+        /vis/disable 
+        /vis/verbose [] 
+        /vis/viewer/set/lineSegmentsPerCircle [] 
+        /vis/viewer/set/sectionPlane ... 
+        /vis/viewer/set/autoRefresh 
+        /vis/viewer/set/projection 
+        /vis/viewer/dolly 
+        /vis/viewer/dollyTo 
+        /vis/viewer/lightsThetaPhi 
+        /vis/viewer/lightsVector 
+        /vis/viewer/pan 
+        /vis/viewer/panTo 
+        /vis/viewer/viewpointThetaPhi 
+        /vis/viewer/viewpointVector 
+        /vis/viewer/zoom 
+        /vis/viewer/zoomTo 
+        /vis/viewer/set/hiddenMarker 
+        /vis/viewer/set/lightsMove
+
+  o G4toG4 Tool:
+    -----------
+    - Fixed bug in G3toG4BuildTree(G3VolTableEntry*, G3VolTableEntry*) 
+      when positioning volume copies. Index is now decremented. 
+      Added -DG3G4DEBUG to CPPFLAGS in GNUmakefile.
+      Fixes bug report #188.
+    - Added support for replicated "PARA" shapes in
+      G3Division::CreateSolid(...). Slices are placed with
+      G4PVPlacement instead of G4PVReplica for this particular case.
+    - G3toG4MakeSolid.cc: fixed bug in construction of G4Sphere where
+      'theta' and 'phi' parameters were reversed according to G4Sphere
+      constructor. Fixes problem report #230. 
+
+  o Examples:
+    --------
+    - Introduced modular Physics List in exampleN04.
+    - ExampleN02: fix to ExN02ChamberParameterisation and
+      ExN02DetectorConstruction to cope with bug report #186.
+    - Added G4MuonMinusCaptureAtRest in physics list of ExampleN04.
+
+
+Notes: 
+
+  o  Geant4 3.1 is based on STL and can be installed with strict
+     ISO/ANSI C++ compliant setup or not. See notes below.
+
+The code and some binary libraries are available through our "Source Code"
+Web page:
+- see our <A href="http://cern.ch/geant4">Geant4 Home Page</A>.
+
+Please refer to <A
+href="http://cern.ch/geant4/G4UsersDocuments/Overview/html/index.html">Geant4
+User Documentation</A> for further information about using Geant4.
+Updates to the documentation for Geant4 3.1 are expected to be published as
+usual within three weeks from the release date.
+
+
+Contents
+--------
+
+  1. Supported and Tested Platforms
+  2. ANAPHE and CLHEP
+  3. The Standard Template Library (STL)
+  4. Persistency
+  5. Compiler Specific Problems
+  6. Known Run-Time Problems
+  7. Compilation Warnings
+  8. Known Run-Time Warnings
+
+
+1. Supported and Tested Platforms
+---------------------------------
+
+  o SUN Solaris 5.6/5.7, C++ 4.2 Patch 104631-04, C++ 5.2 Patch 109508-02.
+  o HP 10.20, aCC C++ B3910B A.01.23
+  o Linux 2.2.17-7, gcc C++ egcs-2.91.66 (egcs 1.1.2), gcc 2.95.2.
+      This configuration was tested with the RedHat 6.1 distribution, but
+      versions of Geant4 have also been compiled successfully on Debian
+      and Suse distributions.
+  o NT 4.0 with Service Pack 4 and Cygnus Tools b20 with:
+      Visual C++ 6.0 Service Pack 2
+
+Platforms also tested but giving rise to some problems - see below:
+
+  o DEC V4.0, cxx C++ V6.1-027.
+
+Platforms configured but not tested and not supported:
+  o SGI V6.5.5, CC 7.2.1 with ObjectSpace
+  o AIX 4.3.2, xlC compiler with ObjectSpace
+
+
+2. ANAPHE and CLHEP
+-------------------
+
+Geant4 3.1 requires the installation of CLHEP. 
+
+See <A href="http://wwwinfo.cern.ch/asd/lhc++/INSTALLATION/clhep.html">
+CLHEP</A>. Tests have been performed with CLHEP 1.6.0.0.
+
+By default, the CLHEP installation scripts will activate ISO/ANSI C++ features
+if the compiler is capable. You need to explicitly disable CLHEP settings in
+case you wish non-ISO/ANSI setup on specific compilers.
+
+Geant4 3.1 coworks with ANAPHE 3.2.0 and components included therein:
+  Objectivity 5.2.1 
+  ObjectSpace 2.1
+  HepODBMS 0.3.1.4
+  CLHEP 1.6.0.0
+
+For more information about ANAPHE 3.2.0, see:
+  <A href="http://wwwinfo.cern.ch/asd/lhc++/release/3.2.0/3.2.0.html">ANAPHE 3.2.0</A>
+
+
+3. The Standard Template Library
+--------------------------------
+
+The following versions of STL have been tested:
+
+   ObjectSpace STL on SUN (CC 4.2).
+
+          See <A href="http://www.objectspace.com/">ObjectSpace</A>.
+
+   "Native" STL on: Windows/NT, Linux, HP, DEC and SUN (CC 5.2).
+
+This is selected at installation/compile time by the environment variable
+G4USE_OSPACE in the case of the former - see documentation.
+
+NOTES:
+- Be aware that by default, the installation scripts will expect to use
+  the native STL implementation. You must set the G4USE_OSPACE variable
+  in the environment in order to select the ObjectSpace implementation.
+
+- Platform specific setup:
+  o DEC:   ObjectSpace is required in non ISO/ANSI setup.
+           Native STL is required for ISO/ANSI setup.
+  o HP:    either ObjectSpace or native STL can be used (non ISO/ANSI setup).
+  o SUN:   ObjectSpace is required in non ISO/ANSI setup (CC 4.2).
+           Native STL is required for ISO/ANSI setup (CC 5.2 only).
+  o Linux: Native STL is required (non ISO/ANSI setup).
+  o NT:    Native STL and ISO/ANSI setup required.
+
+In the interest of stability, part of the code in Geant4 3.1 still makes use
+of the "STL Interface" wrapper classes, used for allowing the migration from
+Rogue Wave Tools.h++ container library.  For these the emphasis has remained
+on correct behaviour, rather than performance.
+
+
+4. Persistency
+--------------
+
+  See release notes for Geant4 3.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.
+    - A bug in cin.getline() system function causes an anomalous
+      behavior when running in interactive-mode on DEC-cxx 6.1 in
+      ISO/ANSI mode. We tested the bug has been fixed in more recent
+      versions of the compiler.
+
+
+6. Known Run-Time Problems and Limitations
+------------------------------------------
+
+For a complete list of outstanding run-time problems and to submit any
+problem you may find running this version of Geant4, please refer to the
+Geant4 Problem Reporting System, available on the Web at this address:
+
+    http://wwwinfo.cern.ch/asd/cgi-bin/geant4/problemreport
+
+
+7. Compilation Warnings
+-----------------------
+
+There are compilation warnings on some platforms.  We do not believe
+that any will lead to incorrect run-time behaviour, but we are working
+on reducing them.
+
+
+8. Known Run-Time Warnings
+--------------------------
+
+The following messages can be written to error output while tracking.  We
+believe none give rise to incorrect behaviour.
+
+  o G4PropagateInField: Warning: Particle is looping 
+    -  tracking in field will be stopped. 
+       It has performed 10000 steps in Field  while a maximum of 10000
+       are allowed. 
diff --git a/config/History b/config/History
index 7538852736b76497a09ca98da51a62900590600f..fd24b2d2502cf8b48d2f6b3f1d594f873ee025af 100644
--- a/config/History
+++ b/config/History
@@ -1,5 +1,5 @@
-$Id: History,v 1.129 2000/12/13 09:19:56 gcosmo Exp $
-$Name: geant4-03-00 $
+$Id: History,v 1.132.2.1 2001/03/22 14:00:01 gunter Exp $
+$Name: geant4-03-01 $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,23 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+22 March 2001 Gunter Folger (config-V03-00-03)
+- binmake.gmk, only store in executable PATH to libs from example/test; 
+  other libs should be taken/found from LD_LIBRARY_PATH
+- sys/{Linux-g++,SUN-CC}.gmk: enable storing of PATH to libs in executable 
+
+06th March 2001 Gabriele Cosmo (config-V03-00-02)
+- binmake.gmk: added include path for processes/electromagnetic/integral
+  the new subcategory introduced with tag em-V03-00-04.
+
+13th February 2001 Gabriele Cosmo (config-V03-00-01)
+- binmake.gmk: added include path for processes/photolepton_hadron
+  which was missing!
+
+08th January 2001 Gabriele Cosmo (config-V03-00-00)
+- sys/WIN32-VC.gmk: introduced -GR compiler option to allow usage of
+  dynamic casting and type-info at run-time.
+
 13th December 2000 Gunter Folger (config-V02-00-14)
 - common.gmk: fix to rule for building dependencies, parsing is skip
   if $(dependencies) is empty.
diff --git a/config/binmake.gmk b/config/binmake.gmk
index 8e53e526883a7a7fbe19dd6f7fc4b15b1b139cf8..57eaf9664254879424844cd05301ff12ef51c471 100644
--- a/config/binmake.gmk
+++ b/config/binmake.gmk
@@ -1,4 +1,4 @@
-# $Id: binmake.gmk,v 1.54 2000/12/05 17:19:49 morita Exp $
+# $Id: binmake.gmk,v 1.56.2.1 2001/03/22 13:54:24 gunter Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
 #                          Gabriele Cosmo, 25/06/1998.
@@ -37,7 +37,9 @@ ifndef INCFLAGS
               -I$(G4BASE)/processes/optical/include \
               -I$(G4BASE)/processes/transportation/include \
               -I$(G4BASE)/processes/parameterisation/include \
+              -I$(G4BASE)/processes/photolepton_hadron/include \
               -I$(G4BASE)/processes/electromagnetic/standard/include \
+              -I$(G4BASE)/processes/electromagnetic/integral/include \
               -I$(G4BASE)/processes/electromagnetic/muons/include \
               -I$(G4BASE)/processes/electromagnetic/utils/include \
               -I$(G4BASE)/processes/electromagnetic/xrays/include \
@@ -115,12 +117,6 @@ endif
 CPPFLAGS += $(INCFLAGS)
 LDFLAGS += -L$(G4LIBDIR)
 
-ifdef SHAREDLIBS
-  ifdef G4RUNPATHOPTION
-    LDFLAGS += $(G4RUNPATHOPTION)$(G4LIBDIR)
-  endif
-endif
-
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(G4TARGET)
 G4BINDIR := $(G4BIN)/$(G4SYSTEM)
 
@@ -129,6 +125,8 @@ ifdef G4EXLIB
   LDFLAGS += -L$(G4LIBDIR)
   ifdef SHAREDLIBS
     ifdef G4RUNPATHOPTION
+#        for the example dependant directory, keep the path to the shared lib 
+#          in the executable.
       LDFLAGS += $(G4RUNPATHOPTION)$(G4LIBDIR)
     endif
   endif
diff --git a/config/sys/Linux-g++.gmk b/config/sys/Linux-g++.gmk
index ca994238cc5915b08be6c47fb0866a2923afa517..9bbdf26237c1107dd5700d14ebe9be1ab9e8a854 100644
--- a/config/sys/Linux-g++.gmk
+++ b/config/sys/Linux-g++.gmk
@@ -21,7 +21,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
     FCFLAGS   += -fPIC
     CCFLAGS   += -fPIC
   endif
-#future  G4RUNPATHOPTION := -rpath 
+  G4RUNPATHOPTION := -Wl,-rpath 
   FC := g77
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
diff --git a/config/sys/SUN-CC.gmk b/config/sys/SUN-CC.gmk
index 479cce90b4e66cae1f411972624c1abc25a26995..3f5d5abaf7a6e7df0dba0e66449a4602c2cc55b2 100644
--- a/config/sys/SUN-CC.gmk
+++ b/config/sys/SUN-CC.gmk
@@ -3,6 +3,7 @@
 #
 ifeq ($(G4SYSTEM),SUN-CC)
   CXX       := CC
+# -Qoption ld -m
   ifdef G4OPTIMISE
     CXXFLAGS  := -O
   else
diff --git a/config/sys/WIN32-VC.gmk b/config/sys/WIN32-VC.gmk
index 21c32d082420011f032a494577d102aeead8144b..779668c8bbfaa743dd7f23675e8d6eb76ceb2b28 100644
--- a/config/sys/WIN32-VC.gmk
+++ b/config/sys/WIN32-VC.gmk
@@ -12,7 +12,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
       CXXFLAGS  += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
     endif
   endif
-  CXXFLAGS += -MD -GX -Zm200 -nologo -DWIN32 -D_CONSOLE 
+  CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32 -D_CONSOLE 
   CXXFLAGS += -D_WIN32 -DOS
   CPPFLAGS += -DWIN32
   #
diff --git a/environments/OPACS/app/EXPO.cc b/environments/OPACS/app/EXPO.cc
index 205810b3e1fefb704961ab86a6b4fea790726d21..df32cd8b618926434ff2b0958b87ddd49c51dbec 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.8 2000/03/17 08:56:10 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include <stdlib.h>
 
diff --git a/environments/OPACS/app/TEST.cc b/environments/OPACS/app/TEST.cc
index a39053d2e40cf506aa9e7cc4860a557040694aad..18eda2d2ec3c6d13f5820a1978afc1dcafad82b4 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.3 1999/12/15 14:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include <stdlib.h>
 
diff --git a/environments/OPACS/include/EXPO_Detector.icc b/environments/OPACS/include/EXPO_Detector.icc
index 3e34fd3a3cec20c43a50122da91414178a800530..34ee8adf62916a1f43a7383cb1f7ed9c5bc8e422 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.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5aaf3aa5a776a2dc42524ffb57b03a1153c2438d..c5e7d2538e92bef735d999db2440991e3753ecb3 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.4 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/environments/OPACS/include/EXPO_PhysicsList.icc b/environments/OPACS/include/EXPO_PhysicsList.icc
index 3deb9f78e808de3e02f79e5757f179d43c4685c2..1591c00b7af4a2e1333883bdd8baedb65fedc038 100644
--- a/environments/OPACS/include/EXPO_PhysicsList.icc
+++ b/environments/OPACS/include/EXPO_PhysicsList.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: EXPO_PhysicsList.icc,v 1.4 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/environments/OPACS/include/EXPO_Primary.icc b/environments/OPACS/include/EXPO_Primary.icc
index 7f65466bb528566b3ace1a15d2daa8581bf41224..696ff0fdee89b1ea1107f869afe59531607aaed2 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.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  See also G4/run/example/EXPO_PrimaryGeneratorAction.cc.
 
diff --git a/environments/OPACS/include/G4o.h b/environments/OPACS/include/G4o.h
index 2adbbe1364a03cf344bfcbdfe76c50677dcf892c..eabeb1d21e9a5bb9a62aa2a0bbcfb9f4d67c0538 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.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 37671bcb1759df83cca1958bc26025cb34f3e414..ffafcde0c21c31876e04d52fd038a8bf658abb5d 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.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
    Included by G4o.h.
diff --git a/environments/OPACS/include/G4oCommon.icc b/environments/OPACS/include/G4oCommon.icc
index 72e59d9a80a7a03822b785882d9b34f883fd0a6d..2b26598b466ae5c2a53d829c06c5702da025fe7b 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.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
    Included by G4o.cc.
diff --git a/environments/OPACS/include/G4oDrawer.hh b/environments/OPACS/include/G4oDrawer.hh
index 311cda87a2cd54997fca914ca7fc21e0183be5f9..8dfe85878099aa79890a297912b66533ee3cb012 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.3 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4e295e335c1f4f22649b795a5703efaeeaf94deb..6f739c971ec879812e616adef56d277ab6646c53 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.3 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 83ab9b2679a404f1dcf4060e4f772615d410717a..71ce355db29384520afe295e3af271433807a858 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.4 2000/03/17 08:58:32 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 60e87e901c32235c7e9651869b0cc7487fcf1b7d..fb39ffc61673bf98d2a6cc89a5a1b606a81b1bd4 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.4 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4oState_h
 #define G4oState_h 
diff --git a/environments/OPACS/include/WoG4o.h b/environments/OPACS/include/WoG4o.h
index d4efa6720c935fd908bea4da9f2e8fe0182c6151..b62e1d550ec9a4ddc4244f71ee7a0c074fdbb0b4 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.3 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 48bb398d3787f6590cd11b330965cb36ed7487cc..96e111ac904d5d0a79350cf8b227bd220a3c8c36 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.7 2000/03/17 08:57:45 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
 #define DEBUG
diff --git a/environments/OPACS/src/G4oDrawer.cc b/environments/OPACS/src/G4oDrawer.cc
index 74a3b8226335f42281ee3aadf2766a08686dab02..0e3fba56f360d68844f967317017add8c91223b3 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.6 2000/03/17 08:57:46 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
   From geant4/visualization/management/src/G4VisManager.cc.
diff --git a/environments/OPACS/src/G4oScene.cc b/environments/OPACS/src/G4oScene.cc
index ae2778eda6415061d38bb76180384faf5a678f07..1e9f7fc38b30ad6c9349cfac5a677c1da9915bd6 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.7 2000/06/09 10:00:58 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 de196810a756e66ce4f8e692a7158d77a73be9e1..e3c02e9cad9a2f1a280d735d94df92490a3dd266 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.6 2000/03/17 08:57:48 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //#define DEBUG
 
diff --git a/examples/History b/examples/History
index 81585be3face77b10ccab7279d31574d8273ab43..e37e4a08bd4b666eba11c64351ca4a035e637fcb 100644
--- a/examples/History
+++ b/examples/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.58 2000/11/18 10:56:11 stesting Exp $
+$Id: History,v 1.59 2001/01/25 11:58:05 stesting Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+25-Jan-2001 Steve O'Neale (examples-V03-00-00) 
+- Updated all "small_N" test outputs
+
 18th Nov 2000 Steve O'Neale (examples-V02-00-05) 
 - Updated test 102,104,508 outputs
 
diff --git a/examples/advanced/brachytherapy/Brachy.cc b/examples/advanced/brachytherapy/Brachy.cc
index cb832ea6c00fd6af3c7adc29dc3f88f157b5ee1a..e572314f70af71bfc958f4a6ac11089653fe37ee 100644
--- a/examples/advanced/brachytherapy/Brachy.cc
+++ b/examples/advanced/brachytherapy/Brachy.cc
@@ -6,7 +6,7 @@
 // statement, and all its terms.
 //
 // $Id: Brachy.cc,v 1.4 2000/12/10 08:56:15 chauvie Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //                 GEANT 4 - Brachytherapy example
diff --git a/examples/advanced/gammaray_telescope/GammaRayTel.cc b/examples/advanced/gammaray_telescope/GammaRayTel.cc
index 791249a9546ec607b28748821e8b3d4a54c617fb..bd3555c75991dc90032cda5a5807ccdd5ecc9fd0 100644
--- a/examples/advanced/gammaray_telescope/GammaRayTel.cc
+++ b/examples/advanced/gammaray_telescope/GammaRayTel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTel.cc,v 1.3 2000/12/06 16:53:12 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh
index ee22c6c018c2e52ea7a01ae8f7621750b8a1c166..0e65bd5d7dd41cf927d3a219010ebf26d2d777cf 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelAnalysisManager.hh,v 1.1 2000/12/06 16:53:12 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelAnalysisManager.hh,v 1.2 2001/03/05 13:58:19 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
@@ -97,3 +97,6 @@ private:
 
 
 
+
+
+
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh
index d4f9d5839397f4a524a87cdbd274fa11d6eba8bb..a10eb7db05fa79d2e18c9b7b17bf08dc08c90d8c 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelAnalysisMessenger.hh,v 1.1 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh
new file mode 100644
index 0000000000000000000000000000000000000000..81d6617d31a430594dd39501698c6d4ced3feac3
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh
@@ -0,0 +1,104 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelAnticoincidenceHit.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class header file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelAnticoincidenceHit  ------
+//           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+// This Class describe the hits on the Anticoincidence
+
+#ifndef GammaRayTelAnticoincidenceHit_h
+#define GammaRayTelAnticoincidenceHit_h 1
+
+#include "G4VHit.hh"
+#include "G4THitsCollection.hh"
+#include "G4Allocator.hh"
+#include "G4ThreeVector.hh"
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class GammaRayTelAnticoincidenceHit : public G4VHit
+{
+public:
+  
+  GammaRayTelAnticoincidenceHit();
+  ~GammaRayTelAnticoincidenceHit();
+  GammaRayTelAnticoincidenceHit(const GammaRayTelAnticoincidenceHit&);
+  const GammaRayTelAnticoincidenceHit& operator=(const
+						GammaRayTelAnticoincidenceHit&);
+  int operator==(const GammaRayTelAnticoincidenceHit&) const;
+  
+  inline void* operator new(size_t);
+  inline void  operator delete(void*);
+  
+  void Draw();
+  void Print();
+
+private:
+  
+  G4double EdepACD;  // Energy deposited on the ACD tile
+  G4ThreeVector pos; // Position of the hit
+  G4int ACDTileNumber; // Number of the ACD tile
+  G4int IsACDPlane;    // Type of the plane (0 top, 1 L-R, 2 F-R)
+
+public:
+  
+  inline void AddEnergy(G4double de) {EdepACD += de;};
+  inline void SetACDTileNumber(G4int i) {ACDTileNumber = i;};
+  inline void SetACDType(G4int i) {IsACDPlane = i;};
+  inline void SetPos(G4ThreeVector xyz){ pos = xyz; }
+  
+  inline G4double GetEdepACD()     { return EdepACD; };
+  inline G4int    GetACDTileNumber()   { return ACDTileNumber; };
+  inline G4int    GetACDType()   {return IsACDPlane;};      
+  inline G4ThreeVector GetPos() { return pos; };
+  
+};
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+typedef G4THitsCollection<GammaRayTelAnticoincidenceHit> GammaRayTelAnticoincidenceHitsCollection;
+
+extern G4Allocator<GammaRayTelAnticoincidenceHit> GammaRayTelAnticoincidenceHitAllocator;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+inline void* GammaRayTelAnticoincidenceHit::operator new(size_t)
+{
+  void* aHit;
+  aHit = (void*) GammaRayTelAnticoincidenceHitAllocator.MallocSingle();
+  return aHit;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+inline void GammaRayTelAnticoincidenceHit::operator delete(void* aHit)
+{
+  GammaRayTelAnticoincidenceHitAllocator.FreeSingle((GammaRayTelAnticoincidenceHit*) aHit);
+}
+
+#endif
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh
new file mode 100644
index 0000000000000000000000000000000000000000..41a01922e5bd3029779566ece449f953ec084957
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh
@@ -0,0 +1,65 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelAnticoincidenceSD.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class header file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelAnticoincidenceSD  ------
+//           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+
+#ifndef GammaRayTelAnticoincidenceSD_h
+#define GammaRayTelAnticoincidenceSD_h 1
+
+#include "G4VSensitiveDetector.hh"
+#include "globals.hh"
+
+class GammaRayTelDetectorConstruction;
+class G4HCofThisEvent;
+class G4Step;
+#include "GammaRayTelAnticoincidenceHit.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class GammaRayTelAnticoincidenceSD : public G4VSensitiveDetector
+{
+public:
+  
+  GammaRayTelAnticoincidenceSD(G4String, GammaRayTelDetectorConstruction* );
+  ~GammaRayTelAnticoincidenceSD();
+  
+  void Initialize(G4HCofThisEvent*);
+  G4bool ProcessHits(G4Step* astep,G4TouchableHistory* ROHist);
+  void EndOfEvent(G4HCofThisEvent*);
+  void clear();
+  void DrawAll();
+  void PrintAll();
+  
+private:
+  
+  GammaRayTelAnticoincidenceHitsCollection*  AnticoincidenceCollection;      
+  GammaRayTelDetectorConstruction* Detector;
+  G4int *HitLateralID;
+  G4int *HitTopID;
+  G4int NbOfACDLateralTiles;
+  G4int NbOfACDTopTiles; 
+};
+
+#endif
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh
new file mode 100644
index 0000000000000000000000000000000000000000..325b3646c7039228f9b7b22321d5e527288b54a6
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh
@@ -0,0 +1,107 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelCalorimeterHit.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class header file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelCalorimeterHit  ------
+//           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+// This Class describe the hits on the Calorimeter
+
+#ifndef GammaRayTelCalorimeterHit_h
+#define GammaRayTelCalorimeterHit_h 1
+
+#include "G4VHit.hh"
+#include "G4THitsCollection.hh"
+#include "G4Allocator.hh"
+#include "G4ThreeVector.hh"
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class GammaRayTelCalorimeterHit : public G4VHit
+{
+public:
+  
+  GammaRayTelCalorimeterHit();
+  ~GammaRayTelCalorimeterHit();
+  GammaRayTelCalorimeterHit(const GammaRayTelCalorimeterHit&);
+  const GammaRayTelCalorimeterHit& operator=(const
+						GammaRayTelCalorimeterHit&);
+  int operator==(const GammaRayTelCalorimeterHit&) const;
+  
+  inline void* operator new(size_t);
+  inline void  operator delete(void*);
+  
+  void Draw();
+  void Print();
+
+private:
+  
+  G4double EdepCAL;  // Energy deposited on the ACD tile
+  G4ThreeVector pos; // Position of the hit
+  G4int CALBarNumber; // Number of the CAL tile
+  G4int CALPlaneNumber;    // Number of the CAL plane
+  G4int IsCALPlane;    // Type of the plane (0 X, 1 Y)
+
+public:
+  
+  inline void AddEnergy(G4double de) {EdepCAL += de;};
+  inline void SetCALBarNumber(G4int i) {CALBarNumber = i;};
+  inline void SetCALPlaneNumber(G4int i) {CALPlaneNumber = i;};
+  inline void SetCALType(G4int i) {IsCALPlane = i;};
+  inline void SetPos(G4ThreeVector xyz){ pos = xyz; }
+  
+  inline G4double GetEdepCAL()     { return EdepCAL; };
+  inline G4int    GetCALBarNumber()   { return CALBarNumber; };
+  inline G4int    GetCALPlaneNumber()   { return CALPlaneNumber; };
+  inline G4int    GetCALType()   {return IsCALPlane;};      
+  inline G4ThreeVector GetPos() { return pos; };
+  
+};
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+typedef G4THitsCollection<GammaRayTelCalorimeterHit> GammaRayTelCalorimeterHitsCollection;
+
+extern G4Allocator<GammaRayTelCalorimeterHit> GammaRayTelCalorimeterHitAllocator;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+inline void* GammaRayTelCalorimeterHit::operator new(size_t)
+{
+  void* aHit;
+  aHit = (void*) GammaRayTelCalorimeterHitAllocator.MallocSingle();
+  return aHit;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+inline void GammaRayTelCalorimeterHit::operator delete(void* aHit)
+{
+  GammaRayTelCalorimeterHitAllocator.FreeSingle((GammaRayTelCalorimeterHit*) aHit);
+}
+
+#endif
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh
new file mode 100644
index 0000000000000000000000000000000000000000..c374f6da6212a033d963921d197b7eaf6902a505
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh
@@ -0,0 +1,65 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelCalorimeterSD.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class header file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelCalorimeterSD  ------
+//           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+
+#ifndef GammaRayTelCalorimeterSD_h
+#define GammaRayTelCalorimeterSD_h 1
+
+#include "G4VSensitiveDetector.hh"
+#include "globals.hh"
+
+class GammaRayTelDetectorConstruction;
+class G4HCofThisEvent;
+class G4Step;
+#include "GammaRayTelCalorimeterHit.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class GammaRayTelCalorimeterSD : public G4VSensitiveDetector
+{
+public:
+  
+  GammaRayTelCalorimeterSD(G4String, GammaRayTelDetectorConstruction* );
+  ~GammaRayTelCalorimeterSD();
+  
+  void Initialize(G4HCofThisEvent*);
+  G4bool ProcessHits(G4Step* astep,G4TouchableHistory* ROHist);
+  void EndOfEvent(G4HCofThisEvent*);
+  void clear();
+  void DrawAll();
+  void PrintAll();
+  
+private:
+  
+  GammaRayTelCalorimeterHitsCollection*  CalorimeterCollection;      
+  GammaRayTelDetectorConstruction* Detector;
+  G4int (*ChitXID)[12];
+  G4int (*ChitYID)[12];
+  G4int NbOfCALLayers;
+  G4int NbOfCALBars; 
+};
+
+#endif
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh
index 496f76b5919a766a95b844540c705f868669dfc8..aa6184a3e9f4757b1de14e8caeff5dcb9c368b02 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelDetectorConstruction.hh,v 1.4 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelDetectorConstruction.hh,v 1.5 2001/03/05 13:58:20 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
@@ -31,8 +31,10 @@ class G4VPhysicalVolume;
 class G4Material;
 class G4UniformMagField;
 class GammaRayTelDetectorMessenger;
-class GammaRayTelPayloadSD;
-class GammaRayTelPayloadROGeometry;
+class GammaRayTelTrackerSD;
+class GammaRayTelAnticoincidenceSD;
+class GammaRayTelCalorimeterSD;
+class GammaRayTelTrackerROGeometry;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -108,7 +110,8 @@ public:
   G4int GetNbOfCALBars()               {return NbOfCALBars;}; 
   
   G4double GetACDThickness()           {return ACDThickness;};
-  
+  G4int GetNbOfACDTopTiles()           {return NbOfACDTopTiles;}; 
+  G4int GetNbOfACDLateralTiles()       {return NbOfACDLateralTiles;};
               
 private:
   
@@ -134,7 +137,11 @@ private:
   G4int NbOfCALBars; 
   G4double CALSizeXY; 
   G4double CALSizeZ;
-  
+
+  G4double CALBarX;
+  G4double CALBarY;
+  G4double CALBarZ;
+
   G4double ACDThickness;
   G4double ACTSizeXY; 
   G4double ACTSizeZ; 
@@ -147,6 +154,10 @@ private:
   G4double ACL2SizeY;
   G4double ACL2SizeZ;  
 
+
+  G4int NbOfACDLateralTiles;
+  G4int NbOfACDTopTiles;
+
   G4double TilesSeparation;
   G4double ACDTKRDistance;
   G4double CALTKRDistance;
@@ -208,10 +219,20 @@ private:
   G4LogicalVolume*   logicTKRDetectorY;
   G4VPhysicalVolume* physiTKRDetectorY;    
 
-  G4Box*             solidCALDetector;  // Calorimeter PLANE 
-  G4LogicalVolume*   logicCALDetector;
+  G4Box*             solidCALLayerX;  // Calorimeter PLANE X 
+  G4LogicalVolume*   logicCALLayerX;
+  G4VPhysicalVolume* physiCALLayerX;    
+
+  G4Box*             solidCALLayerY;  // Calorimeter PLANE Y
+  G4LogicalVolume*   logicCALLayerY;
+  G4VPhysicalVolume* physiCALLayerY;    
 
+  G4Box*             solidCALDetectorX;  // Calorimeter DETECTOR X
+  G4LogicalVolume*   logicCALDetectorX;
   G4VPhysicalVolume* physiCALDetectorX;    
+
+  G4Box*             solidCALDetectorY;  // Calorimeter DETECTOR Y
+  G4LogicalVolume*   logicCALDetectorY;
   G4VPhysicalVolume* physiCALDetectorY;    
 
   G4Box*             solidPlane;  // Support Plane 
@@ -225,7 +246,10 @@ private:
   G4UniformMagField* magField;      //pointer to the magnetic field
   
   GammaRayTelDetectorMessenger* detectorMessenger;  //pointer to the Messenger
-  GammaRayTelPayloadSD* payloadSD;  //pointer to the sensitive detector
+  GammaRayTelTrackerSD* trackerSD;  //pointer to the sensitive detector
+  GammaRayTelCalorimeterSD* calorimeterSD;  //pointer to the sensitive detector
+  GammaRayTelAnticoincidenceSD* anticoincidenceSD;  //pointer to the sensitive detector
+
 
 private:
     
@@ -241,7 +265,7 @@ inline void GammaRayTelDetectorConstruction::ComputePayloadParameters()
   // Compute derived parameters of the payload
 
   TKRSupportThickness =TKRLayerDistance -2.*TKRSiliconThickness 
-    - TKRViewsDistance;
+    - TKRViewsDistance - ConverterThickness;
   TKRSizeXY = NbOfTKRTiles*TKRSiliconTileXY + (NbOfTKRTiles+1)*TilesSeparation;
   TKRSizeZ = NbOfTKRLayers*TKRLayerDistance; 
   
@@ -259,6 +283,10 @@ inline void GammaRayTelDetectorConstruction::ComputePayloadParameters()
   CALSizeXY = TKRSizeXY;
   CALSizeZ = 2.*NbOfCALLayers*CALBarThickness;
  
+  CALBarX = CALSizeXY;
+  CALBarY = CALSizeXY/(NbOfCALBars);
+  CALBarZ = CALBarThickness;
+  
   ACTSizeXY = TKRSizeXY + 2*ACDTKRDistance + 2*ACDThickness;
   ACTSizeZ = ACDThickness;
 
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh
index 23666bc4d9342ec3105b9f112aa4eb2742a7a38e..7b491aa5d74ec080567bc78519dcd8c2546d327e 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelDetectorMessenger.hh,v 1.2 2000/11/15 20:27:38 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh
index f834d0f48be7102854185364ff9d36c6d9df591c..31750feb61b2459ffe8b79602fdd24dbb3f92aaf 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelDummySD.hh,v 1.1 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh
index eb6333de755fe9ade270dc788dd40c8b7519d263..66acc53f5f62369f4ee2130283f3daefd0a813d0 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelEventAction.hh,v 1.3 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelEventAction.hh,v 1.4 2001/03/05 13:58:20 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
@@ -37,25 +37,28 @@
 
 class GammaRayTelEventAction : public G4UserEventAction
 {
-  public:
+public:
+
 #ifdef G4ANALYSIS_USE
   GammaRayTelEventAction(GammaRayTelAnalysisManager* analysisMgr);
 #else
   GammaRayTelEventAction();
 #endif
   virtual ~GammaRayTelEventAction();
-
-  public:
+  
+public:
   virtual void   BeginOfEventAction(const G4Event*);
   virtual void   EndOfEventAction(const G4Event*);
   
   void SetDrawFlag   (G4String val)  {drawFlag = val;};
-
-  private:
-    G4int       trackerCollID;                
-    G4String    drawFlag;
+  
+private:
+  G4int       trackerCollID;                
+  G4int       calorimeterCollID;                
+  G4int       anticoincidenceCollID;                
+  G4String    drawFlag;
 #ifdef G4ANALYSIS_USE
-    GammaRayTelAnalysisManager* analysisManager;
+  GammaRayTelAnalysisManager* analysisManager;
 #endif
 };
 
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh
index 682c17752cbad468dcfe30d1f945fc1046b0c629..aec3b16a5010138701497ced310d72996a8cbcdb 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelPhysicsList.hh,v 1.2 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh
index 9b9629aab46edb1ed24bd2046dfc771c784b0e36..06551ce65b5835a3ecc1f28064c019cd584f6844 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelPrimaryGeneratorAction.hh,v 1.3 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh
index 5fe74f96ecb6a71659baaa354c0408b43140fcf8..3610fb6f1ca9bdf50ab0549c1bdbd9b86a33726d 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelPrimaryGeneratorMessenger.hh,v 1.2 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh
index ccadc56af1b1c22d62e7e406ea04a7f82ea61c4b..29a99dd3b6dccd7eaa7fc42ed5e8305ec0cedb2b 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelRunAction.hh,v 1.3 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPayloadHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh
similarity index 68%
rename from examples/advanced/gammaray_telescope/include/GammaRayTelPayloadHit.hh
rename to examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh
index e866af2a8be57a4fcf548354cd8e5bd7fb572be1..d5c479b5219f6a9525ad38638e7baaf894f34a60 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPayloadHit.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelPayloadHit.hh,v 1.2 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelTrackerHit.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
@@ -14,14 +14,14 @@
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
 //
-//      ------------ GammaRayTelPayloadHit  ------
+//      ------------ GammaRayTelTrackerHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
 //
 // ************************************************************
-// This Class describe the hits on the Payload
+// This Class describe the hits on the Tracker
 
-#ifndef GammaRayTelPayloadHit_h
-#define GammaRayTelPayloadHit_h 1
+#ifndef GammaRayTelTrackerHit_h
+#define GammaRayTelTrackerHit_h 1
 
 #include "G4VHit.hh"
 #include "G4THitsCollection.hh"
@@ -31,15 +31,15 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-class GammaRayTelPayloadHit : public G4VHit
+class GammaRayTelTrackerHit : public G4VHit
 {
 public:
   
-  GammaRayTelPayloadHit();
-  ~GammaRayTelPayloadHit();
-  GammaRayTelPayloadHit(const GammaRayTelPayloadHit&);
-  const GammaRayTelPayloadHit& operator=(const GammaRayTelPayloadHit&);
-  int operator==(const GammaRayTelPayloadHit&) const;
+  GammaRayTelTrackerHit();
+  ~GammaRayTelTrackerHit();
+  GammaRayTelTrackerHit(const GammaRayTelTrackerHit&);
+  const GammaRayTelTrackerHit& operator=(const GammaRayTelTrackerHit&);
+  int operator==(const GammaRayTelTrackerHit&) const;
   
   inline void* operator new(size_t);
   inline void  operator delete(void*);
@@ -73,24 +73,24 @@ public:
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-typedef G4THitsCollection<GammaRayTelPayloadHit> GammaRayTelPayloadHitsCollection;
+typedef G4THitsCollection<GammaRayTelTrackerHit> GammaRayTelTrackerHitsCollection;
 
-extern G4Allocator<GammaRayTelPayloadHit> GammaRayTelPayloadHitAllocator;
+extern G4Allocator<GammaRayTelTrackerHit> GammaRayTelTrackerHitAllocator;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline void* GammaRayTelPayloadHit::operator new(size_t)
+inline void* GammaRayTelTrackerHit::operator new(size_t)
 {
   void* aHit;
-  aHit = (void*) GammaRayTelPayloadHitAllocator.MallocSingle();
+  aHit = (void*) GammaRayTelTrackerHitAllocator.MallocSingle();
   return aHit;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline void GammaRayTelPayloadHit::operator delete(void* aHit)
+inline void GammaRayTelTrackerHit::operator delete(void* aHit)
 {
-  GammaRayTelPayloadHitAllocator.FreeSingle((GammaRayTelPayloadHit*) aHit);
+  GammaRayTelTrackerHitAllocator.FreeSingle((GammaRayTelTrackerHit*) aHit);
 }
 
 #endif
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPayloadROGeometry.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh
similarity index 63%
rename from examples/advanced/gammaray_telescope/include/GammaRayTelPayloadROGeometry.hh
rename to examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh
index 5693aeea054804e9a8822e4d44a338971f6b04dd..735a24b575a9c65ba3a6064b63c9f2ad71e01f30 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPayloadROGeometry.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelPayloadROGeometry.hh,v 1.1 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelTrackerROGeometry.hh,v 1.1 2001/03/05 13:58:21 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
@@ -14,25 +14,25 @@
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
 //
-//      ------------ GammaRayTelPayloadROGeometry  ------
+//      ------------ GammaRayTelTrackerROGeometry  ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
 //
 // ************************************************************
 
-#ifndef GammaRayTelPayloadROGeometry_h
-#define GammaRayTelPayloadROGeometry_h 1
+#ifndef GammaRayTelTrackerROGeometry_h
+#define GammaRayTelTrackerROGeometry_h 1
 
 #include "G4VReadOutGeometry.hh"
 
 class GammaRayTelDetectorConstruction;
 
-class GammaRayTelPayloadROGeometry : public G4VReadOutGeometry
+class GammaRayTelTrackerROGeometry : public G4VReadOutGeometry
 {
 public:
-  GammaRayTelPayloadROGeometry();
-  GammaRayTelPayloadROGeometry(G4String);
-  GammaRayTelPayloadROGeometry(G4String, GammaRayTelDetectorConstruction*);
-  ~GammaRayTelPayloadROGeometry();
+  GammaRayTelTrackerROGeometry();
+  GammaRayTelTrackerROGeometry(G4String);
+  GammaRayTelTrackerROGeometry(G4String, GammaRayTelDetectorConstruction*);
+  ~GammaRayTelTrackerROGeometry();
 
 private:
   G4VPhysicalVolume* Build();
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPayloadSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh
similarity index 69%
rename from examples/advanced/gammaray_telescope/include/GammaRayTelPayloadSD.hh
rename to examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh
index d7007e6ff4f56ce6885ece2ba3e6b63a447d2b72..b28fe23619b1669ea91beed9dacd65e25616ec78 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPayloadSD.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelPayloadSD.hh,v 1.3 2000/11/24 16:56:59 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelTrackerSD.hh,v 1.1 2001/03/05 13:58:21 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
@@ -14,13 +14,13 @@
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
 //
-//      ------------ GammaRayTelPayloadSD  ------
+//      ------------ GammaRayTelTrackerSD  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
 //
 // ************************************************************
 
-#ifndef GammaRayTelPayloadSD_h
-#define GammaRayTelPayloadSD_h 1
+#ifndef GammaRayTelTrackerSD_h
+#define GammaRayTelTrackerSD_h 1
 
 #include "G4VSensitiveDetector.hh"
 #include "globals.hh"
@@ -28,16 +28,16 @@
 class GammaRayTelDetectorConstruction;
 class G4HCofThisEvent;
 class G4Step;
-#include "GammaRayTelPayloadHit.hh"
+#include "GammaRayTelTrackerHit.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-class GammaRayTelPayloadSD : public G4VSensitiveDetector
+class GammaRayTelTrackerSD : public G4VSensitiveDetector
 {
 public:
   
-  GammaRayTelPayloadSD(G4String, GammaRayTelDetectorConstruction* );
-  ~GammaRayTelPayloadSD();
+  GammaRayTelTrackerSD(G4String, GammaRayTelDetectorConstruction* );
+  ~GammaRayTelTrackerSD();
   
   void Initialize(G4HCofThisEvent*);
   G4bool ProcessHits(G4Step* astep,G4TouchableHistory* ROHist);
@@ -48,10 +48,10 @@ public:
   
 private:
   
-  GammaRayTelPayloadHitsCollection*  PayloadCollection;      
+  GammaRayTelTrackerHitsCollection*  TrackerCollection;      
   GammaRayTelDetectorConstruction* Detector;
-  G4int (*HitXID)[30];
-  G4int (*HitYID)[30];
+  G4int (*ThitXID)[30];
+  G4int (*ThitYID)[30];
   G4int NbOfTKRLayers;
   G4int NbOfTKRStrips;
 
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh
index ad383aed830d863edfebcc5d47273eaf0895b886..38f91b1e57c7248b6275dd3e38fbc627e5c93837 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelVisManager.hh,v 1.2 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc
index 1b279c0d3017b0b761ac11affc8d5fa6889905af..9f037b7fe2dd8fe842e0a140d82b7d487f3c58af 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelAnalysisManager.cc,v 1.1 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc
index 65c9f2c25bbc17068b8ae882139a214cc0e744f7..c4d939f014ffaced941002b1a88231dc5e32fc21 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelAnalysisMessenger.cc,v 1.1 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a130089332925d32fcccba49894f8632c805ae29
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc
@@ -0,0 +1,92 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelAnticoincidenceHit.cc,v 1.1 2001/03/05 13:58:22 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class implementation file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelAnticoincidenceHit  ------
+//           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "GammaRayTelAnticoincidenceHit.hh"
+
+G4Allocator<GammaRayTelAnticoincidenceHit> GammaRayTelAnticoincidenceHitAllocator;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelAnticoincidenceHit::GammaRayTelAnticoincidenceHit()
+{
+  EdepACD = 0.; 
+  ACDTileNumber = 0; 
+  IsACDPlane = 0;
+  pos = 0.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelAnticoincidenceHit::~GammaRayTelAnticoincidenceHit()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelAnticoincidenceHit::GammaRayTelAnticoincidenceHit(const GammaRayTelAnticoincidenceHit& right)
+{
+  EdepACD = right.EdepACD; 
+  ACDTileNumber = right.ACDTileNumber;
+  IsACDPlane = right.IsACDPlane;
+  pos = right.pos;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+const GammaRayTelAnticoincidenceHit& GammaRayTelAnticoincidenceHit::operator=(const GammaRayTelAnticoincidenceHit& right)
+{
+  EdepACD = right.EdepACD; 
+  ACDTileNumber = right.ACDTileNumber;
+  IsACDPlane = right.IsACDPlane;
+  pos = right.pos;
+  return *this;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+int GammaRayTelAnticoincidenceHit::operator==(const GammaRayTelAnticoincidenceHit& right) const
+{
+  return 0;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelAnticoincidenceHit::Draw()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelAnticoincidenceHit::Print()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5790ce7589f490ed77dce7435ec361a750bac905
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc
@@ -0,0 +1,217 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelAnticoincidenceSD.cc,v 1.1 2001/03/05 13:58:22 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class implementation file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelAnticoincidenceSD  ------
+//           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+
+#include "GammaRayTelAnticoincidenceSD.hh"
+#include "GammaRayTelAnticoincidenceHit.hh"
+#include "GammaRayTelDetectorConstruction.hh"
+
+#include "G4VPhysicalVolume.hh"
+#include "G4Step.hh"
+#include "G4VTouchable.hh"
+#include "G4TouchableHistory.hh"
+#include "G4SDManager.hh"
+#include "G4ios.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelAnticoincidenceSD::GammaRayTelAnticoincidenceSD(G4String name,
+                                   GammaRayTelDetectorConstruction* det)
+:G4VSensitiveDetector(name),Detector(det)
+{
+  NbOfACDLateralTiles  =  Detector->GetNbOfACDLateralTiles();
+  NbOfACDTopTiles  =  Detector->GetNbOfACDTopTiles(); 
+
+  G4cout <<  NbOfACDLateralTiles << " LAT " << G4endl;
+  G4cout <<  NbOfACDTopTiles << " TOP " << G4endl;
+  
+  HitLateralID = new G4int[NbOfACDLateralTiles];
+  HitTopID = new G4int[NbOfACDTopTiles];
+  collectionName.insert("AnticoincidenceCollection");
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelAnticoincidenceSD::~GammaRayTelAnticoincidenceSD()
+{
+  delete [] HitLateralID;
+  delete [] HitTopID;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelAnticoincidenceSD::Initialize(G4HCofThisEvent*HCE)
+{
+  AnticoincidenceCollection = new GammaRayTelAnticoincidenceHitsCollection
+    (SensitiveDetectorName,collectionName[0]);
+  for (G4int i=0;i<NbOfACDLateralTiles;i++)
+    {
+      HitLateralID[i] = -1;
+    };
+  
+  for (G4int j=0;j<NbOfACDTopTiles;j++) 
+    {
+      
+      HitTopID[j] = -1;
+    };
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4bool GammaRayTelAnticoincidenceSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
+{ 
+  
+  G4double edep = aStep->GetTotalEnergyDeposit();
+  if ((edep/keV == 0.)) return false;      
+  
+  // This TouchableHistory is used to obtain the physical volume
+  // of the hit
+  G4TouchableHistory* theTouchable
+    = (G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable());
+  
+  G4VPhysicalVolume* acd_tile = theTouchable->GetVolume();  
+
+  G4int ACDTileNumber=acd_tile->GetCopyNo();
+  G4String ACDTileName = acd_tile->GetName();
+  
+  G4cout << ACDTileName << " " << edep/keV << G4endl;
+
+  if (ACDTileName == "ACT" )
+    // The hit is on an top ACD tile (ACDType 0)
+    {
+      // This is a new hit
+      if (HitTopID[ACDTileNumber]==-1)
+	{       
+	  GammaRayTelAnticoincidenceHit* 
+	    AnticoincidenceHit = new GammaRayTelAnticoincidenceHit;
+	  AnticoincidenceHit->SetACDType(0);
+	  AnticoincidenceHit->AddEnergy(edep);
+	  AnticoincidenceHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
+	  AnticoincidenceHit->SetACDTileNumber(ACDTileNumber);
+	  HitTopID[ACDTileNumber] = 
+	    AnticoincidenceCollection->insert(AnticoincidenceHit) -1;
+	}
+      else // This is not new
+	{
+	  (*AnticoincidenceCollection)
+	    [HitTopID[ACDTileNumber]]->AddEnergy(edep);
+	}
+    }
+ 
+  if (ACDTileName == "ACL1")
+    // The hit is on an lateral (left-right) ACD tile (ACDType 1)
+    {   
+      // This is a new hit
+      if (HitLateralID[ACDTileNumber]==-1)
+	{       
+	  GammaRayTelAnticoincidenceHit* 
+	    AnticoincidenceHit = new GammaRayTelAnticoincidenceHit;
+	  AnticoincidenceHit->SetACDType(1);
+	  AnticoincidenceHit->AddEnergy(edep);
+	  AnticoincidenceHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
+	  AnticoincidenceHit->SetACDTileNumber(ACDTileNumber);
+	  HitLateralID[ACDTileNumber] = 
+	    AnticoincidenceCollection->insert(AnticoincidenceHit) -1;
+	}
+      else // This is not new
+	{
+	  (*AnticoincidenceCollection)
+	    [HitLateralID[ACDTileNumber]]->AddEnergy(edep);
+	}
+    }
+
+   if (ACDTileName == "ACL2")
+    // The hit is on an lateral (rear - front) ACD tile (ACDType 2)
+    {   
+      // This is a new hit
+      if (HitLateralID[ACDTileNumber]==-1)
+	{       
+	  GammaRayTelAnticoincidenceHit* 
+	    AnticoincidenceHit = new GammaRayTelAnticoincidenceHit;
+	  AnticoincidenceHit->SetACDType(2);
+	  AnticoincidenceHit->AddEnergy(edep);
+	  AnticoincidenceHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
+	  AnticoincidenceHit->SetACDTileNumber(ACDTileNumber);
+	  HitLateralID[ACDTileNumber] = 
+	    AnticoincidenceCollection->insert(AnticoincidenceHit) -1;
+	}
+      else // This is not new
+	{
+	  (*AnticoincidenceCollection)
+	    [HitLateralID[ACDTileNumber]]->AddEnergy(edep);
+	}
+    }
+  return true;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelAnticoincidenceSD::EndOfEvent(G4HCofThisEvent* HCE)
+{
+  static G4int HCID = -1;
+  if(HCID<0)
+    { 
+      HCID = G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]);
+    }
+  HCE->AddHitsCollection(HCID,AnticoincidenceCollection);
+
+  for (G4int i=0;i<NbOfACDLateralTiles;i++)
+    {
+      HitLateralID[i] = -1;
+    };
+  
+  for (G4int j=0;j<NbOfACDTopTiles;j++) 
+    {
+      
+      HitTopID[j] = -1;
+    };
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelAnticoincidenceSD::clear()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelAnticoincidenceSD::DrawAll()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelAnticoincidenceSD::PrintAll()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc
new file mode 100644
index 0000000000000000000000000000000000000000..987a3a12243a769df7001dc648f0f979ca17abbf
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc
@@ -0,0 +1,95 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelCalorimeterHit.cc,v 1.1 2001/03/05 13:58:22 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class implementation file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelCalorimeterHit  ------
+//           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "GammaRayTelCalorimeterHit.hh"
+
+G4Allocator<GammaRayTelCalorimeterHit> GammaRayTelCalorimeterHitAllocator;
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelCalorimeterHit::GammaRayTelCalorimeterHit()
+{
+  EdepCAL = 0.; 
+  CALBarNumber = 0;
+  CALPlaneNumber = 0;
+  IsCALPlane = 0;
+  pos = 0.;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelCalorimeterHit::~GammaRayTelCalorimeterHit()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelCalorimeterHit::GammaRayTelCalorimeterHit(const GammaRayTelCalorimeterHit& right)
+{
+  EdepCAL = right.EdepCAL; 
+  CALBarNumber = right.CALBarNumber;
+  CALPlaneNumber = right.CALPlaneNumber;
+  IsCALPlane = right.IsCALPlane;
+  pos = right.pos;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+const GammaRayTelCalorimeterHit& GammaRayTelCalorimeterHit::operator=(const GammaRayTelCalorimeterHit& right)
+{
+  EdepCAL = right.EdepCAL; 
+  CALBarNumber = right.CALBarNumber;
+  CALPlaneNumber = right.CALPlaneNumber;
+  IsCALPlane = right.IsCALPlane;
+  pos = right.pos;
+  return *this;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+int GammaRayTelCalorimeterHit::operator==(const GammaRayTelCalorimeterHit& right) const
+{
+  return 0;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelCalorimeterHit::Draw()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelCalorimeterHit::Print()
+{;}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6ea448ecd64c841fc266a058e4d0df397fda9e17
--- /dev/null
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc
@@ -0,0 +1,194 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: GammaRayTelCalorimeterSD.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// ------------------------------------------------------------
+//      GEANT 4 class implementation file
+//      CERN Geneva Switzerland
+//
+//      For information related to this code contact:
+//      CERN, IT Division, ASD group
+//
+//      ------------ GammaRayTelCalorimeterSD  ------
+//           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
+//
+// ************************************************************
+
+#include "GammaRayTelCalorimeterSD.hh"
+#include "GammaRayTelCalorimeterHit.hh"
+#include "GammaRayTelDetectorConstruction.hh"
+
+#include "G4VPhysicalVolume.hh"
+#include "G4Step.hh"
+#include "G4VTouchable.hh"
+#include "G4TouchableHistory.hh"
+#include "G4SDManager.hh"
+#include "G4ios.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelCalorimeterSD::GammaRayTelCalorimeterSD(G4String name,
+                                   GammaRayTelDetectorConstruction* det)
+:G4VSensitiveDetector(name),Detector(det)
+{
+  NbOfCALBars  = Detector->GetNbOfCALBars();
+  NbOfCALLayers  = Detector->GetNbOfCALLayers();
+  G4cout <<  NbOfCALBars << " bars " << G4endl;
+  G4cout <<  NbOfCALLayers << " layers " << G4endl;
+  
+  ChitXID = new G4int[NbOfCALBars][12];
+  ChitYID = new G4int[NbOfCALBars][12];
+  collectionName.insert("CalorimeterCollection");
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+GammaRayTelCalorimeterSD::~GammaRayTelCalorimeterSD()
+{
+  delete [] ChitXID;
+  delete [] ChitYID;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelCalorimeterSD::Initialize(G4HCofThisEvent*HCE)
+{
+  CalorimeterCollection = new GammaRayTelCalorimeterHitsCollection
+    (SensitiveDetectorName,collectionName[0]);
+  for (G4int i=0;i<NbOfCALBars;i++)
+    for (G4int j=0;j<NbOfCALLayers;j++) 
+      {
+	ChitXID[i][j] = -1;
+	ChitYID[i][j] = -1;
+      };
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4bool GammaRayTelCalorimeterSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
+{ 
+  
+  G4double edep = aStep->GetTotalEnergyDeposit();
+  if ((edep/keV == 0.)) return false;      
+  
+  // This TouchableHistory is used to obtain the physical volume
+  // of the hit
+  G4TouchableHistory* theTouchable
+    = (G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable());
+  
+  G4VPhysicalVolume* cal_bar = theTouchable->GetVolume();  
+  G4VPhysicalVolume* cal_plane = cal_bar->GetMother();
+
+  G4int CALBarNumber=cal_bar->GetCopyNo();
+  G4String CALBarName = cal_bar->GetName();
+  
+  G4int PlaneNumber = 0;
+  PlaneNumber=cal_plane->GetCopyNo();
+  G4String PlaneName = cal_plane->GetName();
+
+ if (PlaneName == "CALLayerX" )
+
+    // The hit is on an X CsI plane
+
+    {
+      // This is a new hit
+      if (ChitXID[CALBarNumber][PlaneNumber]==-1)
+	{       
+	  GammaRayTelCalorimeterHit* CalorimeterHit = new GammaRayTelCalorimeterHit;
+	  CalorimeterHit->SetCALType(1);
+	  CalorimeterHit->AddEnergy(edep);
+	  CalorimeterHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
+	  CalorimeterHit->SetCALPlaneNumber(PlaneNumber);
+	  CalorimeterHit->SetCALBarNumber(CALBarNumber);
+	  ChitXID[CALBarNumber][PlaneNumber] = 
+	    CalorimeterCollection->insert(CalorimeterHit) -1;
+	}
+      else // This is not new
+	{
+	  (*CalorimeterCollection)
+	    [ChitXID[CALBarNumber][PlaneNumber]]->AddEnergy(edep);
+	}
+    }
+ 
+  if (PlaneName == "CALLayerY")
+    // The hit is on an Y CsI plane    
+    {   
+      // This is a new hit
+      if (ChitYID[CALBarNumber][PlaneNumber]==-1)
+	{       
+	  GammaRayTelCalorimeterHit* CalorimeterHit 
+	    = new GammaRayTelCalorimeterHit;
+	  CalorimeterHit->SetCALType(0);
+	  CalorimeterHit->AddEnergy(edep);
+	  CalorimeterHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
+	  CalorimeterHit->SetCALPlaneNumber(PlaneNumber);
+	  CalorimeterHit->SetCALBarNumber(CALBarNumber);
+	  ChitYID[CALBarNumber][PlaneNumber] = 
+	    CalorimeterCollection->insert(CalorimeterHit)-1;
+	}
+      else // This is not new
+	{
+	  (*CalorimeterCollection)
+	    [ChitYID[CALBarNumber][PlaneNumber]]->AddEnergy(edep);
+	}
+    }
+  
+  return true;
+}
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+void GammaRayTelCalorimeterSD::EndOfEvent(G4HCofThisEvent* HCE)
+{
+  static G4int HCID = -1;
+  if(HCID<0)
+    { 
+      HCID = G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]);
+    }
+  HCE->AddHitsCollection(HCID,CalorimeterCollection);
+
+
+  for (G4int i=0;i<NbOfCALBars;i++) 
+    for (G4int j=0;j<NbOfCALLayers;j++)
+      {
+	ChitXID[i][j] = -1;
+	ChitYID[i][j] = -1;
+      };
+}
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelCalorimeterSD::clear()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelCalorimeterSD::DrawAll()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void GammaRayTelCalorimeterSD::PrintAll()
+{} 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc
index 15f00a7a7bb2e6eb9e3cad3ef4fca1fa7721527b..b92edcadf721fb45ac028a6e2fecefbcd22a79ae 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelDetectorConstruction.cc,v 1.4 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelDetectorConstruction.cc,v 1.5 2001/03/05 13:58:23 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
@@ -24,8 +24,11 @@
 #include "GammaRayTelDetectorConstruction.hh"
 #include "GammaRayTelDetectorMessenger.hh"
 
-#include "GammaRayTelPayloadSD.hh"
-#include "GammaRayTelPayloadROGeometry.hh"
+#include "GammaRayTelTrackerSD.hh"
+#include "GammaRayTelTrackerROGeometry.hh"
+
+#include "GammaRayTelAnticoincidenceSD.hh"
+#include "GammaRayTelCalorimeterSD.hh"
 
 #include "G4Material.hh"
 #include "G4Box.hh"
@@ -57,8 +60,10 @@ GammaRayTelDetectorConstruction::GammaRayTelDetectorConstruction()
    solidTKRDetectorX(0),logicTKRDetectorX(0),
    solidTKRDetectorY(0),logicTKRDetectorY(0),
    physiTKRDetectorX(0),physiTKRDetectorY(0),
-   solidCALDetector(0),logicCALDetector(0),
-   physiCALDetectorX(0),physiCALDetectorY(0),
+   solidCALDetectorX(0),logicCALDetectorX(0),physiCALDetectorX(0),
+   solidCALDetectorY(0),logicCALDetectorY(0),physiCALDetectorY(0),
+   solidCALLayerX(0),logicCALLayerX(0),physiCALLayerX(0),
+   solidCALLayerY(0),logicCALLayerY(0),physiCALLayerY(0),
    solidPlane(0),logicPlane(0),physiPlane(0)
 
 {
@@ -77,6 +82,8 @@ GammaRayTelDetectorConstruction::GammaRayTelDetectorConstruction()
   NbOfCALBars = 12;
   NbOfCALLayers = 5;
   ACDThickness = 1.*cm;
+  NbOfACDTopTiles = 1;
+  NbOfACDLateralTiles = 2;
 
   TilesSeparation = 100.*micrometer;
   ACDTKRDistance = 5.*cm;
@@ -246,427 +253,514 @@ G4VPhysicalVolume* GammaRayTelDetectorConstruction::ConstructPayload()
   solidTKRDetectorX=0;logicTKRDetectorX=0;
   solidTKRDetectorY=0;logicTKRDetectorY=0;
   physiTKRDetectorX=0;physiTKRDetectorY=0;
-  solidCALDetector=0;logicCALDetector=0;
-  physiCALDetectorX=0;physiCALDetectorY=0;
+  solidCALDetectorX=0;logicCALDetectorX=0;physiCALDetectorX=0;
+  solidCALDetectorY=0;logicCALDetectorY=0;physiCALDetectorY=0;
   solidPlane=0;logicPlane=0;physiPlane=0;
   
-  //  if (PayloadSizeZ > 0.) 
-  //  { 
-
-      //
-      // Payload
-      //
-      
-      solidPayload = new G4Box("Payload",		
-			       PayloadSizeXY/2,
-			       PayloadSizeXY/2,
-			       PayloadSizeZ/2);
-      
-      logicPayload = new G4LogicalVolume(solidPayload,	
-					 defaultMaterial,	
-					 "Payload");  
-      
-      physiPayload = new G4PVPlacement(0,		
-				       G4ThreeVector(),	
-				       "Payload",	
-				       logicPayload,	
-				       physiWorld,	
-				       false,		
-				       0);		
-      //                                 
-      // Calorimeter (CAL)
-      //
-
-      solidCAL = new G4Box("CAL",			
-			   CALSizeXY/2,CALSizeXY/2,CALSizeZ/2); 
-      
-      logicCAL = new G4LogicalVolume(solidCAL,
-				     defaultMaterial,
-				     "CAL");	
-      physiCAL = new G4PVPlacement(0,		
-				   G4ThreeVector(0,0,
-						 -PayloadSizeZ/2+CALSizeZ/2),
-				   "CAL",		
-				   logicCAL,
-				   physiPayload,
-				   false,	
-				   0);	
-      //                                 
-      // Tracker (TKR)
+  //
+  // Payload
+  //
+  
+  solidPayload = new G4Box("Payload",		
+			   PayloadSizeXY/2,
+			   PayloadSizeXY/2,
+			   PayloadSizeZ/2);
+  
+  logicPayload = new G4LogicalVolume(solidPayload,	
+				     defaultMaterial,	
+				     "Payload");  
+  
+  physiPayload = new G4PVPlacement(0,		
+				   G4ThreeVector(),	
+				   "Payload",	
+				   logicPayload,	
+				   physiWorld,	
+				   false,		
+				   0);		
+  //                                 
+  // Calorimeter (CAL)
+  //
+  
+  solidCAL = new G4Box("CAL",			
+		       CALSizeXY/2,CALSizeXY/2,CALSizeZ/2); 
+  
+  logicCAL = new G4LogicalVolume(solidCAL,
+				 defaultMaterial,
+				 "CAL");	
+  physiCAL = new G4PVPlacement(0,		
+			       G4ThreeVector(0,0,
+					     -PayloadSizeZ/2+CALSizeZ/2),
+			       "CAL",		
+			       logicCAL,
+			       physiPayload,
+			       false,	
+			       0);	
+  //                                 
+  // Tracker (TKR)
       //
-
-      solidTKR = new G4Box("TKR",			
+  
+  solidTKR = new G4Box("TKR",			
 			   TKRSizeXY/2,TKRSizeXY/2,TKRSizeZ/2); 
+  
+  logicTKR = new G4LogicalVolume(solidTKR,
+				 defaultMaterial,
+				 "TKR");	
+  physiTKR = new G4PVPlacement(0,		
+			       G4ThreeVector(0,0,
+					     -PayloadSizeZ/2+CALSizeZ+
+					     CALTKRDistance+TKRSizeZ/2),
+			       "TKR",		
+			       logicTKR,
+			       physiPayload,
+			       false,	
+			       0);	
+  
+  
+  //                               
+  // Anticoincidence Top (ACT)
+  //
+  
+  solidACT = new G4Box("ACT",			
+		       ACTSizeXY/2,ACTSizeXY/2,ACTSizeZ/2); 
+  
+  logicACT = new G4LogicalVolume(solidACT,ACDMaterial,"ACT");
+  
+  physiACT = new G4PVPlacement(0,		
+			       G4ThreeVector(0,0,
+					     -PayloadSizeZ/2+CALSizeZ+
+					     CALTKRDistance+TKRSizeZ+
+					     ACDTKRDistance+ACTSizeZ/2),
+			       "ACT",		
+			       logicACT,
+			       physiPayload,
+			       false,	
+			       0);	
+  
+  //                               
+  // Anticoincidence Lateral Side (ACL)
+  //
+  
+  solidACL1 = new G4Box("ACL1",			
+			ACL1SizeX/2,ACL1SizeY/2,ACL1SizeZ/2); 
+  
+  logicACL1 = new G4LogicalVolume(solidACL1,ACDMaterial,"ACL");	
+  
+  physiACL1 = new G4PVPlacement(0, 
+				G4ThreeVector(-PayloadSizeXY/2+ACL1SizeX/2,
+					      -PayloadSizeXY/2+ACL1SizeY/2,
+					      -PayloadSizeZ/2+ACL1SizeZ/2),
+				"ACL1",		
+				logicACL1,
+				physiPayload,
+				false,	
+				0);	
+  
+  physiACL1 = new G4PVPlacement(0,
+				G4ThreeVector(PayloadSizeXY/2-ACL1SizeX/2,
+					      PayloadSizeXY/2-ACL1SizeY/2,
+					      -PayloadSizeZ/2+ACL1SizeZ/2),
+				"ACL1",		
+				logicACL1,
+				physiPayload,
+				false,	
+				1);	
+  
+  solidACL2 = new G4Box("ACL2",			
+			ACL2SizeX/2,ACL2SizeY/2,ACL2SizeZ/2); 
+  
+  logicACL2 = new G4LogicalVolume(solidACL2,
+				  ACDMaterial,
+				  "ACL2");	
+  
+  
+  physiACL2 = new G4PVPlacement(0, 
+				G4ThreeVector(-PayloadSizeXY/2+ACL2SizeX/2,
+					      PayloadSizeXY/2-ACL2SizeY/2,
+					      -PayloadSizeZ/2+ACL2SizeZ/2),
+				"ACL2",		
+				logicACL2,
+				physiPayload,
+				false,	
+				0);	
+  
+  physiACL2 = new G4PVPlacement(0, 
+				G4ThreeVector(PayloadSizeXY/2-ACL2SizeX/2,
+					      -PayloadSizeXY/2+ACL2SizeY/2,
+					      -PayloadSizeZ/2+ACL2SizeZ/2),
+				"ACL2",		
+				logicACL2,
+				physiPayload,
+				false,	
+				1);	
+  
+  
+  // Tracker Structure (Plane + Converter + TKRDetectorX + TKRDetectorY)
+  
+  solidPlane = new G4Box("Plane",			
+			 TKRSizeXY/2,TKRSizeXY/2,TKRSupportThickness/2); 
+  
+  logicPlane = new G4LogicalVolume(solidPlane,
+				   defaultMaterial, 
+				   "Plane");	
+  
+  solidTKRDetectorY = new G4Box
+    ("TKRDetectorY",TKRSizeXY/2,TKRSizeXY/2,TKRSiliconThickness/2); 
+  
+  logicTKRDetectorY = new G4LogicalVolume(solidTKRDetectorY,
+					  TKRMaterial, 
+					  "TKRDetector Y");	
+  
+  
+  solidTKRDetectorX = new G4Box
+    ("TKRDetectorX",TKRSizeXY/2,TKRSizeXY/2,TKRSiliconThickness/2); 
+  
+  logicTKRDetectorX = new G4LogicalVolume(solidTKRDetectorX,
+					  TKRMaterial, 
+					  "TKRDetector X");	
+  
+  
+  solidConverter = new G4Box
+    ("Converter",TKRSizeXY/2,TKRSizeXY/2,ConverterThickness/2); 
+  
+  logicConverter = new G4LogicalVolume(solidConverter,
+				       ConverterMaterial, 
+				       "Converter");	
+  
+  G4int i=0;
+  
+  for (i = 0; i < NbOfTKRLayers; i++)
+    {
       
-      logicTKR = new G4LogicalVolume(solidTKR,
-				     defaultMaterial,
-				     "TKR");	
-      physiTKR = new G4PVPlacement(0,		
-				   G4ThreeVector(0,0,
-						 -PayloadSizeZ/2+CALSizeZ+
-                                                 CALTKRDistance+TKRSizeZ/2),
-				   "TKR",		
-				   logicTKR,
-				   physiPayload,
-				   false,	
-				   0);	
-
-
-      //                               
-      // Anticoincidence Top (ACT)
-      //
-      
-      solidACT = new G4Box("ACT",			
-			   ACTSizeXY/2,ACTSizeXY/2,ACTSizeZ/2); 
-      
-      logicACT = new G4LogicalVolume(solidACT,ACDMaterial,"ACT");
-      
-      physiACT = new G4PVPlacement(0,		
-				   G4ThreeVector(0,0,
-						 -PayloadSizeZ/2+CALSizeZ+
-                                                 CALTKRDistance+TKRSizeZ+
-                                                 ACDTKRDistance+ACTSizeZ/2),
-				   "ACT",		
-				   logicACT,
-				   physiPayload,
-				   false,	
-				   0);	
-
-      //                               
-      // Anticoincidence Lateral Side (ACL)
-      //
-      
-      solidACL1 = new G4Box("ACL1",			
-			    ACL1SizeX/2,ACL1SizeY/2,ACL1SizeZ/2); 
-      
-      logicACL1 = new G4LogicalVolume(solidACL1,ACDMaterial,"ACL");	
-
-      physiACL1 = new G4PVPlacement(0, 
-				    G4ThreeVector(-PayloadSizeXY/2+ACL1SizeX/2,
-						  -PayloadSizeXY/2+ACL1SizeY/2,
-						  -PayloadSizeZ/2+ACL1SizeZ/2),
-				    "ACL1",		
-				    logicACL1,
-				    physiPayload,
-				    false,	
-				    0);	
-
-      physiACL1 = new G4PVPlacement(0,
-				    G4ThreeVector(PayloadSizeXY/2-ACL1SizeX/2,
-						  PayloadSizeXY/2-ACL1SizeY/2,
-						  -PayloadSizeZ/2+ACL1SizeZ/2),
-				    "ACL1",		
-				    logicACL1,
-				    physiPayload,
-				    false,	
-				    1);	
-      
-      solidACL2 = new G4Box("ACL2",			
-			    ACL2SizeX/2,ACL2SizeY/2,ACL2SizeZ/2); 
-      
-      logicACL2 = new G4LogicalVolume(solidACL2,
-				      ACDMaterial,
-				      "ACL2");	
- 
-
-      physiACL2 = new G4PVPlacement(0, 
-				    G4ThreeVector(-PayloadSizeXY/2+ACL2SizeX/2,
-						  PayloadSizeXY/2-ACL2SizeY/2,
-						  -PayloadSizeZ/2+ACL2SizeZ/2),
-				    "ACL2",		
-				    logicACL2,
-				    physiPayload,
-				    false,	
-				    0);	
-      
-      physiACL2 = new G4PVPlacement(0, 
-				    G4ThreeVector(PayloadSizeXY/2-ACL2SizeX/2,
-						  -PayloadSizeXY/2+ACL2SizeY/2,
-						  -PayloadSizeZ/2+ACL2SizeZ/2),
-				    "ACL2",		
-				    logicACL2,
-				    physiPayload,
-				    false,	
-				    1);	
-      
-      
-      // Tracker Structure (Plane + Converter + TKRDetectorX + TKRDetectorY)
-      
-      solidPlane = new G4Box("Plane",			
-			     TKRSizeXY/2,TKRSizeXY/2,TKRSupportThickness/2); 
-      
-      logicPlane = new G4LogicalVolume(solidPlane,
-				       defaultMaterial, 
-				       "Plane");	
-
-      solidTKRDetectorY = new G4Box
-	("TKRDetectorY",TKRSizeXY/2,TKRSizeXY/2,TKRSiliconThickness/2); 
-      
-      logicTKRDetectorY = new G4LogicalVolume(solidTKRDetectorY,
-					     TKRMaterial, 
-					     "TKRDetector Y");	
-
-
-      solidTKRDetectorX = new G4Box
-	("TKRDetectorX",TKRSizeXY/2,TKRSizeXY/2,TKRSiliconThickness/2); 
-      
-      logicTKRDetectorX = new G4LogicalVolume(solidTKRDetectorX,
-					     TKRMaterial, 
-					     "TKRDetector X");	
-      
-      
-      solidConverter = new G4Box
-	("Converter",TKRSizeXY/2,TKRSizeXY/2,ConverterThickness/2); 
+      physiTKRDetectorY = 
+	new G4PVPlacement(0,G4ThreeVector(0.,0.,-TKRSizeZ/2
+					  +TKRSiliconThickness/2 
+					  +(i)*TKRLayerDistance),
+			  "TKRDetectorY",		
+			  logicTKRDetectorY,
+			  physiTKR,
+			  false,	
+			  i);
+      
+      physiTKRDetectorX = 
+	new G4PVPlacement(0,G4ThreeVector(0.,0.,
+					  -TKRSizeZ/2+
+					  TKRSiliconThickness/2 +
+					  TKRViewsDistance+
+					  TKRSiliconThickness+
+					  (i)*TKRLayerDistance),
+			  "TKRDetectorX",		
+			  logicTKRDetectorX,
+			  physiTKR,
+			  false,	
+			  i);
+      
+      
+      physiConverter = 
+	new G4PVPlacement(0,G4ThreeVector(0.,0.,
+					  -TKRSizeZ/2+
+					  2*TKRSiliconThickness +
+					  TKRViewsDistance+
+					  ConverterThickness/2+
+					  (i)*TKRLayerDistance),
+			  "Converter",		
+			  logicConverter,
+			  physiTKR,
+			  false,	
+			  i);
+      
+
+      physiPlane =
+	new G4PVPlacement(0,G4ThreeVector(0.,0.,
+					  -TKRSizeZ/2+
+					  2*TKRSiliconThickness +
+					  TKRViewsDistance+
+					  ConverterThickness+
+					  TKRSupportThickness/2),
+			  "Plane",		
+			  logicPlane,
+			  physiTKR,
+			  false,	
+			  i);	
       
-      logicConverter = new G4LogicalVolume(solidConverter,
-					     ConverterMaterial, 
-					     "Converter");	
-
-      G4int i=0;
       
-      for (i = 0; i < NbOfTKRLayers; i++)
+    }
+  
+  
+  
+  G4VSolid * solidTKRActiveTileX = new
+    G4Box("Active Tile X", TKRActiveTileXY/2,
+	  TKRActiveTileXY/2,TKRActiveTileZ/2);
+  
+  
+  G4VSolid * solidTKRActiveTileY = new
+    G4Box("Active Tile Y", TKRActiveTileXY/2,
+	  TKRActiveTileXY/2,TKRActiveTileZ/2);
+  
+  
+  G4LogicalVolume* logicTKRActiveTileX = 
+    new G4LogicalVolume(solidTKRActiveTileX, TKRMaterial,
+			"Active Tile X",0,0,0);
+  
+  
+  G4LogicalVolume* logicTKRActiveTileY = 
+    new G4LogicalVolume(solidTKRActiveTileY, TKRMaterial,
+			"Active Tile Y",0,0,0);
+  
+  
+  G4int j=0;
+  G4int k=0;
+  
+  G4VPhysicalVolume* physiTKRActiveTileX = 0;
+  G4VPhysicalVolume* physiTKRActiveTileY = 0;
+  
+  G4double x=0.;
+  G4double y=0.;
+  G4double z=0.;
+  
+  for (i=0;i< NbOfTKRTiles; i++)
+    { 
+      for (j=0;j< NbOfTKRTiles; j++)
 	{
+	  k = i*NbOfTKRTiles + j;
 	  
-          physiTKRDetectorY = 
-	    new G4PVPlacement(0,G4ThreeVector(0.,0.,-TKRSizeZ/2
-					      +TKRSiliconThickness/2 
-					      +(i)*TKRLayerDistance),
-			      "TKRDetectorY",		
-			      logicTKRDetectorY,
-			      physiTKR,
-			      false,	
-			      i);
-	
-	  physiTKRDetectorX = 
-	    new G4PVPlacement(0,G4ThreeVector(0.,0.,
-					      -TKRSizeZ/2+
-					      TKRSiliconThickness/2 +
-					      TKRViewsDistance+
-					      TKRSiliconThickness+
-					      (i)*TKRLayerDistance),
-			      "TKRDetectorX",		
-			      logicTKRDetectorX,
-			      physiTKR,
-			      false,	
-			      i);
-
-
-          physiConverter = 
-	    new G4PVPlacement(0,G4ThreeVector(0.,0.,
-					      -TKRSizeZ/2+
-					      2*TKRSiliconThickness +
-					      TKRViewsDistance+
-					      ConverterThickness/2+
-					      (i)*TKRLayerDistance),
-			      "Converter",		
-			      logicConverter,
-			      physiTKR,
+	  
+	  x = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
+	    TKRActiveTileXY/2+(i)*((2*SiliconGuardRing)+
+				   TilesSeparation+TKRActiveTileXY);
+	  y = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
+	    TKRActiveTileXY/2+(j)*((2*SiliconGuardRing)+TilesSeparation+
+				   TKRActiveTileXY);
+	  z = 0.;
+	  
+	  physiTKRActiveTileY =
+	    new G4PVPlacement(0,
+			      G4ThreeVector(x,y,z),
+			      "Active Tile Y",		
+			      logicTKRActiveTileY,
+			      physiTKRDetectorY,
 			      false,	
-			      i);
+			      k);
 	  
 
-	  physiPlane =
-	    new G4PVPlacement(0,G4ThreeVector(0.,0.,
-					      -TKRSizeZ/2+
-					      2*TKRSiliconThickness +
-					      TKRViewsDistance+
-					      ConverterThickness+
-                                              TKRSupportThickness/2),
-			      "Plane",		
-			      logicPlane,
-			      physiTKR,
+	  x = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
+	    TKRActiveTileXY/2+(j)*((2*SiliconGuardRing)+
+				   TilesSeparation+TKRActiveTileXY);
+	  y = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
+	    TKRActiveTileXY/2+(i)*((2*SiliconGuardRing)+
+				   TilesSeparation+TKRActiveTileXY);
+	  z = 0.;
+	      
+	  physiTKRActiveTileX =
+	    new G4PVPlacement(0,
+			      G4ThreeVector(x,y,z),
+			      "Active Tile X",		
+			      logicTKRActiveTileX,
+			      physiTKRDetectorX,
 			      false,	
-			      i);	
-	  
+			      k);	
 	  
 	}
- 
-
-
-      G4VSolid * solidTKRActiveTileX = new
-	G4Box("Active Tile X", TKRActiveTileXY/2,TKRActiveTileXY/2,TKRActiveTileZ/2);
-
+    }
+  
 
-      G4VSolid * solidTKRActiveTileY = new
-	G4Box("Active Tile Y", TKRActiveTileXY/2,TKRActiveTileXY/2,TKRActiveTileZ/2);
+  // Calorimeter Structure (CALLayerX + CALLayerY)
   
   
-      G4LogicalVolume* logicTKRActiveTileX = 
-	new G4LogicalVolume(solidTKRActiveTileX, TKRMaterial,
-			    "Active Tile X",0,0,0);
-
-
-      G4LogicalVolume* logicTKRActiveTileY = 
-	new G4LogicalVolume(solidTKRActiveTileY, TKRMaterial,
-			    "Active Tile Y",0,0,0);
-
+  solidCALLayerX = new G4Box("CALLayerX",			
+			     CALSizeXY/2,CALSizeXY/2,CALBarThickness/2); 
+  
+  logicCALLayerX = new G4LogicalVolume(solidCALLayerX,
+				       CALMaterial, 
+				       "CALLayerX");	
+  
+  solidCALLayerY = new G4Box("CALLayerY",			
+			     CALSizeXY/2,CALSizeXY/2,CALBarThickness/2); 
+  
+  logicCALLayerY = new G4LogicalVolume(solidCALLayerY,
+				       CALMaterial, 
+				       "CALLayerY");	
+  
+  for (i = 0; i < NbOfCALLayers; i++)
+    {
       
-      G4int j=0;
-      G4int k=0;
+      physiCALLayerY = 
+	new G4PVPlacement(0,G4ThreeVector(0,0,
+					  -CALSizeZ/2+
+					  CALBarThickness/2 +
+					  (i)*2*CALBarThickness),
+			  "CALLayerY",		
+			  logicCALLayerY,
+			  physiCAL,
+			  false,	
+			  i);	
+      
+      physiCALLayerX = 
+	new G4PVPlacement(0,G4ThreeVector(0,0,
+					  -CALSizeZ/2+
+					  CALBarThickness/2 + 
+					  CALBarThickness +
+					  (i)*2*CALBarThickness),
+			  "CALLayerX",		
+			  logicCALLayerX,
+			  physiCAL,
+			  false,	
+			  i);	
       
-      G4VPhysicalVolume* physiTKRActiveTileX = 0;
-      G4VPhysicalVolume* physiTKRActiveTileY = 0;
+    }
+  
+  // Calorimeter Structure (CALDetectorX + CALDetectorY)
+  
+  solidCALDetectorX = new G4Box("CALDetectorX",			
+				CALBarX/2,CALBarY/2,CALBarThickness/2); 
+  
+  logicCALDetectorX = new G4LogicalVolume(solidCALDetectorX,
+					  CALMaterial, 
+					  "CALDetectorX");	
+  
+  solidCALDetectorY = new G4Box("CALDetectorY",			
+				CALBarY/2,CALBarX/2,CALBarThickness/2); 
+  
+  logicCALDetectorY = new G4LogicalVolume(solidCALDetectorY,
+					  CALMaterial, 
+					  "CALDetectorY");	
+  
+  for (i = 0; i < NbOfCALBars; i++)
+    {
       
-      G4double x=0.;
-      G4double y=0.;
-      G4double z=0.;
-
-      for (i=0;i< NbOfTKRTiles; i++)
-	{ 
-	  for (j=0;j< NbOfTKRTiles; j++)
-	    {
-	      k = i*NbOfTKRTiles + j;
-	      
-	     
-	      x = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
-		TKRActiveTileXY/2+(i)*((2*SiliconGuardRing)+
-				       TilesSeparation+TKRActiveTileXY);
-	      y = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
-		TKRActiveTileXY/2+(j)*((2*SiliconGuardRing)+TilesSeparation+
-				       TKRActiveTileXY);
-	      z = 0.;
-	      
-	      physiTKRActiveTileY =
-		new G4PVPlacement(0,
-				  G4ThreeVector(x,y,z),
-				  "Active Tile Y",		
-				  logicTKRActiveTileY,
-				  physiTKRDetectorY,
-				  false,	
-				  k);
-	  	
-
-	      x = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
-		TKRActiveTileXY/2+(j)*((2*SiliconGuardRing)+
-				       TilesSeparation+TKRActiveTileXY);
-	      y = -TKRSizeXY/2+TilesSeparation+SiliconGuardRing+
-		TKRActiveTileXY/2+(i)*((2*SiliconGuardRing)+
-				       TilesSeparation+TKRActiveTileXY);
-	      z = 0.;
-	      
-	      physiTKRActiveTileX =
-		new G4PVPlacement(0,
-				  G4ThreeVector(x,y,z),
-				  "Active Tile X",		
-				  logicTKRActiveTileX,
-				  physiTKRDetectorX,
-				  false,	
-				  k);	
-	      
-	    }
-	}
+      physiCALDetectorY = 
+	new G4PVPlacement(0,
+			  G4ThreeVector(-CALSizeXY/2+ CALBarY/2 +
+					(i)*CALBarY, 0, 0),
+			  "CALDetectorY",		
+			  logicCALDetectorY,
+			  physiCALLayerY,
+			  false,	
+			  i);	
+      
+      physiCALDetectorX = 
+	new G4PVPlacement(0,
+			  G4ThreeVector(0,-CALSizeXY/2+ CALBarY/2 +
+					(i)*CALBarY, 0),
+			  "CALDetectorX",		
+			  logicCALDetectorX,
+			  physiCALLayerX,
+			  false,	
+			  i);	
+      
+    }
+  
+  
+  
+  // Sensitive Detector Manager
+  
+  G4SDManager* SDman = G4SDManager::GetSDMpointer();
+  
+  //
+  // Sensitive Detectors - Tracker
+  // 
+                               
+  
+  if(!trackerSD)
+    {
+      trackerSD = new GammaRayTelTrackerSD("TrackerSD",this);
+      SDman->AddNewDetector( trackerSD );		
+    }
+  
+  G4String ROgeometryName = "TrackerROGeom";
+  G4VReadOutGeometry* trackerRO = 
+    new GammaRayTelTrackerROGeometry(ROgeometryName, this);
+  
+  trackerRO->BuildROGeometry();
+  trackerSD->SetROgeometry(trackerRO);
 
+  if (logicTKRActiveTileX)
+    logicTKRActiveTileX->SetSensitiveDetector(trackerSD); // ActiveTileX
+  if (logicTKRActiveTileY)
+    logicTKRActiveTileY->SetSensitiveDetector(trackerSD); // ActiveTileY
 
-      // Calorimeter Structure (CALDetectorX + CALDetectorY)
-      
-      
-      solidCALDetector = new G4Box("CALDetector",			
-			     CALSizeXY/2,CALSizeXY/2,CALBarThickness/2); 
-      
-      logicCALDetector = new G4LogicalVolume(solidCALDetector,
-					     CALMaterial, 
-					     "CALDetector");	
-      
-      for (i = 0; i < NbOfCALLayers; i++)
-	{
-	  
-	  physiCALDetectorY = 
-	    new G4PVPlacement(0,G4ThreeVector(0,0,
-					      -CALSizeZ/2+
-					      CALBarThickness/2 +
-					      (i)*2*CALBarThickness),
-			      "CALDetectorY",		
-			      logicCALDetector,
-			      physiCAL,
-			      false,	
-			      i);	
-	  
-          physiCALDetectorX = 
-	    new G4PVPlacement(0,G4ThreeVector(0,0,
-					      -CALSizeZ/2+
-                                              CALBarThickness/2 + 
-                                              CALBarThickness +
-					      (i)*2*CALBarThickness),
-			      "CALDetectorX",		
-			      logicCALDetector,
-			      physiCAL,
-			      false,	
-			      i);	
+  //
+  // Sensitive Detectors: Calorimeter
+  // 
 
-	}
-      
-      
-      //}
-      
-      
-      //                               
-      // Sensitive Detectors: TKRDetector
-      //
 
-      G4SDManager* SDman = G4SDManager::GetSDMpointer();
-      if(!payloadSD)
-	{
-	  payloadSD = new GammaRayTelPayloadSD("PayloadSD",this);
-	  SDman->AddNewDetector( payloadSD );		
-	}
-      
-      G4String ROgeometryName = "PayloadROGeom";
-      G4VReadOutGeometry* payloadRO = 
-	payloadRO = new GammaRayTelPayloadROGeometry(ROgeometryName, this);
 
-      payloadRO->BuildROGeometry();
-      payloadSD->SetROgeometry(payloadRO);
+  if(!calorimeterSD)
+    {
+      calorimeterSD = new GammaRayTelCalorimeterSD("CalorimeterSD",this);
+      SDman->AddNewDetector( calorimeterSD );		
+    }
+  
+  if (logicCALDetectorX)
+    logicCALDetectorX->SetSensitiveDetector(calorimeterSD); // BarX
+  if (logicCALDetectorY)
+    logicCALDetectorY->SetSensitiveDetector(calorimeterSD); // BarY
 
+  //
+  // Sensitive Detectors: Anticoincidence
+  //
 
-      //  if (logicTKRDetector)
-      //  logicTKRDetector->SetSensitiveDetector(payloadSD); // sensitive planes  
-      
-      if (logicTKRActiveTileX)
-	logicTKRActiveTileX->SetSensitiveDetector(payloadSD); // sensitive tile
-      if (logicTKRActiveTileY)
-	logicTKRActiveTileY->SetSensitiveDetector(payloadSD); // sensitive tile
-            
-      //                                        
-      // Visualization attributes
-      //
+  if(!anticoincidenceSD)
+    {
+      anticoincidenceSD = new GammaRayTelAnticoincidenceSD
+	("AnticoincidenceSD",this);
+      SDman->AddNewDetector( anticoincidenceSD );		
+    }
   
-      // Invisible Volume
-      logicWorld->SetVisAttributes (G4VisAttributes::Invisible);
-      logicPayload->SetVisAttributes (G4VisAttributes::Invisible);
-      logicTKR->SetVisAttributes(G4VisAttributes::Invisible);  
-      logicTKRActiveTileX->SetVisAttributes(G4VisAttributes::Invisible);  
-      logicTKRActiveTileY->SetVisAttributes(G4VisAttributes::Invisible);  
-      logicPlane->SetVisAttributes(G4VisAttributes::Invisible);  
-      logicConverter->SetVisAttributes(G4VisAttributes::Invisible);
-  
-      // Some visualization styles
-      G4VisAttributes* VisAtt1= new G4VisAttributes(G4Colour(0.3,0.8,0.1));
-      VisAtt1->SetVisibility(true);
-      VisAtt1->SetForceSolid(TRUE);
-
-      G4VisAttributes* VisAtt2= new G4VisAttributes(G4Colour(0.2,0.3,0.8));
-      VisAtt2->SetVisibility(true);
-      VisAtt2->SetForceSolid(FALSE);
-
-      G4VisAttributes* VisAtt3= new G4VisAttributes(G4Colour(0.8,0.2,0.3));
-      VisAtt3->SetVisibility(true);
-      VisAtt3->SetForceWireframe(TRUE);
-
-      // Visible Volumes
-      logicCAL->SetVisAttributes(VisAtt1);
-      logicTKRDetectorX->SetVisAttributes(VisAtt2);
-      logicTKRDetectorY->SetVisAttributes(VisAtt2);
-      logicACT->SetVisAttributes(VisAtt3);  
-      logicACL1->SetVisAttributes(VisAtt3);  
-      logicACL2->SetVisAttributes(VisAtt3);
+  if (logicACT)
+    logicACT->SetSensitiveDetector(anticoincidenceSD); // ACD top
+  if (logicACL1)
+    logicACL1->SetSensitiveDetector(anticoincidenceSD); // ACD lateral side
+  if (logicACL2)
+    logicACL2->SetSensitiveDetector(anticoincidenceSD); // ACD lateral side
+
+  //                                        
+  // Visualization attributes
+  //
+  
+  // Invisible Volume
+  logicWorld->SetVisAttributes (G4VisAttributes::Invisible);
+  logicPayload->SetVisAttributes (G4VisAttributes::Invisible);
+  logicTKR->SetVisAttributes(G4VisAttributes::Invisible);  
+  logicTKRActiveTileX->SetVisAttributes(G4VisAttributes::Invisible);  
+  logicTKRActiveTileY->SetVisAttributes(G4VisAttributes::Invisible);  
+  logicPlane->SetVisAttributes(G4VisAttributes::Invisible);  
+  logicConverter->SetVisAttributes(G4VisAttributes::Invisible);
+  logicCAL->SetVisAttributes(G4VisAttributes::Invisible);
+  logicCALLayerX->SetVisAttributes(G4VisAttributes::Invisible);
+  logicCALLayerY->SetVisAttributes(G4VisAttributes::Invisible);
+  
+  // Some visualization styles
+
+  G4VisAttributes* VisAtt1= new G4VisAttributes(G4Colour(0.3,0.8,0.1));
+  VisAtt1->SetVisibility(true);
+  VisAtt1->SetForceSolid(TRUE);
+
+  G4VisAttributes* VisAtt2= new G4VisAttributes(G4Colour(0.2,0.3,0.8));
+  VisAtt2->SetVisibility(true);
+  VisAtt2->SetForceSolid(FALSE);
+
+  G4VisAttributes* VisAtt3= new G4VisAttributes(G4Colour(0.8,0.2,0.3));
+  VisAtt3->SetVisibility(true);
+  VisAtt3->SetForceWireframe(TRUE);
   
+  // Visible Volumes
+
+  logicCALDetectorX->SetVisAttributes(VisAtt1);
+  logicCALDetectorY->SetVisAttributes(VisAtt1);
+  logicTKRDetectorX->SetVisAttributes(VisAtt2);
+  logicTKRDetectorY->SetVisAttributes(VisAtt2);
+  logicACT->SetVisAttributes(VisAtt3);  
+  logicACL1->SetVisAttributes(VisAtt3);  
+  logicACL2->SetVisAttributes(VisAtt3);
+
+
   //
   //always return the physical World
   //
   PrintPayloadParameters();
   return physiWorld;
 }
-  
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void GammaRayTelDetectorConstruction::PrintPayloadParameters()
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc
index 9280360f97c2d14660c3cd2752147709d2591e69..e858bf19b97958eb0c77e42c563581f8ad48c6d9 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelDetectorMessenger.cc,v 1.3 2000/12/06 16:53:14 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc
index d044e61ccbc1899fa63d08eea4c5b5f933b5fbe5..81630d2e67799b787d47f9e9b1628f4e9ff050b5 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelEventAction.cc,v 1.4 2000/12/06 16:53:14 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelEventAction.cc,v 1.5 2001/03/05 13:58:23 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
@@ -20,7 +20,10 @@
 // ************************************************************
 
 #include "GammaRayTelEventAction.hh"
-#include "GammaRayTelPayloadHit.hh"
+#include "GammaRayTelTrackerHit.hh"
+#include "GammaRayTelAnticoincidenceHit.hh"
+#include "GammaRayTelCalorimeterHit.hh"
+
 #include "g4rw/tvordvec.h"
 
 #ifdef G4ANALYSIS_USE
@@ -48,12 +51,14 @@ extern G4std::ofstream outFile;
 
 #ifdef G4ANALYSIS_USE
 GammaRayTelEventAction::GammaRayTelEventAction(GammaRayTelAnalysisManager* aMgr)
-  :drawFlag("all"),trackerCollID(-1),analysisManager(aMgr)
+  :drawFlag("all"),trackerCollID(-1),  calorimeterCollID(-1),                
+  anticoincidenceCollID(-1), analysisManager(aMgr)
 {
 }
 #else
 GammaRayTelEventAction::GammaRayTelEventAction()
-  :drawFlag("all"), trackerCollID(-1)
+  :drawFlag("all"), trackerCollID(-1),calorimeterCollID(-1),                
+  anticoincidenceCollID(-1)
 {
 }
 #endif
@@ -71,13 +76,22 @@ void GammaRayTelEventAction::BeginOfEventAction(const G4Event* evt)
 
   G4int evtNb = evt->GetEventID();
   G4cout << "Event: " << evtNb << G4endl;
-  
+
+  G4SDManager * SDman = G4SDManager::GetSDMpointer();  
   if (trackerCollID==-1)
     {
-      G4SDManager * SDman = G4SDManager::GetSDMpointer();
-      trackerCollID = SDman->GetCollectionID("PayloadCollection");
+      trackerCollID = SDman->GetCollectionID("TrackerCollection");
+    }
+  if(anticoincidenceCollID==-1)
+    {
+      anticoincidenceCollID =
+	SDman->GetCollectionID("AnticoincidenceCollection");
+    }
+  if(calorimeterCollID==-1)
+    {
+      calorimeterCollID =
+	SDman->GetCollectionID("CalorimeterCollection");
     }
-
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -86,39 +100,50 @@ void GammaRayTelEventAction::EndOfEventAction(const G4Event* evt)
 {
   G4int event_id = evt->GetEventID();
 
-  
   G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
   G4int n_trajectories = 0;
   if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
   
   
   G4HCofThisEvent* HCE = evt->GetHCofThisEvent();
-  GammaRayTelPayloadHitsCollection* CHC = NULL;
+  GammaRayTelTrackerHitsCollection* THC = 0;
+  GammaRayTelCalorimeterHitsCollection* CHC = 0;
+  GammaRayTelAnticoincidenceHitsCollection* AHC = 0;
+
+
   if (HCE)
-    CHC = (GammaRayTelPayloadHitsCollection*)(HCE->GetHC(trackerCollID));
+    {
+      THC = (GammaRayTelTrackerHitsCollection*)(HCE->GetHC(trackerCollID));
+      CHC = (GammaRayTelCalorimeterHitsCollection*)
+	(HCE->GetHC(calorimeterCollID));
+      AHC = (GammaRayTelAnticoincidenceHitsCollection*)
+	(HCE->GetHC(anticoincidenceCollID));
+    }
   
-  if (CHC)
+  if (THC)
     {
-      int n_hit = CHC->entries();
-      G4cout << "Number of hits in this event =  " << n_hit << G4endl;
+      int n_hit = THC->entries();
+      G4cout << "Number of tracker hits in this event =  " << n_hit << G4endl;
       G4double ESil=0;
       G4int NStrip, NPlane, IsX;
-      // This is a cycle on all the hits of this event
+      
+      // This is a cycle on all the tracker hits of this event
+
       for (int i=0;i<n_hit;i++)
 	{
 	  // Here we put the hit data in a an ASCII file for 
 	  // later analysis 
-	  ESil = (*CHC)[i]->GetEdepSil();
-	  NStrip = (*CHC)[i]->GetNStrip();
-	  NPlane = (*CHC)[i]->GetNSilPlane();
-	  IsX = (*CHC)[i]->GetPlaneType();
-
+	  ESil = (*THC)[i]->GetEdepSil();
+	  NStrip = (*THC)[i]->GetNStrip();
+	  NPlane = (*THC)[i]->GetNSilPlane();
+	  IsX = (*THC)[i]->GetPlaneType();
+	  
 	  outFile << G4std::setw(7) << event_id << " " << 
 	    ESil/keV << " " << NStrip << 
 	    " " << NPlane << " " << IsX << " " <<
-	    (*CHC)[i]->GetPos().x()/mm <<" "<<
-	    (*CHC)[i]->GetPos().y()/mm <<" "<<
-	    (*CHC)[i]->GetPos().z()/mm <<" "<<
+	    (*THC)[i]->GetPos().x()/mm <<" "<<
+	    (*THC)[i]->GetPos().y()/mm <<" "<<
+	    (*THC)[i]->GetPos().z()/mm <<" "<<
 	    G4endl;
 	  
 #ifdef G4ANALYSIS_USE
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc
index 9a9169645a1a65fa386068a836c5c00de497b040..0c9e0aaf677b6c5d68b6f5649f22eefa100842e6 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelPhysicsList.cc,v 1.2 2000/11/15 20:27:41 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc
index 6dfa1520b560481ecb2859b16597f5cc8a159e2e..2a98b6bdfe0e69a29118a2b759efd005e552b9e2 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.3 2000/11/24 16:57:00 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc
index c9398cfe6c3a6a0e056367c674b857840606cd80..4445ed72c48b8a60f1032988fb3d287a4667b583 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelPrimaryGeneratorMessenger.cc,v 1.2 2000/11/15 20:27:41 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc
index 8d41e0bd633bf500cfd4a777bd79ae798ab58eba..477132f78db78906e70ad5f1d66a94d1d5d07381 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelRunAction.cc,v 1.3 2000/12/06 16:53:14 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPayloadHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc
similarity index 72%
rename from examples/advanced/gammaray_telescope/src/GammaRayTelPayloadHit.cc
rename to examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc
index 71de10ebbe48c1a55c1a5bf4150492e4c3b8c8ea..4452a42349ed10fc409cd87b8d69b12b4cb1d72c 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPayloadHit.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelPayloadHit.cc,v 1.2 2000/11/15 20:27:41 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelTrackerHit.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
@@ -14,20 +14,20 @@
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
 //
-//      ------------ GammaRayTelPayloadHit  ------
+//      ------------ GammaRayTelTrackerHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
 //
 // ************************************************************
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-#include "GammaRayTelPayloadHit.hh"
+#include "GammaRayTelTrackerHit.hh"
 
-G4Allocator<GammaRayTelPayloadHit> GammaRayTelPayloadHitAllocator;
+G4Allocator<GammaRayTelTrackerHit> GammaRayTelTrackerHitAllocator;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-GammaRayTelPayloadHit::GammaRayTelPayloadHit()
+GammaRayTelTrackerHit::GammaRayTelTrackerHit()
 {
   EdepSil = 0.; 
   NStrip = 0; NSilPlane = 0; IsXPlane = 0;
@@ -36,12 +36,12 @@ GammaRayTelPayloadHit::GammaRayTelPayloadHit()
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-GammaRayTelPayloadHit::~GammaRayTelPayloadHit()
+GammaRayTelTrackerHit::~GammaRayTelTrackerHit()
 {;}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-GammaRayTelPayloadHit::GammaRayTelPayloadHit(const GammaRayTelPayloadHit& right)
+GammaRayTelTrackerHit::GammaRayTelTrackerHit(const GammaRayTelTrackerHit& right)
 {
   EdepSil = right.EdepSil; 
   NStrip = right.NStrip; NSilPlane = right.NSilPlane;
@@ -51,7 +51,7 @@ GammaRayTelPayloadHit::GammaRayTelPayloadHit(const GammaRayTelPayloadHit& right)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-const GammaRayTelPayloadHit& GammaRayTelPayloadHit::operator=(const GammaRayTelPayloadHit& right)
+const GammaRayTelTrackerHit& GammaRayTelTrackerHit::operator=(const GammaRayTelTrackerHit& right)
 {
   EdepSil = right.EdepSil; 
   NStrip = right.NStrip; NSilPlane = right.NSilPlane;
@@ -62,19 +62,19 @@ const GammaRayTelPayloadHit& GammaRayTelPayloadHit::operator=(const GammaRayTelP
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-int GammaRayTelPayloadHit::operator==(const GammaRayTelPayloadHit& right) const
+int GammaRayTelTrackerHit::operator==(const GammaRayTelTrackerHit& right) const
 {
   return 0;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void GammaRayTelPayloadHit::Draw()
+void GammaRayTelTrackerHit::Draw()
 {;}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void GammaRayTelPayloadHit::Print()
+void GammaRayTelTrackerHit::Print()
 {;}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPayloadROGeometry.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc
similarity index 94%
rename from examples/advanced/gammaray_telescope/src/GammaRayTelPayloadROGeometry.cc
rename to examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc
index 5d6d1ad33a7203c94e710496c556172f3420bd2b..fc1ea98bc9ca3b007dc0ca05154cc295b851811a 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPayloadROGeometry.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelPayloadROGeometry.cc,v 1.2 2000/11/20 16:49:02 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelTrackerROGeometry.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -16,12 +16,12 @@
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
 //
-//      ------------ GammaRayTelPayloadROGeometry class ------
+//      ------------ GammaRayTelTrackerROGeometry class ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
 //
 // ************************************************************
 
-#include "GammaRayTelPayloadROGeometry.hh"
+#include "GammaRayTelTrackerROGeometry.hh"
 #include "GammaRayTelDummySD.hh"
 #include "GammaRayTelDetectorConstruction.hh"
 
@@ -35,25 +35,25 @@
 #include "G4Material.hh"
  
 
-GammaRayTelPayloadROGeometry::GammaRayTelPayloadROGeometry()
+GammaRayTelTrackerROGeometry::GammaRayTelTrackerROGeometry()
   : G4VReadOutGeometry()
 {
 }
-GammaRayTelPayloadROGeometry::GammaRayTelPayloadROGeometry(G4String aString,GammaRayTelDetectorConstruction* GammaRayTelDC)
+GammaRayTelTrackerROGeometry::GammaRayTelTrackerROGeometry(G4String aString,GammaRayTelDetectorConstruction* GammaRayTelDC)
   :GammaRayTelDetector(GammaRayTelDC), G4VReadOutGeometry(aString)
 {
 }
 
-GammaRayTelPayloadROGeometry::GammaRayTelPayloadROGeometry(G4String aString)
+GammaRayTelTrackerROGeometry::GammaRayTelTrackerROGeometry(G4String aString)
   : G4VReadOutGeometry(aString)
 {
 }
 
-GammaRayTelPayloadROGeometry::~GammaRayTelPayloadROGeometry()
+GammaRayTelTrackerROGeometry::~GammaRayTelTrackerROGeometry()
 {
 }
 
-G4VPhysicalVolume* GammaRayTelPayloadROGeometry::Build()
+G4VPhysicalVolume* GammaRayTelTrackerROGeometry::Build()
 {
   // A dummy material is used to fill the volumes of the readout geometry.
   // ( It will be allowed to set a NULL pointer in volumes of such virtual
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPayloadSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc
similarity index 67%
rename from examples/advanced/gammaray_telescope/src/GammaRayTelPayloadSD.cc
rename to examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc
index fcd90c1b039ab5e9d811c6f249cd33341bc4f669..2d6595463ac46834a4cb9eb5298fb4ad2b251754 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPayloadSD.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: GammaRayTelPayloadSD.cc,v 1.6 2000/12/06 17:48:10 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: GammaRayTelTrackerSD.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
@@ -14,14 +14,14 @@
 //      For information related to this code contact:
 //      CERN, IT Division, ASD group
 //
-//      ------------ GammaRayTelPayloadSD  ------
+//      ------------ GammaRayTelTrackerSD  ------
 //           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
 //
 // ************************************************************
 
-#include "GammaRayTelPayloadSD.hh"
+#include "GammaRayTelTrackerSD.hh"
 
-#include "GammaRayTelPayloadHit.hh"
+#include "GammaRayTelTrackerHit.hh"
 #include "GammaRayTelDetectorConstruction.hh"
 
 #include "G4VPhysicalVolume.hh"
@@ -35,7 +35,7 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-GammaRayTelPayloadSD::GammaRayTelPayloadSD(G4String name,
+GammaRayTelTrackerSD::GammaRayTelTrackerSD(G4String name,
                                    GammaRayTelDetectorConstruction* det)
 :G4VSensitiveDetector(name),Detector(det)
 {
@@ -44,36 +44,37 @@ GammaRayTelPayloadSD::GammaRayTelPayloadSD(G4String name,
   NbOfTKRLayers  = Detector->GetNbOfTKRLayers();  
   NbOfTKRStrips = NbOfTKRStrips*NbOfTKRTiles;  
   
-  HitXID = new G4int[NbOfTKRStrips][30];
-  HitYID = new G4int[NbOfTKRStrips][30];
-  collectionName.insert("PayloadCollection");
+  ThitXID = new G4int[NbOfTKRStrips][30];
+  ThitYID = new G4int[NbOfTKRStrips][30];
+  collectionName.insert("TrackerCollection");
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-GammaRayTelPayloadSD::~GammaRayTelPayloadSD()
+GammaRayTelTrackerSD::~GammaRayTelTrackerSD()
 {
-  delete [] HitXID;
-  delete [] HitYID;
+  delete [] ThitXID;
+  delete [] ThitYID;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void GammaRayTelPayloadSD::Initialize(G4HCofThisEvent*HCE)
+void GammaRayTelTrackerSD::Initialize(G4HCofThisEvent*HCE)
 {
-  PayloadCollection = new GammaRayTelPayloadHitsCollection
+  TrackerCollection = new GammaRayTelTrackerHitsCollection
     (SensitiveDetectorName,collectionName[0]);
-  for (G4int i=0;i<NbOfTKRStrips;i++)
+ 
+ for (G4int i=0;i<NbOfTKRStrips;i++)
     for (G4int j=0;j<NbOfTKRLayers;j++) 
       {
-	HitXID[i][j] = -1;
-	HitYID[i][j] = -1;
+	ThitXID[i][j] = -1;
+	ThitYID[i][j] = -1;
       };
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4bool GammaRayTelPayloadSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
+G4bool GammaRayTelTrackerSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
 { 
   
   G4double edep = aStep->GetTotalEnergyDeposit();
@@ -129,20 +130,20 @@ G4bool GammaRayTelPayloadSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhis
     // The hit is on an X silicon plane
     {
       // This is a new hit
-      if (HitXID[StripNumber][PlaneNumber]==-1)
+      if (ThitXID[StripNumber][PlaneNumber]==-1)
 	{       
-	  GammaRayTelPayloadHit* PayloadHit = new GammaRayTelPayloadHit;
-	  PayloadHit->SetPlaneType(1);
-	  PayloadHit->AddSil(edep);
-	  PayloadHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
-	  PayloadHit->SetNSilPlane(PlaneNumber);
-	  PayloadHit->SetNStrip(StripNumber);
-	  HitXID[StripNumber][PlaneNumber] = 
-	    PayloadCollection->insert(PayloadHit) -1;
+	  GammaRayTelTrackerHit* TrackerHit = new GammaRayTelTrackerHit;
+	  TrackerHit->SetPlaneType(1);
+	  TrackerHit->AddSil(edep);
+	  TrackerHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
+	  TrackerHit->SetNSilPlane(PlaneNumber);
+	  TrackerHit->SetNStrip(StripNumber);
+	  ThitXID[StripNumber][PlaneNumber] = 
+	    TrackerCollection->insert(TrackerHit) -1;
 	}
       else // This is not new
 	{
-	  (*PayloadCollection)[HitXID[StripNumber][PlaneNumber]]->AddSil(edep);
+	  (*TrackerCollection)[ThitXID[StripNumber][PlaneNumber]]->AddSil(edep);
           // G4cout << "X" << PlaneNumber << " " << StripNumber << G4endl;
 	}
     }
@@ -151,20 +152,20 @@ G4bool GammaRayTelPayloadSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhis
     // The hit is on an Y silicon plane    
     {   
       // This is a new hit
-      if (HitYID[StripNumber][PlaneNumber]==-1)
+      if (ThitYID[StripNumber][PlaneNumber]==-1)
 	{       
-	  GammaRayTelPayloadHit* PayloadHit = new GammaRayTelPayloadHit;
-	  PayloadHit->SetPlaneType(0);
-	  PayloadHit->AddSil(edep);
-	  PayloadHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
-	  PayloadHit->SetNSilPlane(PlaneNumber);
-	  PayloadHit->SetNStrip(StripNumber);
-	  HitYID[StripNumber][PlaneNumber] = 
-	    PayloadCollection->insert(PayloadHit)-1;
+	  GammaRayTelTrackerHit* TrackerHit = new GammaRayTelTrackerHit;
+	  TrackerHit->SetPlaneType(0);
+	  TrackerHit->AddSil(edep);
+	  TrackerHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
+	  TrackerHit->SetNSilPlane(PlaneNumber);
+	  TrackerHit->SetNStrip(StripNumber);
+	  ThitYID[StripNumber][PlaneNumber] = 
+	    TrackerCollection->insert(TrackerHit)-1;
 	}
       else // This is not new
 	{
-	  (*PayloadCollection)[HitYID[StripNumber][PlaneNumber]]->AddSil(edep);
+	  (*TrackerCollection)[ThitYID[StripNumber][PlaneNumber]]->AddSil(edep);
           // G4cout << "Y" << PlaneNumber << " " << StripNumber << G4endl;
 	}
     }
@@ -174,37 +175,37 @@ G4bool GammaRayTelPayloadSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhis
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void GammaRayTelPayloadSD::EndOfEvent(G4HCofThisEvent* HCE)
+void GammaRayTelTrackerSD::EndOfEvent(G4HCofThisEvent* HCE)
 {
   static G4int HCID = -1;
   if(HCID<0)
     { 
       HCID = G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]);
     }
-  HCE->AddHitsCollection(HCID,PayloadCollection);
+  HCE->AddHitsCollection(HCID,TrackerCollection);
 
 
-  for (G4int i=0;i<NbOfTKRLayers;i++) 
-    for (G4int j=0;j<NbOfTKRStrips;j++)
+  for (G4int i=0;i<NbOfTKRStrips;i++) 
+    for (G4int j=0;j<NbOfTKRLayers;j++)
       {
-	HitXID[i][j] = -1;
-	HitYID[i][j] = -1;
+	ThitXID[i][j] = -1;
+	ThitYID[i][j] = -1;
       };
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void GammaRayTelPayloadSD::clear()
+void GammaRayTelTrackerSD::clear()
 {} 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void GammaRayTelPayloadSD::DrawAll()
+void GammaRayTelTrackerSD::DrawAll()
 {} 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void GammaRayTelPayloadSD::PrintAll()
+void GammaRayTelTrackerSD::PrintAll()
 {} 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc
index 3eeea234b7ed3138187c938a43d3825d8fadb899..32a033b31efcb12c454f91b2a07dca996f102de9 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: GammaRayTelVisManager.cc,v 1.2 2000/11/15 20:27:42 flongo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
diff --git a/examples/extended/analysis/AnaEx01/AnaEx01.cc b/examples/extended/analysis/AnaEx01/AnaEx01.cc
index 54c18cd7e06fffa5f64478ea492d05a439dce4fa..e926badf30539860fc1a90e3f689e18f72f520ea 100644
--- a/examples/extended/analysis/AnaEx01/AnaEx01.cc
+++ b/examples/extended/analysis/AnaEx01/AnaEx01.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01.cc,v 1.6 2000/11/15 13:46:23 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh
index ff4a3cfcb6122641b589a22f3b4fdfc422653a57..f114c489858803351ed0e009f70af61060b563b9 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01AnalysisManager.hh,v 1.3 2000/10/31 13:10:00 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh
index 3c3f709e8d9458b87c6624acdbb5b809d830c522..f11125771d0dd1a5ed2f73b615548d159f7e8f27 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01CalorHit.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh
index 4b4e98ec2d303ff98368e31d5fd5755eeb8e87f2..b8079053fc278ebaa88aed865d3afe512be6b2c6 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01CalorimeterSD.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh
index bb31d4494bc30bc1ccb36ecf8c95a22925573292..d0f6b3e1ea3a8c0f3856641be899e7199f42708a 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01DetectorConstruction.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh
index e774dd6559a3f4e45f3e660e46be2290cfce3ab3..692ecc9b1f4e92877a00aa43f9d06594f44e8b3b 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01DetectorMessenger.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh
index e8183ceaacdc370012f4287a6d5c99222ba6d884..36deb21871b3dbfb37d8fdea110aad602ac16333 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01EventAction.hh,v 1.3 2000/11/10 14:12:07 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh
index a6d8e2eee657a427a6018d52a9122c4a14043916..5862bbb1633499a6477803a3d1fedf5ff6c105ef 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01PhysicsList.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh
index 5c17503b6e0a6e9a910da46eaed3ff6a6556816d..6151d68852c9643b4e692ed7dcc70f243ed9615d 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01PrimaryGeneratorAction.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh
index 140376b8e5e04300e5c88333a5ae7b8da2831e3e..280102d8da26dae7a706d7725b64d17285c72052 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01PrimaryGeneratorMessenger.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh
index 3b2710d39cd4cd151b850b1efd6f8be770d8fafe..a3d7d7c301b17f4ed2abe0c4d275bbc26ac59ab8 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01RunAction.hh,v 1.3 2000/11/10 14:12:07 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh
index cfc09db8c9189f778b27afae962162650319663c..6da767de883ba0ecf16ffae022bbc92300ec555c 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01SteppingAction.hh,v 1.3 2000/11/10 14:12:07 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh
index d0f7ec975c63fa2cb6c1098e156dffe2666abd1c..bfa0b2c9c878555b07cc1f349d1f90841c333ba1 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01SteppingVerbose.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh
index 65e6e7cb4e524d36c1e38c6f3f2d8e565660f608..a9d13b66eb63875f9923e04cfb6606ff5226d7f2 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01VisManager.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc
index 0dcbcccc81a8746fee2f1c6293c22c8cb963b18f..77a69199cf92a7e7147b815c5e0d89c373733b3b 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01AnalysisManager.cc,v 1.9 2000/12/06 13:08:03 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 14th Septembre 2000.
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc
index f5fe58bde785afefd46e7b7897c3c9b30a2c97aa..d5c3fcac106314f7d3227aa29021b901da461284 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01CalorHit.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc
index 814590872a0eb54edce77cbc83bf3caef0a6d145..d2f27cb7935cf0419e5aad5663258c6380bbc9b9 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01CalorimeterSD.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc
index 5714326c889e3e8241dea6185587ff0ba344934b..a5ecf4fd286d42ce18ec254df5bc0cc5f52a30b4 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01DetectorConstruction.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc
index e63ab736c99924e638bd190f91383fc89938c0e1..be6a8a1e3ea68a1889f362351de4a99104f1624f 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01DetectorMessenger.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc
index 321a64db036ba0a5f697d2aec8201e4ae6758f3b..1083d08a765ff840810a7fcbe46a063d8f6dd72c 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01EventAction.cc,v 1.3 2000/11/10 14:08:08 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc
index ce591e843594926273ff405029650f7adf2a66b1..52fe7ee8ca630864e4d27e8f15ac747a8f1c8ee9 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01PhysicsList.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc
index b546f30161eb28a9a2eedb4fe8a5f09b28303073..301f30e720a49d17760431c240036a3581d5d86c 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01PrimaryGeneratorAction.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc
index 4731b00e6c9b43ee56f13b1f8099e99cca386ffc..f88604cf6316f19c19b0872ede74ea88a36670d2 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01PrimaryGeneratorMessenger.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc
index 1685c5940c801e49acff709ee85f2f6c175ab78c..0cdc9a689816a5504eb2f13b26ab782ad78b9b3c 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01RunAction.cc,v 1.3 2000/11/10 14:08:09 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc
index 7edae47e1e44d363441549664060c2dfae7379c5..3ded737d6c2ea2c349d16af8b620cf7d189327cb 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01SteppingAction.cc,v 1.3 2000/11/10 14:08:10 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc
index 5ac0ddcd97e0a56b0bc477d5ca0be96f2a7e8773..99548213fea3a2543c0b11d87e8e01f8a708a147 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01SteppingVerbose.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc
index 5c29d55c86211f99d502cba10571872633bcab86..55838fa91c858f43f8575c06166e2edc4b9010a9 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: AnaEx01VisManager.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm1/GNUmakefile b/examples/extended/electromagnetic/TestEm1/GNUmakefile
index efd75b2985bc5983ac8f225e3f7c4c97d3e0eb12..0ec28464bd8c15b77a623dd6d9e8c1e5292f9091 100644
--- a/examples/extended/electromagnetic/TestEm1/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm1/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 2000/12/07 11:43:03 maire Exp $
+# $Id: GNUmakefile,v 1.5 2001/02/21 14:00:33 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,4 +16,12 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
+G4NOHIST := true
+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 f5654322e721bd7ea5fd2518fdd8467b84ae846c..426ce1a2343f96611cca8082794d50af4d9671be 100644
--- a/examples/extended/electromagnetic/TestEm1/History
+++ b/examples/extended/electromagnetic/TestEm1/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.7 2000/12/07 11:43:03 maire Exp $
+$Id: History,v 1.11 2001/03/27 08:34:07 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,19 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
      
+27-03-01  mma (testem1-V03-00-05)
+	  - set cppflag G4NOHIST = true in gnumakefile
+	  	       
+08-03-01  Hisaya (testem1-V03-00-04)
+          - adapted ProcessesCount to STL
+	       
+21-02-01  mma (testem1-V03-00-03)
+          - hbook histograms restored
+	       
+20-02-01  mma (testem1-V03-00-02)
+          - verbose stepping adapted for STL
+	  - save rndm at begin of event     
+     
 07-12-00  mma (testem1-V02-00-03 & testem-noHist)
           remove hbook histograms: GNUmakefile,runAction,trackingAction,
 	                           steppingAction
diff --git a/examples/extended/electromagnetic/TestEm1/README b/examples/extended/electromagnetic/TestEm1/README
index 21d8be5d7855d68dbc5474a15b403e42799da1d0..c3da6e865339175d82653281f2ddedc90461013b 100644
--- a/examples/extended/electromagnetic/TestEm1/README
+++ b/examples/extended/electromagnetic/TestEm1/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 1999/10/11 13:07:24 maire Exp $
+$Id: README,v 1.3 2001/03/30 12:41:27 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -90,13 +90,16 @@ $Id: README,v 1.1 1999/10/11 13:07:24 maire Exp $
  	
  7- HISTOGRAMS
  
-     Testem1 produces several histo which are saved as testem1.histo
+     Testem1 produces several histo which are saved as testem1.paw
      
      Content of these histo:
   
       1 : track length of a charged particle
       2 : number of steps per track (charged particle)
       3 : step length (charged particle)
- 	
- 	  
- 	
+
+ Note that, histograms are disabled via the flag G4NOHIST in the GNUmakefile.
+ Currently, histograms in this example are implemented through the obsolete
+ CLHEP/Hist package, which is no longer supported. The implementation will
+ be replaced by direct call to the "analysis" module in a near future.
+
diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.cc b/examples/extended/electromagnetic/TestEm1/TestEm1.cc
index 4c971d03b61be74545205a7b35e01e4e65d55df4..b49051c9dcd773f0f3060998b68cbe535fabe7e9 100644
--- a/examples/extended/electromagnetic/TestEm1/TestEm1.cc
+++ b/examples/extended/electromagnetic/TestEm1/TestEm1.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TestEm1.cc,v 1.4 2000/12/06 13:21:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.out b/examples/extended/electromagnetic/TestEm1/TestEm1.out
index e6af893cd9c4489b4382eb60b2a63131c39135a0..baf6f8804ff90584d929ae8eb8b27ecce5967cf0 100644
--- a/examples/extended/electromagnetic/TestEm1/TestEm1.out
+++ b/examples/extended/electromagnetic/TestEm1/TestEm1.out
@@ -1,10 +1,10 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
-***** Table : Nb of materials = 8 *****
+***** Table : Nb of materials = 9 *****
 
  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 %
@@ -23,6 +23,9 @@
  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:     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 %
 
@@ -63,13 +66,14 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
            material       min.delta energy(keV) 
 
                  Air           0.99
-            H2liquid         28.675
-               Water         81.507
-         liquidArgon         78.362
-           Aluminium         125.06
-                Iron         224.07
-                Lead         229.55
-             Uranium         296.06
+            H2liquid         28.089
+               Water         81.851
+         liquidArgon         79.954
+           Aluminium         125.02
+             Silicon         116.88
+                Iron         225.11
+                Lead         228.53
+             Uranium         294.24
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -91,13 +95,14 @@ msc:   Tables of transport mean free paths.
            material        min.delta energy(keV) 
 
                  Air           0.99
-            H2liquid         28.675
-               Water         81.507
-         liquidArgon         78.362
-           Aluminium         125.06
-                Iron         224.07
-                Lead         229.55
-             Uranium         296.06
+            H2liquid         28.089
+               Water         81.851
+         liquidArgon         79.954
+           Aluminium         125.02
+             Silicon         116.88
+                Iron         225.11
+                Lead         228.53
+             Uranium         294.24
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -130,11 +135,12 @@ Cut in energy
               Water         2.9 keV         347 keV
         liquidArgon        6.18 keV         343 keV
           Aluminium        6.89 keV         597 keV
+            Silicon        6.89 keV         541 keV
                Iron        20.8 keV        1.28 MeV
                Lead         101 keV        1.38 MeV
             Uranium         110 keV        1.92 MeV
 ===================================================
-# $Id: TestEm1.out,v 1.7 2000/11/24 10:36:58 stesting Exp $
+# $Id: TestEm1.out,v 1.11 2001/03/30 09:02:57 stesting Exp $
 #
 # Macro file for "TestEm1.cc"
 # (can be run in batch, without graphic)
@@ -176,11 +182,12 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
                  Air           0.99
             H2liquid           0.99
                Water         3.2733
-         liquidArgon         3.7293
-           Aluminium         6.3003
-                Iron         10.422
-                Lead         8.9769
-             Uranium          11.54
+         liquidArgon         3.9154
+           Aluminium         6.2979
+             Silicon         5.8817
+                Iron         10.524
+                Lead         9.1135
+             Uranium         11.689
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -204,11 +211,12 @@ msc:   Tables of transport mean free paths.
                  Air           0.99
             H2liquid           0.99
                Water         3.2733
-         liquidArgon         3.7293
-           Aluminium         6.3003
-                Iron         10.422
-                Lead         8.9769
-             Uranium          11.54
+         liquidArgon         3.9154
+           Aluminium         6.2979
+             Silicon         5.8817
+                Iron         10.524
+                Lead         9.1135
+             Uranium         11.689
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -241,6 +249,7 @@ Cut in energy
               Water        4.06 keV        3.27 keV
         liquidArgon        9.08 keV        3.98 keV
           Aluminium        9.99 keV        9.97 keV
+            Silicon          10 keV        8.45 keV
                Iron        31.1 keV        43.3 keV
                Lead         124 keV        42.8 keV
             Uranium         143 keV        53.4 keV
@@ -265,18 +274,18 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 100
-  User=70.06s Real=75.54s Sys=4.95s
+  User=91.99s Real=97.75s Sys=5.73s
 
- nb tracks/event   neutral:   28.42   charged:  650.00
- nb  steps/event   neutral:  151.89   charged: 1278.63
+ nb tracks/event   neutral:   27.57   charged:  666.07
+ nb  steps/event   neutral:  144.93   charged: 2194.99
 
  nb of process calls per event: 
-       eIoni    eBrem     phot    compt     conv  annihil
-     1251.55    25.69    27.03   123.47     1.39     1.39
+       eIoni    eBrem     conv  annihil    compt     phot
+     2168.94    24.47     1.58     1.58   117.36    25.99
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1391858697, 202982242
+ Current couple of seeds = 1463312763, 65501812
 ----------------------------------------
 G4 kernel has come to Quit state.
 Deletion of G4 kernel class start.
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
index 4d21afe118168913f835ab0498d6dd7e17161414..914f280be15d7cf68714b39c8eb1063bee3b97e4 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1DetectorConstruction.hh,v 1.2 1999/12/15 14:48:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
index 8a626c9073edf5b1f0bc153a6ea0759bc7829ff1..6f533610cec5bb22e1f318d4fe6e86d42147fac0 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1DetectorMessenger.hh,v 1.2 1999/12/15 14:48:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
index 3a64eb6c1dfe64aebc20a505ad21e9852c618305..4b7f943095cb45146ab2eed902d4f026caa3e1dd 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1EventAction.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
index 852d20b7efff7ba347bd5a55dfb633d6e411809d..79b2450759935f70baffff1643a483f2d84ed043 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1EventActionMessenger.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
index 71bfcc25869726af544e01092dfb2814a6561d23..e03cfbd12ea45b4a087ca59a8bddf4f8c05dddc6 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1PhysicsList.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
index 5e65c38791774a8380fab1240e55da2ce2224fe4..7bb6ba93f3a918b616de4a99f7ccefdbf14f012c 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1PhysicsListMessenger.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
index e2719b385cdaaa53231a67e7a2fee18964f0a957..903fae9626e3028a5b64cfab09103d46038a5158 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh
index a9d6a88ef5eadfeffdb9d2382df2378b3b6e9175..c47e5a7b50401264da2486c290c9a99fa6fe4b5e 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.4 2000/12/07 11:43:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em1RunAction.hh,v 1.5 2001/02/21 14:00:34 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -25,6 +25,11 @@
 class G4Run;
 class Em1RunActionMessenger;
 
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
+
 class Em1RunAction : public G4UserRunAction
 {
   public:
@@ -44,7 +49,11 @@ class Em1RunAction : public G4UserRunAction
   public:
     void  SetRndmFreq(G4int val) {saveRndm = val;}
     G4int GetRndmFreq()          {return saveRndm;}
-                   
+        
+#ifndef G4NOHIST   
+    HepHistogram* GetHisto(G4int id) {return histo[id];}
+#endif
+           
   private:  
     void bookHisto();
     void cleanHisto();
@@ -56,6 +65,11 @@ class Em1RunAction : public G4UserRunAction
 
     Em1RunActionMessenger* runMessenger;    
     G4int saveRndm;
+    
+#ifndef G4NOHIST       
+    HepTupleManager* hbookManager;
+    HepHistogram* histo[3];
+#endif                     
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
index 42dc61f501a0d3facce27b99d371012cc495e067..7e02e166d73b9a33cf1a746c9ab3ba5b1c874fc6 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1RunActionMessenger.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
index 80514236dac6414cfaaf8de4bae94f4d1b95de0d..079f8f5caa953f61392e7e3d1d63c9d4959656b0 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1SteppingAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
index 36bbbda10d7bf72e397d0dbb871eb1971179582c..e9a5b59ea2119ae824db799e78385cb23adb7d21 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1SteppingVerbose.hh,v 1.4 2000/12/06 13:21:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em1SteppingVerbose.hh,v 1.5 2001/02/19 14:04:26 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
@@ -15,8 +15,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-class Em1SteppingVerbose;
-
 #ifndef Em1SteppingVerbose_h
 #define Em1SteppingVerbose_h 1
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
index b54e6f64cb2bc647606779e3dc1f4149c594b6e3..e74e227dfaa12e6dff6d32a7f8ffe472194a7996 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1TrackingAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh b/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
index c4efa5b82eff78e0b7b069d49c67af51aee39622..766001b44ab6591816ac77372ad744c5f7d7aeba 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1VisManager.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
index 0bf9a827e48b3876b0908621a91a6e3915c9f85a..0f6dc5e37da37db282be2877f2f37e55099676f1 100644
--- a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
@@ -1,4 +1,3 @@
-
 // This code implementation is the intellectual property of
 // the GEANT4 collaboration.
 //
@@ -6,19 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ProcessesCount.hh,v 1.3 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-// 
-// -----------------------------------------------------------------
-//	GEANT 4 class header file 
-//
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
-//
-//      ------------------- class ProcessesCount -----------------
+// $Id: ProcessesCount.hh,v 1.5 2001/03/08 16:45:17 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-// 26-10-98: first version, M.Maire
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+// 08.03.01 Hisaya: adapted for STL   
+// 26.10.98 mma   : first version
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -27,7 +20,7 @@
 #define ProcessesCount_HH
 
 #include "globals.hh"
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -36,12 +29,6 @@ class OneProcessCount
 public:
     OneProcessCount(G4String name) {Name=name; Counter=0;};
    ~OneProcessCount() {};
-    G4int operator==(const OneProcessCount& right) const {return (this==&right);};
-    G4int operator!=(const OneProcessCount& right) const {return (this!=&right);};
-    
-private:
-    OneProcessCount(OneProcessCount& right)                        {*this= right;};
-    const OneProcessCount& operator=(const OneProcessCount& right) {return right;};
    
 public:
     G4String      GetName()       {return Name;};
@@ -56,6 +43,12 @@ private:
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 
-typedef G4RWTPtrOrderedVector<OneProcessCount> ProcessesCount;
+typedef G4std::vector<OneProcessCount*> ProcessesCount;
 
 #endif
+
+
+
+
+
+
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
index 64db775ed3e7fbb31f7fd2d06a8710a66a671f4c..b134a7da2ee68ecea468cac494547315a11cd454 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: Em1DetectorConstruction.cc,v 1.4 2000/12/13 11:11:59 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
index 871692b5b99554097e4524e31de14df46c5239ed..22cc18115edd787ae4d1042204ac76e7f96a0327 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1DetectorMessenger.cc,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc
index 0d9ecfd11e1375d5f712f4c0c891628bbeb8e1fa..cd289fb20d3bfa113e745e2c2fdfc2edb890360b 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.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em1EventAction.cc,v 1.3 2001/02/20 15:45:17 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -47,10 +47,21 @@ Em1EventAction::~Em1EventAction()
 void Em1EventAction::BeginOfEventAction(const G4Event* evt)
 {
  G4int evtNb = evt->GetEventID();
+ 
+ //printing survey
  if (evtNb%printModulo == 0) 
     G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
-    
- TotalEnergyDeposit = 0.;}
+  
+ //save rndm status
+ if (Em1Run->GetRndmFreq() == 2)
+   { 
+    HepRandom::saveEngineStatus("beginOfEvent.rndm");   
+    if (evtNb%printModulo == 0) HepRandom::showEngineStatus();
+   }
+ 
+ //additional initializations            
+ TotalEnergyDeposit = 0.;
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -73,18 +84,6 @@ void Em1EventAction::EndOfEventAction(const G4Event* evt)
                                trj->DrawTrajectory(50); 
       }
   }
-  
-  //save rndm status
-  if (Em1Run->GetRndmFreq() == 2)
-    { 
-     HepRandom::saveEngineStatus("endOfEvent.rndm");   
-     G4int evtNb = evt->GetEventID();
-     if (evtNb%printModulo == 0)
-       { 
-        G4cout << "\n---> End of Event: " << evtNb << G4endl;
-        HepRandom::showEngineStatus();
-       }
-    }     
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
index 9b4cfaea780c38fa5dd05fa6d470e650f7b6197e..75293ca0351833f99c2a45431cda006374b801ba 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1EventActionMessenger.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
index fda56c9041afff6ad6d801600518457d5bf69a33..2f7edce8722ca3b650f3a3e5859c0a2326b3f567 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1PhysicsList.cc,v 1.3 2000/03/05 03:31:39 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
index 144729db1ea60dc46303cdc1808ab99604540531..cc4b1dbbfe184f50b5af9d76e7148b2881a70962 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1PhysicsListMessenger.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
index 906368b744ed3db71e9e23a63f5c67a8f9cd8af8..18ef2a8775242276c945362bd5ad188d2f2bd385 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
index ac9583873578aff5ddde67efc2b2f3f5f92917e1..7f5675c97bdf0a56e339c14de570a710fc708fd4 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
@@ -5,10 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1RunAction.cc,v 1.6 2000/12/07 11:43:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
+// $Id: Em1RunAction.cc,v 1.10 2001/03/27 08:34:08 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+// 08.03.01 Hisaya: adapted for STL   
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -24,12 +26,20 @@
 
 #include "Randomize.hh"
 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em1RunAction::Em1RunAction()
   : ProcCounter(0), saveRndm (1),
     runMessenger(new Em1RunActionMessenger(this))
-{}
+{
+#ifndef G4NOHIST
+  hbookManager = NULL;
+#endif 
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -42,12 +52,28 @@ Em1RunAction::~Em1RunAction()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em1RunAction::bookHisto()
-{}
+{
+#ifndef G4NOHIST
+  hbookManager = new HBookFile("testem1.paw", 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
+  // writing histogram file
+  hbookManager->write();
+  delete [] histo;
+  delete hbookManager;
+#endif   
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -80,10 +106,10 @@ void Em1RunAction::BeginOfRunAction(const G4Run* aRun)
 void Em1RunAction::CountProcesses(G4String procName)
 {
    //does the process  already encounted ?
-   size_t nbProc = ProcCounter->entries();
+   size_t nbProc = ProcCounter->size();
    size_t i = 0;
    while ((i<nbProc)&&((*ProcCounter)[i]->GetName()!=procName)) i++;
-   if (i == nbProc) ProcCounter->insert( new OneProcessCount(procName));
+   if (i == nbProc) ProcCounter->push_back( new OneProcessCount(procName));
 
    (*ProcCounter)[i]->Count();
 }
@@ -110,11 +136,11 @@ void Em1RunAction::EndOfRunAction(const G4Run* aRun)
       
       //frequency of processes call       
       G4cout << "\n nb of process calls per event: \n   ";       
-      for (G4int i=0; i< ProcCounter->entries();i++)
+      for (G4int i=0; i< ProcCounter->size();i++)
            G4cout << G4std::setw(9) << (*ProcCounter)[i]->GetName();
            
       G4cout << "\n   ";       
-      for (G4int j=0; j< ProcCounter->entries();j++)
+      for (G4int j=0; j< ProcCounter->size();j++)
            G4cout << G4std::setw(9) << ((*ProcCounter)[j]->GetCounter())/dNbOfEvents;
       G4cout << G4endl;    
                          
@@ -122,15 +148,20 @@ void Em1RunAction::EndOfRunAction(const G4Run* aRun)
       G4cout.precision(oldprec);       
     }         
 
-   ProcCounter->clearAndDestroy();
-   delete ProcCounter;
+  // delete and remove all contents in ProcCounter 
+  while (ProcCounter->size()>0){
+    OneProcessCount* aProcCount=ProcCounter->back();
+    ProcCounter->pop_back();
+    delete aProcCount;
+  }
+  delete ProcCounter;
                              
   //draw the events
   if (G4VVisManager::GetConcreteInstance()) 
      G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
 
   // save Rndm status
-  if (saveRndm == 1)
+  if (saveRndm > 0)
     { HepRandom::showEngineStatus();
       HepRandom::saveEngineStatus("endOfRun.rndm");
     }
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc
index e0a2aa5a66234472ce3443c112dc88e524e6d172..433d35e2518a629c048be44605f2ebd0131512b0 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.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em1RunActionMessenger.cc,v 1.3 2001/02/20 15:45:17 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -35,8 +35,8 @@ Em1RunActionMessenger::Em1RunActionMessenger(Em1RunAction* run)
   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->SetGuidance("freq > 0 saved on:   endOfRun.rndm");
+  RndmSaveCmd->SetGuidance("freq = 2 saved on: beginOfEvent.rndm");    
   RndmSaveCmd->SetParameterName("frequency",false);
   RndmSaveCmd->SetRange("frequency>=0 && frequency<=2");
   RndmSaveCmd->AvailableForStates(PreInit,Idle); 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc
index f71e3e0cbb4fc56900b9a236bc9f2a234c30b8b0..25272c42f07c6885df1281316f7daf6f2dea1467 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.4 2000/12/07 11:43:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em1SteppingAction.cc,v 1.5 2001/02/21 14:00:35 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -19,6 +19,10 @@
 #include "G4SteppingManager.hh"
 #include "G4VProcess.hh"
 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em1SteppingAction::Em1SteppingAction(Em1RunAction* RuAct, Em1EventAction* EvAct)
@@ -41,7 +45,11 @@ void Em1SteppingAction::UserSteppingAction(const G4Step* aStep)
  if (process) runAction->CountProcesses(process->GetProcessName());
  
  G4double charge  = aStep->GetTrack()->GetDefinition()->GetPDGCharge();
- G4double steplen = aStep->GetStepLength();                 
+ G4double steplen = aStep->GetStepLength();
+ 
+#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
index 63afbae7dd2f4a3be10397beef795e1b88713d7d..81a78dd1c3b2e24fb6b139833a1ab5d9818a0979 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em1SteppingVerbose.cc,v 1.4 2000/12/06 13:21:50 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em1SteppingVerbose.cc,v 1.6 2001/02/19 14:05:15 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -46,7 +46,7 @@ void Em1SteppingVerbose::StepInfo()
 	     << G4std::setw( 9) << "dEStep"     << " "  
 	     << G4std::setw(10) << "StepLeng"     
 	     << G4std::setw(10) << "TrakLeng" 
-	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Volume"    << "  "
 	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
@@ -61,16 +61,17 @@ void Em1SteppingVerbose::StepInfo()
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
       G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	->GetProcessName();
+      G4cout << "  " 
+             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                ->GetProcessName();
     } else {
-      G4cout << "User Limit";
+      G4cout << "   UserLimit";
     }
 
     G4cout << G4endl;
@@ -86,12 +87,12 @@ void Em1SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -115,8 +116,8 @@ void Em1SteppingVerbose::StepInfo()
     
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 void Em1SteppingVerbose::TrackingStarted()
@@ -134,7 +135,7 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 9) << "dEStep"     << " "  
 	   << G4std::setw(10) << "StepLeng"  
 	   << G4std::setw(10) << "TrakLeng"
-	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     
 
     G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
@@ -147,13 +148,13 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
-      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(10) << "OutOfWorld";
     }
-    G4cout << G4std::setw(10) << "initStep" << G4endl;
+    G4cout  << "    initStep" << G4endl;
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc
index ab35a14cda7236024c41a166f92d5e485e35df7e..24f70b55184fc0a7d7b156e2b3e0c8deb7c391a1 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.4 2000/12/07 11:43:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em1TrackingAction.cc,v 1.5 2001/02/21 14:00:35 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -18,6 +18,10 @@
 #include "Em1RunAction.hh"
 
 #include "G4Track.hh"
+ 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -38,6 +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 ed79ef34f1c9669aecdfbb440fa1f85e20fba47c..66675a23f4b5f15bdca880c7a82161f6f2a9466c 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em1VisManager.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm2/GNUmakefile b/examples/extended/electromagnetic/TestEm2/GNUmakefile
index 70b3f8f6b6190c96404b0ddc28f154986f9a06ba..44da9c381c879f1ccbf9ee9f9513c532960cfa77 100644
--- a/examples/extended/electromagnetic/TestEm2/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm2/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 2000/12/07 12:14:06 maire Exp $
+# $Id: GNUmakefile,v 1.5 2001/02/21 12:15:45 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,4 +16,12 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
+G4NOHIST := true
+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/History b/examples/extended/electromagnetic/TestEm2/History
index a08752b5c59a19e7c8104d7fbef18458a876ada3..7b3bfc689614ca5ae4805b0c3180ce68746566cb 100644
--- a/examples/extended/electromagnetic/TestEm2/History
+++ b/examples/extended/electromagnetic/TestEm2/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.7 2000/12/07 12:14:06 maire Exp $
+$Id: History,v 1.11 2001/03/27 08:58:14 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,19 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
      
+27-03-01  mma (testem2-V03-00-05)
+	  - set cppflag G4NOHIST = true in gnumakefile
+     
+08-03-01  Hisaya (testem2-V03-00-04)
+          - RunAction adapted for STL
+	       
+21-02-01  mma (testem2-V03-00-03)
+          - hbook histograms restored
+	            
+20-02-01  mma (testem2-V03-00-02)
+          - verbose stepping adapted for STL
+	  - save rndm at begin of event     
+	      
 07-12-00  mma (testem2-V02-00-03 & testem-noHist)
           remove hbook histograms: GNUmakefile,runAction
 				   
diff --git a/examples/extended/electromagnetic/TestEm2/README b/examples/extended/electromagnetic/TestEm2/README
index a3da41f64aec8a16d5f959f0bef83d4e36967718..751b913bc8e5bc771e0138079a9c1075b729adab 100644
--- a/examples/extended/electromagnetic/TestEm2/README
+++ b/examples/extended/electromagnetic/TestEm2/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.2 2000/01/21 10:56:13 maire Exp $
+$Id: README,v 1.4 2001/03/30 12:40:42 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -87,7 +87,7 @@ $Id: README,v 1.2 2000/01/21 10:56:13 maire Exp $
  	
  7- HISTOGRAMS
  
-     TestEm2 produces several histo which are saved as testem2.histo
+     TestEm2 produces several histo which are saved as testem2.paw
      
      Content of these histo:
   
@@ -106,4 +106,9 @@ $Id: README,v 1.2 2000/01/21 10:56:13 maire Exp $
      10 : radial energy profile    
      11 : cumulated radial energy profile
      12 : rms of cumulated radial energy profile
-   
+
+ Note that, histograms are disabled via the flag G4NOHIST in the GNUmakefile.
+ Currently, histograms in this example are implemented through the obsolete
+ CLHEP/Hist package, which is no longer supported. The implementation will
+ be replaced by direct call to the "analysis" module in a near future.
+
diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.cc b/examples/extended/electromagnetic/TestEm2/TestEm2.cc
index 19da0d48f3e90f61ca0106cd9cd789b258ed17ee..ef443281656a47fbdb8c1471e706fcf0ea8cd1ab 100644
--- a/examples/extended/electromagnetic/TestEm2/TestEm2.cc
+++ b/examples/extended/electromagnetic/TestEm2/TestEm2.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TestEm2.cc,v 1.4 2000/12/06 14:12:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.out b/examples/extended/electromagnetic/TestEm2/TestEm2.out
index 8b233c6800df792dfe3cb5310e831c7f882084e3..68422e7b6689787dee06b7139bfe41a4f3d9252c 100644
--- a/examples/extended/electromagnetic/TestEm2/TestEm2.out
+++ b/examples/extended/electromagnetic/TestEm2/TestEm2.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -69,14 +69,14 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
            material       min.delta energy(keV) 
 
                  Air           0.99
-               Water         81.507
-                 lAr         78.362
-                  Al         125.06
-                  Fe         224.07
-                 BGO         186.87
-               PbWO4         200.84
-            Tungsten         337.27
-                Lead         229.55
+               Water         81.851
+                 lAr         79.954
+                  Al         125.02
+                  Fe         225.11
+                 BGO         187.26
+               PbWO4         201.19
+            Tungsten         336.44
+                Lead         228.53
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -98,14 +98,14 @@ msc:   Tables of transport mean free paths.
            material        min.delta energy(keV) 
 
                  Air           0.99
-               Water         81.507
-                 lAr         78.362
-                  Al         125.06
-                  Fe         224.07
-                 BGO         186.87
-               PbWO4         200.84
-            Tungsten         337.27
-                Lead         229.55
+               Water         81.851
+                 lAr         79.954
+                  Al         125.02
+                  Fe         225.11
+                 BGO         187.26
+               PbWO4         201.19
+            Tungsten         336.44
+                Lead         228.53
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -143,7 +143,7 @@ Cut in energy
            Tungsten         105 keV        2.31 MeV
                Lead         101 keV        1.38 MeV
 ===================================================
-# $Id: TestEm2.out,v 1.9 2000/11/24 10:50:41 stesting Exp $
+# $Id: TestEm2.out,v 1.13 2001/03/30 09:03:08 stesting Exp $
 #
 # Macro file for "TestEm2.cc" 
 # (can be run in batch, without graphic)
@@ -190,14 +190,14 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
            material       min.delta energy(keV) 
 
                  Air         3.2397
-               Water         215.03
-                 lAr         209.58
-                  Al         349.52
-                  Fe         697.65
-                 BGO         571.17
-               PbWO4         625.41
-            Tungsten         1205.1
-                Lead         750.46
+               Water         215.85
+                 lAr          213.4
+                  Al         349.38
+                  Fe         698.96
+                 BGO         569.64
+               PbWO4         622.56
+            Tungsten         1181.6
+                Lead         737.09
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -219,14 +219,14 @@ msc:   Tables of transport mean free paths.
            material        min.delta energy(keV) 
 
                  Air         3.2397
-               Water         215.03
-                 lAr         209.58
-                  Al         349.52
-                  Fe         697.65
-                 BGO         571.17
-               PbWO4         625.41
-            Tungsten         1205.1
-                Lead         750.46
+               Water         215.85
+                 lAr          213.4
+                  Al         349.38
+                  Fe         698.96
+                 BGO         569.64
+               PbWO4         622.56
+            Tungsten         1181.6
+                Lead         737.09
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -293,20 +293,20 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 100
-  User=140.09s Real=152.81s Sys=11.26s
+  User=118.39s Real=124.16s Sys=5.71s
                  LATERAL PROFILE                         CUMULATIVE LATERAL PROFILE
 
         bin              Mean         rms                 bin            Mean      rms 
 
-    0.00-> 1.11 radl:   14.27%       5.32%             0-> 1.11 radl:   14.27%     5.32% 
-    1.11-> 2.22 radl:   25.49%      10.73%             0-> 2.22 radl:   39.76%    12.31% 
-    2.22-> 3.33 radl:   24.35%       9.19%             0-> 3.33 radl:   64.11%    14.46% 
-    3.33-> 4.44 radl:   14.08%       8.04%             0-> 4.44 radl:   78.19%    12.42% 
-    4.44-> 5.55 radl:    7.56%       5.98%             0-> 5.55 radl:   85.75%     9.56% 
-    5.55-> 6.66 radl:    4.56%       4.61%             0-> 6.66 radl:   90.31%     6.95% 
-    6.66-> 7.77 radl:    2.53%       3.85%             0-> 7.77 radl:   92.84%     4.92% 
-    7.77-> 8.88 radl:    1.36%       2.46%             0-> 8.88 radl:   94.20%     3.96% 
-    8.88-> 9.99 radl:    0.81%       2.04%             0-> 9.99 radl:   95.00%     3.23% 
+    0.00-> 1.11 radl:   13.95%       5.86%             0-> 1.11 radl:   13.95%     5.86% 
+    1.11-> 2.22 radl:   24.45%      11.26%             0-> 2.22 radl:   38.40%    14.27% 
+    2.22-> 3.33 radl:   21.91%       9.16%             0-> 3.33 radl:   60.31%    16.74% 
+    3.33-> 4.44 radl:   13.94%       8.39%             0-> 4.44 radl:   74.25%    15.37% 
+    4.44-> 5.55 radl:    9.45%       7.28%             0-> 5.55 radl:   83.71%    11.88% 
+    5.55-> 6.66 radl:    5.33%       6.03%             0-> 6.66 radl:   89.04%     8.36% 
+    6.66-> 7.77 radl:    3.38%       4.46%             0-> 7.77 radl:   92.41%     5.90% 
+    7.77-> 8.88 radl:    1.43%       2.94%             0-> 8.88 radl:   93.84%     3.90% 
+    8.88-> 9.99 radl:    0.98%       2.37%             0-> 9.99 radl:   94.82%     3.19% 
 
 
 
@@ -314,21 +314,21 @@ Run Summary
 
         bin              Mean         rms                 bin            Mean      rms 
 
-    0.00-> 0.11 radl:   66.35%      10.09%             0-> 0.11 radl:   66.35%    10.09% 
-    0.11-> 0.22 radl:   16.35%       6.18%             0-> 0.22 radl:   82.70%     7.45% 
-    0.22-> 0.33 radl:    5.98%       3.96%             0-> 0.33 radl:   88.68%     5.74% 
-    0.33-> 0.44 radl:    3.19%       3.15%             0-> 0.44 radl:   91.87%     4.09% 
-    0.44-> 0.56 radl:    1.94%       2.23%             0-> 0.56 radl:   93.81%     3.33% 
-    0.56-> 0.67 radl:    1.19%       1.25%             0-> 0.67 radl:   95.00%     3.23% 
+    0.00-> 0.11 radl:   65.09%       8.82%             0-> 0.11 radl:   65.09%     8.82% 
+    0.11-> 0.22 radl:   17.01%       6.52%             0-> 0.22 radl:   82.10%     7.04% 
+    0.22-> 0.33 radl:    6.93%       4.24%             0-> 0.33 radl:   89.02%     5.40% 
+    0.33-> 0.44 radl:    3.06%       3.03%             0-> 0.44 radl:   92.08%     3.54% 
+    0.44-> 0.56 radl:    1.71%       1.25%             0-> 0.56 radl:   93.79%     3.27% 
+    0.56-> 0.67 radl:    1.03%       0.93%             0-> 0.67 radl:   94.82%     3.19% 
 
                               SUMMARY
-                         energy deposit :   95.00 % E0 +-    3.23 % E0
-                         charged traklen:   13.59 radl +-    0.48 radl
-                         neutral traklen:  200.27 radl +-   20.88 radl
+                         energy deposit :   94.82 % E0 +-    3.19 % E0
+                         charged traklen:   13.56 radl +-    0.46 radl
+                         neutral traklen:  200.51 radl +-   16.58 radl
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 617458126, 1124214817
+ Current couple of seeds = 576966569, 1968644705
 ----------------------------------------
 
 
diff --git a/examples/extended/electromagnetic/TestEm2/geant3/README b/examples/extended/electromagnetic/TestEm2/geant3/README
index a0072238b42bf28a7e4992a36ef1d4b43640df36..7ff8556e65674c519f73bd1c741b4ae7a89d7b6f 100644
--- a/examples/extended/electromagnetic/TestEm2/geant3/README
+++ b/examples/extended/electromagnetic/TestEm2/geant3/README
@@ -35,3 +35,6 @@
      10 : radial energy profile    
      11 : cumulated radial energy profile
      12 : rms of cumulated radial energy profile  
+
+     21 : edep distrib as function of kine energy of contributing particle
+     22 : cumulative distrib of 21 
diff --git a/examples/extended/electromagnetic/TestEm2/geant3/include/celoss.inc b/examples/extended/electromagnetic/TestEm2/geant3/include/celoss.inc
index d7d1a534e2252f0f29aea21e2db391c8b8bf7a12..d9c526aa8c9e349cba93a1571d253824c1b46fc8 100644
--- a/examples/extended/electromagnetic/TestEm2/geant3/include/celoss.inc
+++ b/examples/extended/electromagnetic/TestEm2/geant3/include/celoss.inc
@@ -3,4 +3,5 @@
       COMMON/CELOSS/ SEL1(NBIN), SEL1C(NBIN), SER1(NBIN), SER1C(NBIN),          
      +               SEL2(NBIN), SEL2C(NBIN), SER2(NBIN), SER2C(NBIN),                                         
      +               DEDL(NBIN), DEDR(NBIN) , FNPAT(NBIN,3), 
-     +               STRCH,STRCH1,STRCH2,STRNE,STRNE1,STRNE2                
+     +               STRCH,STRCH1,STRCH2,STRNE,STRNE1,STRNE2,
+     +               EDEPCH,EDEPNE                
diff --git a/examples/extended/electromagnetic/TestEm2/geant3/include/history.inc b/examples/extended/electromagnetic/TestEm2/geant3/include/history.inc
index 19b9534ab278975f3b7847fbbfe5ab2a4ff269c3..5321d33ed428414a937a7b4fce2ac2246193e0a0 100644
--- a/examples/extended/electromagnetic/TestEm2/geant3/include/history.inc
+++ b/examples/extended/electromagnetic/TestEm2/geant3/include/history.inc
@@ -22,6 +22,7 @@
 * History                  
 * -------                                            
 *
+*  27-08-01 : added histo 21 and 22 : edep distribution
 *  08-02-99 : adapted for Geant4 comparison: electromagnetic/test/TestEm2
 *  17-02-98 : adapted to Unix + interactive + graphic
 *  21-01-90 : Simplified version (i.e. near gexam1)
diff --git a/examples/extended/electromagnetic/TestEm2/geant3/src/gustep.F b/examples/extended/electromagnetic/TestEm2/geant3/src/gustep.F
index 183ab87c52a4d280a3a47dea6766c0bba3e2666d..43e6214aaf6a9c60c2092cf60e4fab910f0079f7 100644
--- a/examples/extended/electromagnetic/TestEm2/geant3/src/gustep.F
+++ b/examples/extended/electromagnetic/TestEm2/geant3/src/gustep.F
@@ -31,11 +31,13 @@
          DEDL(NL) = DEDL(NL) + DESTEP                                                                                    
       ENDIF
 *
-* *** track length                                                                          
+* *** track length and total energy deposit                                                                         
       IF (CHARGE.NE.0.) THEN
-         STRCH = STRCH + STEP 
+         STRCH  = STRCH  + STEP
+	 EDEPCH = EDEPCH + DESTEP 
       ELSE
-         STRNE = STRNE + STEP
+         STRNE  = STRNE  + STEP
+	 EDEPNE = EDEPNE + DESTEP
       ENDIF	 	                                                                                                     
 *                                                                               
 * ***  Particle's flux                                                          
@@ -46,5 +48,10 @@
 	 IF (IPART.LE.3) FNPAT(NPL,IPART) = FNPAT(NPL,IPART) + 1.                                   
          NLOLD = NL                                                             
        ENDIF                                                                    
-*                                                                               
+*
+* *** energy of particles contributing to edep
+      IF ((DESTEP).GT.0.)THEN
+         elog = log10((gekin+destep)/pkine(3))
+	 call hfill (21,elog,0.,destep)
+      ENDIF 	                                                                                 
       END                                                                       
diff --git a/examples/extended/electromagnetic/TestEm2/geant3/src/uginit.F b/examples/extended/electromagnetic/TestEm2/geant3/src/uginit.F
index ab7debb2eee3c01afa8f94c163badfc45c25c1ed..21cfc9ff7dc7362670ec786e1242b338ab93db03 100644
--- a/examples/extended/electromagnetic/TestEm2/geant3/src/uginit.F
+++ b/examples/extended/electromagnetic/TestEm2/geant3/src/uginit.F
@@ -29,7 +29,7 @@
 * *** achieve initialization                                                    
       NLTOT = MIN(NLTOT,NBIN)                                                   
       NRTOT = MIN(NRTOT,NBIN)                                                   
-      CALL VZERO(SEL1,13*NBIN+6)                                                  
+      CALL VZERO(SEL1,13*NBIN+8)                                                  
 *                                                                               
       CALL GZINIT                                                               
       CALL GPART 
diff --git a/examples/extended/electromagnetic/TestEm2/geant3/src/uglast.F b/examples/extended/electromagnetic/TestEm2/geant3/src/uglast.F
index 325962d3435a8aec3794a0d1f2606d7329731fca..22af5c98fe16b676116af23d57840e81a8ec6da4 100644
--- a/examples/extended/electromagnetic/TestEm2/geant3/src/uglast.F
+++ b/examples/extended/electromagnetic/TestEm2/geant3/src/uglast.F
@@ -10,9 +10,9 @@
 #include "celoss.inc"                                                               
 *                                                                               
       DIMENSION XSEL1(NBIN),XSEL1C(NBIN),XSER1(NBIN),XSER1C(NBIN),          
-     +          XSEL2(NBIN),XSEL2C(NBIN),XSER2(NBIN),XSER2C(NBIN)          
-
-*                                          
+     +          XSEL2(NBIN),XSEL2C(NBIN),XSER2(NBIN),XSER2C(NBIN)
+     
+      DIMENSION EDIST(100),EDISTC(100)                                                    
 *                                                                                
       CALL GLAST
 *
@@ -21,7 +21,11 @@
 *                                                                               
 * *** Normalize and print energy distribution                                   
       XEVENT=IEVENT                                                             
-      CNORM  = 100./(XEVENT*PKINE(3))                                           
+      CNORM  = 100./(XEVENT*PKINE(3))      
+*
+* *** mean total energy deposit by charged and by neutral
+      EDEPCH = CNORM*EDEPCH
+      EDEPNE = CNORM*EDEPNE                                                 
 *
 * *** longitudinal profile                                                                               
       DO 2 I = 1,NLTOT                                                          
@@ -67,9 +71,24 @@
          PRINT 754,B0,B1,XSER1(I),XSER2(I),B1,XSER1C(I),XSER2C(I)                                         
    16 CONTINUE
 *
+* *** normalize histo of energy ditribution of contributing particles
+*     and compute cumulative distribution
+      SUM = HSUM (21)
+      CALL HUNPAK(21,EDIST,'HIST',1)
+         EDIST( 1) = EDIST(1)*100/SUM
+	 EDISTC(1) = EDIST(1)
+      DO 17 I=2,100
+         EDIST (I) = EDIST (I)*100/SUM
+	 EDISTC(I) = EDISTC(I-1) + EDIST(I)
+   17 CONTINUE
+      CALL HPAK (21,EDIST)
+      CALL HPAK (22,EDISTC)	 
+*
 * *** print summary
       PRINT 770
       PRINT 771,XSEL1C(NLTOT),XSEL2C(NLTOT)
+      PRINT 774,EDEPCH
+      PRINT 775,EDEPNE
       PRINT 772,XTRCH1,XTRCH2
       PRINT 773,XTRNE1,XTRNE2   
 *                                                                               
@@ -88,7 +107,9 @@
   770 FORMAT(///,30X,'SUMMARY',/)
   771 FORMAT(    25X,'energy deposit : ',F7.2,' % E0 +- ',F7.2,' % E0')
   772 FORMAT(    25X,'charged traklen: ',F7.2,' radl +- ',F7.2,' radl')
-  773 FORMAT(    25X,'neutral traklen: ',F7.2,' radl +- ',F7.2,' radl')                                                                           
+  773 FORMAT(    25X,'neutral traklen: ',F7.2,' radl +- ',F7.2,' radl')
+  774 FORMAT(    25X,'edep by charged: ',F7.2,' % E0')
+  775 FORMAT(    25X,'edep by neutral: ',F7.2,' % E0')                                                                            
 *
       END
 
diff --git a/examples/extended/electromagnetic/TestEm2/geant3/src/uhinit.F b/examples/extended/electromagnetic/TestEm2/geant3/src/uhinit.F
index ccf8550990205fcf7756bd4c6002379b4259987d..697ea758df987af48a3119cc5bb813ee356d8dd8 100644
--- a/examples/extended/electromagnetic/TestEm2/geant3/src/uhinit.F
+++ b/examples/extended/electromagnetic/TestEm2/geant3/src/uhinit.F
@@ -56,6 +56,16 @@
       CALL HBPROF(11,'cumul radial energy dep. (in percent of E inc)'          
      *, NRTOT, RMIN,RMAX, 0., 100.,' ')
       CALL HBOOK1(12,'resolution: cumul R energy dep. (% of E inc)'          
-     *, NRTOT, RMIN,RMAX, 0.0)                                                                                                                                     
+     *, NRTOT, RMIN,RMAX, 0.0)
+     
+*
+* *** Origin of the deposited energy
+      tminlog = -6.
+      tmaxlog =  0.
+      CALL HBOOK1(21,'edep (normalized 100 percent) versus log(ekin/e0)'          
+     *, 100, tminlog, tmaxlog, 0.0)
+      CALL HBOOK1(22,'cumul edep (100 percent) versus log(ekin/e0)'          
+     *, 100, tminlog, tmaxlog, 0.0)
+                                                                                                                                                     
 *                                                                                                                                     
       END                                                                       
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
index e3e5202e8fc72b7f300c4fe8ee8d1270b0618f16..11689723c86c1d6163f579dabb6d8a8e6661a85c 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2DetectorConstruction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
index 027aaa7bf1de2e37d89db49a280341bb1664720f..38e670b01591847b6bdcc6945bdf5854b109ef57 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2DetectorMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
index c1a8218e7b6312237b9956d67a3c281740567d5f..467ee0d7a7816d90272d8f78a31c66f079a65369 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2EventAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
index 477806dbd8eb43d39e212e60d109f760271725cd..e4e2459916130119a34d9ac454d592d9049c94ec 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2EventActionMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
index 32edfed1b4bc62673b61f7d9fe920415f6136e02..27692e67fce03b382b010ff8ddc2c3b193818032 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PhysicsList.hh,v 1.3 2000/04/17 11:25:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh
index 040184de79a774fadcd3d578a0c34789e1d81fbf..aef4f628a2cc2ad54faceee47e4de88470c49b0e 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PhysicsListMessenger.hh,v 1.1 2000/04/17 11:25:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
index 086e5b11e1802811bd21875c761d00b44d9c5739..acd6440f9a82670c5d37ead742565be223cc04b1 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
index f1fd283a0d9d357c17355cee20a41ce3c80420c0..54fb7c777b08846c01e54cdf27ac8184bf771b8f 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
@@ -5,10 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2RunAction.hh,v 1.5 2000/12/07 12:14:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2RunAction.hh,v 1.7 2001/03/08 14:28:14 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-// 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+// 08.03.01 Hisaya: Adapted MyVector for STL   
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -24,8 +26,9 @@
 #include "G4Positron.hh"
 #include "globals.hh"
 
-#include "g4rw/tvvector.h"
-typedef G4RWTValVector<G4double> MyVector;
+#include "g4std/vector"
+
+typedef  G4std::vector<G4double> MyVector;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -35,6 +38,11 @@ class Em2RunActionMessenger;
 
 class G4Run;
 
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
+
 class Em2RunAction : public G4UserRunAction
 {
   public:
@@ -91,7 +99,16 @@ class Em2RunAction : public G4UserRunAction
     G4double sum2NeutrTrLength;
     
     Em2RunActionMessenger* runMessenger;        
-    G4int saveRndm;    
+    G4int saveRndm;
+                  
+#ifndef G4NOHIST        
+    HepTupleManager* hbookManager;
+    HepHistogram *histo1, *histo2, *histo3;    
+    HepHistogram *histo4, *histo5, *histo6;
+    HepHistogram *histo7, *histo8, *histo9;
+    HepHistogram *hist10, *hist11, *hist12;
+#endif
+    
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -101,10 +118,10 @@ void Em2RunAction::initializePerEvent()
 {
   //initialize arrays of energy deposit per bin     
   for (G4int i=0; i<nLbin; i++)
-     { dEdL(i) = 0.; }
+     { dEdL[i] = 0.; }
      
   for (G4int j=0; j<nRbin; j++)
-     { dEdR(j) = 0.; }     
+     { dEdR[j] = 0.; }     
   
   //initialize tracklength 
     ChargTrLength = NeutrTrLength = 0.;
@@ -124,7 +141,7 @@ void Em2RunAction::fillPerTrack(G4double charge, G4double trkLength)
 inline
 void Em2RunAction::fillPerStep(G4double dEstep, G4int Lbin, G4int Rbin)
 {
-  dEdL(Lbin) += dEstep; dEdR(Rbin) += dEstep;
+  dEdL[Lbin] += dEstep; dEdR[Rbin] += dEstep;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -132,9 +149,9 @@ void Em2RunAction::fillPerStep(G4double dEstep, G4int Lbin, G4int Rbin)
 inline
 void Em2RunAction::particleFlux(G4ParticleDefinition* particle, G4int Lplan)
 {
-       if (particle == G4Gamma::Gamma())          gammaFlux(Lplan)++;
-  else if (particle == G4Electron::Electron()) electronFlux(Lplan)++;
-  else if (particle == G4Positron::Positron()) positronFlux(Lplan)++;
+       if (particle == G4Gamma::Gamma())          gammaFlux[Lplan]++;
+  else if (particle == G4Electron::Electron()) electronFlux[Lplan]++;
+  else if (particle == G4Positron::Positron()) positronFlux[Lplan]++;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
index 8a963a5bce4fb720537eb3010b96ca3841212273..a41004d22edb679a49681e3a40a4a2056404f813 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2RunActionMessenger.hh,v 1.3 2000/01/21 10:56:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
index b15bf12e221aefeec2c4d6cee1e643aa4d7ff2ee..ba0b2831c00e4e0414d40727b5a1320bdf1d7c0e 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2SteppingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
index 1c48ae3922ea02f1b78b6782dc6bf9d0429d3f59..a426f9bc04f06ba5ae633e708759e667565d4425 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2SteppingVerbose.hh,v 1.4 2000/12/06 14:12:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2SteppingVerbose.hh,v 1.5 2001/02/19 14:06:06 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
@@ -15,8 +15,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-class Em2SteppingVerbose;
-
 #ifndef Em2SteppingVerbose_h
 #define Em2SteppingVerbose_h 1
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
index d1e20288d509370537fab6f77976b4895ef52aee..16557930bb64ec189072f8ee2fd1b5c1753df1f3 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2TrackingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh b/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
index e13322bdfd28ab8cd8a77d40125da90d410dc513..0a087a0b4ed290e7dadc55a1248526d9aba53833 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2VisManager.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
index 5b49182478f2004a839cbb68a6917a3729449408..fa9ff6ee6da37a5c9a178370453eab6ddb6c4d27 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2DetectorConstruction.cc,v 1.4 2000/05/09 13:56:33 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
index 3b6deee7175ebb20da09955ee542a46d9feba0b1..0a102a4a2f2e846774b811bc5ba29ef24a72f45b 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2DetectorMessenger.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc
index b643d77a2d5f35533b5aec471bb3d2098528baa6..384997bae651e31813c3af82f05e9296f90125db 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.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2EventAction.cc,v 1.3 2001/02/20 15:58:35 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -45,10 +45,20 @@ Em2EventAction::~Em2EventAction()
 
 void Em2EventAction::BeginOfEventAction(const G4Event* evt)
 {
- G4int evtNb = evt->GetEventID();
+ G4int evtNb = evt->GetEventID();     
+ 
+ //printing survey
  if (evtNb%printModulo == 0) 
-    G4cout << "\n---> Begin Of Event: " << evtNb << G4endl; 
+    G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
+  
+ //save rndm status
+ if (Em2Run->GetRndmFreq() == 2)
+   { 
+    HepRandom::saveEngineStatus("beginOfEvent.rndm");   
+    if (evtNb%printModulo == 0) HepRandom::showEngineStatus();
+   }
  
+ //additional initializations 
  Em2Run->initializePerEvent();
 }
 
@@ -70,18 +80,6 @@ void Em2EventAction::EndOfEventAction(const G4Event* evt)
                                   trj->DrawTrajectory(50); 
         }
   }
-  
-  //save rndm status
-  if (Em2Run->GetRndmFreq() == 2)
-    { 
-     HepRandom::saveEngineStatus("endOfEvent.rndm");   
-     G4int evtNb = evt->GetEventID();
-     if (evtNb%printModulo == 0)
-       { 
-        G4cout << "\n---> End of Event: " << evtNb << G4endl;
-        HepRandom::showEngineStatus();
-       }
-    }       
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
index 55c140d8779a9ae4676b73c96cf0ba1eb6752598..928a58db627b26fe74a5261aaf33345054e26b5d 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2EventActionMessenger.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
index d5d2e6705289ac638f1155b932717019b2d9d0ed..32bbdeb6f771dbd3905ebc7d06562e05a2391627 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PhysicsList.cc,v 1.5 2000/12/06 14:12:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc
index 55eebcca742d344cb5e2b92e6a76a4eae2e01b44..2f16763b451173bab315dc7c8a1e27f8d93f65c3 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PhysicsListMessenger.cc,v 1.1 2000/04/17 11:26:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
index 00dd9433f3eeea2f6a80c8dd0f9cf397726a01f2..498127dd4a645d7f97d48dfc425c707f68eeee8b 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
index 9bd14f019cd586738ee56defd23d56998873df93..e5002e10a1c881c41b893e39ea46d04f326d7af3 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
@@ -5,9 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2RunAction.cc,v 1.6 2000/12/07 12:14:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2RunAction.cc,v 1.10 2001/03/27 08:58:15 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+// 08.03.01 Hisaya: Adapted MyVector for STL   
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -29,6 +32,10 @@
 
 #include "Randomize.hh"
 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em2RunAction::Em2RunAction(Em2DetectorConstruction*   det,
@@ -36,25 +43,30 @@ Em2RunAction::Em2RunAction(Em2DetectorConstruction*   det,
 :Em2Det(det),Em2Kin(kin)			   
 { 
   nLbin = Em2Det->GetnLtot();
-  dEdL             = *new MyVector(nLbin);
-  sumELongit       = *new MyVector(nLbin);
-  sumELongitCumul  = *new MyVector(nLbin);
-  sumE2Longit      = *new MyVector(nLbin);
-  sumE2LongitCumul = *new MyVector(nLbin);
+  dEdL.resize(nLbin, 0.0);
+  sumELongit.resize(nLbin, 0.0);
+  sumELongitCumul.resize(nLbin, 0.0); 
+  sumE2Longit.resize(nLbin, 0.0);     
+  sumE2LongitCumul.resize(nLbin, 0.0);
   
-  gammaFlux        = *new MyVector(nLbin);
-  electronFlux     = *new MyVector(nLbin);
-  positronFlux     = *new MyVector(nLbin);
+  gammaFlux.resize(nLbin, 0.0);
+  electronFlux.resize(nLbin, 0.0);
+  positronFlux.resize(nLbin, 0.0);
     
   nRbin = Em2Det->GetnRtot();
-  dEdR             = *new MyVector(nRbin);
-  sumERadial       = *new MyVector(nRbin);
-  sumERadialCumul  = *new MyVector(nRbin);
-  sumE2Radial      = *new MyVector(nRbin);
-  sumE2RadialCumul = *new MyVector(nRbin);
+  dEdR.resize(nRbin, 0.0);
+  sumERadial.resize(nRbin, 0.0);
+  sumERadialCumul.resize(nRbin, 0.0);
+  sumE2Radial.resize(nRbin, 0.0);
+  sumE2RadialCumul.resize(nRbin, 0.0);
    
   runMessenger = new Em2RunActionMessenger(this);   
-  saveRndm = 1;    
+  saveRndm = 1;
+  
+#ifndef G4NOHIST
+   hbookManager = NULL;
+#endif
+    
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -68,12 +80,69 @@ Em2RunAction::~Em2RunAction()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em2RunAction::bookHisto()
-{}
-
+{
+#ifndef G4NOHIST
+  hbookManager = new HBookFile("TestEm2.paw", 68);
+  assert (hbookManager != 0);
+  
+  G4double Ekin = Em2Kin->GetParticleGun()->GetParticleEnergy();
+  G4double dLradl = Em2Det->GetdLradl();
+  G4double dRradl = Em2Det->GetdRradl();
+  
+  histo1 = hbookManager->histogram("total energy deposit (percent of E inc)",
+                                    100,0.,100.);
+                                    
+  histo2 = hbookManager->histogram("total charged tracklength (radl)",
+                                    100,0.,100.*Ekin/GeV);
+                                    
+  histo3 = hbookManager->histogram("total neutral tracklength (radl)",
+                                    100,0.,1000.*Ekin/GeV);
+                                    
+  histo4 = hbookManager->histogram("longit energy profile (% of E inc)",
+                                    nLbin,0.,nLbin*dLradl);
+                                    
+  G4double Zmin=0.5*dLradl, Zmax=Zmin+nLbin*dLradl;                                 
+  histo5 = hbookManager->histogram("cumul longit energy dep (% of E inc)",
+                                    nLbin,Zmin,Zmax);
+                                    
+  histo6 = hbookManager->histogram("rms on cumul longit Edep (% of E inc)",
+                                    nLbin,Zmin,Zmax);
+                                    
+  histo7 = hbookManager->histogram("nb of gamma per plane",
+                                    nLbin,Zmin,Zmax);
+                                    
+  histo8 = hbookManager->histogram("nb of positron per plane",
+                                    nLbin,Zmin,Zmax);
+                                    
+  histo9 = hbookManager->histogram("nb of electron per plane",
+                                    nLbin,Zmin,Zmax);
+                                    
+  hist10 = hbookManager->histogram("radial energy profile (% of E inc)",
+                                    nRbin,0.,nRbin*dRradl);
+                                    
+  G4double Rmin=0.5*dRradl, Rmax=Rmin+nRbin*dRradl;                                 
+  hist11 = hbookManager->histogram("cumul radial energy dep (% of E inc)",
+                                    nRbin,Rmin,Rmax);
+                                    
+  hist12 = hbookManager->histogram("rms on cumul radial Edep (% of E inc)",
+                                    nRbin,Rmin,Rmax);
+#endif				                                                                                                                                                                                                                                                                                                                                     
+}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em2RunAction::cleanHisto()
-{}
+{
+#ifndef G4NOHIST
+  // Write histogram file 
+  hbookManager->write();
+
+  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....
 
@@ -93,29 +162,34 @@ void Em2RunAction::BeginOfRunAction(const G4Run* aRun)
   
   G4int nLtot = Em2Det->GetnLtot();
   if(nLbin != nLtot)
-    {dEdL.reshape(nLbin=nLtot);
-     sumELongit.reshape(nLbin)     ; sumE2Longit.reshape(nLbin);
-     sumELongitCumul.reshape(nLbin); sumE2LongitCumul.reshape(nLbin);
-     gammaFlux.reshape(nLbin) ;
-     electronFlux.reshape(nLbin)   ; positronFlux.reshape(nLbin);
+    {dEdL.resize(nLbin=nLtot, 0.0);
+     sumELongit.resize(nLbin, 0.0);
+     sumE2Longit.resize(nLbin, 0.0);
+     sumELongitCumul.resize(nLbin, 0.0);
+     sumE2LongitCumul.resize(nLbin, 0.0);
+     gammaFlux.resize(nLbin, 0.0);
+     electronFlux.resize(nLbin, 0.0);
+     positronFlux.resize(nLbin, 0.0);
      rebin=true;
     }
     
   G4int nRtot = Em2Det->GetnRtot();
   if(nRbin != nRtot)
-    {dEdR.reshape(nRbin=nRtot);
-     sumERadial.reshape(nRbin)     ; sumE2Radial.reshape(nRbin);
-     sumERadialCumul.reshape(nRbin); sumE2RadialCumul.reshape(nRbin);
+    {dEdR.resize(nRbin=nRtot, 0.0);
+     sumERadial.resize(nRbin, 0.0);
+     sumE2Radial.resize(nRbin, 0.0);
+     sumERadialCumul.resize(nRbin, 0.0);
+     sumE2RadialCumul.resize(nRbin, 0.0);
      rebin=true;
     }
           
   //initialize arrays of cumulative energy deposition
   //    
   for (G4int i=0; i<nLbin; i++)
-     sumELongit(i)=sumE2Longit(i)=sumELongitCumul(i)=sumE2LongitCumul(i)=0.;
+     sumELongit[i]=sumE2Longit[i]=sumELongitCumul[i]=sumE2LongitCumul[i]=0.;
      
   for (G4int j=0; j<nRbin; j++)
-     sumELongit(j)=sumE2Longit(j)=sumELongitCumul(j)=sumE2LongitCumul(j)=0.;
+     sumELongit[j]=sumE2Longit[j]=sumELongitCumul[j]=sumE2LongitCumul[j]=0.;
              
   //initialize track length
   sumChargTrLength=sum2ChargTrLength=sumNeutrTrLength=sum2NeutrTrLength=0.;
@@ -143,27 +217,39 @@ void Em2RunAction::fillPerEvent()
   G4double dLCumul = 0.;     
   for (G4int i=0; i<nLbin; i++) 
      {
-      sumELongit(i)  += dEdL(i);
-      sumE2Longit(i) += dEdL(i)*dEdL(i);
-      dLCumul        += dEdL(i);
-      sumELongitCumul(i)  += dLCumul;
-      sumE2LongitCumul(i) += dLCumul*dLCumul;
+      sumELongit[i]  += dEdL[i];
+      sumE2Longit[i] += dEdL[i]*dEdL[i];
+      dLCumul        += dEdL[i];
+      sumELongitCumul[i]  += dLCumul;
+      sumE2LongitCumul[i] += dLCumul*dLCumul;
      }
      
   G4double dRCumul = 0.;     
   for (G4int j=0; j<nRbin; j++) 
      {
-      sumERadial(j)  += dEdR(j);
-      sumE2Radial(j) += dEdR(j)*dEdR(j);
-      dRCumul        += dEdR(j);
-      sumERadialCumul(j)  += dRCumul;
-      sumE2RadialCumul(j) += dRCumul*dRCumul;
+      sumERadial[j]  += dEdR[j];
+      sumE2Radial[j] += dEdR[j]*dEdR[j];
+      dRCumul        += dEdR[j];
+      sumERadialCumul[j]  += dRCumul;
+      sumE2RadialCumul[j] += dRCumul*dRCumul;
      }
           
   sumChargTrLength  += ChargTrLength;
   sum2ChargTrLength += ChargTrLength*ChargTrLength;
   sumNeutrTrLength  += NeutrTrLength;
-  sum2NeutrTrLength += NeutrTrLength*NeutrTrLength;   
+  sum2NeutrTrLength += NeutrTrLength*NeutrTrLength;
+  
+#ifndef G4NOHIST  
+  //fill histograms
+  //
+  G4double Ekin=Em2Kin->GetParticleGun()->GetParticleEnergy();
+  G4double mass=Em2Kin->GetParticleGun()->GetParticleDefinition()->GetPDGMass();
+  G4double radl=Em2Det->GetMaterial()->GetRadlen();
+  
+  histo1->accumulate(100.*dLCumul/(Ekin+mass));
+  histo2->accumulate(ChargTrLength/radl);
+  histo3->accumulate(NeutrTrLength/radl);
+#endif      
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -186,42 +272,61 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
   //
   G4double dLradl = Em2Det->GetdLradl();    
   
-  MyVector MeanELongit     (nLbin), rmsELongit     (nLbin);
+  MyVector MeanELongit(nLbin),      rmsELongit(nLbin);
   MyVector MeanELongitCumul(nLbin), rmsELongitCumul(nLbin);
    
   G4int i; G4double bin;  
   for (i=0; i<nLbin; i++)
    {
-    MeanELongit(i) = norme*sumELongit(i);
-     rmsELongit(i) = norme*sqrt(abs(NbOfEvents*sumE2Longit(i)
-                                - sumELongit(i)*sumELongit(i)));
+    MeanELongit[i] = norme*sumELongit[i];
+     rmsELongit[i] = norme*sqrt(abs(NbOfEvents*sumE2Longit[i]
+                                - sumELongit[i]*sumELongit[i]));
           
-    MeanELongitCumul(i) = norme*sumELongitCumul(i);
-     rmsELongitCumul(i) = norme*sqrt(abs(NbOfEvents*sumE2LongitCumul(i) 
-                                    - sumELongitCumul(i)*sumELongitCumul(i)));
+    MeanELongitCumul[i] = norme*sumELongitCumul[i];
+     rmsELongitCumul[i] = norme*sqrt(abs(NbOfEvents*sumE2LongitCumul[i] 
+                                    - sumELongitCumul[i]*sumELongitCumul[i]));
+
+    gammaFlux   [i] /= NbOfEvents;
+    electronFlux[i] /= NbOfEvents;
+    positronFlux[i] /= NbOfEvents;                                    
 
-    gammaFlux   (i) /= NbOfEvents;
-    electronFlux(i) /= NbOfEvents;
-    positronFlux(i) /= NbOfEvents;                                    
+#ifndef G4NOHIST                                    
+    bin = i*dLradl;                                
+    histo4->accumulate(bin,MeanELongit[i]/dLradl);
+    bin = (i+1)*dLradl;
+    histo5->accumulate(bin,MeanELongitCumul[i]);
+    histo6->accumulate(bin, rmsELongitCumul[i]);
+    
+    histo7->accumulate(bin, gammaFlux[i]);
+    histo8->accumulate(bin, positronFlux[i]);
+    histo9->accumulate(bin, electronFlux[i]);
+#endif                                            
    }
    
   //radial
   // 
   G4double dRradl = Em2Det->GetdRradl();    
   
-  MyVector MeanERadial     (nRbin), rmsERadial     (nRbin);
+  MyVector MeanERadial(nRbin),      rmsERadial(nRbin);
   MyVector MeanERadialCumul(nRbin), rmsERadialCumul(nRbin);
     
   for (i=0; i<nRbin; i++)
    {
-    MeanERadial(i) = norme*sumERadial(i);
-     rmsERadial(i) = norme*sqrt(abs(NbOfEvents*sumE2Radial(i)
-                                - sumERadial(i)*sumERadial(i)));
+    MeanERadial[i] = norme*sumERadial[i];
+     rmsERadial[i] = norme*sqrt(abs(NbOfEvents*sumE2Radial[i]
+                                - sumERadial[i]*sumERadial[i]));
           
-    MeanERadialCumul(i) = norme*sumERadialCumul(i);
-     rmsERadialCumul(i) = norme*sqrt(abs(NbOfEvents*sumE2RadialCumul(i) 
-                                    - sumERadialCumul(i)*sumERadialCumul(i)));
-                                                                 
+    MeanERadialCumul[i] = norme*sumERadialCumul[i];
+     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]);
+#endif                                           
    }
 
   //track length
@@ -252,11 +357,11 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
      G4double inf=i*dLradl, sup=inf+dLradl;
        
      G4cout << G4std::setw(8) << inf << "->" << G4std::setw(5) << sup << " radl: " 
-                                      << G4std::setw(7) << MeanELongit(i) << "%  " 
-                                      << G4std::setw(9) << rmsELongit(i) << "%       "                                  
+                                      << 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) << "% " 
+                                      << G4std::setw(7) << MeanELongitCumul[i] << "%  " 
+                                      << G4std::setw(7) << rmsELongitCumul[i] << "% " 
             <<G4endl;
    }
    
@@ -273,18 +378,18 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
      G4double inf=i*dRradl, sup=inf+dRradl;
        
      G4cout << G4std::setw(8) << inf << "->" << G4std::setw(5) << sup << " radl: " 
-                                      << G4std::setw(7) << MeanERadial(i) << "%  " 
-                                      << G4std::setw(9) << rmsERadial(i) << "%       "                                  
+                                      << 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) << "% " 
+                                      << G4std::setw(7) << MeanERadialCumul[i] << "%  " 
+                                      << G4std::setw(7) << rmsERadialCumul[i] << "% " 
             <<G4endl;
    }  
   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;
+         << 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;
@@ -297,7 +402,7 @@ void Em2RunAction::EndOfRunAction(const G4Run* aRun)
   G4cout.precision(oldprec);
 
   // save Rndm status
-  if (saveRndm == 1)
+  if (saveRndm > 0)
     { HepRandom::showEngineStatus();
       HepRandom::saveEngineStatus("endOfRun.rndm");
     }                           
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc
index e60b5397ff95519af31bc6abab0e61b5d22457a1..23d1a3bce51769fa26ace56035966b35c7522607 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.3 2000/01/21 10:56:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2RunActionMessenger.cc,v 1.4 2001/02/20 15:58:36 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -35,8 +35,8 @@ Em2RunActionMessenger::Em2RunActionMessenger(Em2RunAction* run)
   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->SetGuidance("freq > 0 saved on:   endOfRun.rndm");
+  RndmSaveCmd->SetGuidance("freq = 2 saved on: beginOfEvent.rndm");    
   RndmSaveCmd->SetParameterName("frequency",false);
   RndmSaveCmd->SetRange("frequency>=0 && frequency<=2");
   RndmSaveCmd->AvailableForStates(PreInit,Idle); 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
index 428b43f4057bcec960e946585f5c56ed12aeccc2..9f7cc70ad58b2755c5adce97b0ce7cc42be9b61c 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2SteppingAction.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
index 60d2ee0109c812f3a1bc6a4a2c4b46f0ace7964f..0619b51b38f9159136e4b075ad5ad0d61cf9ef93 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2SteppingVerbose.cc,v 1.4 2000/12/06 14:12:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2SteppingVerbose.cc,v 1.6 2001/02/19 14:06:36 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -46,7 +46,7 @@ void Em2SteppingVerbose::StepInfo()
 	     << G4std::setw( 9) << "dEStep"     << " "  
 	     << G4std::setw(10) << "StepLeng"     
 	     << G4std::setw(10) << "TrakLeng" 
-	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Volume"    << "  "
 	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
@@ -61,16 +61,17 @@ void Em2SteppingVerbose::StepInfo()
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
       G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	->GetProcessName();
+      G4cout << "  " 
+             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                ->GetProcessName();
     } else {
-      G4cout << "User Limit";
+      G4cout << "   UserLimit";
     }
 
     G4cout << G4endl;
@@ -86,12 +87,12 @@ void Em2SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -115,8 +116,8 @@ void Em2SteppingVerbose::StepInfo()
     
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 void Em2SteppingVerbose::TrackingStarted()
@@ -134,7 +135,7 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 9) << "dEStep"     << " "  
 	   << G4std::setw(10) << "StepLeng"  
 	   << G4std::setw(10) << "TrakLeng"
-	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     
 
     G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
@@ -147,13 +148,13 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
-      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(10) << "OutOfWorld";
     }
-    G4cout << G4std::setw(10) << "initStep" << G4endl;
+    G4cout  << "    initStep" << G4endl;
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
index 3aeb63854612f2f6affe62c9b772d83e6a1cae19..25f4d8126ec67020a14616f6705c13a77ff19022 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: Em2TrackingAction.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc b/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
index 7e8dcb2201e327d24edce56f0e0f92884a86624e..f8f2a098666bb83d243fd0b936d3d4060e0942c9 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2VisManager.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm3/GNUmakefile b/examples/extended/electromagnetic/TestEm3/GNUmakefile
index 5a154519113d373e2d5157d9174e33991408b2a0..8b572ca8bc631c890557eb43086ba374caa8b038 100644
--- a/examples/extended/electromagnetic/TestEm3/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm3/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 2000/12/07 12:38:24 maire Exp $
+# $Id: GNUmakefile,v 1.5 2001/02/21 11:17:02 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,4 +16,12 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
+G4NOHIST := true
+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/History b/examples/extended/electromagnetic/TestEm3/History
index 7b31dfca33679664f54f42239f9095dd9b11b170..747817a53c7c2e3ecb6a558deed5fbced06e5007 100644
--- a/examples/extended/electromagnetic/TestEm3/History
+++ b/examples/extended/electromagnetic/TestEm3/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.4 2000/12/07 12:38:24 maire Exp $
+$Id: History,v 1.7 2001/03/26 16:01:57 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,26 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
      
+26-03-01  mma (testem3-V03-00-04)
+          - change in histogramming : 1d histo of Edep/Ebeam
+	  in each absorber instead of ntuple, both in G4 and G3.
+	  - interactive command /run/setHisto (in G4) and ffread
+	  data card *histo (in G3) to control the binning of the
+	  histos.
+	  - in G3, new data card cutpr to set bcute, dcute, ppcutm for
+	  each tracking medium
+	  - in gnumakefile : the cpp flag g4nohist=true by default.
+	    --> no histograms in G4 by default. 
+	  
+	       
+21-02-01  mma (testem3-V03-00-03)
+          - hbook histograms restored
+	       
+20-02-01  mma (testem3-V03-00-02)
+          -stepping verbose adapted for STL
+	  -BirkAttenuation function
+	  -save rndm at begin of event
+     
 07-12-00  mma (testem3-V02-00-03 & testem-noHist)
           remove hbook histograms: GNUmakefile,runAction,eventAction
 				   
diff --git a/examples/extended/electromagnetic/TestEm3/README b/examples/extended/electromagnetic/TestEm3/README
index 194dd493468379f0f5166b4583f7712c3cd9c12c..f1b7345941cd08d262346606d53f604cfddeee6c 100644
--- a/examples/extended/electromagnetic/TestEm3/README
+++ b/examples/extended/electromagnetic/TestEm3/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.2 2000/01/21 09:11:04 maire Exp $
+$Id: README,v 1.4 2001/03/30 12:39:56 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -111,16 +111,19 @@ $Id: README,v 1.2 2000/01/21 09:11:04 maire Exp $
  		....
  		Idle> exit
  	
- 7- NTUPLE
+ 7- Histograms
  
-	Testem3 produce an Ntuple which is saved as testem3.histo
- 
-	Content of this Ntuple:
+ Testem3 produces histograms which are saved as testem3.paw : 
+  histo 1 : energy deposit in absorber 0 (edep/Ebeam)
+  histo 2 : energy deposit in absorber 1 (edep/Ebeam)
+  ...etc...........
   
-	EAbs0 = energy deposit in absorber[0] per event
-	LAbs0 = charged track length in absorber[0] per event
-        ........
-	EAbsN = energy deposit in absorber[N] per event
-	LAbsN = charged track length in absorber[N] per event
-	  
- 	
+ One can control the binning of the histo with the command:
+  /run/setHisto   idAbsor  nbin  vmin  vmax 
+  ...etc...........
+
+ Note that, histograms are disabled via the flag G4NOHIST in the GNUmakefile.
+ Currently, histograms in this example are implemented through the obsolete
+ CLHEP/Hist package, which is no longer supported. The implementation will
+ be replaced by direct call to the "analysis" module in a near future.
+
diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.cc b/examples/extended/electromagnetic/TestEm3/TestEm3.cc
index 204135a6784c075f03efd816a8f6f5696163c0af..364190bc96bc8acd974a5d6fe87a044dc56f77a2 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.4 2000/12/06 16:43:38 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: TestEm3.cc,v 1.5 2001/03/26 16:01:57 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
@@ -46,8 +46,9 @@ int main(int argc,char** argv) {
   Em3DetectorConstruction* detector = new Em3DetectorConstruction;
   runManager->SetUserInitialization(detector);
   runManager->SetUserInitialization(new Em3PhysicsList);
-  
-  runManager->SetUserAction(new Em3PrimaryGeneratorAction(detector));
+  //
+  Em3PrimaryGeneratorAction* KinAct = new Em3PrimaryGeneratorAction(detector);
+  runManager->SetUserAction(KinAct);
     
 #ifdef G4VIS_USE
   // visualization manager
@@ -58,7 +59,7 @@ int main(int argc,char** argv) {
   // set user action classes
   Em3RunAction* RunAct = new Em3RunAction(detector);
   runManager->SetUserAction(RunAct);
-  runManager->SetUserAction(new Em3EventAction(RunAct,detector));
+  runManager->SetUserAction(new Em3EventAction(RunAct,KinAct,detector));
   runManager->SetUserAction(new Em3SteppingAction);
   
   //Initialize G4 kernel
diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.out b/examples/extended/electromagnetic/TestEm3/TestEm3.out
index a40528021cd7f384af41bf4b3c505f59e6a1e584..26c83f27499afb81bb1fb3036de77fce8eb3f06c 100644
--- a/examples/extended/electromagnetic/TestEm3/TestEm3.out
+++ b/examples/extended/electromagnetic/TestEm3/TestEm3.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -66,7 +66,7 @@
    --->  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: 6317232936888469291008.000 km 
+ Material: Galactic     density:  0.000 mg/cm3  temperature:   2.73 K  pressure:   0.00 atm  RadLength: 204727576.737 pc 
    --->  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 
@@ -107,21 +107,21 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-           Aluminium         82.738
-         liquidArgon         52.207
-                Iron         142.65
-              Copper         153.03
-            Tungsten         210.48
-                Lead         145.94
-             Uranium         198.28
-               Water         54.624
-        Scintillator         55.559
-            Silicium         76.801
-              quartz         76.434
-             NemaG10          68.96
+           Aluminium         82.719
+         liquidArgon         53.268
+                Iron         143.41
+              Copper         153.59
+            Tungsten         210.64
+                Lead         145.79
+             Uranium         197.41
+               Water         54.852
+        Scintillator         55.938
+            Silicium         77.338
+              quartz           77.2
+             NemaG10         69.507
                  Air           0.99
-             Aerogel         20.283
-         CarbonicGas          6.298
+             Aerogel         20.477
+         CarbonicGas         6.4196
           WaterSteam           0.99
             Galactic           0.99
                 Beam           0.99
@@ -145,21 +145,21 @@ msc:   Tables of transport mean free paths.
 
            material        min.delta energy(keV) 
 
-           Aluminium         82.738
-         liquidArgon         52.207
-                Iron         142.65
-              Copper         153.03
-            Tungsten         210.48
-                Lead         145.94
-             Uranium         198.28
-               Water         54.624
-        Scintillator         55.559
-            Silicium         76.801
-              quartz         76.434
-             NemaG10          68.96
+           Aluminium         82.719
+         liquidArgon         53.268
+                Iron         143.41
+              Copper         153.59
+            Tungsten         210.64
+                Lead         145.79
+             Uranium         197.41
+               Water         54.852
+        Scintillator         55.938
+            Silicium         77.338
+              quartz           77.2
+             NemaG10         69.507
                  Air           0.99
-             Aerogel         20.283
-         CarbonicGas          6.298
+             Aerogel         20.477
+         CarbonicGas         6.4196
           WaterSteam           0.99
             Galactic           0.99
                 Beam           0.99
@@ -209,7 +209,7 @@ Cut in energy
            Galactic         990 eV          990 eV 
                Beam         990 eV          990 eV 
 ===================================================
-# $Id: TestEm3.out,v 1.8 2000/11/24 11:02:55 stesting Exp $
+# $Id: TestEm3.out,v 1.12 2001/03/30 09:03:15 stesting Exp $
 #
 # Macro file for "exampleN03.cc" 
 # (can be run in batch, without graphic)
@@ -242,19 +242,19 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 100
-  User=273.62s Real=311.24s Sys=20.37s
+  User=141.92s Real=151.68s Sys=9.63s
 
 -------------------------------------------------------------
                                    total energy dep            total tracklen 
  
- Absorber0 (        Lead) : 814.79 MeV +- 14.27 MeV       51.33 cm  +-  1.17 cm 
- Absorber1 ( liquidArgon) : 175.43 MeV +- 13.23 MeV       87.65 cm  +-  6.82 cm 
+ Absorber0 (        Lead) : 812.12 MeV +- 16.14 MeV       51.89 cm  +-  1.22 cm 
+ Absorber1 ( liquidArgon) : 177.04 MeV +- 15.38 MeV       88.78 cm  +-  8.08 cm 
 
 -------------------------------------------------------------
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1497149051, 1975036636
+ Current couple of seeds = 859140068, 732198684
 ----------------------------------------
 G4 kernel has come to Quit state.
 Deletion of G4 kernel class start.
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/README b/examples/extended/electromagnetic/TestEm3/geant3/README
index 05281f82293663df4903e4e3e142f2e68468c07a..5967a14b78f07cfb1a515f1a9a42e6f653026e19 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/README
+++ b/examples/extended/electromagnetic/TestEm3/geant3/README
@@ -15,13 +15,18 @@
  
  run01.dat      (runNN.dat is the equivalent of the G4 runNN.mac)
  
+ It is possible to set the production cuts BCUTE, DCUTE and PPCUTM
+ medium by medium, via the data cards:
+ CUTPR  imed1  bcute/m   dcute/m  ppcutm
+ CUTPR  imed2  bcute/m   dcute/m  ppcutm
+ ...etc............
  
- testem3 produce an Ntuple which is saved as testem3.paw if ISWIT(2)=1
- 
- Content of this Ntuple:
+ testem3 produces histograms which are saved as testem3.paw : 
+  histo 1 : energy deposit in absorber 1 (edep/Ebeam)
+  histo 2 : energy deposit in absorber 2 (edep/Ebeam)
+  ...etc...........
   
-   EAbs0 = energy deposit in absorber(0) per event
-   LAbs0 = charged track length in absorber(0) per event
-   ..........
-   EAbsN = energy deposit in absorber(N) per event
-   LAbsN = charged track length in absorber(N) per event 
+ One can control the binning of the histo with the data cards:
+  *HISTO  id1  nbin  vmin  vmax 
+  *HISTO  id2  nbin  vmin  vmax
+  ...etc...........
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc b/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc
index c7a277316b4684d9fa1239c1eab6243414356681..90135fb28674729c3e94ee4464feff9896c25011 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc
+++ b/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc
@@ -15,4 +15,12 @@
 *  calorX  = total  X-size of the calor (cm)
 *  worldX  = total  X-size of the world (cm)
 *  worldYZ = total YZ-size of the world (cm)
-*                                                                               
+*
+
+      COMMON/PRODCUT/prodcut(4*MaxAbs)
+*
+*  prodcut(k)   = tracking medium number k          (data card CUTPR)
+*  prodcut(k+1) = bcute/m for this medium           (data card CUTPR)
+*  prodcut(k+2) = dcute/m for this medium           (data card CUTPR)
+*  prodcut(k+3) = ppcutm  for this medium           (data card CUTPR)
+*
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/include/histo.inc b/examples/extended/electromagnetic/TestEm3/geant3/include/histo.inc
new file mode 100644
index 0000000000000000000000000000000000000000..304539cb395480b170d16ce52fab12ef9d35ae96
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/include/histo.inc
@@ -0,0 +1,2 @@
+     
+      COMMON/HISTO/iexist(MaxAbs),idhist,nbinE,Emin,Emax 
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/run15.dat b/examples/extended/electromagnetic/TestEm3/geant3/run15.dat
new file mode 100644
index 0000000000000000000000000000000000000000..f38dc36c2aadc2611dbff2aca45c8b1f46d72f31
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/run15.dat
@@ -0,0 +1,27 @@
+LIST
+C
+C    Iron-scintillator 20 layers
+C
+CALOR  2 (nbAbs) 20 (nbLay)  30. (calorYZ) 0. (field)
+MATE   7 (iron)    14 (Sc)
+THICK  1.4(cm)    0.3 (cm)
+C
+TRIG   20000
+KINE   5 (Itype) 180. (Ekine) 1000. (x0) 0. (y0) 0. (z0) 1. (ux) 0. (uy) 0. (uz)
+DEBUG  10  5 1000
+SWIT   0 (draw) 1 (save)
+C
+ABAN   0
+LOSS   1
+HADR   0
+TIME   2=1.
+C
+CUTS  10.0e-6 (cutgam) 10.0e-6 (cutele)  3*10.e-3 (cutn/h/mu)       
+CUTPR  1. (tmed)   20.5e-6 (bcute/m)    1.2e-3 (dcute/m)   1.2e-3 (ppcutm)
+       2. (tmed)   10.0e-6 (bcute/m)  356.0e-6 (dcute/m) 356.0e-6 (ppcutm)
+C       
+C CUTPR  1. (tmed)   10.0e+3 (bcute/m)  146.0e+0 (dcute/m)  146.0e+0 (ppcutm)
+C        2. (tmed)  842.0e-6 (bcute/m)  318.0e-3 (dcute/m)  318.0e-3 (ppcutm)       
+C       
+*HISTO 1 (idh) 100 (nbin) 0. (Emin/Ebeam) 1.e-2 (Emax/Ebeam)
+*HISTO 2 (idh) 100 (nbin) 0. (Emin/Ebeam) 5.e-4 (Emax/Ebeam)
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/ffuser.F b/examples/extended/electromagnetic/TestEm3/geant3/src/ffuser.F
new file mode 100644
index 0000000000000000000000000000000000000000..28db2a29429512c10d73d25d88f4da63ee4968c9
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/ffuser.F
@@ -0,0 +1,20 @@
+
+      SUBROUTINE FFUSER(ikey)
+*
+*     The routine is called when a *key card is read
+*
+#include "calor.inc"
+#include "histo.inc"
+*
+      CHARACTER*4  keyw
+      CHARACTER*25 title      
+*
+      call UHTOC(ikey,4,keyw,4)
+      if (keyw.eq.'HIST') then
+        if (iexist(idhist).eq.1) call hdelet(idhist)
+	title = 'Edep/Ebeam in absorber '//char(ichar('0')+(idhist-1))	
+	call hbook1(idhist,title,nbinE,Emin,Emax,0.)
+	iexist(idhist) = 1
+      endif			   
+*                                                                               
+      END                                                                       
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/guout.F b/examples/extended/electromagnetic/TestEm3/geant3/src/guout.F
index 1d7521e5d550b9af6ef5e7d6674c6596ac7a7067..51acfa4acb0c0dd0da30bba5a370766b06b486fe 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/guout.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/guout.F
@@ -4,10 +4,10 @@
 *     User routine called at the end of each event
 *     
 #include "geant321/gcflag.inc"
+#include "geant321/gckine.inc"
 #include "calor.inc"
 #include "celoss.inc"
 *
-      DIMENSION sumevent(2*MaxAbS)
       CHARACTER*4 unit
 *                                                                               
 * *** drawing
@@ -20,12 +20,11 @@
       END IF
 #endif      
 *
-*     ntuple: energies and track length per event
+*     histo: energy deposit per tracking medium
       do k=1,NbAbsor
-        sumevent(2*k-1) = EdepAbs(k)
-        sumevent(2*k  ) = TrckAbs(k)
+        ratio = EdepAbs(k)/pkine(1)
+	call hfill (k,ratio,0.,1.)
       enddo
-      CALL HFN(1,sumevent)     
 *
 *     cumul energy deposited and charged track length
       do k=1,NbAbsor
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/main.F b/examples/extended/electromagnetic/TestEm3/geant3/src/main.F
index b31a7415a2f3a4d2ef80d473c4acf6d53582dd85..a10ec4d07e7a622ab2770b68713121ec9b527e54 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/main.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/main.F
@@ -4,7 +4,7 @@
       PROGRAM main
 *
 *
-      PARAMETER (NGBANK=100000, NHBOOK=40000)
+      PARAMETER (NGBANK=100000, NHBOOK=100000)
       COMMON/GCBANK/Q(NGBANK)
       COMMON/PAWC  /H(NHBOOK)
 *
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F b/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F
index a86f3fafbf5791436f33e6770eceb190af0d475a..4c0af24396f3717d95b1f8fbe804d8a37b454df1 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F
@@ -10,7 +10,8 @@
       DIMENSION Aair(2),Zair(2),Wair(2)
       DIMENSION ACO2(2),ZCO2(2),WCO2(2)
       DIMENSION AH2O(2),ZH2O(2),WH2O(2)
-      DIMENSION AG10(4),ZG10(4),WG10(4)                                        
+      DIMENSION AG10(4),ZG10(4),WG10(4)
+      DIMENSION Asci(2),Zsci(2),Wsci(2)                                              
 *
       CHARACTER*4  volnam
       CHARACTER*20 matnam
@@ -34,7 +35,12 @@
       DATA AG10/ 1.01, 12.00, 16.00, 28.00/
       DATA ZG10/ 1.  ,  6.  ,  8.  , 14.  /
       DATA WG10/ 3.  ,  3.  ,  2.  ,  1.  /      
-      
+*                                                                               
+* *** Scintillator compound parameters
+      DATA Asci/12.01,  1.01/
+      DATA Zsci/ 6.  ,  1.  /
+      DATA Wsci/ 9.  , 10.  /                                                                               
+
 *
 * *** Defines USER perticular materials
       CALL GSMIXT( 1,'Air'      , Aair ,Zair, 1.29E-3, 2   , Wair)
@@ -46,10 +52,11 @@
       CALL GSMATE( 7,'Iron     ', 55.85, 26., 7.87   , 1.76, 17.1, 0,0)
       CALL GSMATE( 8,'Lead     ',207.19, 82., 11.35  , 0.56, 18.5, 0,0)
       CALL GSMATE( 9,'Uranium  ',238.03, 92., 18.95  , 0.32, 12. , 0,0)
-      CALL GSMATE(10,'Silicium ', 28.09, 14.,  2.33  , 9.36, 45.5, 0,0)
+      CALL GSMATE(10,'Silicon  ', 28.09, 14.,  2.33  , 9.36, 45.5, 0,0)
       CALL GSMATE(11,'Tungsten ',183.85, 74., 19.30  , 0.35,  9.6, 0,0)
       CALL GSMIXT(12,'NemaG10'  , AG10 ,ZG10, 1.7    ,-4   , WG10)
-      CALL GSMATE(13,'Copper   ', 63.55, 29., 8.96   , 1.43, 15.0, 0,0)      
+      CALL GSMATE(13,'Copper   ', 63.55, 29., 8.96   , 1.43, 15.0, 0,0)
+      CALL GSMIXT(14,'Scintilla', Asci ,Zsci, 1.032  ,-2   , Wsci)      
 *                                               
 *                                                                               
 * *** Defines USER tracking media parameters
@@ -66,6 +73,18 @@
         CALL GSTMED( k,'absorber',materAbs(k), 0 ,IFIELD,FIELDM,TMAXFD,
      *                 STEMAX,DEEMAX,EPSIL,STMIN, 0 , 0 )
       enddo
+* 
+* *** set specific bcute/dcute (if any)     
+      do k=1,4*NbAbsor,4
+         itm = prodcut(k) + 0.01
+	if(itm.ge.1) then
+	   call GSTPAR(itm,'BCUTE' ,prodcut(k+1))
+           call GSTPAR(itm,'BCUTM' ,prodcut(k+1))	   
+	   call GSTPAR(itm,'DCUTE' ,prodcut(k+2))
+           call GSTPAR(itm,'DCUTM' ,prodcut(k+2))
+	   call GSTPAR(itm,'PPCUTM',prodcut(k+3))
+	endif   
+      enddo
 *
       nudef = NbAbsor+1
       CALL GSTMED( nudef,'default' , 1    , 0 ,IFIELD,FIELDM,TMAXFD,
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F b/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F
index 29e9bf22e9b44103b218da8c25993315c4435984..c02bef735e96157dfe5ae208627a11a8857648f1 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F
@@ -5,6 +5,7 @@
 *
 #include "calor.inc"
 #include "celoss.inc"
+#include "histo.inc"
 #include "geant321/gckine.inc"
 *
       CHARACTER*20 filnam
@@ -23,6 +24,10 @@
       CALL FFKEY('CALOR',NbAbsor,4,'MIXED')
       CALL FFKEY('MATE' ,materAbs(1),MaxAbs,'INTEGER')
       CALL FFKEY('THICK',thickAbs(1),MaxAbs,'REAL')
+* *** production cuts (bcute, dcute and ppcutm) for each absorber       
+      CALL FFKEY('CUTPR',prodcut(1) ,4*MaxAbs,'REAL')
+* *** histograms
+      CALL FFKEY('HISTO',idhist,4,'MIXED')            
 *
 * *** read data cards
       CALL GFFGO 
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/uhinit.F b/examples/extended/electromagnetic/TestEm3/geant3/src/uhinit.F
index a03868ac2acb9a6a721ead4bcfc4d8225e68c8a2..f2eba6e445d820f1c4345f23feb744d6eb3b061d 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/uhinit.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/uhinit.F
@@ -4,14 +4,17 @@
 *     To book the user's histograms
 *
 #include "calor.inc"
+#include "histo.inc"
 *
-      CHARACTER*5 chtags(20)
+      character*25 title
 *
-      DATA chtags /'EAbs0','LAbs0','EAbs1','LAbs1','EAbs2','LAbs2',
-     +             'EAbs3','LAbs3','EAbs4','LAbs4','EAbs5','LAbs5',
-     +             'EAbs6','LAbs6','EAbs7','LAbs7','EAbs8','LAbs8',
-     +	           'EAbs9','LAbs9'/		   
-*      
-      CALL HBOOKN(1,'sum per event',2*NbAbsor,' ',4000,chtags)
+* *** complete the booking of histograms
+      do k=1,NbAbsor
+        if (iexist(k).eq.0) then
+	   title = 'Edep/Ebeam in absorber '//char(ichar('0')+(k-1))
+	   call hbook1(k,title,100, 0.,1.,0.)
+	   iexist(k) = 1
+	endif
+      enddo	   	   
 *                                                                               
       END                                                                       
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh b/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
index fe5d5765d15dfa8c51a1747bff64f00234ff833a..f918bee672c886abebaede1d89e5ce12f509f390 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3CalorHit.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
index 656ff6bd9c800cdc4dc15d47de5bd5a1229b86b5..9c4b2b4b3f6fc5421240dbbe37fc5ac168854297 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3CalorimeterSD.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
index b2e25de7050ed6ea274e5d0f63b5f72f7cfb2da7..ea22fe18b3cbfd7c5900fe84c4ecd17716be60c5 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3DetectorConstruction.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
index 7fee9b6cb20736fd394f2f7afe8c2be9ad4460ff..cfec5db8f5955a154d688add49ff0a2057710c89 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3DetectorMessenger.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh
index 6addcb66872842fe24f09fc529674d43c523270f..ae417182bfe3576b0b60a4e3ba090c793e00fe25 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.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3EventAction.hh,v 1.3 2001/03/26 16:01:58 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -20,6 +20,7 @@
 #include "globals.hh"
 
 class Em3RunAction;
+class Em3PrimaryGeneratorAction;
 class Em3DetectorConstruction;
 class Em3EventActionMessenger;
 
@@ -29,7 +30,8 @@ class Em3EventAction : public G4UserEventAction
 {
   public:
   
-    Em3EventAction(Em3RunAction*,Em3DetectorConstruction*);
+    Em3EventAction(Em3RunAction*,Em3PrimaryGeneratorAction*,
+                   Em3DetectorConstruction*);
    ~Em3EventAction();
 
     void BeginOfEventAction(const G4Event*);
@@ -40,12 +42,13 @@ class Em3EventAction : public G4UserEventAction
         
   private:
   
-    Em3RunAction*             Em3Run;
-    Em3DetectorConstruction*  Detector;
-    G4int                     calorimeterCollID;  // Hits collection ID
-    G4String                  drawFlag;           // draw/print the event
-    G4int                     printModulo;         
-    Em3EventActionMessenger*  eventMessenger;
+    Em3RunAction*              Em3Run;
+    Em3PrimaryGeneratorAction* Em3Kin;
+    Em3DetectorConstruction*   Detector;
+    G4int                      calorimeterCollID;  // Hits collection ID
+    G4String                   drawFlag;           // draw/print the event
+    G4int                      printModulo;         
+    Em3EventActionMessenger*   eventMessenger;
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
index e44cab873f6c89f9f1e680d33d6903d18c04e0b8..6509ef03b4378b75f8bf944dbafa55c9146526a6 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3EventActionMessenger.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
index ed2915f55d8ef7b0b929d54d919cde10490da414..df7e3df26c41330023bb9cc29990fba191bd34a5 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3PhysicsList.hh,v 1.3 2000/04/17 12:06:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh
index a8bda2378c80f6b31d7b56c2c22b3865d71a0f7e..71a02eb4d679a31742640c4383574e054d6dd736 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3PhysicsListMessenger.hh,v 1.1 2000/04/17 12:06:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh
index 7d3073748ffae1ff9c9e0a075f17cf10633ed048..110028275e292f61a7f7685bf1610f804d53d455 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.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3PrimaryGeneratorAction.hh,v 1.3 2001/03/26 16:01:58 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -17,9 +17,9 @@
 #define Em3PrimaryGeneratorAction_h 1
 
 #include "G4VUserPrimaryGeneratorAction.hh"
+#include "G4ParticleGun.hh"
 #include "globals.hh"
 
-class G4ParticleGun;
 class G4Event;
 class Em3DetectorConstruction;
 class Em3PrimaryGeneratorMessenger;
@@ -35,6 +35,7 @@ class Em3PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
   public:
     void SetDefaultKinematic(); 
     void GeneratePrimaries(G4Event*);
+    G4ParticleGun* GetParticleGun() {return particleGun;};
     
   private:
     G4ParticleGun*              particleGun;
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
index 32aa59aef4bde0d24237ae32d9e1ec864f403c76..529d12341dc3a71d7be7fd164ac8dc79a5856ef3 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh
index 8e3cc021e8ab3e63e20a35144252483c8d39e0f5..6f72e5b877ac8a6b2ba156290ff79f18617cd8db 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.4 2000/12/07 12:38:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3RunAction.hh,v 1.6 2001/03/26 16:01:58 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -26,6 +26,11 @@
 class G4Run;
 class Em3RunActionMessenger;
 
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
+
 class Em3RunAction : public G4UserRunAction
 {
   public:
@@ -40,7 +45,13 @@ class Em3RunAction : public G4UserRunAction
     
     void  SetRndmFreq(G4int   val)  {saveRndm = val;}
     G4int GetRndmFreq()             {return saveRndm;}
-                
+    
+#ifndef G4NOHIST
+    HepHistogram* GetHisto(G4int id) {return histo[id];}    
+#endif
+
+    void SetHisto (G4int id, G4int nbins, G4double vmin, G4double vmax);
+            
   private:
     void bookHisto();
     
@@ -52,6 +63,11 @@ class Em3RunAction : public G4UserRunAction
     Em3DetectorConstruction* Detector;    
     Em3RunActionMessenger*   runMessenger;        
     G4int saveRndm;
+    
+#ifndef G4NOHIST    
+    HepTupleManager* hbookManager;    
+    HepHistogram* histo[MaxAbsor];
+#endif               
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh
index 9264a015e37471f83df21d703bfc4794f2c7a649..12e63fd083aa47b5fa75ac891e83adbca25dd788 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.3 2000/01/21 09:11:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3RunActionMessenger.hh,v 1.4 2001/03/26 16:01:58 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -21,6 +21,7 @@
 
 class Em3RunAction;
 class G4UIdirectory;
+class G4UIcommand;
 class G4UIcmdWithAString;
 class G4UIcmdWithAnInteger;
 
@@ -40,6 +41,8 @@ class Em3RunActionMessenger: public G4UImessenger
     G4UIdirectory*         RndmDir;
     G4UIcmdWithAnInteger*  RndmSaveCmd;       
     G4UIcmdWithAString*    RndmReadCmd;
+    
+    G4UIcommand*           HistoCmd;        
  
 };
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh
index 233f5bf8323b149de99bb717bea9f42e8cc799ff..c30d2c4a4494577df0bdb556e7ecbb5ea1b16419 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.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3SteppingAction.hh,v 1.3 2001/02/20 12:34:43 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -17,6 +17,7 @@
 #define Em3SteppingAction_h 1
 
 #include "G4UserSteppingAction.hh"
+#include "globals.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -27,6 +28,8 @@ class Em3SteppingAction : public G4UserSteppingAction
    ~Em3SteppingAction();
 
     void UserSteppingAction(const G4Step*);
+    
+    G4double BirkAttenuation(const G4Step*);
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
index 5bc6402b7125dd7b4ab2753ded4551740b1a1b80..1533bd5c90de53f4120a795d24b76694120c4531 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3SteppingVerbose.hh,v 1.4 2000/12/06 16:43:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3SteppingVerbose.hh,v 1.5 2001/02/19 14:07:20 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
@@ -15,8 +15,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-class Em3SteppingVerbose;
-
 #ifndef Em3SteppingVerbose_h
 #define Em3SteppingVerbose_h 1
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh b/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
index c8dc99e8b543879cfd64655d221f3a87ba349079..56e20b7f669b0644a917be22428aec9e0604a571 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3VisManager.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/run12.draw b/examples/extended/electromagnetic/TestEm3/run12.draw
new file mode 100644
index 0000000000000000000000000000000000000000..80424df05b466dd7bd20f75543312e915201aa29
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/run12.draw
@@ -0,0 +1,30 @@
+# $Id: run12.draw,v 1.1 2001/02/20 12:34:41 maire Exp $
+#
+# Macro file for "TestEm3.cc" 
+# (can be run in batch, without graphic)
+#
+# Iron-scintillator 1 layer; proton 500 MeV
+# (to test the BirkAttenuation() function)
+#
+/control/verbose 2
+#
+/calor/setNbOfLayers 1
+/calor/setNbOfAbsor 2
+/calor/setAbsor 0 Iron 1 cm
+/calor/setAbsor 1 Scintillator 1 cm
+/calor/setSizeYZ 2 cm
+/calor/update
+/gun/setDefault
+#
+/vis/camera/zoom 1.5
+/vis/drawVolume
+#
+/run/particle/setCut 1 mm
+/run/initialize
+#
+/run/verbose 2
+/tracking/verbose 1
+#
+/gun/particle proton
+/gun/energy 500 MeV
+/run/beamOn 1
diff --git a/examples/extended/electromagnetic/TestEm3/run15.mac b/examples/extended/electromagnetic/TestEm3/run15.mac
new file mode 100644
index 0000000000000000000000000000000000000000..9ae90f7dd3581ab21eb3c0b6a0d938c5c344feab
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/run15.mac
@@ -0,0 +1,34 @@
+# $Id: run15.mac,v 1.1 2001/03/26 16:01:57 maire Exp $
+#
+# Macro file for "TestEm3.cc" 
+# (can be run in batch, without graphic)
+#
+# Iron-scintillator 20 layers;
+#
+/control/verbose 2
+#
+/calor/setNbOfLayers 20
+/calor/setNbOfAbsor 2
+/calor/setAbsor 0 Iron 14 mm
+/calor/setAbsor 1 Scintillator 3 mm
+/calor/setSizeYZ 30 cm
+/calor/update
+/gun/setDefault
+#
+/vis/camera/zoom 1.2
+/vis/drawVolume
+#
+/run/particle/setCut 1 mm
+/run/initialize
+#
+/run/verbose 2
+/event/printModulo 1000
+/event/drawTracks charged
+#
+/gun/particle mu+
+/gun/energy 180 GeV
+#
+/run/setHisto 0 100 0. 1.e-2
+/run/setHisto 1 100 0. 5.e-4
+#
+/run/beamOn 20000
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc b/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
index 51ba86686975505584d52c3f09d560e3ca894dda..65b79dc272749536508e0a10f6e7522c289abfe4 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3CalorHit.cc,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
index f66def6fc00c49a4eb5ea55e204d26fbbf1cda6f..24a7c7414e4ef081a7e856e86c458e345689031b 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3CalorimeterSD.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
index 17b3947a3de4969d734eaecc0407630f7e46618e..e0dcc850a62041421350cdad755dc4bcc268f5a5 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3DetectorConstruction.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
index 88aede46113bf0311b6d852783b68a78de66b075..aa2b20e3780081399698af384d9e10173cf95a63 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3DetectorMessenger.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc
index 8ff0d9e2166c89712a220ef5bd3e0c5546732412..aafdd108a7c5ae546ac77d75904133d23dee2ae6 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.5 2000/12/07 12:38:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3EventAction.cc,v 1.8 2001/03/26 16:01:58 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -16,6 +16,7 @@
 #include "Em3EventAction.hh"
 
 #include "Em3RunAction.hh"
+#include "Em3PrimaryGeneratorAction.hh"
 #include "Em3DetectorConstruction.hh"
 #include "Em3CalorHit.hh"
 #include "Em3EventActionMessenger.hh"
@@ -35,10 +36,15 @@
 #include "G4UnitsTable.hh"
 #include "Randomize.hh"
 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-Em3EventAction::Em3EventAction(Em3RunAction* run, Em3DetectorConstruction* det)
-:Em3Run(run),Detector(det),calorimeterCollID(-1),drawFlag("all"),
+Em3EventAction::Em3EventAction(Em3RunAction* run,Em3PrimaryGeneratorAction* kin,
+                               Em3DetectorConstruction* det)
+:Em3Run(run),Em3Kin(kin),Detector(det),calorimeterCollID(-1),drawFlag("all"),
  eventMessenger(NULL),printModulo(10000)
 {
   eventMessenger = new Em3EventActionMessenger(this);
@@ -56,9 +62,19 @@ Em3EventAction::~Em3EventAction()
 void Em3EventAction::BeginOfEventAction(const G4Event* evt)
 {   
  G4int evtNb = evt->GetEventID();
+ 
+ //survey printing
  if (evtNb%printModulo == 0) 
     G4cout << "\n---> Begin Of Event: " << evtNb << G4endl;
     
+ //save rndm status
+ if (Em3Run->GetRndmFreq() == 2)
+   { 
+    HepRandom::saveEngineStatus("beginOfEvent.rndm");   
+    if (evtNb%printModulo == 0) HepRandom::showEngineStatus();
+   }         
+
+ // initialize Hits collection    
  if (calorimeterCollID==-1)
   {
     G4SDManager * SDman = G4SDManager::GetSDMpointer();
@@ -74,10 +90,9 @@ void Em3EventAction::EndOfEventAction(const G4Event* evt)
   Em3CalorHitsCollection* CHC = NULL;
   G4int NbHits=0;
   G4int NbOfAbsor=Detector->GetNbOfAbsor();
+  G4double Ebeam = Em3Kin->GetParticleGun()->GetParticleEnergy();
   G4double totEAbs, totLAbs;
-  char str1[6], str2[6];
-  strcpy(str1,"EAbs");strcpy(str2,"LAbs");
-     
+       
   if (HCE) CHC = (Em3CalorHitsCollection*)(HCE->GetHC(calorimeterCollID));
 
   if (CHC)
@@ -90,7 +105,13 @@ void Em3EventAction::EndOfEventAction(const G4Event* evt)
 	     totEAbs += (*CHC)[j]->GetEdepAbs(k); 
              totLAbs += (*CHC)[j]->GetTrakAbs(k);     
             }
-         Em3Run->fillPerEvent(k,totEAbs,totLAbs);	 
+         Em3Run->fillPerEvent(k,totEAbs,totLAbs);
+	 
+#ifndef G4NOHIST        
+         //fill histo
+         //	 
+	 Em3Run->GetHisto(k)->accumulate(totEAbs/Ebeam);
+#endif  	 	 
        }
     }
     
@@ -106,19 +127,7 @@ void Em3EventAction::EndOfEventAction(const G4Event* evt)
           else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
                                   trj->DrawTrajectory(50); 
         }
-  } 
-  
-  //save rndm status
-  if (Em3Run->GetRndmFreq() == 2)
-    { 
-     HepRandom::saveEngineStatus("endOfEvent.rndm");   
-     G4int evtNb = evt->GetEventID();
-     if (evtNb%printModulo == 0)
-       { 
-        G4cout << "\n---> End of Event: " << evtNb << G4endl;
-        HepRandom::showEngineStatus();
-       }
-    }     
+    }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
index 16b56646fe1de64ef913376f7131fddfa22dafa3..f3257b57f07d1c944679f5e80d1b6c9ef2ee164d 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3EventActionMessenger.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
index 4fd4f5916f7d88a75011f5dea8471fd9c8ca5ff2..1c2b4b7ee122f369551b49fdc136110b01ff26ce 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3PhysicsList.cc,v 1.5 2000/04/17 12:05:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc
index a72789e3076a71208b6a206ac05006761a0a44b4..b832e6b7a654d872b0460d1125323f6c1faada06 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3PhysicsListMessenger.cc,v 1.1 2000/04/17 12:05:40 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
index d3e753fb88c3f4e216258db19be4f1c432e7037a..d0f037365bf0093244ced2981f2b1efb084f1d2c 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
index 4d53df97a58f81aa0d9879c96d94fc276eacb1da..df135e1b40060f2f9cba0374ed0a8e25d250b110 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3PrimaryGeneratorMessenger.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc
index 7e7f803fea26a428799fc3f20a0866dcd8abd0a1..3b1f6234e01a25a39513812e9bbe0fc5f3eb32e2 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.5 2000/12/07 12:38:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3RunAction.cc,v 1.8 2001/03/26 16:01:58 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -26,14 +26,22 @@
 #include "Randomize.hh"
 #include "g4std/iomanip"
 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em3RunAction::Em3RunAction(Em3DetectorConstruction* det)
 :Detector(det)
 {
-  bookHisto(); 
   runMessenger = new Em3RunActionMessenger(this);   
-  saveRndm = 1;  
+  saveRndm = 1;
+#ifndef G4NOHIST
+  // init hbook
+  hbookManager = new HBookFile("TestEm3.paw", 68);
+  for (G4int k=0; k<MaxAbsor; k++) histo[k] = NULL;
+#endif    
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -41,15 +49,18 @@ Em3RunAction::Em3RunAction(Em3DetectorConstruction* det)
 Em3RunAction::~Em3RunAction()
 {
   delete runMessenger;
+  
+#ifndef G4NOHIST
+ // Write histogram file 
+  hbookManager->write();  
+ // Delete HBOOK stuff
+  delete [] histo;
+  delete hbookManager;
+#endif  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void Em3RunAction::bookHisto()
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 void Em3RunAction::BeginOfRunAction(const G4Run* aRun)
 {  
   G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
@@ -71,11 +82,52 @@ void Em3RunAction::BeginOfRunAction(const G4Run* aRun)
     {
       G4UImanager* UI = G4UImanager::GetUIpointer(); 
       UI->ApplyCommand("/vis/scene/notifyHandlers");
-    } 
+    }
+    
+  //histograms
+  //
+  bookHisto();     
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em3RunAction::bookHisto()
+{
+#ifndef G4NOHIST
+  // book histograms
+  char str[25];
+  strcpy(str,"Edep/Ebeam in absorber ");
+  G4int nbins=100; G4double vmin=0., vmax=1.;
+  G4int NbOfAbsor = Detector->GetNbOfAbsor();
+  for (G4int k=0; k<NbOfAbsor; k++)
+     {
+      str[23] = (char)((int)('0') + k);
+      if (histo[k]==NULL)
+        { histo[k] = hbookManager->histogram(str,nbins,vmin,vmax);
+          G4cout << "bookHisto: " << k << " " << histo[k] << G4endl;
+	}  
+     }   
+#endif   
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em3RunAction::SetHisto(G4int idh, G4int nbins, G4double vmin, G4double vmax)
+{
+#ifndef G4NOHIST
+  // (re)book histograms
+  char str[25];
+  strcpy(str,"Edep/Ebeam in absorber ");
+  str[23] = (char)((int)('0') + idh);  
+///  if (histo[idh] != NULL) delete histo[idh];
+  histo[idh] = hbookManager->histogram(str,nbins,vmin,vmax);
+  G4cout << "SetHisto: " << idh << " " << histo[idh] << G4endl;  
+#endif   
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
+
 void Em3RunAction::EndOfRunAction(const G4Run* aRun)
 {
   if (G4VVisManager::GetConcreteInstance())
@@ -118,9 +170,9 @@ void Em3RunAction::EndOfRunAction(const G4Run* aRun)
   G4cout << G4endl;  
   G4cout.setf(oldform,G4std::ios::floatfield);
   G4cout.precision(oldprec);
-  
+    
   // save Rndm status
-  if (saveRndm == 1)
+  if (saveRndm > 0)
     { HepRandom::showEngineStatus();
       HepRandom::saveEngineStatus("endOfRun.rndm");
     }                         
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc
index 678e8d38691f117e7cc1c5e5d422acc589945b9d..bf3235fb762e6af8ec112dfa4e1b7a83d063bc2a 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.3 2000/01/21 09:11:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3RunActionMessenger.cc,v 1.5 2001/03/26 16:01:59 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -19,6 +19,8 @@
 #include "G4UIdirectory.hh"
 #include "G4UIcmdWithAString.hh"
 #include "G4UIcmdWithAnInteger.hh"
+#include "G4UIcommand.hh"
+#include "G4UIparameter.hh"
 #include "G4ios.hh"
 #include "globals.hh"
 #include "Randomize.hh"
@@ -35,8 +37,8 @@ Em3RunActionMessenger::Em3RunActionMessenger(Em3RunAction* run)
   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->SetGuidance("freq > 0 saved on:   endOfRun.rndm");
+  RndmSaveCmd->SetGuidance("freq = 2 saved on: beginOfEvent.rndm");    
   RndmSaveCmd->SetParameterName("frequency",false);
   RndmSaveCmd->SetRange("frequency>=0 && frequency<=2");
   RndmSaveCmd->AvailableForStates(PreInit,Idle); 
@@ -45,14 +47,42 @@ Em3RunActionMessenger::Em3RunActionMessenger(Em3RunAction* run)
   RndmReadCmd->SetGuidance("get rndm status from an external file.");
   RndmReadCmd->SetParameterName("fileName",true);
   RndmReadCmd->SetDefaultValue ("beginOfRun.rndm");
-  RndmReadCmd->AvailableForStates(PreInit,Idle);  
+  RndmReadCmd->AvailableForStates(PreInit,Idle);
+  
+  HistoCmd = new G4UIcommand("/run/setHisto",this);
+  HistoCmd->SetGuidance("Set histo Edep/Ebeam in absorber k");
+  HistoCmd->SetGuidance("  histo=absor number : from 0 to NbOfAbsor-1");
+  HistoCmd->SetGuidance("  number of bins; Emin/Ebeam; Emax/Ebeam");
+  //
+  G4UIparameter* AbsNbPrm = new G4UIparameter("AbsorNb",'i',false);
+  AbsNbPrm->SetGuidance("histo=absor number : from 0 to NbOfAbsor-1");
+  AbsNbPrm->SetParameterRange("AbsorNb>=0");
+  HistoCmd->SetParameter(AbsNbPrm);
+  //
+  G4UIparameter* NbinPrm = new G4UIparameter("Nbin",'i',false);
+  NbinPrm->SetGuidance("number of bins");
+  NbinPrm->SetParameterRange("Nbin>=0");
+  HistoCmd->SetParameter(NbinPrm);  
+  //    
+  G4UIparameter* VminPrm = new G4UIparameter("Vmin",'d',false);
+  VminPrm->SetGuidance("Vmin=Emin/Ebeam");
+  VminPrm->SetParameterRange("Vmin>=0.&&Vmin<=1.");
+  HistoCmd->SetParameter(VminPrm);
+  //    
+  G4UIparameter* VmaxPrm = new G4UIparameter("Vmax",'d',false);
+  VmaxPrm->SetGuidance("Vmax=Emax/Ebeam");
+  VmaxPrm->SetParameterRange("Vmax>=0.&&Vmax<=1.");
+  HistoCmd->SetParameter(VmaxPrm);  
+  //
+  HistoCmd->AvailableForStates(Idle);    
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em3RunActionMessenger::~Em3RunActionMessenger()
 {
-  delete RndmSaveCmd; delete RndmReadCmd; delete RndmDir;  
+  delete RndmSaveCmd; delete RndmReadCmd; delete RndmDir;
+  delete HistoCmd;  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -66,7 +96,15 @@ void Em3RunActionMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
     { G4cout << "\n---> rndm status restored from file: " << newValue << G4endl;
       HepRandom::restoreEngineStatus(newValue);
       HepRandom::showEngineStatus();
-    }     
+    }
+    
+  if (command == HistoCmd)
+   { G4int idh,nbins; G4double vmin,vmax;
+     const char* t = newValue;
+     G4std::istrstream is((char*)t);
+     is >> idh >> nbins >> vmin >> vmax;
+     Em3Run->SetHisto (idh,nbins,vmin,vmax);
+   }         
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc
index 6eb8742e32803907dbc88d2a5c6c9f61d9e556ea..f4c344118bfb583947f2d7ab2978f8e35e12a8c0 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.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3SteppingAction.cc,v 1.3 2001/02/20 12:34:44 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -14,6 +14,7 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 #include "Em3SteppingAction.hh"
+#include "G4Step.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -28,8 +29,36 @@ Em3SteppingAction::~Em3SteppingAction()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em3SteppingAction::UserSteppingAction(const G4Step* aStep)
-{ }
+{
+////  G4double destep   = aStep->GetTotalEnergyDeposit();
+////  G4double response = BirkAttenuation(aStep);
+////  G4cout << " Destep: " << destep/keV << " keV"   
+////         << " response after Birk: "  << response/keV << " keV" << G4endl;
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
+G4double Em3SteppingAction::BirkAttenuation(const G4Step* aStep)
+{
+ //Example of Birk attenuation law in organic scintillators.
+ //adapted from Geant3 PHYS337. See MIN 80 (1970) 239-244
+ //  
+ const G4String myMaterial = "Scintillator";
+ const G4double birk1 = 0.013*g/(MeV*cm2);
+ //
+ G4double destep      = aStep->GetTotalEnergyDeposit();
+ G4Material* material = aStep->GetTrack()->GetMaterial();
+ G4double charge      = aStep->GetTrack()->GetDefinition()->GetPDGCharge();
+ //
+ G4double response = destep;
+ if ((material->GetName()==myMaterial)&&(charge!=0.))
+   {
+     G4double correction =
+     birk1*destep/((material->GetDensity())*(aStep->GetStepLength()));
+     response = destep/(1. + correction);
+   }
+ return response;   
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
index b272f43e350130303cfa7def56af4c451c24e819..9b9cee9080a892c6dbbf057ccb8e2562ffd41220 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em3SteppingVerbose.cc,v 1.4 2000/12/06 16:43:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em3SteppingVerbose.cc,v 1.6 2001/02/19 14:07:37 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -46,7 +46,7 @@ void Em3SteppingVerbose::StepInfo()
 	     << G4std::setw( 9) << "dEStep"     << " "  
 	     << G4std::setw(10) << "StepLeng"     
 	     << G4std::setw(10) << "TrakLeng" 
-	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Volume"    << "  "
 	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
@@ -61,16 +61,17 @@ void Em3SteppingVerbose::StepInfo()
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
       G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	->GetProcessName();
+      G4cout << "  " 
+             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                ->GetProcessName();
     } else {
-      G4cout << "User Limit";
+      G4cout << "   UserLimit";
     }
 
     G4cout << G4endl;
@@ -86,12 +87,12 @@ void Em3SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -115,8 +116,8 @@ void Em3SteppingVerbose::StepInfo()
     
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 void Em3SteppingVerbose::TrackingStarted()
@@ -134,7 +135,7 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 9) << "dEStep"     << " "  
 	   << G4std::setw(10) << "StepLeng"  
 	   << G4std::setw(10) << "TrakLeng"
-	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     
 
     G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
@@ -147,13 +148,13 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
-      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(10) << "OutOfWorld";
     }
-    G4cout << G4std::setw(10) << "initStep" << G4endl;
+    G4cout  << "    initStep" << G4endl;
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc b/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
index e8fa782d23a73f60fba25378cdd584c638285ca8..9b878f460be5562b122f3446e4dd866cd75a286b 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em3VisManager.cc,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm4/GNUmakefile b/examples/extended/electromagnetic/TestEm4/GNUmakefile
index 2ee4bb0740d3594f3b55e681b2f5e3d108082184..337c4f37a03625c967546f45e5f0b48488a9adad 100644
--- a/examples/extended/electromagnetic/TestEm4/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm4/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 2000/12/07 13:02:11 maire Exp $
+# $Id: GNUmakefile,v 1.5 2001/02/21 10:14:37 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,4 +16,13 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
+G4NOHIST := true
+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 6c4783fcbfd494851d9fc5fc3ff688cdb38b59e0..2fc98bebf9a6ef3fd1235751c1db2d17fa525fe3 100644
--- a/examples/extended/electromagnetic/TestEm4/History
+++ b/examples/extended/electromagnetic/TestEm4/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.6 2000/12/07 13:02:11 maire Exp $
+$Id: History,v 1.9 2001/03/26 17:34:22 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -14,7 +14,14 @@ track of all tags.
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
-     
+21-02-01  mma (testem4-V03-00-03)
+          - hbook histograms restored
+	  - set cppflag G4NOHIST = true in gnumakefile
+	       
+20-02-01  mma (testem4-V03-00-02)
+          - verbose stepping adapted for STL
+	  - save rndm at begin of event     
+	           
 07-12-00  mma (testem4-V02-00-03 & testem-noHist)
           remove hbook histograms: GNUmakefile,runAction,eventAction
 				   
diff --git a/examples/extended/electromagnetic/TestEm4/README b/examples/extended/electromagnetic/TestEm4/README
index af57d16b94751298a42542db7d44e051288aefd1..9beaafb09d2dd86936e1953d6c8a27a19cc97648 100644
--- a/examples/extended/electromagnetic/TestEm4/README
+++ b/examples/extended/electromagnetic/TestEm4/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.2 2000/01/20 17:27:55 maire Exp $
+$Id: README,v 1.4 2001/03/30 12:39:05 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -59,9 +59,13 @@ $Id: README,v 1.2 2000/01/20 17:27:55 maire Exp $
  		Idle> exit
  		
  	- visualize the histogram
- 		paw> h/file 1 testem4.histo
+ 		paw> h/file 1 testem4.paw
  		paw> option stat
  		paw> option logy
  		paw> h/pl 1 	
- 	  
- 	
+
+ Note that, histograms are disabled via the flag G4NOHIST in the GNUmakefile.
+ Currently, histograms in this example are implemented through the obsolete
+ CLHEP/Hist package, which is no longer supported. The implementation will
+ be replaced by direct call to the "analysis" module in a near future.
+
diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.cc b/examples/extended/electromagnetic/TestEm4/TestEm4.cc
index 2b5813b8f2f59114988854b62c675017e0598a81..eaa12e1309232ae2c7320ed9b811265051c67ea9 100644
--- a/examples/extended/electromagnetic/TestEm4/TestEm4.cc
+++ b/examples/extended/electromagnetic/TestEm4/TestEm4.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TestEm4.cc,v 1.5 2000/12/06 17:22:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.out b/examples/extended/electromagnetic/TestEm4/TestEm4.out
index 0cfca19b9dbb9f3e9008ed449c02284b1919a1f9..bed8ebd69237e39f11f00a9fb47b269eae22300e 100644
--- a/examples/extended/electromagnetic/TestEm4/TestEm4.out
+++ b/examples/extended/electromagnetic/TestEm4/TestEm4.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
  Material: FluorCarbonate     density:  1.610 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  22.435 cm 
@@ -33,7 +33,7 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-      FluorCarbonate         96.449
+      FluorCarbonate         96.588
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -50,7 +50,7 @@ Cut in range                  1 mm            1 mm
 Cut in energy
      FluorCarbonate        3.61 keV         429 keV
 ===================================================
-# $Id: TestEm4.out,v 1.7 2000/11/24 11:15:45 stesting Exp $
+# $Id: TestEm4.out,v 1.10 2001/03/30 09:03:27 stesting Exp $
 #
 # Macro file for "TestEm4.cc"
 # 
@@ -86,11 +86,11 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 50000
-  User=98s Real=112.09s Sys=9.04s
+  User=48.18s Real=52.97s Sys=4.71s
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1157306522, 1306681835
+ Current couple of seeds = 366655687, 245817838
 ----------------------------------------
 G4 kernel has come to Quit state.
 Deletion of G4 kernel class start.
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
index fb722c964e127ae8ca12093ae96ba055f7c46592..8670922ab61b081e0006e95ed3e79cf41e4a0f63 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4DetectorConstruction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
index 1c35ff01bc51b87bfed1d7c83042ee39c9445d6e..0896acfd6a5657397d75596428451a65046e4b22 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4EventAction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
index 00253f8f7deea9216030a0941cebf1cf14d2115f..45949f5c642f6188c52ea4e06465b5eb5fea782c 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4EventActionMessenger.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh b/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
index 5d10098bf16269e0e849d772bb007b4b1729d371..bb92906beb63bab6b5ecdf2146d64bd637c67edb 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4PhysicsList.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
index 40ee731b748324a73323a68283a236845128fe47..4e3670c784bf28f7a930d56b9580581e8c598bcc 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh
index 5e56f3cf786f03b010109c9173540bc8129720b7..422b946e9d5ab5d23185948b873a4e8b8415bb2c 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.4 2000/12/07 13:02:11 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em4RunAction.hh,v 1.5 2001/02/21 10:14:39 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -24,6 +24,11 @@
 class G4Run;
 class Em4RunActionMessenger;
 
+#ifndef G4NOHIST
+  class HepTupleManager;
+  class HepHistogram;
+#endif
+
 class Em4RunAction : public G4UserRunAction
 {
   public:
@@ -36,6 +41,10 @@ class Em4RunAction : public G4UserRunAction
 
     void  SetRndmFreq(G4int    val) {saveRndm = val;}
     G4int GetRndmFreq()             {return saveRndm;}
+    
+#ifndef G4NOHIST    
+    HepHistogram* GetHisto(G4int id) {return histo[id];}
+#endif
         
   private:
     void bookHisto();
@@ -43,6 +52,11 @@ class Em4RunAction : public G4UserRunAction
   private:  
     Em4RunActionMessenger* runMessenger;
     G4int saveRndm;
+    
+#ifndef G4NOHIST         
+    HepTupleManager* hbookManager;    
+    HepHistogram* histo[1];
+#endif         
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
index 22ddc732e458d6cf3e0c396c6a0b6c3d7340d576..63fbac1ae0cfeeed0178e689a677b57a7162da92 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4RunActionMessenger.hh,v 1.3 2000/01/20 17:27:56 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
index ee0aa4e47b150121e04eea2014cdca0c221625bb..d268e9ef2f4eef610dd8b27a54af86ec0ad89a50 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4SteppingAction.hh,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh
index aa67673338d25043a2e02962983e192296e74e20..083a53457eac40a8868d7abbcaf1ec7ca3f70138 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.4 2000/12/06 17:22:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em4SteppingVerbose.hh,v 1.5 2001/02/19 14:01:59 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
@@ -15,8 +15,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-class Em4SteppingVerbose;
-
 #ifndef Em4SteppingVerbose_h
 #define Em4SteppingVerbose_h 1
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh b/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
index 24b0b01eacff334de51b4e1edef0074fa4077a3b..5955808d96f2cd067ab2d3b2934b1797396a2937 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4VisManager.hh,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
index ad938685ee548d39b060a1094ee2508a3c8c4eb5..16262f9d5e4ca1ec9ab3f127b2b5550ab136fada 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4DetectorConstruction.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc
index 525b07179eb672a8e1069f50a5ce293471767072..0c00b22771686b7dc23e79ca3a43028830d9b4f2 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.4 2000/12/07 13:02:11 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em4EventAction.cc,v 1.6 2001/02/21 10:14:39 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -27,6 +27,10 @@
 #include "G4UnitsTable.hh"
 #include "Randomize.hh"
 
+#ifndef G4NOHIST
+  #include "CLHEP/Hist/HBookFile.h"
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em4EventAction::Em4EventAction(Em4RunAction* run)
@@ -47,9 +51,19 @@ Em4EventAction::~Em4EventAction()
 void Em4EventAction::BeginOfEventAction( const G4Event* evt)
 {
  G4int evtNb = evt->GetEventID();
+
+ //printing survey
  if (evtNb%printModulo == 0) 
     G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
-    
+  
+ //save rndm status
+ if (Em4Run->GetRndmFreq() == 2)
+   { 
+    HepRandom::saveEngineStatus("beginOfEvent.rndm");   
+    if (evtNb%printModulo == 0) HepRandom::showEngineStatus();
+   }
+  
+ //additional initializations   
  TotalEnergyDeposit = 0.;
 }
 
@@ -61,6 +75,10 @@ void Em4EventAction::EndOfEventAction( const G4Event* evt)
     G4cout << " Energy deposit: " 
            << G4BestUnit(TotalEnergyDeposit,"Energy") << G4endl;
 	   
+#ifndef G4NOHIST
+  Em4Run->GetHisto(0)->accumulate(TotalEnergyDeposit/MeV);
+#endif
+	   
   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
 
   if(pVVisManager)
@@ -75,18 +93,6 @@ void Em4EventAction::EndOfEventAction( const G4Event* evt)
                                trj->DrawTrajectory(50); 
       }
   }
-  
-  //save rndm status
-  if (Em4Run->GetRndmFreq() == 2)
-    { 
-     HepRandom::saveEngineStatus("endOfEvent.rndm");   
-     G4int evtNb = evt->GetEventID();
-     if (evtNb%printModulo == 0)
-       { 
-        G4cout << "\n---> End of Event: " << evtNb << G4endl;
-        HepRandom::showEngineStatus();
-       }
-    }     
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
index ea4b2b999f3b6bb1e778e1a6a463aa4157a0d63c..807c2ba1bbbeee75752ec698f6717f728ad054cc 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4EventActionMessenger.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc b/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
index 4c53ebb798f8ddd45fa4ffa3e70ab2a71f006ad9..7d2363b2d8c3fa1d018dd51913c54848de5632cb 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4PhysicsList.cc,v 1.3 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
index b1b65da6f590262f6af6658d35199429458bb5c8..3592488a458b894d0af5a0bd2262445cf04fdf7b 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc
index 61deeec9535ff2ba973d702bd4f1d1c64aecb747..7af75cc3f9ffea0478998b3a8dcb2cab3cb662a4 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.5 2000/12/07 13:02:11 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em4RunAction.cc,v 1.8 2001/03/26 17:34:23 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -23,6 +23,10 @@
 
 #include "Randomize.hh"
 
+#ifndef G4NOHIST
+ #include "CLHEP/Hist/HBookFile.h"
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em4RunAction::Em4RunAction()
@@ -38,12 +42,30 @@ Em4RunAction::Em4RunAction()
 Em4RunAction::~Em4RunAction()
 {
   delete runMessenger;
+  
+#ifndef G4NOHIST
+ // Write histogram file 
+  hbookManager->write();
+ // Delete HBOOK stuff
+  delete [] histo;
+  delete hbookManager;
+#endif  
+  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em4RunAction::bookHisto()
-{}
+{
+#ifndef G4NOHIST 
+  // init hbook
+  hbookManager = new HBookFile("TestEm4.paw", 68);
+
+  // book histograms
+  histo[0] = hbookManager->histogram("total energy deposit in C6F6 (MeV)"
+                                   , 100,0.,10.);
+#endif      
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -75,10 +97,10 @@ void Em4RunAction::EndOfRunAction(const G4Run* aRun)
     G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
 
   // save Rndm status
-  if (saveRndm == 1)
+  if (saveRndm > 0)
     { HepRandom::showEngineStatus();
       HepRandom::saveEngineStatus("endOfRun.rndm");      
-    }
+    }                
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc
index 1fca349631b2b7ce89c3b9d9a527b65de4bf1890..345d45dbb46277681b1233d20ef468fe45566f22 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.3 2000/01/20 17:27:57 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em4RunActionMessenger.cc,v 1.4 2001/02/20 16:08:37 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -35,8 +35,8 @@ Em4RunActionMessenger::Em4RunActionMessenger(Em4RunAction* run)
   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->SetGuidance("freq > 0 saved on:   endOfRun.rndm");
+  RndmSaveCmd->SetGuidance("freq = 2 saved on: beginOfEvent.rndm");    
   RndmSaveCmd->SetParameterName("frequency",false);
   RndmSaveCmd->SetRange("frequency>=0 && frequency<=2");
   RndmSaveCmd->AvailableForStates(PreInit,Idle); 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
index 155015faf6ac4f319ea242835449bbebd92cd175..e791759bc53254c04626bb5fcc95207496d38767 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4SteppingAction.cc,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc
index 9fcff2e21d33e92429779ab3eaedbd1df9db9eed..a101fb3511518d354a7a0614adc7c7b3dd22eaaa 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.4 2000/12/06 17:22:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em4SteppingVerbose.cc,v 1.6 2001/02/19 14:02:48 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -46,7 +46,7 @@ void Em4SteppingVerbose::StepInfo()
 	     << G4std::setw( 9) << "dEStep"     << " "  
 	     << G4std::setw(10) << "StepLeng"     
 	     << G4std::setw(10) << "TrakLeng" 
-	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Volume"    << "  "
 	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
@@ -61,16 +61,17 @@ void Em4SteppingVerbose::StepInfo()
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
       G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	->GetProcessName();
+      G4cout << "  " 
+             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                ->GetProcessName();
     } else {
-      G4cout << "User Limit";
+      G4cout << "   UserLimit";
     }
 
     G4cout << G4endl;
@@ -86,12 +87,12 @@ void Em4SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -115,8 +116,8 @@ void Em4SteppingVerbose::StepInfo()
     
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 void Em4SteppingVerbose::TrackingStarted()
@@ -134,7 +135,7 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 9) << "dEStep"     << " "  
 	   << G4std::setw(10) << "StepLeng"  
 	   << G4std::setw(10) << "TrakLeng"
-	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     
 
     G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
@@ -147,13 +148,13 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
-      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(10) << "OutOfWorld";
     }
-    G4cout << G4std::setw(10) << "initStep" << G4endl;
+    G4cout  << "    initStep" << G4endl;
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc b/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
index 069595dc75a3abb4807afb6ed187bd1c367185d3..59af8af8e0d94ebedf88f9ad7770746104e4b751 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em4VisManager.cc,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm5/GNUmakefile b/examples/extended/electromagnetic/TestEm5/GNUmakefile
index 6e9292345b29788e9e16471c2a00957955008df7..bb3635fba2bc94af810b2abb6bf827ea3989eb86 100644
--- a/examples/extended/electromagnetic/TestEm5/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm5/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 2000/12/07 13:32:33 maire Exp $
+# $Id: GNUmakefile,v 1.5 2001/02/21 14:44:32 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,4 +16,12 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
+G4NOHIST := true
+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 ab99a93794538d6727d34432c91b820397a66bf3..317cb589de91c2660ad5cd1882c156c9006da651 100644
--- a/examples/extended/electromagnetic/TestEm5/History
+++ b/examples/extended/electromagnetic/TestEm5/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.5 2000/12/07 13:32:34 maire Exp $
+$Id: History,v 1.9 2001/03/27 09:23:59 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,12 +15,25 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
      
-07-12-00  mma (testem5-V02-00-03 & testem-noHist)
-          remove hbook histograms: GNUmakefile,runAction
+27-03-01  mma (testem5-V03-00-04)
+	  - set cppflag G4NOHIST = true in gnumakefile
+	  
+21-02-01  mma (testem5-V03-00-03)
+          - hbook histograms restored
+	  
+20-02-01 mma (testem5-V03-00-02)
+         - verbose stepping adapted for STL
+	 - save rndm at begin of event 
+	     
+09-01-01 mma modified Em5PhysicsList and Em5StepCut in order to make the
+         command /step/setMaxStep working
+	      
+07-12-00 mma (testem5-V02-00-03 & testem-noHist)
+         remove hbook histograms: GNUmakefile,runAction
 				   
-06-12-00  mma (testem5-V02-00-02 & testem-withHist)
-          update of init.mac for new vis commands.
-	  G4UItcsh in the main()
+06-12-00 mma (testem5-V02-00-02 & testem-withHist)
+         update of init.mac for new vis commands.
+	 G4UItcsh in the main()
 	  
 25th November 2000 Steve O'Neale (tagset210)
 - update test outputs for min.delta energy cut and cut table
diff --git a/examples/extended/electromagnetic/TestEm5/README b/examples/extended/electromagnetic/TestEm5/README
index 1c167343e66b74219b11ee8f2b3f9cf8e64d4abb..c680aa187d56dfb80e2e388af1c6d2bb3bfacdf6 100644
--- a/examples/extended/electromagnetic/TestEm5/README
+++ b/examples/extended/electromagnetic/TestEm5/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 1999/10/12 12:23:17 maire Exp $
+$Id: README,v 1.3 2001/03/30 12:38:03 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -129,4 +129,9 @@ $Id: README,v 1.1 1999/10/12 12:23:17 maire Exp $
         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)
-        
+
+ Note that, histograms are disabled via the flag G4NOHIST in the GNUmakefile.
+ Currently, histograms in this example are implemented through the obsolete
+ CLHEP/Hist package, which is no longer supported. The implementation will
+ be replaced by direct call to the "analysis" module in a near future.
+
diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.cc b/examples/extended/electromagnetic/TestEm5/TestEm5.cc
index be40778852ba06fe81603b3bb968fe0799cecb73..b400b832c14afb58b6b07e9390c1ad177b252283 100644
--- a/examples/extended/electromagnetic/TestEm5/TestEm5.cc
+++ b/examples/extended/electromagnetic/TestEm5/TestEm5.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TestEm5.cc,v 1.4 2000/12/06 18:25:54 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.out b/examples/extended/electromagnetic/TestEm5/TestEm5.out
index 82e1eaa63e6812b018d4f4c63977029d90ff2811..a812c7570a691380193c673d5353c29f94b0b0ed 100644
--- a/examples/extended/electromagnetic/TestEm5/TestEm5.out
+++ b/examples/extended/electromagnetic/TestEm5/TestEm5.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -65,7 +65,7 @@
    --->  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: 6317232936888469291008.000 km 
+ Material: Galactic     density:  0.000 mg/cm3  temperature:   2.73 K  pressure:   0.00 atm  RadLength: 204727576.737 pc 
    --->  Element: Galactic      Z =  1.0   N =   1.0   A =   1.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
 
 
@@ -100,15 +100,15 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-           Beryllium         104.75
-           Aluminium         125.06
-             Silicon         116.06
-         liquidArgon         78.362
-                Iron         224.07
-              Copper         238.25
-                Gold         334.85
-                Lead         229.56
-               Water         81.507
+           Beryllium         103.96
+           Aluminium         125.02
+             Silicon         116.88
+         liquidArgon         79.954
+                Iron         225.11
+              Copper         239.08
+                Gold         332.49
+                Lead         228.54
+               Water         81.851
                  Air        0.27455
             XenonGas         1.7521
          CarbonicGas        0.54205
@@ -155,15 +155,15 @@ msc:   Tables of transport mean free paths.
 
            material        min.delta energy(keV) 
 
-           Beryllium         104.75
-           Aluminium         125.06
-             Silicon         116.06
-         liquidArgon         78.362
-                Iron         224.07
-              Copper         238.25
-                Gold         334.85
-                Lead         229.56
-               Water         81.507
+           Beryllium         103.96
+           Aluminium         125.02
+             Silicon         116.88
+         liquidArgon         79.954
+                Iron         225.11
+              Copper         239.08
+                Gold         332.49
+                Lead         228.54
+               Water         81.851
                  Air        0.27455
             XenonGas         1.7521
          CarbonicGas        0.54205
@@ -263,14 +263,14 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-           Beryllium         6.2257
-           Aluminium          6.878
-             Silicon          6.341
-         liquidArgon         4.0982
-                Iron         11.398
-              Copper         11.936
-                Gold         14.357
-                Lead         9.9052
+           Beryllium         6.1522
+           Aluminium         6.8754
+             Silicon         6.4277
+         liquidArgon         4.2884
+                Iron         11.501
+              Copper         12.024
+                Gold         14.484
+                Lead         10.043
                Water         3.9978
                  Air           0.25
             XenonGas           0.25
@@ -318,14 +318,14 @@ msc:   Tables of transport mean free paths.
 
            material        min.delta energy(keV) 
 
-           Beryllium         6.2257
-           Aluminium          6.878
-             Silicon          6.341
-         liquidArgon         4.0982
-                Iron         11.398
-              Copper         11.936
-                Gold         14.357
-                Lead         9.9052
+           Beryllium         6.1522
+           Aluminium         6.8754
+             Silicon         6.4277
+         liquidArgon         4.2884
+                Iron         11.501
+              Copper         12.024
+                Gold         14.484
+                Lead         10.043
                Water         3.9978
                  Air           0.25
             XenonGas           0.25
@@ -400,99 +400,99 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 100000
-  User=257.69s Real=286.45s Sys=14.71s
+  User=137.58s Real=145s Sys=7.23s
  ================== run summary =====================
  end of Run TotNbofEvents = 100000
-    mean charged track length   in absorber=0.0209905 +- 1.66548e-05  mm  
+    mean charged track length   in absorber=0.0209432 +- 1.3765e-05  mm  
 
-            mean energy deposit in absorber=0.00682286 +- 2.23919e-05  MeV 
+            mean energy deposit in absorber=0.00661788 +- 2.01721e-05  MeV 
 
- mean number of steps in absorber (charged) =0.04007 +- 0.000740165      
- mean number of steps in absorber (neutral) =5e-05 +- 2.23601e-05      
+ mean number of steps in absorber (charged) =0.05585 +- 0.00112183      
+ mean number of steps in absorber (neutral) =7e-05 +- 2.64566e-05      
 
-   mean number of charged secondaries = 0.03709 +- 0.000635093
+   mean number of charged secondaries = 0.03739 +- 0.000629063
 
-   mean number of neutral secondaries = 5e-05 +- 2.23601e-05
+   mean number of neutral secondaries = 7e-05 +- 2.64566e-05
 
-   mean number of e-s =0.03709  and e+s =0
+   mean number of e-s =0.03739  and e+s =0
 
-(number) transmission coeff=1  reflection coeff=0.50178
+(number) transmission coeff=0.99999  reflection coeff=0.49943
 
  energy deposit distribution 
-#entries=100000    #underflows=0    #overflows=5815
+#entries=100000    #underflows=0    #overflows=5677
  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           0           0
-    5     0.001           4         0.2
-    6    0.0012           7        0.35
-    7    0.0014           9        0.45
-    8    0.0016          52         2.6
-    9    0.0018         104         5.2
-   10     0.002         232        11.6
-   11    0.0022         432        21.6
-   12    0.0024         751       37.55
-   13    0.0026        1268        63.4
-   14    0.0028        1785       89.25
-   15     0.003        2413      120.65
-   16    0.0032        3161      158.05
-   17    0.0034        3701      185.05
-   18    0.0036        4201      210.05
-   19    0.0038        4552       227.6
-   20     0.004        4729      236.45
-   21    0.0042        4816       240.8
-   22    0.0044        4543      227.15
-   23    0.0046        4361      218.05
-   24    0.0048        3999      199.95
-   25     0.005        3778       188.9
-   26    0.0052        3576       178.8
-   27    0.0054        3199      159.95
-   28    0.0056        2984       149.2
-   29    0.0058        2706       135.3
-   30     0.006        2445      122.25
-   31    0.0062        2400         120
-   32    0.0064        2238       111.9
-   33    0.0066        1984        99.2
-   34    0.0068        1911       95.55
-   35     0.007        1802        90.1
-   36    0.0072        1666        83.3
-   37    0.0074        1524        76.2
-   38    0.0076        1422        71.1
-   39    0.0078        1287       64.35
-   40     0.008        1235       61.75
-   41    0.0082        1180          59
-   42    0.0084        1042        52.1
-   43    0.0086         909       45.45
-   44    0.0088         880          44
-   45     0.009         805       40.25
-   46    0.0092         769       38.45
-   47    0.0094         680          34
-   48    0.0096         630        31.5
-   49    0.0098         624        31.2
-   50      0.01         545       27.25
-   51    0.0102         508        25.4
-   52    0.0104         482        24.1
-   53    0.0106         418        20.9
-   54    0.0108         428        21.4
-   55     0.011         403       20.15
-   56    0.0112         381       19.05
-   57    0.0114         353       17.65
-   58    0.0116         294        14.7
-   59    0.0118         304        15.2
-   60     0.012         276        13.8
-   61    0.0122         261       13.05
-   62    0.0124         249       12.45
-   63    0.0126         241       12.05
-   64    0.0128         246        12.3
-
- Emp =          0.0042   width=          0.003  MeV 
+    4    0.0008           1        0.05
+    5     0.001           3        0.15
+    6    0.0012           6         0.3
+    7    0.0014          16         0.8
+    8    0.0016          41        2.05
+    9    0.0018         116         5.8
+   10     0.002         275       13.75
+   11    0.0022         463       23.15
+   12    0.0024         916        45.8
+   13    0.0026        1346        67.3
+   14    0.0028        2008       100.4
+   15     0.003        2726       136.3
+   16    0.0032        3528       176.4
+   17    0.0034        4172       208.6
+   18    0.0036        4626       231.3
+   19    0.0038        4801      240.05
+   20     0.004        5040         252
+   21    0.0042        4830       241.5
+   22    0.0044        4673      233.65
+   23    0.0046        4396       219.8
+   24    0.0048        4045      202.25
+   25     0.005        3650       182.5
+   26    0.0052        3389      169.45
+   27    0.0054        3071      153.55
+   28    0.0056        2791      139.55
+   29    0.0058        2650       132.5
+   30     0.006        2443      122.15
+   31    0.0062        2277      113.85
+   32    0.0064        2089      104.45
+   33    0.0066        1920          96
+   34    0.0068        1837       91.85
+   35     0.007        1656        82.8
+   36    0.0072        1542        77.1
+   37    0.0074        1445       72.25
+   38    0.0076        1343       67.15
+   39    0.0078        1237       61.85
+   40     0.008        1149       57.45
+   41    0.0082        1023       51.15
+   42    0.0084         943       47.15
+   43    0.0086         898        44.9
+   44    0.0088         785       39.25
+   45     0.009         738        36.9
+   46    0.0092         689       34.45
+   47    0.0094         629       31.45
+   48    0.0096         574        28.7
+   49    0.0098         540          27
+   50      0.01         511       25.55
+   51    0.0102         464        23.2
+   52    0.0104         449       22.45
+   53    0.0106         425       21.25
+   54    0.0108         407       20.35
+   55     0.011         354        17.7
+   56    0.0112         343       17.15
+   57    0.0114         339       16.95
+   58    0.0116         272        13.6
+   59    0.0118         243       12.15
+   60     0.012         251       12.55
+   61    0.0122         249       12.45
+   62    0.0124         261       13.05
+   63    0.0126         230        11.5
+   64    0.0128         189        9.45
+
+ Emp =           0.004   width=         0.0028  MeV 
 
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1120554762, 1278607785
+ Current couple of seeds = 1527606189, 1848314746
 ----------------------------------------
 #
 
diff --git a/examples/extended/electromagnetic/TestEm5/geant3/src/ugeom.F b/examples/extended/electromagnetic/TestEm5/geant3/src/ugeom.F
index 14ad7e17bb4cf3c11c73b8a7e4e1739c56763713..9ea24eec85e2fadd005fd2da873214e5532734e6 100644
--- a/examples/extended/electromagnetic/TestEm5/geant3/src/ugeom.F
+++ b/examples/extended/electromagnetic/TestEm5/geant3/src/ugeom.F
@@ -98,7 +98,7 @@ C
         PAXIS =   0.
         SAXIS =   0.1*max(XWORLD,YZWORL)
         CALL GDRAWC ('worl',IX,0.,10.,9.3,SCALE,SCALE)
-        CALL GDAXIS (PAXIS,PAXIS,PAXIS,SAXIS)
+CCC        CALL GDAXIS (PAXIS,PAXIS,PAXIS,SAXIS)
         CALL GDSCAL (10., 0.3)
         CALL GDCLOS
       END DO
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh b/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
index 6a31ab524516924f57b74ce589c2f58fb4500a52..be299a2115e39147f7c4dc12a7c4e5a7b8872300 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5CalorHit.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
index 37435bac3e54b4273e947983818ff8a3e7c4b677..ad09ee8d945e5e94cfb68296d579798fa370642f 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5CalorimeterSD.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
index 9e3138b4c1e5faf8c66b937eef6c3b9a7b536a91..d60f479f74fd79a37ad1b6490fdfc1133d3c03c4 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5DetectorConstruction.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
index 61a83873e06a29e50dd4a13eeba51e2760f78cae..8af3d14a14ab8b3be3343a1a8f4cfb184244bb5d 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5DetectorMessenger.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
index e8b3487d7cc846035377beef1e7da7353e534176..c6915c72f2c832d02e99db670db990b15d248605 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5EventAction.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
index 8e7970174672a9d1c84b5986eaa1e912faa3e526..9af1c89452e22922c9d6906d9486c5e605bd9661 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5EventActionMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh
index 6da4fda0ab197ea52be12e44098765bab72d3c1a..cd9df9d341af911fab789665304a6189df07fd54 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.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5PhysicsList.hh,v 1.3 2001/01/09 12:36:37 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -20,6 +20,7 @@
 
 class Em5DetectorConstruction;
 class Em5PhysicsListMessenger;
+class Em5StepCut;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -64,11 +65,10 @@ class Em5PhysicsList: public G4VUserPhysicsList
     G4double cutForElectron;
     G4double cutForProton;
     G4double currentDefaultCut;
-    
-    G4double MaxChargedStep;    
 
     Em5DetectorConstruction* pDet;
     Em5PhysicsListMessenger* physicsListMessenger;
+    Em5StepCut* pStepCut;
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
index 4fd894cb9b91ca9eeb03d37ad5f74556736b06c9..5a8a6df6c760351121a8063b3ec384435d1771c7 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5PhysicsListMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
index f1b75b8cacf7fac54e83dbf74fd2d0d5fe57e096..4c15e970687d8cd038ab4043962e38663d534e46 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
index 0bf5b0ff5fa05fba6ee24a369d33b1f09e7c0bcb..a6c547209e9908d68e43502c6892bbc6271fc834 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh
index 344c190629b40d08c09730ed1ec3f02ef82f0a29..b805c8c454d2bb6268235d1a7084c63754904989 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.4 2000/12/07 13:32:34 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5RunAction.hh,v 1.5 2001/02/21 14:44:33 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -25,6 +25,11 @@
 class Em5RunMessenger;
 class G4Run;
 
+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 class Em5RunAction : public G4UserRunAction
@@ -111,6 +116,13 @@ class Em5RunAction : public G4UserRunAction
 
     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 322ba96d21417666d4cba7c3da78641db6c15abb..0f03f02fe9b0b3c02c7ab13ee928a943e4f2e3fa 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: Em5RunMessenger.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh b/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh
index 9f0e4eaaceeb8cd91109ed0399c4bac2a2f12664..1ae8374a092b857c210ba0275b26125e43754936 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.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5StepCut.hh,v 1.3 2001/01/09 12:36:37 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -15,7 +15,6 @@
 #ifndef Em5StepCut_h
 #define Em5StepCut_h 1
 
-#include "G4ios.hh"
 #include "globals.hh"
 #include "G4VDiscreteProcess.hh"
 #include "G4Step.hh"
@@ -26,11 +25,13 @@ class Em5StepCut : public G4VDiscreteProcess
 {
   public:     
 
-     Em5StepCut(const G4String& processName ="UserStepCut" );
-     Em5StepCut(Em5StepCut &);
-
-    ~Em5StepCut();
+     Em5StepCut(const G4String& processName ="UserStepCut" )
+         : G4VDiscreteProcess(processName),MaxChargedStep(DBL_MAX) {};
 
+    ~Em5StepCut() {};
+    
+     void SetMaxStep(G4double step) {MaxChargedStep = step;};
+     
      G4double PostStepGetPhysicalInteractionLength(
                              const G4Track& track,
 			     G4double   previousStepSize,
@@ -39,21 +40,10 @@ class Em5StepCut : public G4VDiscreteProcess
 
      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 
-    Em5StepCut& operator=(const Em5StepCut &right);
+                            ) {return 0.;};     // it is not needed here !
 
   private:
 
@@ -61,42 +51,32 @@ class Em5StepCut : public G4VDiscreteProcess
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
+//
 // inlined function members implementation
 
-#include "G4Step.hh"
-#include "G4Track.hh"
-#include "G4UserLimits.hh"
-#include "G4VParticleChange.hh"
-#include "G4EnergyLossTables.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 inline G4double Em5StepCut::PostStepGetPhysicalInteractionLength(
                              const G4Track& aTrack,
                              G4double   previousStepSize,
-                             G4ForceCondition* condition
-                            )
+                             G4ForceCondition* condition )
 {
   // condition is set to "Not Forced"
   *condition = NotForced;
-   G4double ProposedStep = DBL_MAX;
+  
+  G4double ProposedStep = DBL_MAX;
 
-   if((MaxChargedStep > 0.) &&
-      (aTrack.GetVolume() != NULL) &&
-      (aTrack.GetVolume()->GetName() == "Absorber") &&
-      (aTrack.GetDynamicParticle()->GetDefinition()->GetPDGCharge() != 0.))
-        ProposedStep = MaxChargedStep;
+  if((MaxChargedStep > 0.) &&
+     (aTrack.GetVolume() != NULL) &&
+     (aTrack.GetVolume()->GetName() == "Absorber") &&
+     (aTrack.GetDynamicParticle()->GetDefinition()->GetPDGCharge() != 0.))
+     ProposedStep = MaxChargedStep;
 
-   return ProposedStep;
+  return ProposedStep;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline G4VParticleChange* Em5StepCut::PostStepDoIt(
-                             const G4Track& aTrack,
-                             const G4Step&
-                            )
+inline G4VParticleChange* Em5StepCut::PostStepDoIt(const G4Track& aTrack,
+                                                   const G4Step&        )
 {
    // do nothing
    aParticleChange.Initialize(aTrack);
@@ -105,15 +85,5 @@ inline G4VParticleChange* Em5StepCut::PostStepDoIt(
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-inline G4double Em5StepCut::GetMeanFreePath(const G4Track& aTrack,
-                             G4double   previousStepSize,
-                             G4ForceCondition* condition
-                            )
-{
-  return 0.;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 #endif
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
index 3027c4707cd74ec24ec160a9df82a45f8c920271..d0b4e37e48be99cdf43a104a7f293c022566b5ae 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5SteppingAction.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
index b4f9392e0a7b54b1564e45f19b877cded7abbfda..d2fd01d716221908bfde7fe41c5bf951cc84dffe 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5SteppingMessenger.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
index 10e0232c96c7f2b7ffb5039ea65506d2de345aea..44a407a8597f66048cc5ad7ae87db1eb47dd729f 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5SteppingVerbose.hh,v 1.4 2000/12/06 18:25:55 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5SteppingVerbose.hh,v 1.5 2001/02/19 14:08:22 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
@@ -15,8 +15,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-class Em5SteppingVerbose;
-
 #ifndef Em5SteppingVerbose_h
 #define Em5SteppingVerbose_h 1
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh b/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
index ee9e90f8d23d2980c0c28f12730c65cf84164cdb..c5829180ead8fb96ecb41e1e8d50bb11f203a9ad 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5VisManager.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/init.mac b/examples/extended/electromagnetic/TestEm5/init.mac
index d7f6713d8dc0171a917c7ba4f9bffe538c866094..5a13364a31c09dbe477d9da3227810908a18e3cc 100644
--- a/examples/extended/electromagnetic/TestEm5/init.mac
+++ b/examples/extended/electromagnetic/TestEm5/init.mac
@@ -18,8 +18,9 @@
 # Draw scene
 /vis/camera/zoom 1.4
 /vis/drawVolume
+/vis/viewer/update
 #
 # for drawing the tracks
 # if too many tracks cause core dump => storeTrajectory 0
 /tracking/storeTrajectory 1
-/event/drawTracks charged
+/event/drawTracks all
diff --git a/examples/extended/electromagnetic/TestEm5/run01.mac b/examples/extended/electromagnetic/TestEm5/run01.mac
index 6fd111c6c99c4b7e896a10299b4c9cf8441841f2..65cd918a08a408cab69ca5fc09d3077d58e383b0 100644
--- a/examples/extended/electromagnetic/TestEm5/run01.mac
+++ b/examples/extended/electromagnetic/TestEm5/run01.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 9.658 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot01
@@ -27,7 +28,7 @@
 /gun/particle e- 
 /gun/energy 15.7 MeV
 #
-/run/beamOn 1000000
+/run/beamOn 10000
 #
 
 
diff --git a/examples/extended/electromagnetic/TestEm5/run01a.mac b/examples/extended/electromagnetic/TestEm5/run01a.mac
index f724ec29a9a50061a07f4a02cf3a847d18150063..da7b67ba1543607df4d9d46ee3df965413915871 100644
--- a/examples/extended/electromagnetic/TestEm5/run01a.mac
+++ b/examples/extended/electromagnetic/TestEm5/run01a.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 9.658 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot01a
diff --git a/examples/extended/electromagnetic/TestEm5/run02.mac b/examples/extended/electromagnetic/TestEm5/run02.mac
index f6d1ee5f5f415e040dff6eee5518efd4883768ae..ec48a4d4be3a454e022c820e3ddd5481c746a8c2 100644
--- a/examples/extended/electromagnetic/TestEm5/run02.mac
+++ b/examples/extended/electromagnetic/TestEm5/run02.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 19.296 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot02
diff --git a/examples/extended/electromagnetic/TestEm5/run02a.mac b/examples/extended/electromagnetic/TestEm5/run02a.mac
index bf3bf4c7f212b72957828b2166d6dad556ca1ff2..8ee527deef2495afd25b77bd7b993f6b336a7f2f 100644
--- a/examples/extended/electromagnetic/TestEm5/run02a.mac
+++ b/examples/extended/electromagnetic/TestEm5/run02a.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 19.296 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot02a
diff --git a/examples/extended/electromagnetic/TestEm5/run03.mac b/examples/extended/electromagnetic/TestEm5/run03.mac
index 0f6104f2c5e4fffa142a77c033e02d943bc30d39..d060bba1a149dbaedf450d4183d0c7b558f4455b 100644
--- a/examples/extended/electromagnetic/TestEm5/run03.mac
+++ b/examples/extended/electromagnetic/TestEm5/run03.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 50. mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot03 
diff --git a/examples/extended/electromagnetic/TestEm5/run04.mac b/examples/extended/electromagnetic/TestEm5/run04.mac
index 0c33a3515e98f06eadf775cb3584e78c6efe4e5b..975d7b864183c55e262c21ab94cbc80d399791eb 100644
--- a/examples/extended/electromagnetic/TestEm5/run04.mac
+++ b/examples/extended/electromagnetic/TestEm5/run04.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 92.6 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot04 
diff --git a/examples/extended/electromagnetic/TestEm5/run05.mac b/examples/extended/electromagnetic/TestEm5/run05.mac
index 9806946486aefe6e5ae41e995ce121362a2ed760..8fe519d549b16cee3d2a7b3e08840848e697d944 100644
--- a/examples/extended/electromagnetic/TestEm5/run05.mac
+++ b/examples/extended/electromagnetic/TestEm5/run05.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 4.005 mm  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #
 #  hist file name
diff --git a/examples/extended/electromagnetic/TestEm5/run11.mac b/examples/extended/electromagnetic/TestEm5/run11.mac
index e243d3f101183f63844c13f014e00ef4571ef95e..b7e4d58d68c55d7b138be1f7c76fac7f2ae688e8 100644
--- a/examples/extended/electromagnetic/TestEm5/run11.mac
+++ b/examples/extended/electromagnetic/TestEm5/run11.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick  61.0 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot11
diff --git a/examples/extended/electromagnetic/TestEm5/run12.mac b/examples/extended/electromagnetic/TestEm5/run12.mac
index ffadf9daba254636e1eb876f997298dbd549bc4f..1189136fe70c055781c43db45fe7315d16c258a5 100644
--- a/examples/extended/electromagnetic/TestEm5/run12.mac
+++ b/examples/extended/electromagnetic/TestEm5/run12.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 105.0 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot12
diff --git a/examples/extended/electromagnetic/TestEm5/run13.mac b/examples/extended/electromagnetic/TestEm5/run13.mac
index 1f8c4795c5c4142171718c93db3e44717b90add8..bec7cfb74c3be74265d9e90066b123a6dcfb0b6d 100644
--- a/examples/extended/electromagnetic/TestEm5/run13.mac
+++ b/examples/extended/electromagnetic/TestEm5/run13.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 191.0 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot13
diff --git a/examples/extended/electromagnetic/TestEm5/run14.mac b/examples/extended/electromagnetic/TestEm5/run14.mac
index d4c668a3da1560d029959572280050c0d80f5384..f25ef61e9d5865462b2a92002facc6d5b78bd723 100644
--- a/examples/extended/electromagnetic/TestEm5/run14.mac
+++ b/examples/extended/electromagnetic/TestEm5/run14.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 530.0 mum  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot14
diff --git a/examples/extended/electromagnetic/TestEm5/run15.mac b/examples/extended/electromagnetic/TestEm5/run15.mac
index 0875001e8351820bc1aabcdcef9ffe5c3c28beb2..0e6eba7d393baa7a22de402466cb4273faece136 100644
--- a/examples/extended/electromagnetic/TestEm5/run15.mac
+++ b/examples/extended/electromagnetic/TestEm5/run15.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 1. mm  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot15
diff --git a/examples/extended/electromagnetic/TestEm5/run16.mac b/examples/extended/electromagnetic/TestEm5/run16.mac
index 7923324adf2afd94f68d4a5dadbbd4c4ab1e5832..685f1c8014fd84c49b5f4c09cdc9649a7c154c3f 100644
--- a/examples/extended/electromagnetic/TestEm5/run16.mac
+++ b/examples/extended/electromagnetic/TestEm5/run16.mac
@@ -11,6 +11,7 @@
 /calor/setAbsThick 3. mm  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 #  hist file name
 /plots/sethistName geant4.plot16
diff --git a/examples/extended/electromagnetic/TestEm5/run21.mac b/examples/extended/electromagnetic/TestEm5/run21.mac
index b6aae5178a75d8f8aedc9c84da194b73ceedfec4..5ab0ca6290d17c41008aa92a39d1c31000629c2d 100644
--- a/examples/extended/electromagnetic/TestEm5/run21.mac
+++ b/examples/extended/electromagnetic/TestEm5/run21.mac
@@ -18,6 +18,7 @@
 /calor/setAbsThick 5.30 mm  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 /calor/cutG 1.00 mm
 /calor/cutE 5.0 mum
diff --git a/examples/extended/electromagnetic/TestEm5/run22.mac b/examples/extended/electromagnetic/TestEm5/run22.mac
index b9dd1b4fa5fda53eb8adb6b9a3b41461e90e357e..bed467bf7c831fe710b95de93f63a11fdbb295ab 100644
--- a/examples/extended/electromagnetic/TestEm5/run22.mac
+++ b/examples/extended/electromagnetic/TestEm5/run22.mac
@@ -18,6 +18,7 @@
 /calor/setAbsThick 0.15 mm  
 /calor/setAbsYZ 10. cm
 /calor/update
+/gun/setDefault
 #
 /calor/cutG 1.00 mm
 /calor/cutE 5.0 mum
diff --git a/examples/extended/electromagnetic/TestEm5/run44.draw b/examples/extended/electromagnetic/TestEm5/run44.draw
new file mode 100644
index 0000000000000000000000000000000000000000..b0bc682fbbab27f97a4d399f9442fbef83a934fc
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm5/run44.draw
@@ -0,0 +1,27 @@
+#
+# 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 10 mum  
+/calor/setAbsYZ 20 mum
+/calor/update
+/gun/setDefault
+#
+/vis/camera/zoom 1.4
+/vis/drawVolume
+#
+/gun/particle e-
+/gun/energy 500 keV
+/tracking/verbose 1
+#
+/step/setMaxStep 1 mm
+/run/beamOn 20
+#
+#/step/setMaxStep 2 mum
+#/run/beamOn 20
+
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc b/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
index 5e706d943f8d7ff8d8e5ef8752570f721ad238d4..5de053d34892191d4cb2c664edb5fd6bb78c373a 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5CalorHit.cc,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
index 3be8657333735f62529d35ef2a2974bc1c258857..7f226376ee96ad735916d9a7979bc40e6dd70294 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5CalorimeterSD.cc,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc
index 9784719558eb5a10b897f0c213759390ea3cd174..7d5338a78c4c7b6bb2fbbccdcb3e0ad693c41fde 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.4 2000/01/20 15:34:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5DetectorConstruction.cc,v 1.5 2001/03/27 09:24:00 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -130,6 +130,10 @@ density = 8.960*g/cm3;
 a = 63.55*g/mole;
 G4Material* Cu = new G4Material(name="Copper"   , z=29., a, density);
 
+density = 19.30*g/cm3;
+a =183.85*g/mole;
+G4Material* W = new G4Material(name="Tungsten"  , z=74., a, density);
+
 density = 19.32*g/cm3;
 a =196.97*g/mole;
 G4Material* Au = new G4Material(name="Gold"   , z=79., a, density);
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
index f9f6824a1e0beb1be5a0650dbb606be5e54a9bea..5f31eb792556ecfd2d2a989acc8d24514143b003 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5DetectorMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc
index c7abc62911e97a78a046adc0f6ede73268496e3e..6b36a62b72be35360686c7eb5d9c559c63f6dc55 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.3 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5EventAction.cc,v 1.4 2001/02/20 16:26:49 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -56,11 +56,17 @@ Em5EventAction::~Em5EventAction()
 void Em5EventAction::BeginOfEventAction(const G4Event* evt)
 {
  G4int evtNb = evt->GetEventID();
+
+ //printing survey
  if (evtNb%printModulo == 0) 
     G4cout << "\n---> Begin of Event: " << evtNb << G4endl;
-     
-  if(verboselevel>1)
-    G4cout << "<<< Event  " << evtNb << " started." << G4endl;
+  
+ //save rndm status
+ if (runaction->GetRndmFreq() == 2)
+   { 
+    HepRandom::saveEngineStatus("beginOfEvent.rndm");   
+    if (evtNb%printModulo == 0) HepRandom::showEngineStatus();
+   }
     
   if (calorimeterCollID==-1)
     {
@@ -139,22 +145,6 @@ void Em5EventAction::EndOfEventAction(const G4Event* evt)
                                trj->DrawTrajectory(50); 
       }
   }  
-
-  if(verboselevel>0)
-    G4cout << "<<< Event  " << evt->GetEventID() << " ended." << G4endl;
-  
-  
-  //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 << G4endl;
-        HepRandom::showEngineStatus();
-       }
-    }     
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
index 25b13fd11c0ad5394295178b1c1becaf6fd7f65e..0a7a454d1fb7db5e1cd36377c521358d01a75c01 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5EventActionMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
index b1f50511628d6be329ebd90cc7ae260d6f76d84a..d5b89b7ad019cd3b16c90eb39ca983f82fa79a49 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5PhysicsList.cc,v 1.6 2000/05/24 16:13:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5PhysicsList.cc,v 1.7 2001/01/09 12:36:38 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -42,8 +42,6 @@ Em5PhysicsList::Em5PhysicsList(Em5DetectorConstruction* p)
   cutForElectron    = defaultCutValue;
   cutForProton      = defaultCutValue;
   
-  MaxChargedStep = DBL_MAX; 
-  
   SetVerboseLevel(1);
   physicsListMessenger = new Em5PhysicsListMessenger(this);
 }
@@ -145,8 +143,6 @@ void Em5PhysicsList::ConstructProcess()
 
 #include "G4hIonisation.hh"
 
-#include "Em5StepCut.hh"
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 void Em5PhysicsList::ConstructEM()
@@ -169,20 +165,12 @@ void Em5PhysicsList::ConstructEM()
       pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
       pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);       
 
-      Em5StepCut* theeminusStepCut = new Em5StepCut();
-      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);
-                  
-      Em5StepCut* theeplusStepCut = new Em5StepCut();
-      theeplusStepCut->SetMaxStep(MaxChargedStep) ;          
-      pmanager->AddProcess(theeplusStepCut,          -1,-1,5);
   
     } else if( particleName == "mu+" || 
                particleName == "mu-"    ) {
@@ -190,8 +178,8 @@ void Em5PhysicsList::ConstructEM()
      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);       	       
-
+     pmanager->AddProcess(new G4MuPairProduction,  -1,-1,4);
+      
     } else if (
                 particleName == "proton"  
                || particleName == "antiproton"  
@@ -203,10 +191,6 @@ void Em5PhysicsList::ConstructEM()
     {
       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
       pmanager->AddProcess(new G4hIonisation,       -1,2,2);
-      
-      Em5StepCut* thehadronStepCut = new Em5StepCut();
-      thehadronStepCut->SetMaxStep(MaxChargedStep);          		       
-      pmanager->AddProcess( thehadronStepCut,       -1,-1,3);
     }
   }
 }
@@ -214,21 +198,28 @@ void Em5PhysicsList::ConstructEM()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 #include "G4Decay.hh"
+#include "Em5StepCut.hh"
 
 void Em5PhysicsList::ConstructGeneral()
 {
-  // Add Decay Process
    G4Decay* theDecayProcess = new G4Decay();
+   pStepCut = new Em5StepCut();   
+   
   theParticleIterator->reset();
   while( (*theParticleIterator)() ){
     G4ParticleDefinition* particle = theParticleIterator->value();
     G4ProcessManager* pmanager = particle->GetProcessManager();
+    
+    //add decay process
     if (theDecayProcess->IsApplicable(*particle)) { 
       pmanager ->AddProcess(theDecayProcess);
       // set ordering for PostStepDoIt and AtRestDoIt
       pmanager ->SetProcessOrdering(theDecayProcess, idxPostStep);
       pmanager ->SetProcessOrdering(theDecayProcess, idxAtRest);
     }
+    
+    //user StepCut  
+      pmanager ->AddDiscreteProcess(pStepCut);
   }
 }
 
@@ -364,9 +355,8 @@ void Em5PhysicsList::GetRange(G4double val)
 
 void Em5PhysicsList::SetMaxStep(G4double step)
 {
-  MaxChargedStep = step ;
-  G4cout << " MaxChargedStep=" << MaxChargedStep << G4endl;
-  G4cout << G4endl;
+  pStepCut->SetMaxStep(step);
+  G4cout << " MaxChargedStep=" << step/mm << " mm" << G4endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
index fc5b4ce4502bef88b51e3382d0a4f54049f0be03..8da1eb9d1257f8d51e8491b369e4a1094782ebec 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5PhysicsListMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
index 073071c844a4ace4b4dab7cf752b56f42be03421..2e1c2a76e4889efdb45ad79d49ba1f176bfa1059 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
index 48b538b42f3e71b294b388271633c4df0a8542b1..bbc771aab4010b4c49b54e2cbdd0682c13d3ecf6 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5PrimaryGeneratorMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
index 76640286befa0a152e52f43d366df7ee0cc4884f..84031cc9282931ae398d819c19820d2941364fda 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
@@ -5,14 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5RunAction.cc,v 1.5 2000/12/07 13:32:34 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5RunAction.cc,v 1.8 2001/03/27 09:24:00 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 #include "Em5RunAction.hh"
 #include "Em5RunMessenger.hh"
 
@@ -24,6 +23,11 @@
 
 #include "Randomize.hh"
 
+#ifndef G4NOHIST
+#include "CLHEP/Hist/HBookFile.h"
+#include <assert.h>
+#endif
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em5RunAction::Em5RunAction()
@@ -31,7 +35,12 @@ Em5RunAction::Em5RunAction()
    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....
@@ -39,12 +48,101 @@ Em5RunAction::Em5RunAction()
 Em5RunAction::~Em5RunAction()
 {
   delete runMessenger;
+#ifndef G4NOHIST   
+   // Write histogram file
+   hbookManager->write();
+  
+  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);
+
+  // 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);
+    				     
+    hi2bis = hbookManager->histogram("energy deposit: normalized distribution"
+                                     ,nbinEn,Enlow,Enhigh) ;				     
+    assert (hi2bis != 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);
+  }
+#endif  
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -337,7 +435,9 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
      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];
@@ -631,7 +731,7 @@ void Em5RunAction::EndOfRunAction(const G4Run* aRun)
     G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
    
   // save Rndm status
-  if (saveRndm == 1)
+  if (saveRndm > 0)
     { HepRandom::showEngineStatus();
       HepRandom::saveEngineStatus("endOfRun.rndm");
     }     
@@ -707,6 +807,9 @@ void Em5RunAction::FillNbOfSteps(G4double ns)
       ibin= bin ;
       distStep[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
+   histo1->accumulate(ns);
+#endif   
   }
 }
 
@@ -731,6 +834,9 @@ void Em5RunAction::FillEn(G4double En)
       ibin= bin ;
       distEn[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
+  histo2->accumulate(En/MeV);
+#endif  
   }
 }
 
@@ -757,6 +863,9 @@ void Em5RunAction::FillTt(G4double En)
       ibin= bin ;
       distTt[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
+  histo5->accumulate(En/MeV);
+#endif  
   }
 }
 
@@ -783,6 +892,9 @@ void Em5RunAction::FillTb(G4double En)
       ibin= bin ;
       distTb[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
+  histo7->accumulate(En/MeV) ;
+#endif  
   }
 }
 
@@ -807,6 +919,9 @@ void Em5RunAction::FillTsec(G4double En)
       ibin= bin ;
       distTsec[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
+  histo8->accumulate(En/MeV) ;
+#endif  
   }
 }
 
@@ -831,6 +946,9 @@ void Em5RunAction::FillGammaSpectrum(G4double En)
       ibin= bin ;
       distGamma[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
+  histo10->accumulate(log10(En/MeV)) ;
+#endif  
   }
 }
 
@@ -869,7 +987,10 @@ void Em5RunAction::FillTh(G4double Th)
         wg=0. ; 
       }
       distTh[ibin] += wg  ;
-    } 
+    }
+#ifndef G4NOHIST
+  histo3->accumulate(Th/deg, wg) ;
+#endif  
   }
 }
 
@@ -907,7 +1028,11 @@ void Em5RunAction::FillThBack(G4double Th)
       }
       distThback[ibin] += wg  ;
     }
+#ifndef G4NOHIST
+  histo6->accumulate(Th/deg, wg) ;
+#endif  
   }
+
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -932,7 +1057,10 @@ void Em5RunAction::FillR(G4double R )
       bin = (R -Rlow)/dR  ;
       ibin= bin ;
       distR[ibin] += 1. ;
-    } 
+    }
+#ifndef G4NOHIST    
+  histo4->accumulate(R/mm) ;
+#endif  
   }
 }
 
@@ -957,6 +1085,9 @@ void Em5RunAction::Fillvertexz(G4double z )
       ibin= bin ;
       distvertexz[ibin] += 1. ;
     }
+#ifndef G4NOHIST    
+  histo9->accumulate(z/mm) ;
+#endif  
   }
 }
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc
index f6ec06f98949135b222faef52399c18b62540abd..4d45009a000300dbe72a8c44d30aae5fbe5df0da 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.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5RunMessenger.cc,v 1.3 2001/02/20 16:26:50 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -167,8 +167,8 @@ Em5RunMessenger::Em5RunMessenger(Em5RunAction* RA)
   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->SetGuidance("freq > 0 saved on:   endOfRun.rndm");
+  RndmSaveCmd->SetGuidance("freq = 2 saved on: beginOfEvent.rndm");    
   RndmSaveCmd->SetParameterName("frequency",false);
   RndmSaveCmd->SetRange("frequency>=0 && frequency<=2");
   RndmSaveCmd->AvailableForStates(PreInit,Idle); 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc b/examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc
deleted file mode 100644
index a559865bb8a94dc7ab133c33b19956afa01df2d6..0000000000000000000000000000000000000000
--- a/examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc
+++ /dev/null
@@ -1,49 +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: Em5StepCut.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#include "Em5StepCut.hh"
-
-#include "G4Step.hh"
-#include "G4UserLimits.hh"
-#include "G4VParticleChange.hh"
-#include "G4EnergyLossTables.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em5StepCut::Em5StepCut(const G4String& aName)
-  : G4VDiscreteProcess(aName),MaxChargedStep(DBL_MAX)
-{
-   if (verboseLevel>0) {
-     G4cout << GetProcessName() << " is created "<< G4endl;
-   }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em5StepCut::~Em5StepCut()
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-Em5StepCut::Em5StepCut(Em5StepCut& right)
-    :G4VDiscreteProcess(right)
-{}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-void Em5StepCut::SetMaxStep(G4double step)
-{
-  MaxChargedStep = step ;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
index d03ef33d741d2d130ea8266b475c2bcc158d09c7..aadebf2e466bf9b47f75000bcc75b250792497d1 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5SteppingAction.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
index d84d6376ff9df71e8cefd9f755fcd5f8b14827d6..33657a3b9baf7d175b521acbc0a10586d0008a21 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5SteppingMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
index c79f5c9b168393a50cb497a6e475d9dc9d83d5ff..aa7a77c88ba298881f4548f6cdc5e8cadec28b31 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em5SteppingVerbose.cc,v 1.4 2000/12/06 18:25:55 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em5SteppingVerbose.cc,v 1.6 2001/02/19 14:08:39 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -46,7 +46,7 @@ void Em5SteppingVerbose::StepInfo()
 	     << G4std::setw( 9) << "dEStep"     << " "  
 	     << G4std::setw(10) << "StepLeng"     
 	     << G4std::setw(10) << "TrakLeng" 
-	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Volume"    << "  "
 	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
@@ -61,16 +61,17 @@ void Em5SteppingVerbose::StepInfo()
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
       G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	->GetProcessName();
+      G4cout << "  " 
+             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                ->GetProcessName();
     } else {
-      G4cout << "User Limit";
+      G4cout << "   UserLimit";
     }
 
     G4cout << G4endl;
@@ -86,12 +87,12 @@ void Em5SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -115,8 +116,8 @@ void Em5SteppingVerbose::StepInfo()
     
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 void Em5SteppingVerbose::TrackingStarted()
@@ -134,7 +135,7 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 9) << "dEStep"     << " "  
 	   << G4std::setw(10) << "StepLeng"  
 	   << G4std::setw(10) << "TrakLeng"
-	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     
 
     G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
@@ -147,13 +148,13 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
-      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(10) << "OutOfWorld";
     }
-    G4cout << G4std::setw(10) << "initStep" << G4endl;
+    G4cout  << "    initStep" << G4endl;
   }
   G4cout.precision(prec);
-  
 }
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc b/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
index 2c41c0d75e670fc10f21f14fdb73623e58984b3b..f99c5d57beafc4b14571d1e4158b92020430cff2 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em5VisManager.cc,v 1.2 1999/12/15 14:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm8/GNUmakefile b/examples/extended/electromagnetic/TestEm8/GNUmakefile
index c29ee8221472dadcc8e0bf6004fc85f7d290f14d..411857b0d948b658f6a49ef2081db849502161de 100644
--- a/examples/extended/electromagnetic/TestEm8/GNUmakefile
+++ b/examples/extended/electromagnetic/TestEm8/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.3 2000/07/27 13:02:48 gcosmo Exp $
+# $Id: GNUmakefile,v 1.4 2001/03/30 12:29:56 gcosmo Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -16,6 +16,7 @@ all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
+G4NOHIST := true
 ifdef G4NOHIST
   CPPFLAGS += -DG4NOHIST
 else
diff --git a/examples/extended/electromagnetic/TestEm8/README b/examples/extended/electromagnetic/TestEm8/README
index ff691ae968d8a68fb625f5ca05f2dd35aadaf99c..c239db61f9c9370bfa8d3d935f60222416e0aeaf 100644
--- a/examples/extended/electromagnetic/TestEm8/README
+++ b/examples/extended/electromagnetic/TestEm8/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 2000/01/07 14:49:04 grichine Exp $
+$Id: README,v 1.2 2001/03/30 12:35:46 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -135,4 +135,9 @@ $Id: README,v 1.1 2000/01/07 14:49:04 grichine Exp $
         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)
-        
+
+ Note that, histograms are disabled via the flag G4NOHIST in the GNUmakefile.
+ Currently, histograms in this example are implemented through the obsolete
+ CLHEP/Hist package, which is no longer supported. The implementation will
+ be replaced by direct call to the "analysis" module in a near future.
+
diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.cc b/examples/extended/electromagnetic/TestEm8/TestEm8.cc
index 58b22c5bb7f59e39fbae8abbd1135448decee85f..a8d2f44dff3215d4cb10d4466dd77d2c3d0a624e 100644
--- a/examples/extended/electromagnetic/TestEm8/TestEm8.cc
+++ b/examples/extended/electromagnetic/TestEm8/TestEm8.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TestEm8.cc,v 1.1 2000/01/07 14:49:19 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.out b/examples/extended/electromagnetic/TestEm8/TestEm8.out
index 943d7b3be45036fa82b909cb347e93bc430fc81f..1508696ad23860d42b82c1911d9b1c8ab448bbd8 100644
--- a/examples/extended/electromagnetic/TestEm8/TestEm8.out
+++ b/examples/extended/electromagnetic/TestEm8/TestEm8.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -118,7 +118,7 @@ Irregular X-ray TR model is called
 48	fGamma = 8.085e+04	sumE = 8.377
 49	fGamma = 9.283e+04	sumE = 8.504
 
-total time for build X-ray TR tables = 23.54 s
+total time for build X-ray TR tables = 12.42 s
 Em8PhysicsList::SetCuts:CutLength : 1 mm 
 
 phot:  Total cross sections from a parametrisation. Good description from 10 KeV to 50 MeV for all Z
@@ -141,15 +141,15 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-           Aluminium         125.06
-               Mylar         117.99
-       Polypropelene         111.37
+           Aluminium         125.02
+               Mylar         119.05
+       Polypropelene         111.68
                   Kr         1.0737
                Argon           0.99
                   N2           0.99
                   O2           0.99
                  Air           0.99
-               Xenon         1.8725
+               Xenon         1.9491
                  CO2           0.99
              Xe20CO2         1.6715
              Kr20CO2          1.088
@@ -164,15 +164,15 @@ eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data l
 
            material        min.delta energy(keV) 
 
-           Aluminium         125.06
-               Mylar         117.99
-       Polypropelene         111.37
+           Aluminium         125.02
+               Mylar         119.05
+       Polypropelene         111.68
                   Kr         1.0737
                Argon           0.99
                   N2           0.99
                   O2           0.99
                  Air           0.99
-               Xenon         1.8725
+               Xenon         1.9491
                  CO2           0.99
              Xe20CO2         1.6715
              Kr20CO2          1.088
@@ -182,7 +182,7 @@ hIoni:    Knock-on electron cross sections .
          delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
-total time(SetCuts)=41.1 s 
+total time(SetCuts)=18.25 s 
 #
 # Macro file 'run11.mac' for the initialization phase of "TestEm8.cc"
 #
@@ -259,28 +259,28 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 1000
-  User=499.2s Real=528.93s Sys=2.64s
+  User=201.16s Real=203.45s Sys=1.35s
  ================== run summary =====================
  end of Run TotNbofEvents = 1000
-    mean charged track length   in absorber=43.6288 +- 0.226983  mm  
+    mean charged track length   in absorber=72.4217 +- 1.01247  mm  
 
-            mean energy deposit in absorber=0.105986 +- 0.00116297  MeV 
+            mean energy deposit in absorber=0.0888196 +- 0.000843106  MeV 
 
- mean number of steps in absorber (charged) =523.456 +- 3.87851      
- mean number of steps in absorber (neutral) =5.124 +- 0.0694451      
+ mean number of steps in absorber (charged) =430.074 +- 1.91795      
+ mean number of steps in absorber (neutral) =5.176 +- 0.0754124      
 
-   mean number of charged secondaries = 1.402 +- 0.0366933
+   mean number of charged secondaries = 1.405 +- 0.0372958
 
-   mean number of neutral secondaries = 0.017 +- 0.00408791
+   mean number of neutral secondaries = 0.052 +- 0.00743613
 
-   mean number of e-s =1.402  and e+s =0
+   mean number of e-s =1.405  and e+s =0
 
-(number) transmission coeff=0.109  reflection coeff=0
+(number) transmission coeff=0.534  reflection coeff=0.004
 
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1680269066, 2086392423
+ Current couple of seeds = 605696309, 189660433
 ----------------------------------------
 #
 #
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
index fc55a5143333b3b47d8f8e5625334c75e478e386..3d6ebed356aec945b09cf184d11b35beea3e75a5 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8CalorHit.hh,v 1.2 2000/06/27 13:29:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
index 5d8c3efa18d425bbce14766ac01f7773237fbf87..3979e5964bb94d8adf05c21790df79f4ae9b20ac 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8CalorimeterSD.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
index 049eeca96dd3393396a016a33682b34c6405d2c0..6c7714dcbc4ccb74befb4a236359bee3211b1a78 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8DetectorConstruction.hh,v 1.3 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
index bbfd11b884be0b894712d87a85c3d70aec40c5c4..6e39196d0d5672a399227d63ae5859dd1143fc60 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8DetectorMessenger.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
index ff1930098eb0c16c347c4b2f91627e2a4f62e444..0ce9d6588199e4e560c354f9c42d3ea9c7f9fae7 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8EventAction.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
index f15c5fca08c0de418a63a9a1f4490a5c7183629b..874719bb2b2efa9cc9a6147b90e1f0f0068d2881 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8EventActionMessenger.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
index cfffd66b62f812fd95cbd3dfb7d2a8fc14d078a5..ca144e636c15bb8a7c9d6944c566df1ca66f591a 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PhysicsList.hh,v 1.3 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef Em8PhysicsList_h
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
index cae0751242233193a93c13bddd3f1014f3053818..ece0edaa5bb440ad0113d240b03ec0d8011d2ff7 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PhysicsListMessenger.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
index fd967d10805e82d66be35c40088111375683abd1..d4206ef3ac00b470cf65802ee5a5d32963c367a1 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PrimaryGeneratorAction.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
index f8c1a0aeb1895413f9685c37f141dcb247452c30..044ff923467d20b82fc7d3bf19d0d35998ec7481 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PrimaryGeneratorMessenger.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
index 65bd940a9635caae7ebdc80ccdaab6d911ec20a7..dfbc4906e8d019ee61fea959a6c427271dffbce6 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8RunAction.hh,v 1.3 2000/06/28 09:55:54 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
index 9e7de2126298142e2da09f44512a4b15ed5772c2..184c82b7a6253b84d464d6d8cbaab0edd084e128 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: Em8RunMessenger.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh b/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
index 0de9584661fb55154489d17fe105ced664ba7baf..70da45d34e516faefa23ad585569f1abbd23e8a2 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8StepCut.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
index 310a76b1cc89ed80b340ef32c9bd8d1bd73765be..a8685331e2eea4c2b6c47ab452b33512453ddcdc 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8SteppingAction.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
index 2a334ce44a00aa73c442a30b9d04d2c32d43d2fd..f9484df7bd8d4465c80245c73a0564f21415d7b3 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8SteppingMessenger.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
index 55f6d2ab7144a32d3f23b6026c261b63597cd5b7..4ed6722e444b70b721322db4b3910b1f6f743dfe 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8SteppingVerbose.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh b/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
index 4d5bbdae9123fd6b8f6045e9d64751a332bdebc8..9971635ac0a37700d2c8984d3498349ced548143 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8VisManager.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
index 54a0225f6519583d32248113879032bf0c5a7e28..9f8c86cc3cfd6472c1f5c7ff9dcbcc84f784b0bf 100644
--- a/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TRTDetectorConstruction.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
index c81807135010596bfdd9523543435ba0792a2b00..dd716b7d62c3b4b877fc6a83868cbb8bc9dfff4b 100644
--- a/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: TRTMaterials.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
index 4ee7206203b3ff37551613c7e60a66589e687688..cd54a50fb7f58bd0c576ff270fd2e28b725a5c2a 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8CalorHit.cc,v 1.2 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
index 09c40c15fe1772724c6f5130fe5ce3bd40c2efe4..a8f2df12f16394fa7620ccf7bc2775e2a6f1e282 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8CalorimeterSD.cc,v 1.3 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
index f38d2391c5d3c8cdd852b0bdcfa6500030aefbed..9b5f5f02b4e5b22d7516faede5e5fde405b36067 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8DetectorConstruction.cc,v 1.5 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
index ba01dfdeace82f3c307bd5eb4e5354b3ee145d29..67c4077d6561f6657fed84017ebe81814df3f773 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8DetectorMessenger.cc,v 1.2 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
index 5f39e2d989905f44e2f63c154875679345f45386..6585bcb026dffa55c0baf0bea271e9de08c405da 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8EventAction.cc,v 1.3 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
index 06c3a1dc902985781d1682b562595534ed157511..f887c66561c7f135ce2928da93b4473e5c3aab89 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8EventActionMessenger.cc,v 1.2 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
index 25aa7e44303a9e87f8fd461cd9dfdd28e93ce3bb..2d6c0e9a20e990a67888d06a030f8410d1c4c741 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PhysicsList.cc,v 1.4 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 
 #include "G4Timer.hh"
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
index bc39a84a64d6297c08937b2a717a343a64e9c00e..bd3ce47190e3e86e4e00088b4d22985680dd3ae0 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PhysicsListMessenger.cc,v 1.2 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
index 67d041ddf15a14175cdaa80c6ea60cec12aea70a..7c64b9682ba717201ff26df6f5cd53df330b9e69 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PrimaryGeneratorAction.cc,v 1.3 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
index b1b27ceda22317d9381fdfc3137de20d1f9a53b4..f0f1c73bb65c59f2716d9e01459b0cbc43c27ebb 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8PrimaryGeneratorMessenger.cc,v 1.2 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
index 839ed75678eae5b9fd28f8a6441b831beeb11886..4c66f0b687d7653d25db8906e32d38704acd2c95 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8RunAction.cc,v 1.5 2000/06/28 09:55:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
index 970ab8ab1d3282bb344e62d3cfdc6e1853e55cfd..7394adefbc4964da0277b3aa3cfb30530d7106d5 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8RunMessenger.cc,v 1.3 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc b/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
index 5b65f764a6da5cdc56dec3f3c8e13137f46f45d8..b89c72a2c4de1d228dee480019867c1e5bcdf8f0 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8StepCut.cc,v 1.3 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "Em8StepCut.hh"
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
index d34bb8daeb2168abf42d63305d014cfe32e5cfab..2b896cd6bc7b37cd835d4ae048ca7903f23bd6a2 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8SteppingAction.cc,v 1.3 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
index 7476e5d891a8d56e3b5dcca4f8550b3568385f05..a3eee856e1a7d4f7cddb597040c25f4f6025277f 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8SteppingMessenger.cc,v 1.2 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
index 3f810eddbde681517c26201df4ffe17e3295ddf3..6e4b726dec21fa8443c61c21b1466fef9127cf5f 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em8SteppingVerbose.cc,v 1.3 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em8SteppingVerbose.cc,v 1.4 2001/02/09 02:57:12 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -99,12 +99,12 @@ void Em8SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc b/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
index b792b7c03fc02e46d3689d515c6c2772dffecba2..bab7fcb0d7c8a371ce7ac5f1b3d563e9bb6cdba4 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em8VisManager.cc,v 1.2 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/g3tog4/README b/examples/extended/g3tog4/README
index 97f6024c2baee94d6ff2a8f91ce72bd6e25f5f42..5bf75c4f680c84c7e988089b0546978448f4c664 100644
--- a/examples/extended/g3tog4/README
+++ b/examples/extended/g3tog4/README
@@ -19,7 +19,7 @@ clGeometry.in is a macro to be executed either interactively or in batch.
 
 For example:
 > cd $G4INSTALL/examples/extended/g3tog4
-> clGeometry data/testmodel.dat < clGeometry.in
+> clGeometry data/testmodel.dat clGeometry.in
 
 cltog4
 ------
diff --git a/examples/extended/g3tog4/clGeometry/clGeometry.cc b/examples/extended/g3tog4/clGeometry/clGeometry.cc
index 475f9d4c05990ae36f2453119161a3abc8c9f3bf..1e10bb023ff54d78c63caf045de35e368313e8e5 100644
--- a/examples/extended/g3tog4/clGeometry/clGeometry.cc
+++ b/examples/extended/g3tog4/clGeometry/clGeometry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: clGeometry.cc,v 1.1 2000/07/24 11:23:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/clGeometry.in b/examples/extended/g3tog4/clGeometry/clGeometry.in
index ba750576d9823c4a1241a7b9de35b369ddecadbf..18075d1b4ed21d72d468dc9b94d9119d792f486c 100644
--- a/examples/extended/g3tog4/clGeometry/clGeometry.in
+++ b/examples/extended/g3tog4/clGeometry/clGeometry.in
@@ -27,3 +27,5 @@
 #
 # Termination
 #
+exit
+
diff --git a/examples/extended/g3tog4/clGeometry/clGeometry.out b/examples/extended/g3tog4/clGeometry/clGeometry.out
index bbcad18530bab1e546eda2ecf541d1a9871abe0b..45af5638399eaf5a3f1abe1697d9c1bf3417c92d 100644
--- a/examples/extended/g3tog4/clGeometry/clGeometry.out
+++ b/examples/extended/g3tog4/clGeometry/clGeometry.out
@@ -1,16 +1,16 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (23-Feb-2001)
              Copyright : Geant4 Collaboration
 **********************************************
-Instantiated G3toG4DetectorConstruction using call list file "/afs/cern.ch/sw/geant4/stt/dev1/src/geant4/examples/extended/g3tog4/data/testmodel.dat"
+Instantiated G3toG4DetectorConstruction using call list file "/afs/cern.ch/sw/geant4/stt/dev2/src/geant4/examples/extended/g3tog4/data/testmodel.dat"
 G4VUserPhysicsList::SetVerboseLevel  : Verbose level is set to 2
 /run/verbose 1
 /tracking/verbose 1
 /tracking/storeTrajectory 1
 /run/initialize
 Instantiated unit rotation matrix irot=0
-Reading the call List file /afs/cern.ch/sw/geant4/stt/dev1/src/geant4/examples/extended/g3tog4/data/testmodel.dat...
+Reading the call List file /afs/cern.ch/sw/geant4/stt/dev2/src/geant4/examples/extended/g3tog4/data/testmodel.dat...
 G4ggclos: setting top-level VolTableEntry
 Dump of VTD - 26 entries:
 Instantiated 26 volume table entries 
@@ -80,20 +80,20 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-HYDROGEN                     42.186
-DEUTERIUM                    67.149
-HELIUM                         37.6
-LITHIUM                      76.527
-BERILLIUM                    158.47
-CARBON                       187.35
-NITROGEN                      99.22
-NEON                         121.65
-ALUMINIUM                    191.92
-IRON                         356.49
-COPPER                       380.82
-TUNGSTEN                     561.11
-LEAD                         370.83
-URANIUM                      529.64
+HYDROGEN                     41.322
+DEUTERIUM                     65.86
+HELIUM                       37.951
+LITHIUM                      75.845
+BERILLIUM                    157.35
+CARBON                        189.5
+NITROGEN                     100.11
+NEON                         120.85
+ALUMINIUM                    191.86
+IRON                         358.11
+COPPER                       381.87
+TUNGSTEN                     557.83
+LEAD                         368.12
+URANIUM                      521.92
                  AIR           0.99
 VACUUM                         0.99
 
@@ -118,20 +118,20 @@ msc:   Tables of transport mean free paths.
 
            material        min.delta energy(keV) 
 
-HYDROGEN                     42.186
-DEUTERIUM                    67.149
-HELIUM                         37.6
-LITHIUM                      76.527
-BERILLIUM                    158.47
-CARBON                       187.35
-NITROGEN                      99.22
-NEON                         121.65
-ALUMINIUM                    191.92
-IRON                         356.49
-COPPER                       380.82
-TUNGSTEN                     561.11
-LEAD                         370.83
-URANIUM                      529.64
+HYDROGEN                     41.322
+DEUTERIUM                     65.86
+HELIUM                       37.951
+LITHIUM                      75.845
+BERILLIUM                    157.35
+CARBON                        189.5
+NITROGEN                     100.11
+NEON                         120.85
+ALUMINIUM                    191.86
+IRON                         358.11
+COPPER                       381.87
+TUNGSTEN                     557.83
+LEAD                         368.12
+URANIUM                      521.92
                  AIR           0.99
 VACUUM                         0.99
 
@@ -229,7 +229,7 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0.02s Real=0.06s Sys=0s
+  User=0s Real=0.06s Sys=0.01s
 Idle> /gun/particle mu+
 Idle> /run/beamOn 1
 ### Run 1 start.
@@ -271,7 +271,7 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0.01s Real=0.01s Sys=0s
+  User=0s Real=0s Sys=0s
 Idle> /gun/particle e+
 Idle> /run/beamOn 1
 ### Run 3 start.
@@ -292,7 +292,7 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0.01s Real=0.01s Sys=0s
+  User=0s Real=0s Sys=0s
 Idle> #
 Idle> /gun/position   0. 1.5 0. mm
 Idle> /gun/direction  1.  0.   0.
@@ -338,7 +338,7 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0s Real=0s Sys=0s
+  User=0.01s Real=0.01s Sys=0s
 Idle> /gun/particle e-
 Idle> /run/beamOn 1
 ### Run 6 start.
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh
index 2f1e1f2d4691210e55d7de0117094a74ead5029c..8bc30e72a5a34ec1bc28cb3590644e1000c2aa20 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4DetectorConstruction.hh,v 1.1 2000/07/24 11:23:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G3toG4DetectorConstruction_h
 #define G3toG4DetectorConstruction_h 1
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh
index 1e2a1dd47997014a131e410bd320f94367c62637..15d0afc998c7a704946a7a9244778b6d0866e7ea 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventAction.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh
index b9f5057a841474781b90c7df6fc0c6f44e19aa32..06f2d825e8b14cb39630db96da6cfbedb74df919 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventActionMessenger.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh
index bede86edcb27171ca1ebe110232adf2adb2e7927..2f4b4057e781d1e863fb835552466dd810178f64 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PhysicsList.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh
index 8b7f604bed067db42ad5a03a728f90da4723ad41..0518835314e8592f5c564fabb1b0a04d844f6336 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PrimaryGeneratorAction.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G3toG4PrimaryGeneratorAction_h
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh
index c4df47ae7e0942eeceff1adec8af748a6a010c47..0a0876d7da85bf918bdd41911b0e50fba5d1433c 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4RunAction.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G3toG4RunAction_h
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh
index 92baeea01a1978fe19b49f5e1566dff7a8cd179e..97204e39b354ff2d83269bbad948649500b1ee7a 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4VisManager.hh,v 1.1 2000/07/24 11:23:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc
index 3e882b6532f32e6fdc341c7dff788254377074b7..1eaf4d25245370bbfbc3f55f5ae02af88ff2e260 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4DetectorConstruction.cc,v 1.1 2000/07/24 11:23:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //--------------------------------------------------------------------------
 // G3toG4DetectorConstruction. Most the work is Done in
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc
index e8f734a14edb7eecead5e906fe2e75abd5f63d13..455d1f5f5039283b8362f8063251f1f7a5d3b338 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventAction.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc
index 7e98f018c462ac4c68e6b023aa57feb526037a3b..f333bf8086740658b80e3477c5ce8fbb065316c8 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventActionMessenger.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc
index a71806a5a510effafcb70e45e98354f53182bf87..4b6cb062e0e9665e44740041b441cd4680c559b9 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PhysicsList.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc
index 431c5eded27a83f6d6d484f70f3aece523a45f7f..e192a0de618814db45613d84dec4212a5ac86687 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PrimaryGeneratorAction.cc,v 1.2 2000/08/01 09:44:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "globals.hh"
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc
index 54e4ba8c3a0d37dd80582b25f12d06bbce696028..b5e99c8589cae2e965203f782e5d1edcd03592a3 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4RunAction.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4ios.hh"
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc
index 22ffc0e1e337acbd07181a6a25f2279bce5ba95c..6d217c5e72f3e7c34eea3a3493022b79940b9068 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4VisManager.cc,v 1.1 2000/07/24 11:23:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/g3tog4/cltog4/cltog4.cc b/examples/extended/g3tog4/cltog4/cltog4.cc
index ffe77e8ca338b3b336c77dd1b949a6a1ebdcbc90..8937447b3be9b3672b2f682d3382ccc0fb3986a2 100644
--- a/examples/extended/g3tog4/cltog4/cltog4.cc
+++ b/examples/extended/g3tog4/cltog4/cltog4.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: cltog4.cc,v 1.1 2000/07/24 11:23:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 #include "G4ios.hh"
diff --git a/examples/extended/g3tog4/cltog4/cltog4.in b/examples/extended/g3tog4/cltog4/cltog4.in
index b63ff1aa607bb4bc1481d94600ae1c693080f1c9..5a152b3705296e8427fc50ed34949f712db207d2 100644
--- a/examples/extended/g3tog4/cltog4/cltog4.in
+++ b/examples/extended/g3tog4/cltog4/cltog4.in
@@ -13,3 +13,5 @@
 #
 # Termination
 #
+exit
+
diff --git a/examples/extended/g3tog4/cltog4/cltog4.out b/examples/extended/g3tog4/cltog4/cltog4.out
index bb3d0d5c3575ce4034a8bd0cfcf4beda54782116..10e83f45dd11af5d6367c6d0e86c15519eb25901 100644
--- a/examples/extended/g3tog4/cltog4/cltog4.out
+++ b/examples/extended/g3tog4/cltog4/cltog4.out
@@ -1,15 +1,15 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (23-Feb-2001)
              Copyright : Geant4 Collaboration
 **********************************************
-Instantiated G3toG4DetectorConstruction using call list file "/afs/cern.ch/sw/geant4/stt/dev1/src/geant4/examples/extended/g3tog4/data/testmodel.dat"
+Instantiated G3toG4DetectorConstruction using call list file "/afs/cern.ch/sw/geant4/stt/dev2/src/geant4/examples/extended/g3tog4/data/testmodel.dat"
 /run/verbose 1
 /tracking/verbose 1
 /tracking/storeTrajectory 1
 /run/initialize
 Instantiated unit rotation matrix irot=0
-Reading the call List file /afs/cern.ch/sw/geant4/stt/dev1/src/geant4/examples/extended/g3tog4/data/testmodel.dat...
+Reading the call List file /afs/cern.ch/sw/geant4/stt/dev2/src/geant4/examples/extended/g3tog4/data/testmodel.dat...
 G4ggclos: setting top-level VolTableEntry
 Dump of VTD - 26 entries:
 Instantiated 26 volume table entries 
@@ -75,20 +75,20 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-HYDROGEN                     42.186
-DEUTERIUM                    67.149
-HELIUM                         37.6
-LITHIUM                      76.527
-BERILLIUM                    158.47
-CARBON                       187.35
-NITROGEN                      99.22
-NEON                         121.65
-ALUMINIUM                    191.92
-IRON                         356.49
-COPPER                       380.82
-TUNGSTEN                     561.11
-LEAD                         370.83
-URANIUM                      529.64
+HYDROGEN                     41.322
+DEUTERIUM                     65.86
+HELIUM                       37.951
+LITHIUM                      75.845
+BERILLIUM                    157.35
+CARBON                        189.5
+NITROGEN                     100.11
+NEON                         120.85
+ALUMINIUM                    191.86
+IRON                         358.11
+COPPER                       381.87
+TUNGSTEN                     557.83
+LEAD                         368.12
+URANIUM                      521.92
                  AIR           0.99
 VACUUM                         0.99
 
@@ -111,20 +111,20 @@ msc:   Tables of transport mean free paths.
 
            material        min.delta energy(keV) 
 
-HYDROGEN                     42.186
-DEUTERIUM                    67.149
-HELIUM                         37.6
-LITHIUM                      76.527
-BERILLIUM                    158.47
-CARBON                       187.35
-NITROGEN                      99.22
-NEON                         121.65
-ALUMINIUM                    191.92
-IRON                         356.49
-COPPER                       380.82
-TUNGSTEN                     561.11
-LEAD                         370.83
-URANIUM                      529.64
+HYDROGEN                     41.322
+DEUTERIUM                     65.86
+HELIUM                       37.951
+LITHIUM                      75.845
+BERILLIUM                    157.35
+CARBON                        189.5
+NITROGEN                     100.11
+NEON                         120.85
+ALUMINIUM                    191.86
+IRON                         358.11
+COPPER                       381.87
+TUNGSTEN                     557.83
+LEAD                         368.12
+URANIUM                      521.92
                  AIR           0.99
 VACUUM                         0.99
 
@@ -298,7 +298,7 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 Run terminated.
 Run Summary
   Number of events processed : 10
-  User=0.03s Real=0.11s Sys=0s
+  User=0.02s Real=0.11s Sys=0.01s
 Idle> #
 Idle> # Termination
 Idle> #
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh
index 74f4a1fbd733ea578ba24a0df53e4bf5725ad139..893be7fdd057fc67f82c10d50267afd39e8db0c9 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4DetectorConstruction.hh,v 1.1 2000/07/24 11:23:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G3toG4DetectorConstruction_h
 #define G3toG4DetectorConstruction_h 1
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh
index 4de3c587fab294115d1e4666467aeca09242e1fe..01481d8474661b9eb354ff9749ab9e17f31ac908 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventAction.hh,v 1.1 2000/07/24 11:23:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh b/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh
index 44c2eef47c3874bb2576b2ac1a4ffacbb74c8229..f8c16ead88f2a232f789c6e31acba8958c259ac9 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventActionMessenger.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh b/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh
index 6219f4592b116971cf65682d8baf0992ff15b315..e2eb43d3f7cbf3022ecbde0144ad5fe7848c179f 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PhysicsList.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh
index 4d6f810dbbba10c903f9e7f2de91a9998550c431..43deb1062830bb9ef841c94913a22f3238e005d9 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PrimaryGeneratorAction.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G3toG4PrimaryGeneratorAction_h
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh
index 729ed7a08bf4fab20a0703da45aa153b34271d5e..faf739882cf3df2e33c5f4ddb5ae337e0f251a14 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4RunAction.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G3toG4RunAction_h
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh b/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh
index 1c8ce355eece777b5d4aa14807d1f3a44c04df1e..f73008e067df80363dfe6956ceb0999244557f0f 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4VisManager.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc
index 9fb523a70303b166231c74ea0d9671ee1c555461..04491c0b0f79dbe107954caca998de6d0e2ca3a6 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4DetectorConstruction.cc,v 1.1 2000/07/24 11:23:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //--------------------------------------------------------------------------
 // G3toG4DetectorConstruction. Most the work is Done in
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc
index 4473a0cd2f16038ce493c2c577fb00abbd318c51..fe894c7c7e131dd3eaca748b14cdb08df0d97b05 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventAction.cc,v 1.1 2000/07/24 11:23:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc b/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc
index b698026a9481f9349d3f29efc2b30873be65e141..381c2a2ef637c871558f393f97fa5e016b227f88 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4EventActionMessenger.cc,v 1.1 2000/07/24 11:23:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc b/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc
index c74da7c72873eb0b6b490a8d492122222fdbf16f..dc27676ae916286d41ec3c64c2225c88d72e436d 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PhysicsList.cc,v 1.1 2000/07/24 11:23:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc
index 8752151c2f154b408343a86e1b05f8afcf53ff09..8fba4ab240a872fad8927fdffd44fdd4cd5744fd 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4PrimaryGeneratorAction.cc,v 1.2 2000/08/01 09:44:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "globals.hh"
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc
index 50f72998d0bd413755f1b43c0310afb7f8d4cf60..b41274288f55cab129f1853fe91e22b61989faa2 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4RunAction.cc,v 1.1 2000/07/24 11:23:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4ios.hh"
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc b/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc
index 9c4f732ea981ba5ead6637d5bef1413807d1eb04..b400e204ec110c29daa9fdedb18a1d5fe17601f5 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4VisManager.cc,v 1.1 2000/07/24 11:23:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/persistency/PersistentEx01/PersistentEx01.cc b/examples/extended/persistency/PersistentEx01/PersistentEx01.cc
index 24214768d468b37ad41c22ab12f686207085e838..940f2cd0f0446dbeef64f10d3cad62750d3389f2 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.5 1999/12/15 14:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // --------------------------------------------------------------
diff --git a/examples/extended/persistency/PersistentEx01/PersistentEx01.out b/examples/extended/persistency/PersistentEx01/PersistentEx01.out
index 1bc6b0cc3116f892b63faeff9ade351c11e6d447..f1dc17071bc53753d74f283ceaac953c2719db05 100644
--- a/examples/extended/persistency/PersistentEx01/PersistentEx01.out
+++ b/examples/extended/persistency/PersistentEx01/PersistentEx01.out
@@ -1,7 +1,7 @@
-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
+LD_LIBRARY_PATH = /afs/cern.ch/sw/lhcxx/specific/sun/Objectivity/5.1/lib:/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/@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/dev1/SUN-CC/debug_NONISO/exampleSchema/SUN-CC/PersistentEx01 for FDID 207
+Creating new runtime federated database /afs/cern.ch/sw/geant4/stt/dev2/SUN-CC/debug_NONISO/exampleSchema/SUN-CC/PersistentEx01 for FDID 207
 Run with active lockserver
 Schema import from PersistentEx01 to PersistentEx01
 
@@ -10,12 +10,12 @@ 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/dev1/SUN-CC/debug_NONISO/exampleFD/SUN-CC/PersistentEx01
+OO_FD_BOOT is set to /afs/cern.ch/sw/geant4/stt/dev2/SUN-CC/debug_NONISO/exampleFD/SUN-CC/PersistentEx01
 
 Opening federated database OO_FD_BOOT.
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (23-Feb-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 #
@@ -54,8 +54,8 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-           Aluminium         125.06
-                Lead         229.55
+           Aluminium         125.02
+                Lead         228.53
                  Air           0.99
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
@@ -77,8 +77,8 @@ msc:   Tables of transport mean free paths.
 
            material        min.delta energy(keV) 
 
-           Aluminium         125.06
-                Lead         229.55
+           Aluminium         125.02
+                Lead         228.53
                  Air           0.99
 
 hIoni:    Knock-on electron cross sections . 
@@ -112,91 +112,91 @@ Transaction started for /Geometry/GeomContainer/ with non-sustained mode.
 Transaction is committed on /Geometry/GeomContainer/
 >>> Event 0
 Event : 0
-mySD/EvenCollection    Number of hits       14
-  Edep of the first Hit 33.78
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 30.589
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 34.266
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 5.5545
 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       12
-  Edep of the first Hit 17.334
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 3.9675
+mySD/EvenCollection    Number of hits       30
+  Edep of the first Hit 23.89
+mySD/OddCollection     Number of hits       9
+  Edep of the first Hit 79.701
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 1 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 2
 Event : 2
 mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 34.294
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 37.385
+  Edep of the first Hit 1.9165
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 4.8478
 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       11
-  Edep of the first Hit 2.3184
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 5.8462
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 2.7206
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 19.452
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 3 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 4
 Event : 4
-mySD/EvenCollection    Number of hits       33
-  Edep of the first Hit 5.4403
-mySD/OddCollection     Number of hits       18
-  Edep of the first Hit 46.378
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 0.0075332
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 39.335
 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       8
-  Edep of the first Hit 52.566
-mySD/OddCollection     Number of hits       51
-  Edep of the first Hit 88.941
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 8.6101
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 21.639
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 5 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 6
 Event : 6
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 75.661
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 19.696
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 30.514
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 26.07
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 6 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 7
 Event : 7
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 64.235
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 12.01
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 5.7609
+mySD/OddCollection     Number of hits       23
+  Edep of the first Hit 21.21
 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       10
-  Edep of the first Hit 7.8162
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 35.162
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 3.1874
+mySD/OddCollection     Number of hits       20
+  Edep of the first Hit 10.518
 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       9
-  Edep of the first Hit 45.438
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 52.619
+mySD/EvenCollection    Number of hits       33
+  Edep of the first Hit 20.604
+mySD/OddCollection     Number of hits       19
+  Edep of the first Hit 0.083018
 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/PersistentEx02/PersistentEx02.cc b/examples/extended/persistency/PersistentEx02/PersistentEx02.cc
index e59913b3af0067e8a3e8fdbba1008ee66555f001..cd462db128f34e92c77385b05bb272291230cb97 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.3 1999/12/15 14:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // --------------------------------------------------------------
diff --git a/examples/extended/persistency/PersistentEx02/PersistentEx02.out b/examples/extended/persistency/PersistentEx02/PersistentEx02.out
index 32748fd3039de04a42a5f70514c4c99f7dc92e5c..58d2f837769fdc6013183eaacb46ca3a6602607f 100644
--- a/examples/extended/persistency/PersistentEx02/PersistentEx02.out
+++ b/examples/extended/persistency/PersistentEx02/PersistentEx02.out
@@ -1,7 +1,7 @@
-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
+LD_LIBRARY_PATH = /afs/cern.ch/sw/lhcxx/specific/sun/Objectivity/5.1/lib:/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/@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/dev1/SUN-CC/debug_NONISO/exampleSchema/SUN-CC/PersistentEx02 for FDID 207
+Creating new runtime federated database /afs/cern.ch/sw/geant4/stt/dev2/SUN-CC/debug_NONISO/exampleSchema/SUN-CC/PersistentEx02 for FDID 207
 Run with active lockserver
 Schema import from PersistentEx02 to PersistentEx02
 
@@ -10,12 +10,12 @@ 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/dev1/SUN-CC/debug_NONISO/exampleFD/SUN-CC/PersistentEx02
+OO_FD_BOOT is set to /afs/cern.ch/sw/geant4/stt/dev2/SUN-CC/debug_NONISO/exampleFD/SUN-CC/PersistentEx02
 
 Opening federated database OO_FD_BOOT.
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (23-Feb-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 #
@@ -54,8 +54,8 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-           Aluminium         125.06
-                Lead         229.55
+           Aluminium         125.02
+                Lead         228.53
                  Air           0.99
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
@@ -77,8 +77,8 @@ msc:   Tables of transport mean free paths.
 
            material        min.delta energy(keV) 
 
-           Aluminium         125.06
-                Lead         229.55
+           Aluminium         125.02
+                Lead         228.53
                  Air           0.99
 
 hIoni:    Knock-on electron cross sections . 
@@ -113,723 +113,723 @@ Transaction is committed on /Geometry/GeomContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
 >>> Event 0
 Event : 0
-mySD/EvenCollection    Number of hits       14
-  Edep of the first Hit 33.78
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 30.589
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 34.266
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 5.5545
 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       12
-  Edep of the first Hit 17.334
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 3.9675
+mySD/EvenCollection    Number of hits       29
+  Edep of the first Hit 23.89
+mySD/OddCollection     Number of hits       9
+  Edep of the first Hit 79.701
  -- G4PEvent 1 stored in /Events/EventContainer/ (sustained)
 >>> Event 2
 Event : 2
 mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 34.294
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 37.385
+  Edep of the first Hit 1.9165
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 4.8478
  -- G4PEvent 2 stored in /Events/EventContainer/ (sustained)
 >>> Event 3
 Event : 3
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 2.3184
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 5.8462
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 2.7206
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 19.452
  -- G4PEvent 3 stored in /Events/EventContainer/ (sustained)
 >>> Event 4
 Event : 4
-mySD/EvenCollection    Number of hits       32
-  Edep of the first Hit 5.4403
-mySD/OddCollection     Number of hits       18
-  Edep of the first Hit 46.378
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 0.0075332
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 39.335
  -- G4PEvent 4 stored in /Events/EventContainer/ (sustained)
 >>> Event 5
 Event : 5
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 52.566
-mySD/OddCollection     Number of hits       50
-  Edep of the first Hit 88.941
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 8.6101
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 21.639
  -- G4PEvent 5 stored in /Events/EventContainer/ (sustained)
 >>> Event 6
 Event : 6
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 75.661
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 19.696
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 30.514
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 26.07
  -- G4PEvent 6 stored in /Events/EventContainer/ (sustained)
 >>> Event 7
 Event : 7
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 64.235
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 12.01
+mySD/EvenCollection    Number of hits       30
+  Edep of the first Hit 5.7609
+mySD/OddCollection     Number of hits       23
+  Edep of the first Hit 21.21
  -- G4PEvent 7 stored in /Events/EventContainer/ (sustained)
 >>> Event 8
 Event : 8
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 7.8162
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 35.162
+mySD/EvenCollection    Number of hits       30
+  Edep of the first Hit 3.1874
+mySD/OddCollection     Number of hits       20
+  Edep of the first Hit 10.518
  -- G4PEvent 8 stored in /Events/EventContainer/ (sustained)
 >>> Event 9
 Event : 9
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 45.438
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 52.619
+mySD/EvenCollection    Number of hits       32
+  Edep of the first Hit 20.604
+mySD/OddCollection     Number of hits       19
+  Edep of the first Hit 0.083018
  -- G4PEvent 9 stored in /Events/EventContainer/ (sustained)
 >>> Event 10
 Event : 10
 mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 8.6076
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 35.99
+  Edep of the first Hit 56.761
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 37.056
 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       4
-  Edep of the first Hit 129.12
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 35.02
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 27.247
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 10.33
  -- G4PEvent 11 stored in /Events/EventContainer/ (sustained)
 >>> Event 12
 Event : 12
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 29.32
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 37.156
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 4.5263
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 21.012
  -- G4PEvent 12 stored in /Events/EventContainer/ (sustained)
 >>> Event 13
 Event : 13
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 51.838
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 75.941
+mySD/EvenCollection    Number of hits       20
+  Edep of the first Hit 6.0642
+mySD/OddCollection     Number of hits       26
+  Edep of the first Hit 26.13
  -- G4PEvent 13 stored in /Events/EventContainer/ (sustained)
 >>> Event 14
 Event : 14
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 76.24
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 5.5928
+mySD/EvenCollection    Number of hits       32
+  Edep of the first Hit 19.883
+mySD/OddCollection     Number of hits       20
+  Edep of the first Hit 0.64362
  -- G4PEvent 14 stored in /Events/EventContainer/ (sustained)
 >>> Event 15
 Event : 15
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 46.576
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 22.02
 mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 7.6868
+  Edep of the first Hit 1.0133
  -- G4PEvent 15 stored in /Events/EventContainer/ (sustained)
 >>> Event 16
 Event : 16
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 6.5263
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 3.6904
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 10.689
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 21.419
  -- G4PEvent 16 stored in /Events/EventContainer/ (sustained)
 >>> Event 17
 Event : 17
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 6.4445
-mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 10.196
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 5.514
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 12.06
  -- G4PEvent 17 stored in /Events/EventContainer/ (sustained)
 >>> Event 18
 Event : 18
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 18.891
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 33.746
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 5.0775
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 37.576
  -- G4PEvent 18 stored in /Events/EventContainer/ (sustained)
 >>> Event 19
 Event : 19
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 103.72
-mySD/OddCollection     Number of hits       49
-  Edep of the first Hit 0.23897
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 27.35
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 20.238
  -- G4PEvent 19 stored in /Events/EventContainer/ (sustained)
 >>> Event 20
 Event : 20
-mySD/EvenCollection    Number of hits       23
-  Edep of the first Hit 66.011
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 81.957
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 17.728
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 37.015
 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       11
-  Edep of the first Hit 12.318
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 10.471
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 56.905
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 6.6167
  -- G4PEvent 21 stored in /Events/EventContainer/ (sustained)
 >>> Event 22
 Event : 22
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 54.155
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 19.497
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 0.45028
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 0.54982
  -- G4PEvent 22 stored in /Events/EventContainer/ (sustained)
 >>> Event 23
 Event : 23
-mySD/EvenCollection    Number of hits       35
-  Edep of the first Hit 9.0521
-mySD/OddCollection     Number of hits       17
-  Edep of the first Hit 4.1481
+mySD/EvenCollection    Number of hits       25
+  Edep of the first Hit 65.862
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 14.964
  -- G4PEvent 23 stored in /Events/EventContainer/ (sustained)
 >>> Event 24
 Event : 24
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 27.378
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 36.241
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 20.565
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 55.449
  -- G4PEvent 24 stored in /Events/EventContainer/ (sustained)
 >>> Event 25
 Event : 25
-mySD/EvenCollection    Number of hits       27
-  Edep of the first Hit 9.7429
-mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 7.6519
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 16.844
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 31.598
  -- G4PEvent 25 stored in /Events/EventContainer/ (sustained)
 >>> Event 26
 Event : 26
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 0.13644
-mySD/OddCollection     Number of hits       22
-  Edep of the first Hit 15.808
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 11.96
+mySD/OddCollection     Number of hits       25
+  Edep of the first Hit 9.078
  -- G4PEvent 26 stored in /Events/EventContainer/ (sustained)
 >>> Event 27
 Event : 27
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 10.607
-mySD/OddCollection     Number of hits       48
-  Edep of the first Hit 3.7085
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 52.562
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 72.814
  -- G4PEvent 27 stored in /Events/EventContainer/ (sustained)
 >>> Event 28
 Event : 28
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 11.389
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 36.446
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 68.624
+mySD/OddCollection     Number of hits       33
+  Edep of the first Hit 5.4009
  -- G4PEvent 28 stored in /Events/EventContainer/ (sustained)
 >>> Event 29
 Event : 29
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 0.81911
-mySD/OddCollection     Number of hits       49
-  Edep of the first Hit 12.546
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 95.877
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 17.071
  -- G4PEvent 29 stored in /Events/EventContainer/ (sustained)
 >>> Event 30
 Event : 30
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 16.914
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 31.867
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 84.22
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 43.408
 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       11
-  Edep of the first Hit 5.6758
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 20.45
+mySD/EvenCollection    Number of hits       29
+  Edep of the first Hit 7.2273
+mySD/OddCollection     Number of hits       24
+  Edep of the first Hit 22.637
  -- G4PEvent 31 stored in /Events/EventContainer/ (sustained)
 >>> Event 32
 Event : 32
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 10.865
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 8.4417
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 4.0929
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 8.9806
  -- G4PEvent 32 stored in /Events/EventContainer/ (sustained)
 >>> Event 33
 Event : 33
-mySD/EvenCollection    Number of hits       14
-  Edep of the first Hit 24.566
-mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 17.839
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 5.3198
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 10.067
  -- G4PEvent 33 stored in /Events/EventContainer/ (sustained)
 >>> Event 34
 Event : 34
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 27.659
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 24.839
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 12.521
+mySD/OddCollection     Number of hits       19
+  Edep of the first Hit 41.506
  -- G4PEvent 34 stored in /Events/EventContainer/ (sustained)
 >>> Event 35
 Event : 35
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 6.0366
+mySD/EvenCollection    Number of hits       33
+  Edep of the first Hit 15.274
 mySD/OddCollection     Number of hits       17
-  Edep of the first Hit 51.51
+  Edep of the first Hit 1.872
  -- G4PEvent 35 stored in /Events/EventContainer/ (sustained)
 >>> Event 36
 Event : 36
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 5.2104
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 94.608
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 117.42
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 39.012
  -- G4PEvent 36 stored in /Events/EventContainer/ (sustained)
 >>> Event 37
 Event : 37
-mySD/EvenCollection    Number of hits       13
-  Edep of the first Hit 6.9929
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 29.298
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 11.275
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 15.736
  -- G4PEvent 37 stored in /Events/EventContainer/ (sustained)
 >>> Event 38
 Event : 38
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 8.4366
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 62.729
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 4.6425
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 3.874
  -- G4PEvent 38 stored in /Events/EventContainer/ (sustained)
 >>> Event 39
 Event : 39
-mySD/EvenCollection    Number of hits       27
-  Edep of the first Hit 45.507
-mySD/OddCollection     Number of hits       17
-  Edep of the first Hit 4.8999
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 24.682
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 5.5627
  -- G4PEvent 39 stored in /Events/EventContainer/ (sustained)
 >>> Event 40
 Event : 40
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 44.34
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 16.517
+mySD/EvenCollection    Number of hits       26
+  Edep of the first Hit 4.9304
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 3.6689
 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 2.8041
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 41.008
+mySD/EvenCollection    Number of hits       19
+  Edep of the first Hit 26.355
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 11.793
  -- G4PEvent 41 stored in /Events/EventContainer/ (sustained)
 >>> Event 42
 Event : 42
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 0.53774
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 33.61
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 0.26423
+mySD/OddCollection     Number of hits       31
+  Edep of the first Hit 18.678
  -- G4PEvent 42 stored in /Events/EventContainer/ (sustained)
 >>> Event 43
 Event : 43
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 75.591
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 33.415
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 64.542
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 12.654
  -- G4PEvent 43 stored in /Events/EventContainer/ (sustained)
 >>> Event 44
 Event : 44
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 17.706
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 22.565
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 0.29066
+mySD/OddCollection     Number of hits       33
+  Edep of the first Hit 36.856
  -- G4PEvent 44 stored in /Events/EventContainer/ (sustained)
 >>> Event 45
 Event : 45
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 7.2448
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 6.6821
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 17.313
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 129.88
  -- G4PEvent 45 stored in /Events/EventContainer/ (sustained)
 >>> Event 46
 Event : 46
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 12.043
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 110.21
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 8.5612
+mySD/OddCollection     Number of hits       30
+  Edep of the first Hit 113.93
  -- G4PEvent 46 stored in /Events/EventContainer/ (sustained)
 >>> Event 47
 Event : 47
-mySD/EvenCollection    Number of hits       26
-  Edep of the first Hit 40.18
-mySD/OddCollection     Number of hits       15
-  Edep of the first Hit 16.365
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 58.835
+mySD/OddCollection     Number of hits       47
+  Edep of the first Hit 30.319
  -- G4PEvent 47 stored in /Events/EventContainer/ (sustained)
 >>> Event 48
 Event : 48
-mySD/EvenCollection    Number of hits       23
-  Edep of the first Hit 27.245
-mySD/OddCollection     Number of hits       17
-  Edep of the first Hit 42.801
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 28.194
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 43.718
  -- G4PEvent 48 stored in /Events/EventContainer/ (sustained)
 >>> Event 49
 Event : 49
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 0.66946
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 24.889
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 11.664
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 67.442
  -- G4PEvent 49 stored in /Events/EventContainer/ (sustained)
 >>> Event 50
 Event : 50
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 39.982
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 27.025
+mySD/EvenCollection    Number of hits       15
+  Edep of the first Hit 5.1898
+mySD/OddCollection     Number of hits       48
+  Edep of the first Hit 3.887
 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       20
-  Edep of the first Hit 6.2659
-mySD/OddCollection     Number of hits       24
-  Edep of the first Hit 17.2
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 57.018
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 40.94
  -- G4PEvent 51 stored in /Events/EventContainer/ (sustained)
 >>> Event 52
 Event : 52
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 30.022
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 35.668
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 2.0228
+mySD/OddCollection     Number of hits       31
+  Edep of the first Hit 18.913
  -- G4PEvent 52 stored in /Events/EventContainer/ (sustained)
 >>> Event 53
 Event : 53
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 44.207
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 1.1609
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 0.41212
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 14.7
  -- G4PEvent 53 stored in /Events/EventContainer/ (sustained)
 >>> Event 54
 Event : 54
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 35.352
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 7.7773
+mySD/EvenCollection    Number of hits       30
+  Edep of the first Hit 2.3345
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 18.687
  -- G4PEvent 54 stored in /Events/EventContainer/ (sustained)
 >>> Event 55
 Event : 55
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 11.445
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 11.356
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 11.878
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 31.531
  -- G4PEvent 55 stored in /Events/EventContainer/ (sustained)
 >>> Event 56
 Event : 56
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 33.04
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 48.97
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 9.1227
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 4.1692
  -- G4PEvent 56 stored in /Events/EventContainer/ (sustained)
 >>> Event 57
 Event : 57
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 3.1266
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 10.492
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 46.142
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 21.799
  -- G4PEvent 57 stored in /Events/EventContainer/ (sustained)
 >>> Event 58
 Event : 58
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 52.133
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 47.385
+mySD/EvenCollection    Number of hits       25
+  Edep of the first Hit 73.826
+mySD/OddCollection     Number of hits       20
+  Edep of the first Hit 61.423
  -- G4PEvent 58 stored in /Events/EventContainer/ (sustained)
 >>> Event 59
 Event : 59
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 44.222
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 0.13428
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 6.5228
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 45.921
  -- G4PEvent 59 stored in /Events/EventContainer/ (sustained)
 >>> Event 60
 Event : 60
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 14.987
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 7.845
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 46.107
+mySD/OddCollection     Number of hits       21
+  Edep of the first Hit 38.81
 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       13
-  Edep of the first Hit 0.22923
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 21.235
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 63.965
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 37.453
  -- G4PEvent 61 stored in /Events/EventContainer/ (sustained)
 >>> Event 62
 Event : 62
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 2.1524
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 4.5559
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 21.839
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 1.9311
  -- G4PEvent 62 stored in /Events/EventContainer/ (sustained)
 >>> Event 63
 Event : 63
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 9.0836
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 0.03217
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 18.338
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 14.612
  -- G4PEvent 63 stored in /Events/EventContainer/ (sustained)
 >>> Event 64
 Event : 64
-mySD/EvenCollection    Number of hits       29
-  Edep of the first Hit 1.3635
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 10.876
+mySD/EvenCollection    Number of hits       30
+  Edep of the first Hit 12.908
+mySD/OddCollection     Number of hits       13
+  Edep of the first Hit 15.228
  -- G4PEvent 64 stored in /Events/EventContainer/ (sustained)
 >>> Event 65
 Event : 65
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 79.542
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 5.1056
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 19.111
+mySD/OddCollection     Number of hits       23
+  Edep of the first Hit 2.722
  -- G4PEvent 65 stored in /Events/EventContainer/ (sustained)
 >>> Event 66
 Event : 66
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 79.287
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 32.595
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 12.998
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 20.792
  -- G4PEvent 66 stored in /Events/EventContainer/ (sustained)
 >>> Event 67
 Event : 67
-mySD/EvenCollection    Number of hits       16
-  Edep of the first Hit 7.4335
-mySD/OddCollection     Number of hits       28
-  Edep of the first Hit 0.71975
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 6.0136
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 64.005
  -- G4PEvent 67 stored in /Events/EventContainer/ (sustained)
 >>> Event 68
 Event : 68
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 30.497
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 24.565
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 10.996
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 5.5241
  -- G4PEvent 68 stored in /Events/EventContainer/ (sustained)
 >>> Event 69
 Event : 69
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 19.79
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 36.085
+mySD/EvenCollection    Number of hits       4
+  Edep of the first Hit 5.2663
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 66.258
  -- G4PEvent 69 stored in /Events/EventContainer/ (sustained)
 >>> Event 70
 Event : 70
 mySD/EvenCollection    Number of hits       13
-  Edep of the first Hit 11.197
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 69.045
+  Edep of the first Hit 45.079
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 21.543
 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       10
-  Edep of the first Hit 22.033
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 15.701
+mySD/EvenCollection    Number of hits       33
+  Edep of the first Hit 3.2396
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 15.341
  -- G4PEvent 71 stored in /Events/EventContainer/ (sustained)
 >>> Event 72
 Event : 72
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 3.1751
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 104.22
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 42.564
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 3.5303
  -- G4PEvent 72 stored in /Events/EventContainer/ (sustained)
 >>> Event 73
 Event : 73
-mySD/EvenCollection    Number of hits       16
-  Edep of the first Hit 7.1071
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 12.678
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 16.245
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 4.8676
  -- G4PEvent 73 stored in /Events/EventContainer/ (sustained)
 >>> Event 74
 Event : 74
 mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 4.4276
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 2.3699
+  Edep of the first Hit 33.658
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 125.43
  -- G4PEvent 74 stored in /Events/EventContainer/ (sustained)
 >>> Event 75
 Event : 75
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 39.51
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 35.53
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 11.25
+mySD/OddCollection     Number of hits       24
+  Edep of the first Hit 7.3928
  -- G4PEvent 75 stored in /Events/EventContainer/ (sustained)
 >>> Event 76
 Event : 76
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 4.3003
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 17.905
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 5.0371
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 1.2719
  -- G4PEvent 76 stored in /Events/EventContainer/ (sustained)
 >>> Event 77
 Event : 77
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 25.033
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 11.919
+mySD/EvenCollection    Number of hits       20
+  Edep of the first Hit 8.1984
+mySD/OddCollection     Number of hits       12
+  Edep of the first Hit 26.406
  -- G4PEvent 77 stored in /Events/EventContainer/ (sustained)
 >>> Event 78
 Event : 78
 mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 11.176
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 73.461
+  Edep of the first Hit 21.99
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 48.568
  -- G4PEvent 78 stored in /Events/EventContainer/ (sustained)
 >>> Event 79
 Event : 79
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 6.3703
-mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 9.1866
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 81.662
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 1.9005
  -- G4PEvent 79 stored in /Events/EventContainer/ (sustained)
 >>> Event 80
 Event : 80
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 3.9276
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 38.212
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 49.948
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 28.802
 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       10
-  Edep of the first Hit 74.144
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 25.057
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 105.52
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 15.1
  -- G4PEvent 81 stored in /Events/EventContainer/ (sustained)
 >>> Event 82
 Event : 82
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 77.136
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 22.79
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 46.57
+mySD/OddCollection     Number of hits       33
+  Edep of the first Hit 73.187
  -- G4PEvent 82 stored in /Events/EventContainer/ (sustained)
 >>> Event 83
 Event : 83
 mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 11.281
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 6.2267
+  Edep of the first Hit 30.216
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 3.7834
  -- G4PEvent 83 stored in /Events/EventContainer/ (sustained)
 >>> Event 84
 Event : 84
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 90.325
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 4.9492
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 69.815
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 41.518
  -- G4PEvent 84 stored in /Events/EventContainer/ (sustained)
 >>> Event 85
 Event : 85
-mySD/EvenCollection    Number of hits       20
-  Edep of the first Hit 22.527
-mySD/OddCollection     Number of hits       17
-  Edep of the first Hit 42.417
+mySD/EvenCollection    Number of hits       33
+  Edep of the first Hit 23.846
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 69.098
  -- G4PEvent 85 stored in /Events/EventContainer/ (sustained)
 >>> Event 86
 Event : 86
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 10.329
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 23.674
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 27.901
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 45.093
  -- G4PEvent 86 stored in /Events/EventContainer/ (sustained)
 >>> Event 87
 Event : 87
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 0.36084
-mySD/OddCollection     Number of hits       29
-  Edep of the first Hit 11.128
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 18.889
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 36.675
  -- G4PEvent 87 stored in /Events/EventContainer/ (sustained)
 >>> Event 88
 Event : 88
 mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 7.9583
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 50.892
+  Edep of the first Hit 17.299
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 14.991
  -- G4PEvent 88 stored in /Events/EventContainer/ (sustained)
 >>> Event 89
 Event : 89
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 49.676
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 18.966
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 48.015
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 11.476
  -- G4PEvent 89 stored in /Events/EventContainer/ (sustained)
 >>> Event 90
 Event : 90
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 1.4919
-mySD/OddCollection     Number of hits       32
-  Edep of the first Hit 106.33
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 16.099
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 3.2642
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 90 stored in /Events/EventContainer/ (sustained)
 >>> Event 91
 Event : 91
 mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 9.4966
-mySD/OddCollection     Number of hits       46
-  Edep of the first Hit 0.058401
+  Edep of the first Hit 3.689
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 13.049
  -- G4PEvent 91 stored in /Events/EventContainer/ (sustained)
 >>> Event 92
 Event : 92
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 5.4288
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 1.784
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 3.0583
+mySD/OddCollection     Number of hits       32
+  Edep of the first Hit 58.855
  -- G4PEvent 92 stored in /Events/EventContainer/ (sustained)
 >>> Event 93
 Event : 93
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 6.5922
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 18.346
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 46.456
+mySD/OddCollection     Number of hits       33
+  Edep of the first Hit 50.997
  -- G4PEvent 93 stored in /Events/EventContainer/ (sustained)
 >>> Event 94
 Event : 94
-mySD/EvenCollection    Number of hits       23
-  Edep of the first Hit 15.627
-mySD/OddCollection     Number of hits       26
-  Edep of the first Hit 65.553
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 40.024
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 114.89
  -- G4PEvent 94 stored in /Events/EventContainer/ (sustained)
 >>> Event 95
 Event : 95
-mySD/EvenCollection    Number of hits       21
-  Edep of the first Hit 0.38597
-mySD/OddCollection     Number of hits       27
-  Edep of the first Hit 24.729
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 12.246
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 44.227
  -- G4PEvent 95 stored in /Events/EventContainer/ (sustained)
 >>> Event 96
 Event : 96
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 29.871
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 2.0288
+mySD/EvenCollection    Number of hits       26
+  Edep of the first Hit 63.321
+mySD/OddCollection     Number of hits       24
+  Edep of the first Hit 54.303
  -- G4PEvent 96 stored in /Events/EventContainer/ (sustained)
 >>> Event 97
 Event : 97
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 19.856
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 13.483
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 13.714
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 54.194
  -- G4PEvent 97 stored in /Events/EventContainer/ (sustained)
 >>> Event 98
 Event : 98
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 169.75
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 75.759
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 43.008
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 42.129
  -- G4PEvent 98 stored in /Events/EventContainer/ (sustained)
 >>> Event 99
 Event : 99
-mySD/EvenCollection    Number of hits       26
-  Edep of the first Hit 22.632
-mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 78.927
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 19.068
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 23.959
  -- 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 af83b312e6c1f365abf6a93153ab2f7349146b57..34233133f460e7051fbc9684d403aba62548831e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02DetectorConstruction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh
index 58d7e0625d1d1993456c586d4769c4c742512bed..1a4ecfc972f5ffa90782eeaac5d6c602d2febb19 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh
index e55009491997da98c43263105e4c25d8d7f02fdc..40dfe4937a2305660999c2207ea16c1d7b8baf8b 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02PhysicsList_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh
index 698fd4f17af44c99fc6e25fe7606876f1d10e1f8..f4a25bc6f2ab3045ebdc4c43b8b9124f942d902e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02PrimaryGeneratorAction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh
index 4b1a3dc265c270f0ffa7ee2ac79effe421c6cf5d..f1234e06fce3b17afa233786ccd1f636b9b09780 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02RunAction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh
index cb48207992013350cd5bde78ae5ba969c8e5b156..03b15f78dd4818db585ede1e85ae72f2d7c4c576 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02StackingAction_H
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl
index d6f29d6cb38a740b61890743401c010f3e32eb55..4665af6ce9d8cf488a931e53e13e470a03a55ec4 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02TrackerHit_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl
index 304e10edd12173a746f6aeb94c01cc50352cff5a..7f00be2fda81cabb87be37aa3ed124812525a93c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02TrackerHitsCollection_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh
index 719c2eadd1fc055bf0e3604e0120ec3dea54e19d..9b99eab6b25512ff774a82f933481867ee7b87e9 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef PersEx02TrackerSD_h
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
index 5c5dcc5c1953b8c5fc8ce30925825452f3025bef..3ccf7839b8478bc3d56ba8a44d34a9761a4a7e53 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02DetectorConstruction.cc,v 1.4 1999/12/15 14:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "PersEx02DetectorConstruction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
index f21e37c02c87e04a770fbf3272bdebf5fd884244..689d26a58657d4ecb6c14f22ed30c586af164549 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02EventAction.cc,v 1.4 1999/12/15 14:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "PersEx02EventAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
index 95344726db72b07c0f736aa6202dc37db5492421..695cd400b58c6ed8922c7492702b51371b65cf44 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: PersEx02PhysicsList.cc,v 1.4 1999/12/15 14:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "globals.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc
index f0e3f1defa14d5d833ca03ff9499b2e204c5c438..7579762241f97a52723c4d267af80bbae5775e8a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "PersEx02PrimaryGeneratorAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc
index 30ba4cda6b01ab7ab24a3673c7bd813ad47cd101..4bce3ffbf142aa1d81cca79fa03910c9dfdebf87 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "PersEx02RunAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc
index b91f4be351e903bad2da4018be4ea514c5581e63..869625ea7ded3d6dce4ca41aee097dd279cff9a4 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "PersEx02StackingAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc
index 88e053917787010dc8f07146a4f577447742a485..8020677993ab0b6be3698be09adfbe163acb7a13 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "PersEx02TrackerHit.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc
index 5223482b79fb142c204e6bfb443923f187ac59cd..bcd72ae5ee49dc1dd7819ffb6dba7bda3c1fa2e7 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "PersEx02TrackerHitsCollection.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc
index 03c0338896a49c8db3ef7ef7d73dd65f6f9f0d8a..02fcd22f90ef814d6b29cfff878013abcfee36d5 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include <assert.h>
diff --git a/examples/novice/N01/exampleN01.cc b/examples/novice/N01/exampleN01.cc
index 96114fee46164237fb64c6584b5649342a16ba71..bac705c4e5e61d63de85eb6080797a4402686388 100644
--- a/examples/novice/N01/exampleN01.cc
+++ b/examples/novice/N01/exampleN01.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: exampleN01.cc,v 1.2 1999/12/15 14:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N01/exampleN01.out b/examples/novice/N01/exampleN01.out
index 2fc25511937d64a6585f895c9a7fc183f3b0f9a6..b815cdfcb260d31bc9d6fddab3d725bea0ba7897 100644
--- a/examples/novice/N01/exampleN01.out
+++ b/examples/novice/N01/exampleN01.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 Start Run processing.
@@ -193,5 +193,5 @@ Terminate current event processing.
 Run terminated.
 Run Summary
   Number of events processed : 3
-  User=0.11s Real=0.11s Sys=0s
+  User=0.06s Real=0.1s Sys=0s
 G4 kernel has come to Quit state.
diff --git a/examples/novice/N01/include/ExN01DetectorConstruction.hh b/examples/novice/N01/include/ExN01DetectorConstruction.hh
index ebcf1cf5f96978b44573431a92d2b1c3e312471d..bd20920b54c561be7774c5148131b1c0a564237f 100644
--- a/examples/novice/N01/include/ExN01DetectorConstruction.hh
+++ b/examples/novice/N01/include/ExN01DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN01DetectorConstruction.hh,v 1.2 1999/12/15 14:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN01DetectorConstruction_H
diff --git a/examples/novice/N01/include/ExN01PhysicsList.hh b/examples/novice/N01/include/ExN01PhysicsList.hh
index d286d65116abdd3cb41b6fc1a22a8609e8af2519..d7880301e298d1f1750b2f83ea21c82f6c94c73c 100644
--- a/examples/novice/N01/include/ExN01PhysicsList.hh
+++ b/examples/novice/N01/include/ExN01PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN01PhysicsList.hh,v 1.3 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
diff --git a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
index 4e5790257d28b8b76038537fe781e94ea3440998..55f82ea8dcf96238c1c419a3fe8460e2e9cf536b 100644
--- a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
+++ b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN01PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN01PrimaryGeneratorAction_h
diff --git a/examples/novice/N01/src/ExN01DetectorConstruction.cc b/examples/novice/N01/src/ExN01DetectorConstruction.cc
index bb168c90a2c04983e62648194b64cae94e827e66..4d03287e54a1997e9ec0f6f5362d849765093f1d 100644
--- a/examples/novice/N01/src/ExN01DetectorConstruction.cc
+++ b/examples/novice/N01/src/ExN01DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN01DetectorConstruction.cc,v 1.2 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN01DetectorConstruction.hh"
diff --git a/examples/novice/N01/src/ExN01PhysicsList.cc b/examples/novice/N01/src/ExN01PhysicsList.cc
index 00e42f1db3bcd7c06304415cb81c09feecf55aa6..faf11fadf0686e3b7b0a6ed7808fc87d8426b115 100644
--- a/examples/novice/N01/src/ExN01PhysicsList.cc
+++ b/examples/novice/N01/src/ExN01PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN01PhysicsList.cc,v 1.3 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
index 348205ee9739a60976280821dc506bfc253d5f2b..fa1f51de7ebcca0149ca5c03c7f9153d06cc4103 100644
--- a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
+++ b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN01PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN01PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N02/History b/examples/novice/N02/History
index 465dc93a8dd7b085740a661da4d8f642bea5957b..afec2be05d9d7552863bac4fa3516d3224ed3f3a 100644
--- a/examples/novice/N02/History
+++ b/examples/novice/N02/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.13 2000/12/06 12:33:38 stesting Exp $
+$Id: History,v 1.17 2001/02/20 11:57:29 stesting Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,29 +15,51 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+20-02-01  S.O'Neale (exampleN02-V03-00-03) update reference outputs following
+   materials-V03-00-04 (tagset 268)
+
+09-02-01 M.Asai (exampleN02-V03-00-02)
+- Migration to STL vector classes
+ affected file : ExN02SteppingVerbose.cc
+
+31-02-05 S.O'Neale (exampleN02-V03-00-01)
+- update reference output for Batch Mode system testing for
+  exampleN02-V03-00-00 and recent EM Physics tags.
+
+31-01-01 G.Cosmo (exampleN02-V03-00-00)
+- fix to ExN02ChamberParameterisation and ExN02DetectorConstruction
+  to cope with bug report #186. Parameterisation of chambers was not
+  taking into account that copyNo starts from 0, therefore dimensions
+  of the first chamber (parametrised G4Box) were set to negative values (!).
+  This was causing the side-effect of visualising a "ghost" chamber (the
+  first one close to the target), which was correctly not seen by tracking.
+  Therefore, number of chambers is now reduced to 5 but global positioning
+  and parameters have been preserved.
+
 06-12-00 S.O'Neale (exampleN02-V02-00-03)
--update reference output for Batch Mode system testing
- in this context 0 trajectories stored is normal.
+- update reference output for Batch Mode system testing
+  in this context 0 trajectories stored is normal.
+
 03-12-00 M.Maire (exampleN02-V02-00-02)
--README updated
--prerun.g4mac updated for new vis commands, and renamed initInter.mac
--new examples of macro: run1.mac, run2.mac
--G4UItcsh in the main, under the control of G4UI_USE_TCSH (for Linux)
--visualisation on interactive mode
--DetectorConstruction: tracker region in the centre of the world.
- default target material: Pb, chamber material: Xenon
--interactive commands to change the materials and to setup a magnetic field
--the magnetic field is transverse to the beam (i.e. along x)
--PhysicsList: copy of N03. defaultCut = 1 cm
--PrimaryGenerator: default momentum direction corrected: along z.
- Suppress the possibility of random impact and the associated messenger.
--RunAction and EventAction updated for vis commands
--SteppingAction: cleanup because no specific actions
--SteppingVerbose: see README
--TrackerHit: a Hit = 4 informations: trackID, chamberNb, edep, position.
- Draw and Print
--TrackerSD: ProcessHits.
- Print HitsCollection at end of event 
+- README updated
+- prerun.g4mac updated for new vis commands, and renamed initInter.mac
+- new examples of macro: run1.mac, run2.mac
+- G4UItcsh in the main, under the control of G4UI_USE_TCSH (for Linux)
+- visualisation on interactive mode
+- DetectorConstruction: tracker region in the centre of the world.
+  default target material: Pb, chamber material: Xenon
+- interactive commands to change the materials and to setup a magnetic field
+- the magnetic field is transverse to the beam (i.e. along x)
+- PhysicsList: copy of N03. defaultCut = 1 cm
+- PrimaryGenerator: default momentum direction corrected: along z.
+  Suppress the possibility of random impact and the associated messenger.
+- RunAction and EventAction updated for vis commands
+- SteppingAction: cleanup because no specific actions
+- SteppingVerbose: see README
+- TrackerHit: a Hit = 4 informations: trackID, chamberNb, edep, position.
+  Draw and Print
+- TrackerSD: ProcessHits.
+  Print HitsCollection at end of event 
 
 25th November 2000 Steve O'Neale (tagset210)
 - Update test outputs for min.delta energy cut
diff --git a/examples/novice/N02/exampleN02.cc b/examples/novice/N02/exampleN02.cc
index d68af07fde4531d4631c3e800cbbefad53e8aaa8..c450cb6c44f07039bf76c4ad529fc3d000cdf349 100644
--- a/examples/novice/N02/exampleN02.cc
+++ b/examples/novice/N02/exampleN02.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: exampleN02.cc,v 1.4 2000/12/04 16:24:03 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/exampleN02.large_N.out b/examples/novice/N02/exampleN02.large_N.out
index c6befd88b1082e78ffc6316c5a96846e96375c10..0f0634f735b1c63975f2b1bb1e45732e403bc029 100644
--- a/examples/novice/N02/exampleN02.large_N.out
+++ b/examples/novice/N02/exampleN02.large_N.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -24,7 +24,7 @@ The materials defined are :
 
 
 Target is 5 cm of Pb
-There are 6 chambers in the tracker region. The chambers are 2e+02 mm of XenonGas
+There are 5 chambers in the tracker region. The chambers are 2e+02 mm of XenonGas
  The distance between chamber is 80 cm
 
 conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
@@ -52,10 +52,10 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-                 Air         6.1428
-                  Al         572.84
-                  Pb           1370
-            XenonGas         8.9393
+                 Air         6.2457
+                  Al         572.17
+                  Pb         1332.1
+            XenonGas         9.4278
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -71,10 +71,10 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 
            material        min.delta energy(keV) 
 
-                 Air         6.1428
-                  Al         572.84
-                  Pb           1370
-            XenonGas         8.9393
+                 Air         6.2457
+                  Al         572.17
+                  Pb         1332.1
+            XenonGas         9.4278
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -118,8732 +118,1357 @@ Cut in energy
 * G4Track Information:   Particle = e+,   Track ID = 1,   Parent ID = 0
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0      0 fm      0 fm  -2.91 m     200 MeV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -31.4 mum  1.22 mum -2.86 m     200 MeV  7.66 keV  4.79 cm   4.79 cm    WorldPV     eIoni
-    2   -278 mum  -212 mum -2.45 m     200 MeV  93.3 keV  41.2 cm     46 cm   TargetPVTransportation
-    3   -285 mum  -201 mum -2.45 m     128 MeV   930 keV   682 mum  46.1 cm   TargetPV     eBrem
-    4   -289 mum  -209 mum -2.45 m     121 MeV  2.05 MeV   876 mum  46.2 cm   TargetPV     eBrem
-    5   -270 mum  -197 mum -2.45 m     117 MeV   706 keV   506 mum  46.2 cm   TargetPV     eBrem
-    6   -282 mum  -181 mum -2.45 m     115 MeV  1.45 MeV   985 mum  46.3 cm   TargetPV     eBrem
-    7   -281 mum  -182 mum -2.45 m     110 MeV  31.1 keV  24.6 mum  46.3 cm   TargetPV     eBrem
-    8   -301 mum  -345 mum -2.45 m     105 MeV  1.99 MeV  1.58 mm   46.5 cm   TargetPV     eBrem
-    9   -324 mum  -362 mum -2.44 m     102 MeV  3.24 MeV  2.23 mm   46.7 cm   TargetPV     eBrem
-   10   -318 mum  -364 mum -2.44 m      30 MeV   148 keV   129 mum  46.7 cm   TargetPV     eBrem
-   11   -300 mum  -371 mum -2.44 m    23.7 MeV   222 keV   183 mum  46.7 cm   TargetPV     eBrem
-   12   -265 mum  -378 mum -2.44 m    23.2 MeV   243 keV   207 mum  46.7 cm   TargetPV     eBrem
-   13   -199 mum  -282 mum -2.44 m    21.6 MeV   710 keV   537 mum  46.8 cm   TargetPV     eBrem
-   14     22 mum  -186 mum -2.44 m    18.6 MeV  1.63 MeV  1.37 mm   46.9 cm   TargetPV     eBrem
-   15   -452 mum   786 mum -2.44 m    12.7 MeV  4.79 MeV   2.9 mm   47.2 cm   TargetPV     eBrem
-   16   -394 mum   139 mum -2.44 m    8.42 MeV   790 keV   781 mum  47.3 cm   TargetPV     eBrem
-   17   -393 mum   136 mum -2.44 m     6.4 MeV  3.84 keV  4.48 mum  47.3 cm   TargetPV     eBrem
-   18    220 mum  -777 mum -2.44 m    5.04 MeV  1.36 MeV  1.29 mm   47.4 cm   TargetPV     eIoni
-   19   -449 mum  -1.1 mm  -2.44 m     3.9 MeV  1.14 MeV  1.09 mm   47.5 cm   TargetPV     eIoni
-   20   -132 mum -1.17 mm  -2.44 m    2.92 MeV   984 keV   921 mum  47.6 cm   TargetPV     eIoni
-   21   -498 mum  -771 mum -2.44 m    1.89 MeV  1.03 MeV   765 mum  47.7 cm   TargetPV     eIoni
-   22   -772 mum  -702 mum -2.44 m     820 keV  1.07 MeV   590 mum  47.8 cm   TargetPV     eIoni
-   23   -855 mum  -784 mum -2.44 m     296 keV   524 keV   376 mum  47.8 cm   TargetPV     eIoni
-   24   -872 mum  -791 mum -2.44 m       0 eV    296 keV   142 mum  47.8 cm   TargetPV     eIoni
-   25   -872 mum  -791 mum -2.44 m       0 eV      0 eV      0 fm   47.8 cm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0      0 fm      0 fm  -2.91 m     200 MeV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1  -32.2 mum -1.27 mum -2.86 m     200 MeV  7.66 keV  4.79 cm   4.79 cm    WorldPV       eIoni
+    2   -185 mum   115 mum -2.45 m     200 MeV  94.2 keV  41.2 cm     46 cm    WorldPV  Transportation
+    3   -173 mum   108 mum -2.45 m     191 MeV  5.58 MeV   682 mum  46.1 cm   TargetPV       eBrem
+    4   -178 mum   107 mum -2.45 m     190 MeV   535 keV   277 mum  46.1 cm   TargetPV       eBrem
+    5   -204 mum   116 mum -2.45 m     180 MeV   556 keV   363 mum  46.1 cm   TargetPV       eBrem
+    6   -238 mum   116 mum -2.45 m     170 MeV   556 keV   379 mum  46.2 cm   TargetPV       eBrem
+    7   -244 mum   115 mum -2.45 m     162 MeV  81.3 keV  72.9 mum  46.2 cm   TargetPV       eBrem
+    8   -356 mum  35.1 mum -2.45 m     156 MeV  2.86 MeV  2.02 mm   46.4 cm   TargetPV       eBrem
+    9   -389 mum  17.6 mum -2.45 m     156 MeV   376 keV   346 mum  46.4 cm   TargetPV       eBrem
+   10   -461 mum -38.1 mum -2.45 m     154 MeV  1.17 MeV   796 mum  46.5 cm   TargetPV       eBrem
+   11   -481 mum -47.8 mum -2.44 m     113 MeV   309 keV   261 mum  46.5 cm   TargetPV       eBrem
+   12   -482 mum -48.6 mum -2.44 m     112 MeV  9.75 keV  11.6 mum  46.5 cm   TargetPV       eBrem
+   13   -561 mum  -131 mum -2.44 m    70.2 MeV   969 keV   810 mum  46.6 cm   TargetPV       eBrem
+   14   -952 mum  -430 mum -2.44 m    46.6 MeV  2.65 MeV  1.92 mm   46.8 cm   TargetPV       eBrem
+   15  -1.04 mm   -580 mum -2.44 m    43.7 MeV  1.35 MeV   860 mum  46.9 cm   TargetPV       eBrem
+   16  -1.12 mm   -567 mum -2.44 m    34.9 MeV   511 keV   504 mum  46.9 cm   TargetPV       eBrem
+   17  -1.12 mm   -567 mum -2.44 m    30.1 MeV   449 eV   2.58 mum  46.9 cm   TargetPV       eBrem
+   18  -1.65 mm   -871 mum -2.44 m    19.7 MeV  2.29 MeV  1.77 mm   47.1 cm   TargetPV       eBrem
+   19  -1.79 mm   -949 mum -2.44 m    7.37 MeV   278 keV   288 mum  47.1 cm   TargetPV       eBrem
+   20   -1.9 mm  -1.08 mm  -2.44 m     4.5 MeV   405 keV   450 mum  47.2 cm   TargetPV       eBrem
+   21   -2.7 mm   -954 mum -2.44 m    3.43 MeV  1.08 MeV  1.04 mm   47.3 cm   TargetPV       eIoni
+   22  -3.05 mm  -1.48 mm  -2.44 m    2.54 MeV   889 keV   862 mum  47.4 cm   TargetPV       eIoni
+   23   -2.7 mm  -1.65 mm  -2.44 m     784 keV  1.75 MeV   713 mum  47.4 cm   TargetPV       eIoni
+   24  -2.81 mm  -1.68 mm  -2.44 m     364 keV   420 keV   370 mum  47.5 cm   TargetPV       eIoni
+   25  -2.79 mm  -1.69 mm  -2.44 m       0 eV    364 keV   193 mum  47.5 cm   TargetPV       eIoni
+   26  -2.79 mm  -1.69 mm  -2.44 m       0 eV      0 eV      0 fm   47.5 cm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 19,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -872 mum  -791 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   5.23 mm   -1.2 cm  -2.44 m       0 eV    511 keV  1.28 cm   1.28 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 18,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -872 mum  -791 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -2.5 mm   2.21 mm  -2.44 m     205 keV   306 keV  3.41 mm   3.41 mm   TargetPV     compt
-    2  -2.52 mm   1.73 mm  -2.44 m       0 eV    205 keV   816 mum  4.23 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 17,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -393 mum   136 mum -2.44 m    2.02 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    1.1 cm  -1.42 cm  -2.42 m     586 keV  1.43 MeV  2.82 cm   2.82 cm   TargetPV     compt
-    2    1.1 cm  -1.43 cm  -2.42 m     423 keV   163 keV  25.4 mum  2.83 cm   TargetPV     compt
-    3   1.13 cm  -1.52 cm  -2.42 m       0 eV    423 keV   994 mum  2.93 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 16,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -394 mum   139 mum -2.44 m    3.51 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.91 mm  -1.56 cm  -2.42 m    3.22 MeV   287 keV  2.36 cm   2.36 cm   TargetPV     compt
-    2   7.52 mm   -2.5 cm  -2.41 m    3.22 MeV     0 eV    1.2 cm   3.56 cm    WorldPVTransportation
-    3   1.27 cm  -4.34 cm   -2.4 m    3.22 MeV     0 eV   2.37 cm   5.93 cm    TrackerTransportation
-    4     67 cm   -2.4 m   -61.3 cm   3.22 MeV     0 eV   3.03 m    3.09 m     WorldPVTransportation
-    5   81.2 cm  -2.91 m   -22.6 cm   3.22 MeV     0 eV   65.6 cm   3.74 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 15,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -452 mum   786 mum -2.44 m    1.05 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -891 mum  -921 mum -2.44 m     383 keV   669 keV  2.13 mm   2.13 mm   TargetPV     compt
-    2  -2.73 mm   2.29 mm  -2.43 m       0 eV    383 keV  6.83 mm   8.96 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 14,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0     22 mum  -186 mum -2.44 m    1.44 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    560 mum   463 mum -2.44 m     831 keV   611 keV  3.57 mm   3.57 mm   TargetPV     compt
-    2   1.06 mm    757 mum -2.44 m       0 eV    831 keV   707 mum  4.28 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 13,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -199 mum  -282 mum -2.44 m     866 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.84 mm   2.09 mm  -2.43 m       0 eV    866 keV  8.27 mm   8.27 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 12,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -265 mum  -378 mum -2.44 m     286 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -207 mum  -336 mum -2.44 m     188 keV  98.2 keV   545 mum   545 mum  TargetPV     compt
-    2  -74.3 mum -79.7 mum -2.44 m       0 eV    188 keV   289 mum   834 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 11,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -300 mum  -371 mum -2.44 m    6.01 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.39 mm  -1.09 mm  -2.42 m       0 eV   4.99 MeV  1.91 cm   1.91 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 20,   Parent ID = 11
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.39 mm  -1.09 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.39 mm  -1.09 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 22,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.39 mm  -1.09 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.05 mm  -2.57 mm  -2.42 m       0 eV    511 keV  2.72 mm   2.72 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 21,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.39 mm  -1.09 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    125 mum   1.7 mm  -2.43 m     416 keV  94.7 keV  5.15 mm   5.15 mm   TargetPV     compt
-    2    457 mum  2.97 mm  -2.43 m     243 keV   174 keV  1.47 mm   6.62 mm   TargetPV     compt
-    3   1.83 mm   2.05 mm  -2.43 m       0 eV    243 keV   2.4 mm   9.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -318 mum  -364 mum -2.44 m    71.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -59.9 mum  -353 mum -2.44 m       0 eV   1.03 MeV  4.54 mm   4.54 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 24,   Parent ID = 10
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -59.9 mum  -353 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 26,   Parent ID = 24
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.78 mm  -3.87 mm  -2.43 m       0 eV    511 keV  7.17 mm   7.17 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 24
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.68 mm   5.37 mm  -2.45 m     176 keV   335 keV  1.17 cm   1.17 cm   TargetPV     compt
-    2  -3.99 mm    420 mum -2.44 m       0 eV    176 keV  6.25 mm   1.79 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 23,   Parent ID = 10
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m    69.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -30.3 mum  -362 mum -2.44 m    67.4 MeV   476 keV   354 mum   354 mum  TargetPV     eBrem
-    2  -11.7 mum  -359 mum -2.44 m    65.6 MeV  1.14 MeV   485 mum   839 mum  TargetPV     eBrem
-    3   17.2 mum  -567 mum -2.44 m      62 MeV  3.15 MeV  2.51 mm   3.35 mm   TargetPV     eBrem
-    4    269 mum  -604 mum -2.43 m    35.7 MeV  1.38 MeV   917 mum  4.27 mm   TargetPV     eBrem
-    5    316 mum  -558 mum -2.43 m    32.8 MeV   397 keV   313 mum  4.58 mm   TargetPV     eBrem
-    6    783 mum  -546 mum -2.43 m    28.8 MeV  1.42 MeV  1.08 mm   5.66 mm   TargetPV     eBrem
-    7    977 mum  -849 mum -2.43 m    27.3 MeV   644 keV   515 mum  6.17 mm   TargetPV     eBrem
-    8   1.47 mm  -1.19 mm  -2.43 m    14.4 MeV  1.06 MeV   653 mum  6.83 mm   TargetPV     eBrem
-    9   1.76 mm  -1.36 mm  -2.43 m      13 MeV   511 keV   418 mum  7.24 mm   TargetPV     eBrem
-   10   1.86 mm  -1.39 mm  -2.43 m    9.67 MeV   113 keV   113 mum  7.36 mm   TargetPV     eBrem
-   11   1.88 mm  -1.39 mm  -2.43 m    8.29 MeV  15.7 keV  17.2 mum  7.37 mm   TargetPV     eBrem
-   12   2.33 mm  -2.09 mm  -2.43 m    6.27 MeV  2.02 MeV  1.52 mm   8.89 mm   TargetPV     eIoni
-   13   2.37 mm  -2.07 mm  -2.43 m    5.92 MeV  37.3 keV  45.6 mum  8.94 mm   TargetPV     eBrem
-   14   2.64 mm  -1.77 mm  -2.43 m    3.27 MeV   617 keV   523 mum  9.46 mm   TargetPV     eBrem
-   15   2.53 mm  -1.24 mm  -2.43 m    2.32 MeV   949 keV   805 mum  1.03 cm   TargetPV     eIoni
-   16   2.19 mm  -1.18 mm  -2.43 m    1.37 MeV   950 keV   654 mum  1.09 cm   TargetPV     eIoni
-   17    2.1 mm   -988 mum -2.43 m     908 keV   464 keV   488 mum  1.14 cm   TargetPV     eIoni
-   18   2.15 mm   -975 mum -2.43 m     231 keV   677 keV   393 mum  1.18 cm   TargetPV     eIoni
-   19   2.15 mm   -978 mum -2.43 m       0 eV    231 keV  99.2 mum  1.19 cm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 39,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.64 mm  -1.77 mm  -2.43 m    2.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.53 mm   -940 mum -2.43 m       0 eV   1.01 MeV  1.26 mm   1.26 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 40,   Parent ID = 39
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.53 mm   -940 mum -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.53 mm   -940 mum -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 42,   Parent ID = 40
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.53 mm   -940 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.91 mm   -426 mum -2.43 m       0 eV    511 keV   863 mum   863 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 41,   Parent ID = 40
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.53 mm   -940 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.55 mm  -3.68 mm  -2.43 m     455 keV  55.5 keV   4.6 mm    4.6 mm   TargetPV     compt
-    2   -446 mum -5.97 mm  -2.43 m       0 eV    455 keV  3.13 mm   7.73 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 38,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.37 mm  -2.07 mm  -2.43 m     312 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.43 mm  -2.03 mm  -2.43 m       0 eV    312 keV  72.7 mum  72.7 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 37,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.88 mm  -1.39 mm  -2.43 m    1.36 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.08 cm  -1.05 cm  -2.42 m     449 keV   914 keV  2.33 cm   2.33 cm   TargetPV     compt
-    2   1.98 cm  -1.15 cm  -2.42 m       0 eV    449 keV  2.68 mm    2.6 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 36,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.86 mm  -1.39 mm  -2.43 m    3.24 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    2.5 cm  -1.09 cm  -2.42 m    3.24 MeV     0 eV   2.72 cm   2.72 cm    WorldPVTransportation
-    2   7.07 cm  -2.96 cm   -2.4 m    3.24 MeV     0 eV   5.38 cm    8.1 cm    TrackerTransportation
-    3    2.4 m   -98.6 cm  -1.31 m    3.24 MeV     0 eV   2.74 m    2.82 m     WorldPVTransportation
-    4   2.91 m    -1.2 m   -1.07 m    3.24 MeV     0 eV   60.1 cm   3.42 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 35,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.76 mm  -1.36 mm  -2.43 m     849 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.28 cm   -6.1 mm  -2.43 m       0 eV    849 keV  1.27 cm   1.27 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 34,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.47 mm  -1.19 mm  -2.43 m    11.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.46 mm  -1.78 mm  -2.43 m       0 eV   10.8 MeV  1.26 mm   1.26 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 43,   Parent ID = 34
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.46 mm  -1.78 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.46 mm  -1.78 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 45,   Parent ID = 43
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.46 mm  -1.78 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.27 mm  -5.18 mm  -2.43 m     293 keV   218 keV  6.02 mm   6.02 mm   TargetPV     compt
-    2  -1.32 mm  -5.32 mm  -2.43 m     153 keV   140 keV   190 mum  6.21 mm   TargetPV     compt
-    3  -1.59 mm   -5.1 mm  -2.43 m       0 eV    153 keV   458 mum  6.67 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 44,   Parent ID = 43
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.46 mm  -1.78 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.96 mm   -411 mum -2.43 m       0 eV    511 keV  2.42 mm   2.42 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 33,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    977 mum  -849 mum -2.43 m     838 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.34 cm  -1.58 cm  -2.42 m       0 eV    838 keV  3.15 cm   3.15 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 32,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    783 mum  -546 mum -2.43 m    2.57 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   6.04 mm  -6.41 mm  -2.43 m     948 keV  1.62 MeV   1.1 cm    1.1 cm   TargetPV     compt
-    2   6.29 mm  -6.13 mm  -2.42 m     472 keV   476 keV  1.65 mm   1.26 cm   TargetPV     compt
-    3   4.48 mm  -6.87 mm  -2.42 m       0 eV    472 keV  2.54 mm   1.52 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 31,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    316 mum  -558 mum -2.43 m    2.55 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.69 mm    335 mum -2.42 m       0 eV   1.53 MeV  1.09 cm   1.09 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 46,   Parent ID = 31
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.69 mm    335 mum -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.69 mm    335 mum -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 48,   Parent ID = 46
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.69 mm    335 mum -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.91 mm   3.12 mm  -2.42 m       0 eV    511 keV  3.09 mm   3.09 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 47,   Parent ID = 46
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.69 mm    335 mum -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.72 mm  -1.88 mm  -2.42 m       0 eV    511 keV  2.46 mm   2.46 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 30,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    269 mum  -604 mum -2.43 m    24.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    429 mum  -521 mum -2.43 m       0 eV   9.25 MeV   755 mum   755 mum  TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 49,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    429 mum  -521 mum -2.43 m    14.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    404 mum  -354 mum -2.43 m    11.5 MeV   788 keV   609 mum   609 mum  TargetPV     eBrem
-    2    252 mum  -380 mum -2.43 m    8.28 MeV   1.6 MeV  1.12 mm   1.72 mm   TargetPV     eBrem
-    3  -34.1 mum  -166 mum -2.43 m    6.68 MeV   1.3 MeV   918 mum  2.64 mm   TargetPV     eBrem
-    4   -972 mum  -773 mum -2.43 m    5.26 MeV  1.42 MeV  1.33 mm   3.97 mm   TargetPV     eIoni
-    5  -1.17 mm   -830 mum -2.43 m    4.46 MeV   215 keV   214 mum  4.19 mm   TargetPV     eBrem
-    6  -1.57 mm   -859 mum -2.43 m    3.31 MeV  1.16 MeV  1.01 mm    5.2 mm   TargetPV     eIoni
-    7  -1.56 mm   -854 mum -2.43 m     895 keV  4.42 keV  5.93 mum   5.2 mm   TargetPV     eBrem
-    8   -1.5 mm   -749 mum -2.43 m     406 keV   489 keV   395 mum   5.6 mm   TargetPV     eIoni
-    9  -1.49 mm   -711 mum -2.43 m    86.2 keV   320 keV   222 mum  5.82 mm   TargetPV     eIoni
-   10  -1.49 mm   -708 mum -2.43 m       0 eV   86.2 keV  19.9 mum  5.84 mm   TargetPV     eIoni
-   11  -1.49 mm   -708 mum -2.43 m       0 eV      0 eV      0 fm   5.84 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 56,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 mm   -708 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    924 mum  1.58 mm  -2.42 m       0 eV    511 keV  6.07 mm   6.07 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 55,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 mm   -708 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -5.42 mm  -4.43 mm  -2.44 m     329 keV   182 keV   9.9 mm    9.9 mm   TargetPV     compt
-    2  -5.17 mm  -5.19 mm  -2.44 m     317 keV  12.3 keV   831 mum  1.07 cm   TargetPV     compt
-    3  -3.45 mm  -1.12 cm  -2.44 m       0 eV    317 keV  7.65 mm   1.84 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 54,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.56 mm   -854 mum -2.43 m    2.41 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.17 cm    2.5 cm  -2.42 m    2.41 MeV     0 eV   3.03 cm   3.03 cm    WorldPVTransportation
-    2   4.44 cm   8.87 cm   -2.4 m    2.41 MeV     0 eV   7.47 cm   10.5 cm    TrackerTransportation
-    3   1.23 m     2.4 m   -1.63 m    2.41 MeV     0 eV   2.71 m    2.82 m     WorldPVTransportation
-    4   1.49 m    2.91 m   -1.46 m    2.41 MeV     0 eV   59.8 cm   3.41 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 53,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.17 mm   -830 mum -2.43 m     580 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.91 mm   -746 mum -2.43 m       0 eV    580 keV   905 mum   905 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 52,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -34.1 mum  -166 mum -2.43 m     302 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -109 mum  -263 mum -2.43 m     235 keV  66.8 keV   188 mum   188 mum  TargetPV     compt
-    2   1.83 mm   -937 mum -2.43 m     205 keV    30 keV  3.75 mm   3.93 mm   TargetPV     compt
-    3   1.55 mm   -930 mum -2.43 m       0 eV    205 keV  1.14 mm   5.08 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 51,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    252 mum  -380 mum -2.43 m     1.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    674 mum -1.47 mm  -2.41 m       0 eV    1.6 MeV  2.46 cm   2.46 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 50,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    404 mum  -354 mum -2.43 m    2.37 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.82 cm  -1.12 mm   -2.4 m    2.37 MeV     0 eV   3.79 cm   3.79 cm    TrackerTransportation
-    2   -2.4 m   -9.89 cm   1.82 m    2.37 MeV     0 eV   4.84 m    4.88 m     WorldPVTransportation
-    3  -2.91 m     -12 cm   2.72 m    2.37 MeV     0 eV   1.04 m    5.92 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 29,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.2 mum  -567 mum -2.44 m     411 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    793 mum  -658 mum -2.43 m     376 keV  34.9 keV  3.82 mm   3.82 mm   TargetPV     compt
-    2    763 mum  -272 mum -2.43 m     202 keV   174 keV   988 mum  4.81 mm   TargetPV     compt
-    3    345 mum   248 mum -2.43 m       0 eV    202 keV   765 mum  5.57 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 28,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -11.7 mum  -359 mum -2.44 m     737 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    839 mum  69.3 mum -2.43 m       0 eV    737 keV  1.09 cm   1.09 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -30.3 mum  -362 mum -2.44 m    1.54 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    161 mum  -246 mum -2.44 m       0 eV   1.54 MeV  3.09 mm   3.09 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 9,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -324 mum  -362 mum -2.44 m     480 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -11.1 mum  -429 mum -2.44 m     444 keV  36.1 keV   6.8 mm    6.8 mm   TargetPV     compt
-    2   4.58 mm   5.61 mm  -2.42 m     332 keV   112 keV  1.79 cm   2.47 cm   TargetPV     compt
-    3   4.21 mm   6.79 mm  -2.42 m       0 eV    332 keV  1.37 mm   2.61 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 8,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -301 mum  -345 mum -2.45 m    2.62 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -724 mum  -900 mum -2.44 m     759 keV  1.86 MeV  8.92 mm   8.92 mm   TargetPV     compt
-    2   -358 mum  4.42 mm  -2.43 m       0 eV    759 keV  6.54 mm   1.55 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 7,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -281 mum  -182 mum -2.45 m    4.58 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.21 mm  -2.52 mm   -2.4 m    4.58 MeV     0 eV    4.7 cm    4.7 cm    TrackerTransportation
-    2  -1.71 cm  -4.24 cm   -1.6 m    4.58 MeV     0 eV   80.1 cm   84.8 cm    ChamberTransportation
-    3  -2.11 cm  -5.24 cm   -1.4 m    4.58 MeV     0 eV     20 cm   1.05 m     TrackerTransportation
-    4   -3.3 cm  -8.23 cm    -80 cm   4.58 MeV     0 eV   60.1 cm   1.65 m     ChamberTransportation
-    5   -3.7 cm  -9.23 cm    -60 cm   4.58 MeV     0 eV     20 cm   1.85 m     TrackerTransportation
-    6  -4.89 cm  -12.2 cm      0 fm   4.58 MeV     0 eV   60.1 cm   2.45 m     ChamberTransportation
-    7  -5.29 cm  -13.2 cm     20 cm   4.58 MeV     0 eV     20 cm   2.65 m     TrackerTransportation
-    8  -6.48 cm  -16.2 cm     80 cm   4.58 MeV     0 eV   60.1 cm   3.25 m     ChamberTransportation
-    9  -6.88 cm  -17.2 cm      1 m    4.58 MeV     0 eV     20 cm   3.45 m     TrackerTransportation
-   10  -8.07 cm  -20.2 cm    1.6 m    4.58 MeV     0 eV   60.1 cm   4.05 m     ChamberTransportation
-   11  -8.47 cm  -21.2 cm    1.8 m    4.58 MeV     0 eV     20 cm   4.25 m     TrackerTransportation
-   12  -9.66 cm  -24.2 cm    2.4 m    4.58 MeV     0 eV   60.1 cm   4.85 m     WorldPVTransportation
-   13  -10.7 cm  -26.7 cm   2.91 m    4.58 MeV     0 eV   51.1 cm   5.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 6,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -282 mum  -181 mum -2.45 m     608 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -278 mum  -191 mum -2.45 m       0 eV    608 keV   183 mum   183 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 5,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -270 mum  -197 mum -2.45 m    3.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.62 mm    446 mum -2.42 m     323 keV  2.91 MeV  2.65 cm   2.65 cm   TargetPV     compt
-    2  -1.46 mm    445 mum -2.42 m     160 keV   162 keV   168 mum  2.66 cm   TargetPV     compt
-    3  -1.76 mm    350 mum -2.42 m       0 eV    160 keV   355 mum   2.7 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 4,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -289 mum  -209 mum -2.45 m    5.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -240 mum  -107 mum -2.44 m     677 keV  4.61 MeV  4.75 mm   4.75 mm   TargetPV     compt
-    2  -7.37 mm  -7.12 mm  -2.44 m     294 keV   383 keV  1.07 cm   1.55 cm   TargetPV     compt
-    3  -4.19 mm  -8.02 mm  -2.44 m       0 eV    294 keV  5.53 mm    2.1 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 3,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -285 mum  -201 mum -2.45 m    71.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -375 mum  -103 mum -2.45 m       0 eV      0 eV   4.26 mm   4.26 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 58,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -375 mum  -103 mum -2.45 m      19 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -371 mum  -110 mum -2.44 m    12.2 MeV   660 keV   149 mum   149 mum  TargetPV     eBrem
-    2   -766 mum  -171 mum -2.44 m    8.42 MeV   1.4 MeV   1.1 mm   1.25 mm   TargetPV     eBrem
-    3    125 mum   222 mum -2.44 m     6.6 MeV  1.52 MeV  1.35 mm    2.6 mm   TargetPV     eBrem
-    4    912 mum   575 mum -2.44 m    5.12 MeV  1.48 MeV  1.32 mm   3.93 mm   TargetPV     eIoni
-    5    294 mum  1.15 mm  -2.44 m       4 MeV  1.13 MeV  1.11 mm   5.03 mm   TargetPV     eIoni
-    6  -63.7 mum  1.49 mm  -2.44 m    3.14 MeV   562 keV   563 mum   5.6 mm   TargetPV     eBrem
-    7    340 mum  1.15 mm  -2.44 m    2.33 MeV   809 keV   800 mum   6.4 mm   TargetPV     eIoni
-    8   1.66 mum  1.38 mm  -2.44 m     1.6 MeV   728 keV   667 mum  7.06 mm   TargetPV     eIoni
-    9  -38.8 mum  1.58 mm  -2.44 m    1.13 MeV   469 keV   538 mum   7.6 mm   TargetPV     eIoni
-   10   -176 mum  1.58 mm  -2.44 m     499 keV   630 keV   447 mum  8.05 mm   TargetPV     eIoni
-   11   -206 mum  1.59 mm  -2.44 m     207 keV   292 keV   272 mum  8.32 mm   TargetPV     eIoni
-   12   -205 mum  1.59 mm  -2.44 m       0 eV    207 keV  82.8 mum   8.4 mm   TargetPV     eIoni
-   13   -205 mum  1.59 mm  -2.44 m       0 eV      0 eV      0 fm    8.4 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 64,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -205 mum  1.59 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -683 mum   3.9 mm  -2.45 m     440 keV  71.5 keV  2.69 mm   2.69 mm   TargetPV     compt
-    2   -652 mum  3.98 mm  -2.45 m     167 keV   273 keV    89 mum  2.78 mm   TargetPV     compt
-    3   -650 mum  3.83 mm  -2.45 m       0 eV    167 keV   174 mum  2.96 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 63,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -205 mum  1.59 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -188 mum  1.52 mm  -2.44 m     257 keV   254 keV  92.1 mum  92.1 mum  TargetPV     compt
-    2  -2.89 mm   2.24 mm  -2.44 m       0 eV    257 keV  3.68 mm   3.77 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 62,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -63.7 mum  1.49 mm  -2.44 m     299 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    2.5 mm   1.19 mm  -2.44 m     192 keV   107 keV  4.63 mm   4.63 mm   TargetPV     compt
-    2    768 mum   441 mum -2.44 m       0 eV    192 keV  2.25 mm   6.88 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 61,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    125 mum   222 mum -2.44 m     297 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    807 mum -92.7 mum -2.44 m       0 eV    297 keV   1.8 mm    1.8 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 60,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -766 mum  -171 mum -2.44 m    2.39 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   8.46 mm   -1.9 mm  -2.43 m    2.09 MeV   306 keV  1.88 cm   1.88 cm   TargetPV     compt
-    2   8.99 mm  -1.72 mm  -2.43 m    2.06 MeV  26.5 keV  1.41 mm   2.02 cm   TargetPV     compt
-    3   2.22 cm    3.2 mm   -2.4 m    2.06 MeV     0 eV   2.98 cm   5.01 cm    TrackerTransportation
-    4    2.4 m    89.2 cm   2.35 m    2.06 MeV     0 eV   5.38 m    5.43 m     WorldPVTransportation
-    5   2.68 m    99.8 cm   2.91 m    2.06 MeV     0 eV     64 cm   6.07 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 59,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -371 mum  -110 mum -2.44 m    6.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -450 mum  -274 nm  -2.44 m    3.53 MeV  2.65 MeV  2.05 mm   2.05 mm   TargetPV     compt
-    2   -2.7 mm   1.77 mm  -2.44 m    1.43 MeV     0 eV   7.08 mm   9.13 mm   TargetPV     compt
-    3  -8.17 mm   -2.3 mm  -2.43 m     423 keV  1.01 MeV  1.11 cm   2.03 cm   TargetPV     compt
-    4  -6.55 mm   1.79 mm  -2.42 m       0 eV    423 keV  5.97 mm   2.62 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 59
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.7 mm   1.77 mm  -2.44 m     2.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.86 mm   2.07 mm  -2.44 m    1.47 MeV   633 keV   618 mum   618 mum  TargetPV     eIoni
-    2  -2.78 mm   2.28 mm  -2.44 m     911 keV   559 keV   507 mum  1.12 mm   TargetPV     eIoni
-    3  -2.66 mm   2.24 mm  -2.44 m     535 keV   377 keV   393 mum  1.52 mm   TargetPV     eIoni
-    4  -2.63 mm   2.28 mm  -2.44 m     190 keV   344 keV   284 mum   1.8 mm   TargetPV     eIoni
-    5  -2.63 mm   2.29 mm  -2.44 m       0 eV    190 keV  74.6 mum  1.88 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 57,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -375 mum  -103 mum -2.45 m      51 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -722 mum -47.6 mum -2.44 m    40.5 MeV   3.3 MeV  2.07 mm   2.07 mm   TargetPV     eBrem
-    2   -611 mum  -391 mum -2.44 m    28.5 MeV   1.1 MeV   934 mum     3 mm   TargetPV     eBrem
-    3   -614 mum  -427 mum -2.44 m    10.6 MeV  96.8 keV  83.8 mum  3.08 mm   TargetPV     eBrem
-    4   -610 mum  -631 mum -2.44 m    6.62 MeV   404 keV   331 mum  3.41 mm   TargetPV     eBrem
-    5  -82.2 mum -1.24 mm  -2.44 m    3.93 MeV   2.7 MeV  1.29 mm   4.71 mm   TargetPV     eIoni
-    6   -672 mum -1.33 mm  -2.44 m    2.89 MeV  1.04 MeV   905 mum  5.61 mm   TargetPV     eIoni
-    7   -399 mum -1.62 mm  -2.44 m    2.03 MeV   858 keV   746 mum  6.36 mm   TargetPV     eIoni
-    8   -268 mum -1.38 mm  -2.44 m    1.21 MeV   492 keV   512 mum  6.87 mm   TargetPV     eBrem
-    9   -353 mum  -1.3 mm  -2.44 m     546 keV   668 keV   458 mum  7.33 mm   TargetPV     eIoni
-   10   -375 mum -1.32 mm  -2.44 m       0 eV    546 keV   288 mum  7.61 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 57
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -268 mum -1.38 mm  -2.44 m     327 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.12 mm    272 mum -2.44 m     152 keV   175 keV  1.86 mm   1.86 mm   TargetPV     compt
-    2  -1.15 mm   55.4 mum -2.44 m       0 eV    152 keV   222 mum  2.08 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 69,   Parent ID = 57
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -610 mum  -631 mum -2.44 m    3.56 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.33 mm   -1.4 mm  -2.43 m    3.33 MeV   234 keV   9.4 mm    9.4 mm   TargetPV     compt
-    2   3.29 mm  -2.72 mm  -2.43 m       0 eV   2.31 MeV  6.82 mm   1.62 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 71,   Parent ID = 69
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.29 mm  -2.72 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.29 mm  -2.72 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 73,   Parent ID = 71
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.29 mm  -2.72 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.72 mm  -4.84 mm  -2.43 m     375 keV   136 keV  6.23 mm   6.23 mm   TargetPV     compt
-    2   4.72 mm  -7.97 mm  -2.43 m     314 keV    61 keV  4.16 mm   1.04 cm   TargetPV     compt
-    3   4.71 mm   -8.5 mm  -2.44 m       0 eV    314 keV  1.21 mm   1.16 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 72,   Parent ID = 71
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.29 mm  -2.72 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.31 mm  -2.65 mm  -2.43 m       0 eV    511 keV   203 mum   203 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 57
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -614 mum  -427 mum -2.44 m    17.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -861 mum -3.61 mm  -2.44 m       0 eV      0 eV   7.43 mm   7.43 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 75,   Parent ID = 68
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -861 mum -3.61 mm  -2.44 m    14.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.37 mm  -5.13 mm  -2.43 m    10.5 MeV  2.96 MeV  2.22 mm   2.22 mm   TargetPV     eBrem
-    2  -1.59 mm   -5.4 mm  -2.43 m    2.83 MeV   1.3 MeV   949 mum  3.17 mm   TargetPV     eBrem
-    3  -2.08 mm  -5.14 mm  -2.43 m    2.07 MeV   760 keV   751 mum  3.92 mm   TargetPV     eIoni
-    4  -2.03 mm  -4.76 mm  -2.43 m    1.43 MeV   641 keV   623 mum  4.54 mm   TargetPV     eIoni
-    5  -1.87 mm  -4.82 mm  -2.43 m     701 keV   729 keV   507 mum  5.05 mm   TargetPV     eIoni
-    6  -1.79 mm  -4.84 mm  -2.43 m     132 keV   569 keV   344 mum  5.39 mm   TargetPV     eIoni
-    7   -1.8 mm  -4.84 mm  -2.43 m       0 eV    132 keV  40.1 mum  5.43 mm   TargetPV     eIoni
-    8   -1.8 mm  -4.84 mm  -2.43 m       0 eV      0 eV      0 fm   5.43 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 79,   Parent ID = 75
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -1.8 mm  -4.84 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.78 mm   -4.2 mm  -2.43 m     423 keV  87.6 keV  1.61 mm   1.61 mm   TargetPV     compt
-    2  -6.27 mm  -3.64 mm  -2.43 m     415 keV  8.08 keV  3.62 mm   5.23 mm   TargetPV     compt
-    3  -8.93 mm   -3.5 mm  -2.43 m       0 eV    415 keV  2.66 mm   7.89 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 78,   Parent ID = 75
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -1.8 mm  -4.84 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    6.3 mm  -1.01 cm  -2.42 m       0 eV    511 keV  1.33 cm   1.33 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 77,   Parent ID = 75
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 mm   -5.4 mm  -2.43 m     6.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -4.4 mm  -3.55 mm  -2.43 m     558 keV  5.84 MeV  3.94 mm   3.94 mm   TargetPV     compt
-    2  -6.02 mm   -4.4 mm  -2.43 m     221 keV   337 keV  2.01 mm   5.94 mm   TargetPV     compt
-    3  -5.53 mm  -4.86 mm  -2.43 m       0 eV    221 keV   695 mum  6.64 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 76,   Parent ID = 75
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.37 mm  -5.13 mm  -2.43 m    1.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -690 mum -7.17 mm  -2.43 m     862 keV   321 keV  9.03 mm   9.03 mm   TargetPV     compt
-    2  -4.78 mm  -5.99 mm  -2.42 m     750 keV   112 keV  1.08 cm   1.99 cm   TargetPV     compt
-    3  -1.08 cm   -9.1 mm  -2.41 m       0 eV    750 keV  1.15 cm   3.13 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 74,   Parent ID = 68
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -861 mum -3.61 mm  -2.44 m    2.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -808 mum  -3.6 mm  -2.44 m     876 keV   191 keV   194 mum   194 mum  TargetPV     eBrem
-    2   -805 mum -3.72 mm  -2.44 m     517 keV   359 keV   385 mum   579 mum  TargetPV     eIoni
-    3   -827 mum -3.71 mm  -2.44 m       0 eV    517 keV   276 mum   856 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 80,   Parent ID = 74
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -808 mum  -3.6 mm  -2.44 m    1.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.72 mm  -1.41 cm  -2.44 m     280 keV   798 keV  1.23 cm   1.23 cm   TargetPV     compt
-    2   5.33 mm  -1.29 cm  -2.44 m       0 eV    280 keV  1.51 mm   1.38 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 57
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -611 mum  -391 mum -2.44 m    10.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -2.3 mm  -1.09 cm  -2.42 m       0 eV   9.86 MeV  2.58 cm   2.58 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 81,   Parent ID = 67
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.3 mm  -1.09 cm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -2.3 mm  -1.09 cm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 83,   Parent ID = 81
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.3 mm  -1.09 cm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.53 mm  -9.22 mm  -2.42 m     300 keV   211 keV  2.98 mm   2.98 mm   TargetPV     compt
-    2  -1.12 mm  -9.95 mm  -2.42 m       0 eV    300 keV  1.18 mm   4.17 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 82,   Parent ID = 81
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.3 mm  -1.09 cm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.81 mm   -1.2 cm  -2.42 m     344 keV   167 keV  1.96 mm   1.96 mm   TargetPV     compt
-    2  -4.49 mm  -1.05 cm  -2.42 m       0 eV    344 keV  3.92 mm   5.88 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 66,   Parent ID = 57
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -722 mum -47.6 mum -2.44 m    7.19 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -306 mum  -912 mum -2.44 m    1.19 MeV     0 eV    3.5 mm    3.5 mm   TargetPV     compt
-    2  -4.96 mm  -2.19 mm  -2.43 m     842 keV   344 keV  6.77 mm   1.03 cm   TargetPV     compt
-    3  -1.97 cm   7.55 mm  -2.42 m     711 keV   131 keV  2.44 cm   3.47 cm   TargetPV     compt
-    4  -2.01 cm   8.83 mm  -2.42 m       0 eV    711 keV  1.88 mm   3.66 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 84,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -306 mum  -912 mum -2.44 m       6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -499 mum -1.06 mm  -2.44 m    3.98 MeV  1.47 MeV   678 mum   678 mum  TargetPV     eBrem
-    2   -156 mum -1.62 mm  -2.44 m    3.04 MeV   943 keV   913 mum  1.59 mm   TargetPV     eIoni
-    3  -96.4 mum -1.74 mm  -2.44 m    2.44 MeV   222 keV   211 mum   1.8 mm   TargetPV     eBrem
-    4   -249 mum -1.94 mm  -2.44 m    1.42 MeV  1.02 MeV   674 mum  2.48 mm   TargetPV     eIoni
-    5   -305 mum -2.11 mm  -2.44 m     852 keV   571 keV   498 mum  2.97 mm   TargetPV     eIoni
-    6   -247 mum -2.17 mm  -2.44 m     348 keV   504 keV   379 mum  3.35 mm   TargetPV     eIoni
-    7   -236 mum -2.17 mm  -2.44 m       0 eV    348 keV   178 mum  3.53 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 86,   Parent ID = 84
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -96.4 mum -1.74 mm  -2.44 m     373 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    378 mum -2.55 mm  -2.44 m       0 eV    373 keV  1.51 mm   1.51 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 85,   Parent ID = 84
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -499 mum -1.06 mm  -2.44 m     551 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -436 mum -2.36 mm  -2.44 m       0 eV    551 keV  1.52 mm   1.52 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -31.4 mum  1.22 mum -2.86 m    16.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -275 mum   1.3 mm  -2.86 m    13.8 keV   2.5 keV  1.41 mm   1.41 mm    WorldPV     eIoni
-    2    355 mum   1.4 mm  -2.86 m    11.8 keV  2.06 keV  1.13 mm   2.53 mm    WorldPV     eIoni
-    3    834 mum     2 mm  -2.86 m    10.4 keV  1.35 keV   925 mum  3.46 mm    WorldPV     eIoni
-    4    621 mum  1.71 mm  -2.86 m    8.72 keV  1.73 keV   806 mum  4.27 mm    WorldPV     eIoni
-    5    454 mum  1.37 mm  -2.86 m    7.47 keV  1.24 keV   668 mum  4.93 mm    WorldPV     eIoni
-    6    460 mum   954 mum -2.86 m    1.27 keV   6.2 keV   578 mum  5.51 mm    WorldPV     eIoni
-    7    438 mum   957 mum -2.86 m       0 eV   1.27 keV  84.4 mum  5.59 mm    WorldPV     eIoni
->>> Event 0
-    0 trajectories stored in this event.
-### Run 1 start.
-
-*********************************************************************************************************
-* G4Track Information:   Particle = mu+,   Track ID = 1,   Parent ID = 0
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0      0 fm      0 fm  -2.91 m       1 TeV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -3.88 Ang -8.52 Ang  -2.9 m   1e+03 GeV  3.03 keV  1.28 cm   1.28 cm    WorldPV    MuIoni
-    2  -27.8 nm   39.9 nm  -2.45 m   1e+03 GeV   105 keV  44.7 cm     46 cm   TargetPVTransportation
-    3  -94.3 nm   -850 nm  -2.42 m   1e+03 GeV  56.6 MeV  3.14 cm   49.1 cm   TargetPV    MuIoni
-    4    111 nm   -877 nm  -2.41 m     998 GeV  5.55 MeV  4.08 mm   49.5 cm   TargetPVMuPairProd
-    5    202 nm   -895 nm  -2.41 m     998 GeV  2.43 MeV  1.89 mm   49.7 cm   TargetPV    MuIoni
-    6    787 nm  -1.05 mum  -2.4 m     998 GeV  17.5 MeV  1.26 cm     51 cm    TrackerTransportation
-    7     60 mum -8.13 mum  -1.6 m     998 GeV   193 keV    80 cm   1.31 m     ChamberTransportation
-    8   74.9 mum -9.75 mum  -1.4 m     998 GeV   154 keV    20 cm   1.51 m     TrackerTransportation
-    9    118 mum -15.1 mum   -80 cm    998 GeV   138 keV    60 cm   2.11 m     ChamberTransportation
-   10    132 mum -16.8 mum   -60 cm    998 GeV   201 keV    20 cm   2.31 m     TrackerTransportation
-   11    176 mum -21.8 mum 0.114 fm    998 GeV   145 keV    60 cm   2.91 m     ChamberTransportation
-   12    190 mum -23.6 mum    20 cm    998 GeV   201 keV    20 cm   3.11 m     TrackerTransportation
-   13    233 mum -29.2 mum    80 cm    998 GeV   145 keV    60 cm   3.71 m     ChamberTransportation
-   14    247 mum -31.1 mum     1 m     998 GeV   159 keV    20 cm   3.91 m     TrackerTransportation
-   15    289 mum -37.4 mum   1.6 m     998 GeV   139 keV    60 cm   4.51 m     ChamberTransportation
-   16    303 mum -39.5 mum   1.8 m     998 GeV   144 keV    20 cm   4.71 m     TrackerTransportation
-   17    326 mum -42.8 mum  2.12 m     998 GeV  88.1 keV    32 cm   5.03 m     Tracker    MuIoni
-   18    345 mum -45.6 mum   2.4 m     998 GeV  58.2 keV    28 cm   5.31 m     WorldPVTransportation
-   19    381 mum -50.7 mum  2.91 m     998 GeV   133 keV    51 cm   5.82 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 7,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    326 mum -42.8 mum  2.12 m    16.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.25 mm  -1.16 mm   2.12 m    4.55 keV  11.9 keV  1.42 mm   1.42 mm    Tracker     eIoni
-    2    979 mum -1.39 mm   2.12 m    2.99 keV  1.57 keV   389 mum  1.81 mm    Tracker     eIoni
-    3    901 mum -1.55 mm   2.12 m       0 eV   2.99 keV   276 mum  2.09 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 6,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    202 nm   -895 nm  -2.41 m    15.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    811 mum  -249 mum -2.41 m    12.3 MeV  3.52 MeV  2.51 mm   2.51 mm   TargetPV     eIoni
-    2    750 mum  -209 mum -2.41 m    11.2 MeV    99 keV  77.5 mum  2.59 mm   TargetPV     eBrem
-    3    629 mum  -117 mum -2.41 m      10 MeV   246 keV   216 mum   2.8 mm   TargetPV     eBrem
-    4   -622 mum   514 mum -2.41 m    1.39 MeV  8.11 MeV  1.69 mm   4.49 mm   TargetPV     eBrem
-    5   -640 mum   541 mum -2.41 m    1.01 MeV   383 keV   492 mum  4.98 mm   TargetPV     eIoni
-    6   -772 mum   610 mum -2.41 m     622 keV   384 keV   415 mum   5.4 mm   TargetPV     eIoni
-    7   -727 mum   670 mum -2.41 m     279 keV   344 keV   316 mum  5.71 mm   TargetPV     eIoni
-    8   -735 mum   676 mum -2.41 m       0 eV    279 keV   131 mum  5.84 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -622 mum   514 mum -2.41 m     548 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.95 mm  -1.01 mm  -2.41 m       0 eV    548 keV  3.57 mm   3.57 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 9,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    629 mum  -117 mum -2.41 m     880 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.68 mm    5.6 mm  -2.42 m     388 keV     0 eV   8.97 mm   8.97 mm   TargetPV     compt
-    2   -5.2 mm   6.32 mm  -2.41 m       0 eV    388 keV  1.26 mm   1.02 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 11,   Parent ID = 9
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -4.68 mm    5.6 mm  -2.42 m     492 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.72 mm   5.63 mm  -2.42 m     183 keV   309 keV   265 mum   265 mum  TargetPV     eIoni
-    2  -4.71 mm   5.63 mm  -2.42 m       0 eV    183 keV  70.2 mum   336 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 8,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    750 mum  -209 mum -2.41 m    1.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.58 cm   9.42 mm  -2.43 m     566 keV   474 keV  2.46 cm   2.46 cm   TargetPV     compt
-    2  -1.54 cm   2.13 cm  -2.43 m       0 eV    566 keV  1.29 cm   3.75 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 5,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    111 nm   -877 nm  -2.41 m     272 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   5.08 mum  4.59 mum -2.41 m     271 MeV   709 keV   556 mum   556 mum  TargetPV     eBrem
-    2  -6.06 mum  2.52 mum -2.41 m     269 MeV  1.34 MeV   670 mum  1.23 mm   TargetPV     eBrem
-    3   4.02 mum  1.98 mum -2.41 m     267 MeV   642 keV   438 mum  1.66 mm   TargetPV     eBrem
-    4   29.5 mum  7.96 mum -2.41 m     252 MeV  1.57 MeV   853 mum  2.52 mm   TargetPV     eBrem
-    5   32.7 mum  21.1 mum -2.41 m     250 MeV   569 keV   525 mum  3.04 mm   TargetPV     eBrem
-    6   33.9 mum  24.4 mum -2.41 m    50.3 MeV   190 keV   167 mum  3.21 mm   TargetPV     eBrem
-    7   29.6 mum  29.9 mum -2.41 m    49.4 MeV   230 keV   202 mum  3.41 mm   TargetPV     eBrem
-    8   30.2 mum  29.9 mum -2.41 m    27.7 MeV  13.7 keV  18.7 mum  3.43 mm   TargetPV     eBrem
-    9    113 mum  -143 mum -2.41 m    20.8 MeV  1.15 MeV  1.07 mm    4.5 mm   TargetPV     eBrem
-   10    308 mum  -165 mum -2.41 m    17.3 MeV  1.23 MeV  1.01 mm   5.51 mm   TargetPV     eBrem
-   11   -167 mum  1.72 mm  -2.41 m    12.9 MeV  2.58 MeV  2.23 mm   7.73 mm   TargetPV     eBrem
-   12   -182 mum  1.74 mm  -2.41 m    9.03 MeV  39.9 keV  30.6 mum  7.76 mm   TargetPV     eBrem
-   13  -1.37 mm    2.7 mm  -2.41 m    6.94 MeV  2.08 MeV  1.66 mm   9.42 mm   TargetPV     eIoni
-   14  -1.49 mm    3.2 mm  -2.41 m    5.59 MeV  1.36 MeV  1.37 mm   1.08 cm   TargetPV     eIoni
-   15  -1.11 mm   3.05 mm  -2.41 m    4.53 MeV   627 keV   603 mum  1.14 cm   TargetPV     eBrem
-   16   -609 mum  2.83 mm  -2.41 m    2.78 MeV   897 keV   674 mum  1.21 cm   TargetPV     eBrem
-   17   -585 mum  3.22 mm  -2.41 m    1.79 MeV   993 keV   743 mum  1.28 cm   TargetPV     eIoni
-   18   -333 mum   3.1 mm  -2.41 m     1.2 MeV   593 keV   573 mum  1.34 cm   TargetPV     eIoni
-   19   -530 mum  3.16 mm  -2.41 m     777 keV   420 keV   461 mum  1.38 cm   TargetPV     eIoni
-   20   -459 mum  3.23 mm  -2.41 m     197 keV   580 keV   365 mum  1.42 cm   TargetPV     eIoni
-   21   -469 mum  3.23 mm  -2.41 m       0 eV    197 keV  76.4 mum  1.43 cm   TargetPV     eIoni
-   22   -469 mum  3.23 mm  -2.41 m       0 eV      0 eV      0 fm   1.43 cm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -469 mum  3.23 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.13 mm   2.66 mm  -2.41 m     185 keV   326 keV  3.65 mm   3.65 mm   TargetPV     compt
-    2   2.82 mm   2.55 mm  -2.41 m       0 eV    185 keV   378 mum  4.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 26,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -469 mum  3.23 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -8.24 mm   4.46 mm  -2.41 m     441 keV  70.2 keV  7.86 mm   7.86 mm   TargetPV     compt
-    2  -1.29 cm   5.51 mm  -2.41 m     284 keV   157 keV  5.67 mm   1.35 cm   TargetPV     compt
-    3  -1.29 cm    5.6 mm  -2.41 m       0 eV    284 keV   131 mum  1.37 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -609 mum  2.83 mm  -2.41 m     850 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.01 cm   7.08 mm   -2.4 m     585 keV   264 keV  1.33 cm   1.33 cm   TargetPV     compt
-    2  -1.03 cm   7.02 mm   -2.4 m       0 eV    585 keV   208 mum  1.35 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 24,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.11 mm   3.05 mm  -2.41 m     430 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   7.74 mm   -161 mum -2.41 m       0 eV    430 keV  9.56 mm   9.56 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 23,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -182 mum  1.74 mm  -2.41 m    3.81 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -502 mum  2.16 mm  -2.41 m     459 keV     0 eV    653 mum   653 mum  TargetPV     compt
-    2   4.48 mm   5.09 mm  -2.41 m       0 eV    459 keV   5.9 mm   6.55 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 28,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -502 mum  2.16 mm  -2.41 m    3.35 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.06 mm   2.23 mm  -2.41 m    2.53 MeV   816 keV   817 mum   817 mum  TargetPV     eIoni
-    2  -1.11 mm   1.85 mm  -2.41 m    1.56 MeV   969 keV   689 mum  1.51 mm   TargetPV     eIoni
-    3   -951 mum  1.78 mm  -2.41 m    1.04 MeV   529 keV   524 mum  2.03 mm   TargetPV     eIoni
-    4   -829 mum  1.71 mm  -2.41 m     588 keV   448 keV   421 mum  2.45 mm   TargetPV     eIoni
-    5   -865 mum   1.7 mm  -2.41 m     132 keV   456 keV   304 mum  2.75 mm   TargetPV     eIoni
-    6   -862 mum   1.7 mm  -2.41 m       0 eV    132 keV  42.5 mum   2.8 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 22,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -167 mum  1.72 mm  -2.41 m    1.83 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -6.28 mm   9.44 mm   -2.4 m    1.83 MeV     0 eV   1.28 cm   1.28 cm    TrackerTransportation
-    2   -1.9 m     2.4 m    12.5 cm   1.83 MeV     0 eV   3.96 m    3.97 m     WorldPVTransportation
-    3   -2.3 m    2.91 m    66.3 cm   1.83 MeV     0 eV   84.5 cm   4.82 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 21,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    308 mum  -165 mum -2.41 m    2.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.38 mm   8.05 mm   -2.4 m    2.28 MeV     0 eV   1.28 cm   1.28 cm    TrackerTransportation
-    2  -1.08 m     2.4 m    24.5 cm   2.28 MeV     0 eV   3.72 m    3.74 m     WorldPVTransportation
-    3  -1.31 m    2.91 m    80.9 cm   2.28 MeV     0 eV   79.4 cm   4.53 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 20,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    113 mum  -143 mum -2.41 m    5.76 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.16 mm   -953 mum -2.41 m     587 keV  5.17 MeV  3.94 mm   3.94 mm   TargetPV     compt
-    2   87.3 mum -2.39 mm  -2.41 m     408 keV   179 keV  1.84 mm   5.78 mm   TargetPV     compt
-    3    446 mum -5.59 mm   -2.4 m     311 keV  97.2 keV   5.2 mm    1.1 cm   TargetPV     compt
-    4    777 mum -5.11 mm   -2.4 m     311 keV     0 eV   1.95 mm   1.29 cm    TrackerTransportation
-    5   14.3 cm   20.2 cm   -1.6 m     311 keV     0 eV   83.8 cm   85.1 cm    ChamberTransportation
-    6     17 cm     24 cm  -1.45 m     311 keV     0 eV   15.6 cm   1.01 m     TrackerTransportation
-    7   28.6 cm   40.8 cm    -80 cm    311 keV     0 eV   68.3 cm   1.69 m     ChamberTransportation
-    8   32.1 cm     46 cm    -60 cm    311 keV     0 eV     21 cm    1.9 m     TrackerTransportation
-    9   42.8 cm   61.5 cm      0 fm    311 keV     0 eV   62.9 cm   2.53 m     ChamberTransportation
-   10   46.4 cm   66.7 cm     20 cm    311 keV     0 eV     21 cm   2.74 m     TrackerTransportation
-   11     57 cm   82.2 cm     80 cm    311 keV     0 eV   62.9 cm   3.37 m     ChamberTransportation
-   12   60.6 cm   87.3 cm      1 m     311 keV     0 eV     21 cm   3.58 m     TrackerTransportation
-   13   71.3 cm   1.03 m     1.6 m     311 keV     0 eV   62.9 cm   4.21 m     ChamberTransportation
-   14   74.8 cm   1.08 m     1.8 m     311 keV     0 eV     21 cm   4.41 m     TrackerTransportation
-   15   85.5 cm   1.24 m     2.4 m     311 keV     0 eV   62.9 cm   5.04 m     WorldPVTransportation
-   16   94.6 cm   1.37 m    2.91 m     311 keV     0 eV   53.5 cm   5.58 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 19,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   30.2 mum  29.9 mum -2.41 m    21.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    433 mum  -413 nm   -2.4 m       0 eV      0 eV    8.7 mm    8.7 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 30,   Parent ID = 19
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    433 mum  -413 nm   -2.4 m      14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   77.5 mum  -440 mum  -2.4 m    10.5 MeV  3.48 MeV  2.33 mm   2.33 mm   TargetPV     eIoni
-    2    673 mum  -407 mum  -2.4 m    9.62 MeV   892 keV   821 mum  3.15 mm    TrackerTransportation
-    3   20.8 cm  -16.9 cm  -2.13 m    9.53 MeV  72.9 keV  38.1 cm   38.5 cm    Tracker     eIoni
-    4   52.5 cm  -42.2 cm  -1.63 m     9.4 MeV   124 keV    64 cm   1.02 m     Tracker     eIoni
-    5   92.4 cm    -69 cm  -1.06 m    9.25 MeV   134 keV  74.7 cm   1.77 m     Tracker     eIoni
-    6   1.07 m   -76.1 cm  -86.5 cm   9.19 MeV  43.2 keV  25.6 cm   2.03 m     Tracker     eIoni
-    7   1.12 m   -78.4 cm  -79.9 cm   8.32 MeV  23.5 keV  8.44 cm   2.11 m     Tracker     eIoni
-    8   1.27 m   -88.7 cm  -56.3 cm   8.25 MeV  55.4 keV    30 cm   2.41 m     Tracker     eIoni
-    9   1.33 m   -93.4 cm    -46 cm   8.21 MeV  18.7 keV  12.8 cm   2.54 m     Tracker     eIoni
-   10    1.4 m   -99.4 cm    -35 cm   6.39 MeV  27.9 keV  14.1 cm   2.68 m     Tracker     eIoni
-   11   1.41 m   -1.02 m   -30.4 cm   6.37 MeV  8.08 keV  5.29 cm   2.73 m     Tracker     eIoni
-   12   1.61 m   -1.38 m    44.2 cm   6.18 MeV   150 keV  85.6 cm   3.59 m     Tracker     eIoni
-   13   1.62 m   -1.39 m    47.6 cm   6.17 MeV  6.52 keV  4.02 cm   3.63 m     Tracker     eIoni
-   14    2.2 m   -2.08 m    1.93 m    5.86 MeV   299 keV  1.72 m    5.35 m     Tracker     eIoni
-   15   2.26 m   -2.18 m    2.08 m    5.76 MeV  41.9 keV  19.3 cm   5.54 m     Tracker     eIoni
-   16   2.37 m   -2.35 m     2.4 m     5.7 MeV  60.2 keV  37.9 cm   5.92 m     WorldPVTransportation
-   17   2.42 m   -2.46 m    2.57 m    5.63 MeV  43.7 keV  21.1 cm   6.13 m     WorldPV     eIoni
-   18   2.51 m   -2.59 m     2.8 m    5.56 MeV  54.1 keV  27.8 cm   6.41 m     WorldPV     eIoni
-   19   2.54 m   -2.63 m    2.89 m    5.46 MeV  23.6 keV  10.4 cm   6.51 m     WorldPV     eIoni
-   20   2.55 m   -2.64 m    2.91 m    5.46 MeV  3.95 keV  2.45 cm   6.54 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 46,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.54 m   -2.63 m    2.89 m    78.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.55 m   -2.65 m    2.88 m    63.6 keV  14.6 keV  1.83 cm   1.83 cm    WorldPV     eIoni
-    2   2.55 m   -2.66 m    2.87 m    59.1 keV  4.51 keV  1.28 cm   3.11 cm    WorldPV     eIoni
-    3   2.55 m   -2.66 m    2.86 m    48.5 keV  10.5 keV  1.13 cm   4.23 cm    WorldPV     eIoni
-    4   2.56 m   -2.66 m    2.86 m    36.2 keV  12.3 keV  8.01 mm   5.03 cm    WorldPV     eIoni
-    5   2.56 m   -2.67 m    2.86 m    31.7 keV  4.49 keV  4.83 mm   5.52 cm    WorldPV     eIoni
-    6   2.56 m   -2.67 m    2.86 m    28.9 keV  2.78 keV  3.89 mm   5.91 cm    WorldPV     eIoni
-    7   2.56 m   -2.67 m    2.86 m    24.7 keV  4.21 keV  3.34 mm   6.24 cm    WorldPV     eIoni
-    8   2.56 m   -2.67 m    2.86 m    20.7 keV  3.97 keV  2.59 mm    6.5 cm    WorldPV     eIoni
-    9   2.56 m   -2.67 m    2.86 m      18 keV  2.77 keV  1.97 mm    6.7 cm    WorldPV     eIoni
-   10   2.56 m   -2.67 m    2.86 m    15.1 keV  2.88 keV   1.6 mm   6.86 cm    WorldPV     eIoni
-   11   2.56 m   -2.67 m    2.86 m    13.7 keV  1.41 keV  1.26 mm   6.98 cm    WorldPV     eIoni
-   12   2.56 m   -2.67 m    2.86 m    11.6 keV  2.07 keV  1.11 mm   7.09 cm    WorldPV     eIoni
-   13   2.56 m   -2.67 m    2.86 m    10.4 keV  1.17 keV   908 mum  7.18 cm    WorldPV     eIoni
-   14   2.56 m   -2.67 m    2.86 m    8.55 keV  1.88 keV   806 mum  7.27 cm    WorldPV     eIoni
-   15   2.56 m   -2.67 m    2.86 m    6.19 keV  2.36 keV   655 mum  7.33 cm    WorldPV     eIoni
-   16   2.56 m   -2.67 m    2.86 m    5.29 keV   901 eV    492 mum  7.38 cm    WorldPV     eIoni
-   17   2.56 m   -2.67 m    2.86 m    3.57 keV  1.72 keV   435 mum  7.42 cm    WorldPV     eIoni
-   18   2.56 m   -2.67 m    2.86 m     816 eV   2.76 keV   323 mum  7.46 cm    WorldPV     eIoni
-   19   2.56 m   -2.67 m    2.86 m       0 eV    816 eV   47.6 mum  7.46 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 45,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.51 m   -2.59 m     2.8 m      15 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.52 m   -2.59 m     2.8 m      14 keV     1 keV  1.25 mm   1.25 mm    WorldPV     eIoni
-    2   2.52 m   -2.59 m     2.8 m    12.9 keV   1.1 keV  1.14 mm   2.39 mm    WorldPV     eIoni
-    3   2.52 m   -2.59 m     2.8 m    10.1 keV  2.79 keV  1.03 mm   3.42 mm    WorldPV     eIoni
-    4   2.52 m   -2.59 m     2.8 m    8.22 keV  1.88 keV   776 mum   4.2 mm    WorldPV     eIoni
-    5   2.52 m   -2.59 m     2.8 m    7.49 keV   732 eV    630 mum  4.83 mm    WorldPV     eIoni
-    6   2.52 m   -2.59 m     2.8 m    5.62 keV  1.87 keV   579 mum  5.41 mm    WorldPV     eIoni
-    7   2.52 m   -2.59 m     2.8 m    4.81 keV   811 eV    455 mum  5.87 mm    WorldPV     eIoni
-    8   2.52 m   -2.59 m     2.8 m    1.95 keV  2.87 keV   404 mum  6.27 mm    WorldPV     eIoni
-    9   2.52 m   -2.59 m     2.8 m       0 eV   1.95 keV   156 mum  6.43 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 44,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.42 m   -2.46 m    2.57 m    22.9 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.42 m   -2.46 m    2.57 m    20.2 keV  2.75 keV  2.31 mm   2.31 mm    WorldPV     eIoni
-    2   2.42 m   -2.46 m    2.57 m    18.9 keV  1.24 keV   1.9 mm   4.21 mm    WorldPV     eIoni
-    3   2.42 m   -2.46 m    2.57 m    17.3 keV  1.63 keV  1.74 mm   5.95 mm    WorldPV     eIoni
-    4   2.42 m   -2.46 m    2.57 m    8.64 keV  8.68 keV  1.52 mm   7.47 mm    WorldPV     eIoni
-    5   2.42 m   -2.46 m    2.57 m    7.57 keV  1.08 keV   662 mum  8.13 mm    WorldPV     eIoni
-    6   2.42 m   -2.46 m    2.57 m    6.29 keV  1.28 keV   584 mum  8.71 mm    WorldPV     eIoni
-    7   2.42 m   -2.46 m    2.57 m    4.34 keV  1.95 keV   498 mum  9.21 mm    WorldPV     eIoni
-    8   2.42 m   -2.46 m    2.57 m    2.34 keV     2 keV   375 mum  9.59 mm    WorldPV     eIoni
-    9   2.42 m   -2.46 m    2.57 m       0 eV   2.34 keV   207 mum  9.79 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 43,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.26 m   -2.18 m    2.08 m    56.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.26 m   -2.17 m    2.09 m    44.2 keV  12.3 keV  1.04 cm   1.04 cm    Tracker     eIoni
-    2   2.26 m   -2.16 m    2.09 m    39.5 keV  4.73 keV  6.79 mm   1.72 cm    Tracker     eIoni
-    3   2.26 m   -2.16 m    2.09 m    35.7 keV  3.75 keV  5.62 mm   2.29 cm    Tracker     eIoni
-    4   2.26 m   -2.16 m     2.1 m    31.2 keV  4.49 keV  4.73 mm   2.76 cm    Tracker     eIoni
-    5   2.26 m   -2.15 m     2.1 m    27.8 keV  3.38 keV  3.79 mm   3.14 cm    Tracker     eIoni
-    6   2.26 m   -2.15 m     2.1 m    25.1 keV  2.75 keV  3.15 mm   3.45 cm    Tracker     eIoni
-    7   2.26 m   -2.15 m     2.1 m      23 keV  2.11 keV  2.65 mm   3.72 cm    Tracker     eIoni
-    8   2.26 m   -2.15 m     2.1 m    20.2 keV   2.8 keV  2.32 mm   3.95 cm    Tracker     eIoni
-    9   2.26 m   -2.15 m     2.1 m    18.3 keV  1.87 keV   1.9 mm   4.14 cm    Tracker     eIoni
-   10   2.26 m   -2.15 m     2.1 m    15.5 keV  2.84 keV  1.65 mm    4.3 cm    Tracker     eIoni
-   11   2.26 m   -2.14 m     2.1 m    12.1 keV  3.34 keV  1.31 mm   4.43 cm    Tracker     eIoni
-   12   2.26 m   -2.14 m     2.1 m    10.3 keV  1.81 keV   957 mum  4.53 cm    Tracker     eIoni
-   13   2.26 m   -2.14 m     2.1 m    9.19 keV  1.14 keV   797 mum  4.61 cm    Tracker     eIoni
-   14   2.26 m   -2.14 m     2.1 m    7.35 keV  1.84 keV   705 mum  4.68 cm    Tracker     eIoni
-   15   2.26 m   -2.14 m     2.1 m    5.71 keV  1.64 keV   569 mum  4.74 cm    Tracker     eIoni
-   16   2.26 m   -2.14 m     2.1 m    4.77 keV   944 eV    461 mum  4.78 cm    Tracker     eIoni
-   17   2.26 m   -2.14 m     2.1 m    2.96 keV  1.81 keV   401 mum  4.82 cm    Tracker     eIoni
-   18   2.26 m   -2.14 m     2.1 m       0 eV   2.96 keV   273 mum  4.85 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 42,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.2 m   -2.08 m    1.93 m    8.46 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    2.2 m   -2.08 m    1.93 m    5.86 keV   2.6 keV   647 mum   647 mum   Tracker     eIoni
-    2    2.2 m   -2.08 m    1.93 m    3.56 keV   2.3 keV   470 mum  1.12 mm    Tracker     eIoni
-    3    2.2 m   -2.08 m    1.93 m     833 eV   2.73 keV   322 mum  1.44 mm    Tracker     eIoni
-    4    2.2 m   -2.08 m    1.93 m       0 eV    833 eV   48.8 mum  1.49 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 41,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.62 m   -1.39 m    47.6 cm   8.13 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.62 m   -1.39 m    47.6 cm   6.82 keV  1.31 keV   624 mum   624 mum   Tracker     eIoni
-    2   1.63 m   -1.39 m    47.6 cm   3.37 keV  3.45 keV   533 mum  1.16 mm    Tracker     eIoni
-    3   1.63 m   -1.39 m    47.6 cm      0 eV   3.37 keV   307 mum  1.46 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 40,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.61 m   -1.38 m    44.2 cm   43.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.61 m   -1.38 m    44.5 cm   32.9 keV  10.4 keV  6.56 mm   6.56 mm    Tracker     eIoni
-    2    1.6 m   -1.38 m    44.8 cm     30 keV  2.84 keV  4.13 mm   1.07 cm    Tracker     eIoni
-    3    1.6 m   -1.38 m    44.8 cm   25.7 keV  4.36 keV  3.54 mm   1.42 cm    Tracker     eIoni
-    4    1.6 m   -1.39 m    44.8 cm   23.1 keV  2.62 keV  2.75 mm    1.7 cm    Tracker     eIoni
-    5    1.6 m   -1.39 m    44.8 cm   21.6 keV  1.47 keV  2.33 mm   1.93 cm    Tracker     eIoni
-    6    1.6 m   -1.39 m    44.8 cm   18.9 keV  2.68 keV   2.1 mm   2.14 cm    Tracker     eIoni
-    7    1.6 m   -1.39 m    44.8 cm   16.3 keV  2.62 keV  1.73 mm   2.32 cm    Tracker     eIoni
-    8    1.6 m   -1.39 m    44.7 cm   11.4 keV  4.86 keV   1.4 mm   2.46 cm    Tracker     eIoni
-    9    1.6 m   -1.39 m    44.7 cm   9.89 keV  1.54 keV   893 mum  2.55 cm    Tracker     eIoni
-   10    1.6 m   -1.39 m    44.7 cm   7.78 keV  2.11 keV   759 mum  2.62 cm    Tracker     eIoni
-   11    1.6 m   -1.39 m    44.7 cm   6.83 keV   945 eV    599 mum  2.68 cm    Tracker     eIoni
-   12    1.6 m   -1.39 m    44.7 cm   3.78 keV  3.05 keV   533 mum  2.73 cm    Tracker     eIoni
-   13    1.6 m   -1.39 m    44.7 cm      0 eV   3.78 keV   337 mum  2.77 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 39,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.41 m   -1.02 m   -30.4 cm      9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.41 m   -1.02 m   -30.5 cm   4.85 keV  4.14 keV   690 mum   690 mum   Tracker     eIoni
-    2   1.41 m   -1.02 m   -30.4 cm   2.76 keV  2.09 keV   407 mum   1.1 mm    Tracker     eIoni
-    3   1.41 m   -1.02 m   -30.4 cm      0 eV   2.76 keV   254 mum  1.35 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 38,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.4 m   -99.4 cm    -35 cm   1.79 MeV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    1.5 m   -1.02 m   -29.3 cm   1.76 MeV  16.5 keV  11.9 cm   11.9 cm    Tracker     eIoni
-    2   1.77 m   -1.09 m   -15.3 cm   1.71 MeV  45.1 keV  31.4 cm   43.2 cm    Tracker     eIoni
-    3   1.97 m   -1.09 m    4.55 cm   1.64 MeV  52.7 keV  28.7 cm   71.9 cm    Tracker     eIoni
-    4   2.14 m   -1.09 m    26.9 cm   1.47 MeV  49.4 keV    28 cm   99.9 cm    Tracker     eIoni
-    5    2.4 m    -1.2 m      63 cm    1.4 MeV  75.3 keV  47.2 cm   1.47 m     WorldPVTransportation
-    6   2.44 m   -1.23 m    65.5 cm   1.37 MeV  10.3 keV  5.27 cm   1.52 m     WorldPV     eIoni
-    7    2.5 m   -1.27 m    68.7 cm   1.35 MeV  13.6 keV  7.63 cm    1.6 m     WorldPV     eIoni
-    8   2.64 m   -1.36 m    75.3 cm   1.27 MeV  32.7 keV  18.9 cm   1.79 m     WorldPV     eIoni
-    9   2.74 m   -1.44 m    82.5 cm   1.24 MeV  22.2 keV  14.3 cm   1.93 m     WorldPV     eIoni
-   10   2.88 m   -1.52 m    92.8 cm   1.19 MeV  32.7 keV  19.1 cm   2.12 m     WorldPV     eIoni
-   11   2.91 m   -1.52 m    94.3 cm   1.19 MeV  5.27 keV   3.3 cm   2.16 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 55,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.88 m   -1.52 m    92.8 cm   10.5 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.88 m   -1.52 m    92.8 cm   9.27 keV  1.23 keV   811 mum   811 mum   WorldPV     eIoni
-    2   2.88 m   -1.52 m    92.8 cm   7.84 keV  1.43 keV   711 mum  1.52 mm    WorldPV     eIoni
-    3   2.88 m   -1.52 m    92.8 cm   5.97 keV  1.87 keV   603 mum  2.13 mm    WorldPV     eIoni
-    4   2.88 m   -1.52 m    92.8 cm   2.67 keV   3.3 keV   477 mum   2.6 mm    WorldPV     eIoni
-    5   2.88 m   -1.52 m    92.8 cm   1.41 keV  1.26 keV   245 mum  2.85 mm    WorldPV     eIoni
-    6   2.88 m   -1.52 m    92.8 cm      0 eV   1.41 keV  97.4 mum  2.94 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 54,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.74 m   -1.44 m    82.5 cm     11 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.74 m   -1.44 m    82.4 cm   9.21 keV  1.81 keV   857 mum   857 mum   WorldPV     eIoni
-    2   2.74 m   -1.44 m    82.4 cm   8.02 keV  1.19 keV   706 mum  1.56 mm    WorldPV     eIoni
-    3   2.74 m   -1.44 m    82.3 cm   6.24 keV  1.79 keV   616 mum  2.18 mm    WorldPV     eIoni
-    4   2.74 m   -1.44 m    82.3 cm   4.39 keV  1.85 keV   495 mum  2.67 mm    WorldPV     eIoni
-    5   2.74 m   -1.44 m    82.3 cm   3.35 keV  1.04 keV   378 mum  3.05 mm    WorldPV     eIoni
-    6   2.74 m   -1.44 m    82.3 cm      0 eV   3.35 keV   305 mum  3.36 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 53,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.64 m   -1.36 m    75.3 cm   45.4 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.65 m   -1.36 m    74.9 cm     39 keV   6.4 keV  7.12 mm   7.12 mm    WorldPV     eIoni
-    2   2.65 m   -1.36 m    74.9 cm     37 keV  1.98 keV   5.5 mm   1.26 cm    WorldPV     eIoni
-    3   2.66 m   -1.36 m    74.9 cm   33.8 keV   3.2 keV  5.02 mm   1.76 cm    WorldPV     eIoni
-    4   2.66 m   -1.36 m    74.8 cm   30.1 keV  3.65 keV  4.32 mm    2.2 cm    WorldPV     eIoni
-    5   2.66 m   -1.36 m    74.7 cm   26.1 keV  3.99 keV  3.56 mm   2.55 cm    WorldPV     eIoni
-    6   2.67 m   -1.36 m    74.7 cm   24.1 keV  2.07 keV  2.84 mm   2.83 cm    WorldPV     eIoni
-    7   2.67 m   -1.36 m    74.9 cm   20.8 keV  3.31 keV  2.49 mm   3.08 cm    WorldPV     eIoni
-    8   2.67 m   -1.36 m      75 cm   18.9 keV  1.89 keV  1.98 mm   3.28 cm    WorldPV     eIoni
-    9   2.67 m   -1.36 m      75 cm   16.9 keV     2 keV  1.72 mm   3.45 cm    WorldPV     eIoni
-   10   2.67 m   -1.36 m      75 cm     15 keV  1.87 keV  1.47 mm    3.6 cm    WorldPV     eIoni
-   11   2.67 m   -1.36 m    74.9 cm   13.2 keV  1.76 keV  1.25 mm   3.73 cm    WorldPV     eIoni
-   12   2.67 m   -1.36 m    74.9 cm   11.8 keV  1.47 keV  1.07 mm   3.83 cm    WorldPV     eIoni
-   13   2.67 m   -1.36 m    74.9 cm   10.6 keV  1.14 keV   922 mum  3.92 cm    WorldPV     eIoni
-   14   2.67 m   -1.36 m    74.9 cm   9.04 keV  1.58 keV   822 mum  4.01 cm    WorldPV     eIoni
-   15   2.67 m   -1.36 m    74.9 cm   7.55 keV  1.49 keV   693 mum  4.08 cm    WorldPV     eIoni
-   16   2.67 m   -1.36 m      75 cm   6.68 keV   870 eV    583 mum  4.13 cm    WorldPV     eIoni
-   17   2.67 m   -1.36 m      75 cm   5.57 keV   1.1 keV   523 mum  4.19 cm    WorldPV     eIoni
-   18   2.67 m   -1.36 m      75 cm   3.52 keV  2.05 keV   452 mum  4.23 cm    WorldPV     eIoni
-   19   2.67 m   -1.36 m      75 cm      0 eV   3.52 keV   319 mum  4.26 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 52,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.5 m   -1.27 m    68.7 cm   13.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.5 m   -1.27 m    68.7 cm   11.7 keV  1.66 keV  1.08 mm   1.08 mm    WorldPV     eIoni
-    2    2.5 m   -1.27 m    68.6 cm   10.5 keV  1.23 keV   915 mum  1.99 mm    WorldPV     eIoni
-    3    2.5 m   -1.27 m    68.5 cm   8.87 keV  1.58 keV   807 mum   2.8 mm    WorldPV     eIoni
-    4    2.5 m   -1.27 m    68.5 cm   6.32 keV  2.55 keV   680 mum  3.48 mm    WorldPV     eIoni
-    5    2.5 m   -1.27 m    68.5 cm   5.27 keV  1.05 keV   501 mum  3.98 mm    WorldPV     eIoni
-    6    2.5 m   -1.27 m    68.5 cm   2.87 keV   2.4 keV   434 mum  4.42 mm    WorldPV     eIoni
-    7    2.5 m   -1.27 m    68.5 cm   1.57 keV  1.31 keV   266 mum  4.68 mm    WorldPV     eIoni
-    8    2.5 m   -1.27 m    68.5 cm      0 eV   1.57 keV   113 mum  4.79 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 51,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.44 m   -1.23 m    65.5 cm   11.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.44 m   -1.23 m    65.5 cm   7.57 keV  3.77 keV   885 mum   885 mum   WorldPV     eIoni
-    2   2.44 m   -1.23 m    65.4 cm   6.29 keV  1.27 keV   584 mum  1.47 mm    WorldPV     eIoni
-    3   2.44 m   -1.23 m    65.4 cm    4.4 keV   1.9 keV   499 mum  1.97 mm    WorldPV     eIoni
-    4   2.44 m   -1.23 m    65.4 cm   2.82 keV  1.57 keV   379 mum  2.35 mm    WorldPV     eIoni
-    5   2.44 m   -1.23 m    65.4 cm      0 eV   2.82 keV   260 mum  2.61 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 50,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.14 m   -1.09 m    26.9 cm    118 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.17 m   -1.07 m    25.2 cm    105 keV  13.5 keV  3.75 cm   3.75 cm    Tracker     eIoni
-    2   2.17 m   -1.05 m      24 cm     92 keV  12.7 keV  3.04 cm    6.8 cm    Tracker     eIoni
-    3   2.16 m   -1.03 m    23.7 cm   82.1 keV  9.85 keV  2.43 cm   9.22 cm    Tracker     eIoni
-    4   2.14 m   -1.03 m    23.7 cm   71.8 keV  10.3 keV     2 cm   11.2 cm    Tracker     eIoni
-    5   2.13 m   -1.01 m    24.2 cm   61.9 keV  9.88 keV  1.58 cm   12.8 cm    Tracker     eIoni
-    6   2.13 m      -1 m    24.3 cm   53.6 keV   8.3 keV  1.22 cm     14 cm    Tracker     eIoni
-    7   2.12 m   -99.7 cm   23.9 cm   46.9 keV  6.76 keV   9.5 mm     15 cm    Tracker     eIoni
-    8   2.12 m   -99.2 cm   24.1 cm   40.2 keV  6.68 keV  7.55 mm   15.7 cm    Tracker     eIoni
-    9   2.11 m   -99.3 cm   24.5 cm   35.2 keV  4.96 keV   5.8 mm   16.3 cm    Tracker     eIoni
-   10   2.11 m   -99.1 cm   24.9 cm   30.9 keV  4.35 keV  4.63 mm   16.8 cm    Tracker     eIoni
-   11   2.11 m   -98.9 cm   25.1 cm   26.1 keV  4.79 keV  3.71 mm   17.1 cm    Tracker     eIoni
-   12   2.11 m   -98.9 cm   25.2 cm   23.4 keV  2.64 keV  2.83 mm   17.4 cm    Tracker     eIoni
-   13   2.11 m   -98.8 cm   25.1 cm   19.7 keV  3.72 keV  2.39 mm   17.7 cm    Tracker     eIoni
-   14   2.11 m   -98.7 cm   25.1 cm   17.4 keV  2.33 keV  1.84 mm   17.8 cm    Tracker     eIoni
-   15   2.11 m   -98.6 cm   25.1 cm   13.9 keV  3.48 keV  1.53 mm     18 cm    Tracker     eIoni
-   16   2.11 m   -98.7 cm     25 cm   11.7 keV  2.27 keV  1.14 mm   18.1 cm    Tracker     eIoni
-   17   2.11 m   -98.7 cm     25 cm   9.22 keV  2.44 keV   913 mum  18.2 cm    Tracker     eIoni
-   18   2.11 m   -98.7 cm     25 cm    6.7 keV  2.52 keV   707 mum  18.3 cm    Tracker     eIoni
-   19   2.11 m   -98.7 cm   24.9 cm   5.71 keV   994 eV    525 mum  18.3 cm    Tracker     eIoni
-   20   2.11 m   -98.8 cm   24.9 cm   3.97 keV  1.74 keV   460 mum  18.4 cm    Tracker     eIoni
-   21   2.11 m   -98.7 cm   24.9 cm    954 eV   3.02 keV   350 mum  18.4 cm    Tracker     eIoni
-   22   2.11 m   -98.7 cm   24.9 cm      0 eV    954 eV   57.7 mum  18.4 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 49,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.97 m   -1.09 m    4.55 cm   15.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.97 m   -1.09 m    4.53 cm   13.3 keV  2.48 keV  1.34 mm   1.34 mm    Tracker     eIoni
-    2   1.97 m   -1.09 m    4.59 cm   11.2 keV  2.15 keV  1.08 mm   2.42 mm    Tracker     eIoni
-    3   1.97 m   -1.09 m    4.64 cm   9.92 keV  1.27 keV   871 mum  3.29 mm    Tracker     eIoni
-    4   1.97 m   -1.09 m    4.68 cm   8.11 keV   1.8 keV   761 mum  4.05 mm    Tracker     eIoni
-    5   1.97 m   -1.09 m    4.66 cm   6.89 keV  1.23 keV   622 mum  4.67 mm    Tracker     eIoni
-    6   1.97 m   -1.09 m    4.67 cm   5.35 keV  1.54 keV   536 mum  5.21 mm    Tracker     eIoni
-    7   1.97 m   -1.09 m    4.66 cm   2.07 keV  3.28 keV   439 mum  5.65 mm    Tracker     eIoni
-    8   1.97 m   -1.09 m    4.67 cm      0 eV   2.07 keV   172 mum  5.82 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 48,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.77 m   -1.09 m   -15.3 cm   8.61 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.77 m   -1.09 m   -15.4 cm   5.47 keV  3.15 keV   660 mum   660 mum   Tracker     eIoni
-    2   1.77 m   -1.09 m   -15.4 cm   2.95 keV  2.52 keV   446 mum  1.11 mm    Tracker     eIoni
-    3   1.77 m   -1.09 m   -15.4 cm   1.08 keV  1.86 keV   272 mum  1.38 mm    Tracker     eIoni
-    4   1.77 m   -1.09 m   -15.4 cm      0 eV   1.08 keV  67.8 mum  1.45 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 47,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.5 m   -1.02 m   -29.3 cm   11.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    1.5 m   -1.02 m   -29.3 cm    9.6 keV  2.28 keV   932 mum   932 mum   Tracker     eIoni
-    2    1.5 m   -1.02 m   -29.2 cm   8.24 keV  1.36 keV   736 mum  1.67 mm    Tracker     eIoni
-    3    1.5 m   -1.02 m   -29.2 cm   7.34 keV   896 eV    631 mum   2.3 mm    Tracker     eIoni
-    4    1.5 m   -1.02 m   -29.1 cm   5.39 keV  1.96 keV   569 mum  2.87 mm    Tracker     eIoni
-    5    1.5 m   -1.02 m   -29.1 cm   3.79 keV   1.6 keV   441 mum  3.31 mm    Tracker     eIoni
-    6    1.5 m   -1.02 m   -29.1 cm   1.86 keV  1.92 keV   338 mum  3.65 mm    Tracker     eIoni
-    7    1.5 m   -1.02 m   -29.1 cm      0 eV   1.86 keV   146 mum  3.79 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 37,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.33 m   -93.4 cm    -46 cm   26.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.33 m   -93.7 cm  -45.9 cm   23.8 keV  3.01 keV  2.96 mm   2.96 mm    Tracker     eIoni
-    2   1.33 m   -93.9 cm  -46.1 cm     22 keV  1.82 keV  2.45 mm   5.41 mm    Tracker     eIoni
-    3   1.33 m   -93.8 cm  -46.3 cm   17.1 keV  4.84 keV  2.16 mm   7.57 mm    Tracker     eIoni
-    4   1.33 m   -93.7 cm  -46.4 cm   14.9 keV  2.23 keV   1.5 mm   9.07 mm    Tracker     eIoni
-    5   1.33 m   -93.6 cm  -46.5 cm   13.3 keV  1.59 keV  1.24 mm   1.03 cm    Tracker     eIoni
-    6   1.33 m   -93.6 cm  -46.5 cm     12 keV  1.32 keV  1.08 mm   1.14 cm    Tracker     eIoni
-    7   1.33 m   -93.5 cm  -46.6 cm   10.3 keV  1.71 keV   944 mum  1.23 cm    Tracker     eIoni
-    8   1.33 m   -93.4 cm  -46.6 cm   9.08 keV  1.22 keV   794 mum  1.31 cm    Tracker     eIoni
-    9   1.33 m   -93.4 cm  -46.5 cm    6.4 keV  2.68 keV   696 mum  1.38 cm    Tracker     eIoni
-   10   1.33 m   -93.3 cm  -46.5 cm   2.36 keV  4.04 keV   506 mum  1.43 cm    Tracker     eIoni
-   11   1.33 m   -93.3 cm  -46.5 cm      0 eV   2.36 keV   209 mum  1.45 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 36,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.27 m   -88.7 cm  -56.3 cm     16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.27 m   -88.6 cm  -56.2 cm   4.26 keV  11.7 keV  1.37 mm   1.37 mm    Tracker     eIoni
-    2   1.27 m   -88.6 cm  -56.2 cm   3.14 keV  1.11 keV   370 mum  1.74 mm    Tracker     eIoni
-    3   1.27 m   -88.6 cm  -56.2 cm   1.55 keV   1.6 keV   289 mum  2.03 mm    Tracker     eIoni
-    4   1.27 m   -88.6 cm  -56.2 cm      0 eV   1.55 keV   111 mum  2.14 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 35,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.12 m   -78.4 cm  -79.9 cm    847 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.63 m   -83.6 cm  -57.3 cm    728 keV  92.8 keV  57.5 cm   57.5 cm    Tracker     eIoni
-    2   1.79 m   -88.8 cm  -55.8 cm    615 keV  32.1 keV  17.2 cm   74.8 cm    Tracker     eIoni
-    3   2.11 m   -89.9 cm  -65.7 cm    548 keV  55.1 keV    35 cm    1.1 m     Tracker     eIoni
-    4    2.4 m   -93.9 cm  -81.5 cm    476 keV  71.7 keV  35.6 cm   1.45 m     WorldPVTransportation
-    5    2.4 m   -93.9 cm  -81.6 cm    467 keV   147 eV    537 mum  1.45 m     WorldPV     eIoni
-    6   2.66 m   -1.14 m   -82.2 cm    397 keV  70.5 keV  33.8 cm   1.79 m     WorldPV     eIoni
-    7   2.66 m   -1.14 m   -82.3 cm    382 keV  16.5 eV   1.17 mm   1.79 m     WorldPV     eIoni
-    8   2.75 m   -1.22 m   -1.02 m     324 keV  58.4 keV  25.1 cm   2.04 m     WorldPV     eIoni
-    9    2.8 m   -1.24 m   -1.07 m     300 keV    14 keV  7.46 cm   2.12 m     WorldPV     eIoni
-   10   2.91 m   -1.25 m   -1.18 m     258 keV  41.4 keV  17.3 cm   2.29 m     WorldPV     eIoni
-   11   2.91 m   -1.25 m   -1.18 m     258 keV   152 eV   1.31 mm   2.29 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 61,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.8 m   -1.24 m   -1.07 m    9.88 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.79 m   -1.24 m   -1.07 m     8.9 keV   978 eV    758 mum   758 mum   WorldPV     eIoni
-    2   2.79 m   -1.24 m   -1.07 m    7.91 keV   993 eV    682 mum  1.44 mm    WorldPV     eIoni
-    3   2.79 m   -1.24 m   -1.07 m    6.56 keV  1.35 keV   608 mum  2.05 mm    WorldPV     eIoni
-    4   2.79 m   -1.24 m   -1.07 m    3.89 keV  2.67 keV   516 mum  2.56 mm    WorldPV     eIoni
-    5   2.79 m   -1.24 m   -1.07 m    2.66 keV  1.23 keV   345 mum  2.91 mm    WorldPV     eIoni
-    6   2.79 m   -1.24 m   -1.07 m       0 eV   2.66 keV   244 mum  3.15 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 60,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.66 m   -1.14 m   -82.3 cm     15 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.66 m   -1.14 m   -82.2 cm   11.5 keV  3.47 keV  1.25 mm   1.25 mm    WorldPV     eIoni
-    2   2.66 m   -1.14 m   -82.1 cm   9.68 keV  1.86 keV   903 mum  2.16 mm    WorldPV     eIoni
-    3   2.66 m   -1.14 m   -82.1 cm   7.75 keV  1.93 keV   743 mum   2.9 mm    WorldPV     eIoni
-    4   2.66 m   -1.14 m   -82.1 cm   4.95 keV   2.8 keV   597 mum   3.5 mm    WorldPV     eIoni
-    5   2.66 m   -1.14 m   -82.1 cm      0 eV   4.95 keV   414 mum  3.91 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 59,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.4 m   -93.9 cm  -81.6 cm   8.78 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.4 m   -93.9 cm  -81.5 cm   6.72 keV  2.06 keV   673 mum   673 mum   WorldPV     eIoni
-    2    2.4 m   -93.9 cm  -81.5 cm      0 eV   6.72 keV   526 mum   1.2 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 58,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.11 m   -89.9 cm  -65.7 cm   11.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.11 m   -89.8 cm  -65.7 cm   10.3 keV  1.25 keV   902 mum   902 mum   Tracker     eIoni
-    2   2.11 m   -89.7 cm  -65.7 cm   8.43 keV  1.85 keV   792 mum  1.69 mm    Tracker     eIoni
-    3   2.11 m   -89.7 cm  -65.7 cm   7.59 keV   844 eV    646 mum  2.34 mm    Tracker     eIoni
-    4   2.12 m   -89.6 cm  -65.7 cm   5.98 keV  1.61 keV   586 mum  2.93 mm    Tracker     eIoni
-    5   2.12 m   -89.6 cm  -65.6 cm   4.35 keV  1.62 keV   478 mum   3.4 mm    Tracker     eIoni
-    6   2.12 m   -89.6 cm  -65.6 cm      0 eV   4.35 keV   376 mum  3.78 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 57,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.79 m   -88.8 cm  -55.8 cm   81.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.79 m   -89.4 cm  -54.1 cm   66.6 keV  14.8 keV  1.97 cm   1.97 cm    Tracker     eIoni
-    2    1.8 m   -89.9 cm  -53.6 cm   60.1 keV  6.46 keV  1.39 cm   3.36 cm    Tracker     eIoni
-    3   1.81 m   -90.4 cm  -53.2 cm   53.4 keV  6.72 keV  1.16 cm   4.52 cm    Tracker     eIoni
-    4   1.82 m   -90.7 cm  -52.6 cm   42.1 keV  11.3 keV  9.42 mm   5.46 cm    Tracker     eIoni
-    5   1.82 m   -91.3 cm  -52.6 cm   36.9 keV  5.18 keV  6.27 mm   6.09 cm    Tracker     eIoni
-    6   1.83 m   -91.2 cm    -53 cm   33.1 keV   3.8 keV  5.01 mm   6.59 cm    Tracker     eIoni
-    7   1.82 m   -91.2 cm  -53.2 cm   23.4 keV  1.34 keV  2.15 mm    6.8 cm    Tracker     eIoni
-    8   1.83 m   -91.1 cm  -53.4 cm   20.3 keV   3.1 keV  2.38 mm   7.04 cm    Tracker     eIoni
-    9   1.83 m   -91.1 cm  -53.6 cm   11.9 keV  8.34 keV  1.91 mm   7.23 cm    Tracker     eIoni
-   10   1.83 m     -91 cm  -53.7 cm   10.6 keV  1.33 keV   937 mum  7.32 cm    Tracker     eIoni
-   11   1.83 m     -91 cm  -53.7 cm   8.47 keV  2.13 keV   821 mum  7.41 cm    Tracker     eIoni
-   12   1.83 m     -91 cm  -53.6 cm   6.88 keV   1.6 keV   649 mum  7.47 cm    Tracker     eIoni
-   13   1.83 m     -91 cm  -53.7 cm   4.32 keV  2.56 keV   536 mum  7.53 cm    Tracker     eIoni
-   14   1.83 m   -90.9 cm  -53.6 cm   1.62 keV   2.7 keV   374 mum  7.56 cm    Tracker     eIoni
-   15   1.83 m     -91 cm  -53.6 cm      0 eV   1.62 keV   119 mum  7.57 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 62,   Parent ID = 57
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.82 m   -91.2 cm  -53.2 cm   8.43 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.82 m   -91.1 cm  -53.2 cm   5.92 keV  2.51 keV   645 mum   645 mum   Tracker     eIoni
-    2   1.82 m   -91.1 cm  -53.2 cm   2.53 keV  3.38 keV   474 mum  1.12 mm    Tracker     eIoni
-    3   1.82 m   -91.2 cm  -53.2 cm      0 eV   2.53 keV   231 mum  1.35 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 56,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.63 m   -83.6 cm  -57.3 cm   25.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.63 m   -83.5 cm  -57.4 cm   24.3 keV  1.52 keV  2.77 mm   2.77 mm    Tracker     eIoni
-    2   1.63 m   -83.5 cm  -57.6 cm   22.3 keV  1.94 keV  2.52 mm   5.29 mm    Tracker     eIoni
-    3   1.63 m   -83.7 cm  -57.7 cm   21.1 keV  1.22 keV  2.22 mm    7.5 mm    Tracker     eIoni
-    4   1.63 m   -83.6 cm  -57.9 cm   18.3 keV  2.75 keV  2.03 mm   9.53 mm    Tracker     eIoni
-    5   1.63 m   -83.6 cm    -58 cm   15.8 keV  2.57 keV  1.65 mm   1.12 cm    Tracker     eIoni
-    6   1.63 m   -83.7 cm  -58.1 cm   14.3 keV  1.49 keV  1.34 mm   1.25 cm    Tracker     eIoni
-    7   1.63 m   -83.7 cm  -58.2 cm   12.6 keV  1.72 keV  1.17 mm   1.37 cm    Tracker     eIoni
-    8   1.63 m   -83.7 cm  -58.2 cm   11.5 keV  1.04 keV     1 mm   1.47 cm    Tracker     eIoni
-    9   1.63 m   -83.8 cm  -58.3 cm   10.1 keV  1.46 keV   903 mum  1.56 cm    Tracker     eIoni
-   10   1.63 m   -83.8 cm  -58.3 cm   8.47 keV  1.61 keV   774 mum  1.64 cm    Tracker     eIoni
-   11   1.63 m   -83.7 cm  -58.3 cm   7.33 keV  1.14 keV   649 mum   1.7 cm    Tracker     eIoni
-   12   1.63 m   -83.7 cm  -58.3 cm   5.06 keV  2.28 keV   568 mum  1.76 cm    Tracker     eIoni
-   13   1.63 m   -83.7 cm  -58.3 cm   2.93 keV  2.13 keV   420 mum   1.8 cm    Tracker     eIoni
-   14   1.63 m   -83.7 cm  -58.3 cm    798 eV   2.13 keV   270 mum  1.83 cm    Tracker     eIoni
-   15   1.63 m   -83.7 cm  -58.3 cm      0 eV    798 eV   46.3 mum  1.83 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 34,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.07 m   -76.1 cm  -86.5 cm   9.23 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.07 m     -76 cm  -86.4 cm   7.41 keV  1.82 keV   708 mum   708 mum   Tracker     eIoni
-    2   1.07 m     -76 cm  -86.4 cm    6.1 keV  1.31 keV   573 mum  1.28 mm    Tracker     eIoni
-    3   1.07 m   -75.9 cm  -86.4 cm   4.69 keV  1.41 keV   486 mum  1.77 mm    Tracker     eIoni
-    4   1.07 m     -76 cm  -86.4 cm   2.44 keV  2.25 keV   397 mum  2.16 mm    Tracker     eIoni
-    5   1.07 m     -76 cm  -86.4 cm   1.51 keV   932 eV    220 mum  2.38 mm    Tracker     eIoni
-    6   1.07 m     -76 cm  -86.4 cm      0 eV   1.51 keV   107 mum  2.49 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 33,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   92.4 cm    -69 cm  -1.06 m    18.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   92.5 cm  -68.9 cm  -1.06 m    13.9 keV  4.42 keV  1.65 mm   1.65 mm    Tracker     eIoni
-    2   92.6 cm    -69 cm  -1.06 m    11.4 keV  2.44 keV  1.13 mm   2.78 mm    Tracker     eIoni
-    3   92.6 cm    -69 cm  -1.06 m    4.38 keV  7.06 keV   894 mum  3.67 mm    Tracker     eIoni
-    4   92.6 cm    -69 cm  -1.07 m    2.34 keV  2.04 keV   378 mum  4.05 mm    Tracker     eIoni
-    5   92.6 cm    -69 cm  -1.07 m       0 eV   2.34 keV   207 mum  4.26 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 32,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   52.5 cm  -42.2 cm  -1.63 m    10.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   52.5 cm  -42.2 cm  -1.63 m    9.29 keV  1.12 keV   804 mum   804 mum   Tracker     eIoni
-    2   52.6 cm  -42.2 cm  -1.63 m    8.18 keV  1.11 keV   713 mum  1.52 mm    Tracker     eIoni
-    3   52.6 cm  -42.1 cm  -1.63 m    6.54 keV  1.64 keV   627 mum  2.14 mm    Tracker     eIoni
-    4   52.6 cm  -42.1 cm  -1.63 m       0 eV   6.54 keV   515 mum  2.66 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 31,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   20.8 cm  -16.9 cm  -2.13 m    10.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   20.9 cm  -16.9 cm  -2.13 m    9.56 keV  1.29 keV   842 mum   842 mum   Tracker     eIoni
-    2   20.9 cm  -16.9 cm  -2.13 m    7.44 keV  2.12 keV   733 mum  1.58 mm    Tracker     eIoni
-    3   20.8 cm    -17 cm  -2.13 m     5.7 keV  1.74 keV   575 mum  2.15 mm    Tracker     eIoni
-    4   20.8 cm    -17 cm  -2.13 m    4.59 keV  1.11 keV   460 mum  2.61 mm    Tracker     eIoni
-    5   20.8 cm    -17 cm  -2.13 m    2.05 keV  2.54 keV   391 mum     3 mm    Tracker     eIoni
-    6   20.8 cm    -17 cm  -2.13 m       0 eV   2.05 keV   170 mum  3.17 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 29,   Parent ID = 19
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    433 mum  -413 nm   -2.4 m    6.69 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.12 mm   -238 mum  -2.4 m    5.32 MeV  1.37 MeV   1.3 mm    1.3 mm   TargetPV     eIoni
-    2   1.54 mm    449 mum  -2.4 m    4.17 MeV  1.15 MeV  1.11 mm   2.41 mm   TargetPV     eIoni
-    3   1.55 mm    450 mum  -2.4 m    3.75 MeV  95.9 keV  23.4 mum  2.43 mm   TargetPV     eBrem
-    4   1.43 mm    884 mum  -2.4 m    2.43 MeV  1.32 MeV   879 mum  3.31 mm   TargetPV     eIoni
-    5   1.65 mm    623 mum  -2.4 m     1.8 MeV   626 keV   672 mum  3.99 mm   TargetPV     eIoni
-    6   1.54 mm    619 mum  -2.4 m     446 keV   386 keV   227 mum  4.21 mm   TargetPV     eBrem
-    7   1.53 mm    629 mum  -2.4 m    26.3 keV   420 keV   243 mum  4.46 mm   TargetPV     eIoni
-    8   1.53 mm    630 mum  -2.4 m       0 eV   26.3 keV  3.17 mum  4.46 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 64,   Parent ID = 29
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.54 mm    619 mum  -2.4 m     971 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -439 mum  3.33 mm   -2.4 m     696 keV   275 keV  3.76 mm   3.76 mm   TargetPV     compt
-    2  -1.62 mm   6.05 mm   -2.4 m     483 keV   213 keV     3 mm   6.76 mm   TargetPV     compt
-    3  -2.25 cm    1.3 cm  -2.41 m       0 eV    483 keV  2.25 cm   2.93 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 63,   Parent ID = 29
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.55 mm    450 mum  -2.4 m     321 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    2.1 mm    876 mum  -2.4 m     284 keV  36.4 keV   957 mum   957 mum  TargetPV     compt
-    2   5.66 mm   3.43 mm   -2.4 m       0 eV    284 keV   4.4 mm   5.36 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 18,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.6 mum  29.9 mum -2.41 m     654 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    439 mum  45.5 mum -2.41 m     292 keV   362 keV  3.76 mm   3.76 mm   TargetPV     compt
-    2   5.16 mm   3.82 mm  -2.41 m       0 eV    292 keV  6.05 mm   9.81 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 17,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   33.9 mum  24.4 mum -2.41 m     199 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    149 mum   189 mum  -2.4 m       0 eV      0 eV   6.53 mm   6.53 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 66,   Parent ID = 17
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    149 mum   189 mum  -2.4 m     100 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    225 mum   200 mum  -2.4 m    79.2 MeV  1.34 MeV  1.16 mm   1.16 mm   TargetPV     eBrem
-    2    227 mum   185 mum  -2.4 m    77.9 MeV   544 keV   532 mum  1.69 mm   TargetPV     eBrem
-    3    217 mum   189 mum  -2.4 m    75.7 MeV   258 keV   170 mum  1.86 mm   TargetPV     eBrem
-    4   66.9 mum   208 mum  -2.4 m    71.3 MeV  4.46 MeV  2.97 mm   4.83 mm    TrackerTransportation
-    5  -4.39 cm   9.09 cm   -1.6 m    71.1 MeV   170 keV  80.6 cm   81.1 cm    ChamberTransportation
-    6  -5.25 cm   10.4 cm  -1.47 m      71 MeV    79 keV  12.7 cm   93.8 cm    Chamber     eBrem
-    7  -5.63 cm   11.2 cm   -1.4 m    70.9 MeV  92.1 keV  7.49 cm   1.01 m     TrackerTransportation
-    8  -8.73 cm     18 cm    -80 cm   70.8 MeV   135 keV  60.5 cm   1.62 m     ChamberTransportation
-    9  -9.64 cm   20.2 cm    -60 cm   70.6 MeV   126 keV  20.1 cm   1.82 m     TrackerTransportation
-   10  -9.82 cm   20.7 cm  -54.4 cm   70.6 MeV  13.2 keV  5.65 cm   1.88 m     Tracker     eIoni
-   11  -9.89 cm   20.9 cm  -51.8 cm   70.5 MeV  5.57 keV  2.59 cm    1.9 m     Tracker     eIoni
-   12  -9.97 cm   21.2 cm  -48.5 cm   70.5 MeV  6.69 keV  3.35 cm   1.93 m     Tracker     eIoni
-   13  -10.5 cm     23 cm  -28.2 cm   70.5 MeV    38 keV  20.3 cm   2.14 m     Tracker     eIoni
-   14  -11.2 cm   25.5 cm      0 fm   70.4 MeV  53.8 keV  28.3 cm   2.42 m     ChamberTransportation
-   15  -11.3 cm   26.2 cm   7.25 cm   70.2 MeV  33.6 keV  7.28 cm   2.49 m     Chamber     eBrem
-   16  -11.7 cm   27.1 cm     20 cm   70.2 MeV  67.6 keV  12.8 cm   2.62 m     TrackerTransportation
-   17  -13.6 cm   32.2 cm     80 cm   70.1 MeV   130 keV  60.2 cm   3.22 m     ChamberTransportation
-   18  -14.2 cm   33.5 cm      1 m    69.9 MeV   114 keV  20.1 cm   3.43 m     TrackerTransportation
-   19  -15.1 cm   36.3 cm    1.4 m    69.8 MeV  85.4 keV  40.5 cm   3.83 m     Tracker     eIoni
-   20  -15.5 cm   37.8 cm    1.6 m    69.8 MeV  39.1 keV  19.6 cm   4.03 m     ChamberTransportation
-   21  -15.9 cm   39.2 cm    1.8 m    69.7 MeV   101 keV  20.1 cm   4.23 m     TrackerTransportation
-   22    -16 cm   40.3 cm      2 m    69.6 MeV  47.9 keV  20.1 cm   4.43 m     Tracker     eIoni
-   23  -16.2 cm   41.5 cm   2.25 m    69.5 MeV  53.4 keV  24.8 cm   4.68 m     Tracker     eIoni
-   24  -16.4 cm   42.2 cm    2.4 m    69.5 MeV  34.6 keV  15.2 cm   4.83 m     WorldPVTransportation
-   25  -16.5 cm   43.5 cm   2.71 m    69.3 MeV  57.2 keV  31.1 cm   5.14 m     WorldPV     eIoni
-   26  -16.7 cm   44.5 cm   2.91 m    69.3 MeV  38.5 keV    20 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 82,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -16.5 cm   43.5 cm   2.71 m    79.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -16.9 cm   41.9 cm   2.72 m    68.1 keV    11 keV  1.87 cm   1.87 cm    WorldPV     eIoni
-    2    -16 cm   42.6 cm   2.71 m    54.3 keV  13.8 keV  1.45 cm   3.32 cm    WorldPV     eIoni
-    3  -15.8 cm   43.5 cm   2.71 m    48.3 keV     6 keV  9.73 mm   4.29 cm    WorldPV     eIoni
-    4  -15.2 cm     44 cm   2.71 m      44 keV  4.38 keV  7.96 mm   5.09 cm    WorldPV     eIoni
-    5  -14.7 cm   44.2 cm   2.72 m    40.9 keV   3.1 keV  6.73 mm   5.76 cm    WorldPV     eIoni
-    6  -14.5 cm   44.2 cm   2.72 m    37.6 keV   3.3 keV  5.96 mm   6.36 cm    WorldPV     eIoni
-    7  -14.5 cm     44 cm   2.72 m    33.3 keV  4.26 keV  5.16 mm   6.87 cm    WorldPV     eIoni
-    8  -14.2 cm   43.9 cm   2.73 m    28.9 keV  4.39 keV  4.22 mm   7.29 cm    WorldPV     eIoni
-    9  -14.1 cm     44 cm   2.73 m    25.6 keV  3.31 keV  3.34 mm   7.63 cm    WorldPV     eIoni
-   10    -14 cm   44.2 cm   2.73 m    23.4 keV  2.18 keV  2.74 mm    7.9 cm    WorldPV     eIoni
-   11  -14.1 cm   44.4 cm   2.73 m      20 keV  3.44 keV  2.39 mm   8.14 cm    WorldPV     eIoni
-   12  -14.2 cm   44.5 cm   2.73 m    17.5 keV  2.46 keV  1.87 mm   8.33 cm    WorldPV     eIoni
-   13  -14.2 cm   44.6 cm   2.73 m    15.4 keV   2.1 keV  1.54 mm   8.48 cm    WorldPV     eIoni
-   14  -14.2 cm   44.6 cm   2.73 m    12.9 keV  2.55 keV   1.3 mm   8.61 cm    WorldPV     eIoni
-   15  -14.2 cm   44.7 cm   2.74 m    11.7 keV  1.13 keV  1.03 mm   8.72 cm    WorldPV     eIoni
-   16  -14.2 cm   44.7 cm   2.74 m    10.5 keV   1.2 keV   920 mum  8.81 cm    WorldPV     eIoni
-   17  -14.1 cm   44.7 cm   2.74 m    8.26 keV  2.27 keV   814 mum  8.89 cm    WorldPV     eIoni
-   18  -14.1 cm   44.8 cm   2.74 m    5.69 keV  2.57 keV   632 mum  8.95 cm    WorldPV     eIoni
-   19  -14.1 cm   44.8 cm   2.74 m     1.9 keV  3.79 keV   459 mum     9 cm    WorldPV     eIoni
-   20  -14.1 cm   44.8 cm   2.74 m       0 eV    1.9 keV   150 mum  9.01 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 81,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -16.2 cm   41.5 cm   2.25 m      12 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -16.1 cm   41.5 cm   2.25 m    10.5 keV  1.49 keV   947 mum   947 mum   Tracker     eIoni
-    2  -16.1 cm   41.6 cm   2.25 m    8.83 keV  1.71 keV   815 mum  1.76 mm    Tracker     eIoni
-    3    -16 cm   41.6 cm   2.25 m    6.71 keV  2.12 keV   677 mum  2.44 mm    Tracker     eIoni
-    4    -16 cm   41.6 cm   2.25 m    2.21 keV   4.5 keV   525 mum  2.96 mm    Tracker     eIoni
-    5    -16 cm   41.6 cm   2.25 m       0 eV   2.21 keV   189 mum  3.15 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 80,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -16 cm   40.3 cm      2 m    64.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -15.4 cm   39.4 cm   2.01 m    58.1 keV  6.37 keV  1.31 cm   1.31 cm    Tracker     eIoni
-    2  -14.8 cm   38.8 cm   2.01 m    52.7 keV  5.42 keV  1.09 cm    2.4 cm    Tracker     eIoni
-    3    -15 cm     38 cm   2.02 m      49 keV  3.67 keV  9.19 mm   3.32 cm    Tracker     eIoni
-    4    -15 cm     38 cm   2.02 m    43.4 keV   5.6 keV  8.14 mm   4.14 cm    Tracker     eIoni
-    5  -14.7 cm   37.5 cm   2.02 m    38.4 keV  4.98 keV  6.58 mm   4.79 cm    Tracker     eIoni
-    6  -14.4 cm   37.3 cm   2.03 m    35.1 keV  3.31 keV  5.36 mm   5.33 cm    Tracker     eIoni
-    7  -14.2 cm     37 cm   2.03 m    30.4 keV  4.66 keV   4.6 mm   5.79 cm    Tracker     eIoni
-    8  -14.1 cm   36.9 cm   2.03 m    16.4 keV  2.05 keV  2.05 mm   5.99 cm    Tracker     eIoni
-    9    -14 cm   36.9 cm   2.03 m    13.4 keV  2.98 keV  1.41 mm   6.13 cm    Tracker     eIoni
-   10  -13.9 cm   36.8 cm   2.03 m    10.9 keV  2.48 keV  1.08 mm   6.24 cm    Tracker     eIoni
-   11  -13.9 cm   36.7 cm   2.03 m    6.92 keV  4.01 keV   850 mum  6.33 cm    Tracker     eIoni
-   12  -13.9 cm   36.7 cm   2.03 m    5.19 keV  1.73 keV   539 mum  6.38 cm    Tracker     eIoni
-   13  -13.9 cm   36.7 cm   2.03 m    3.32 keV  1.88 keV   429 mum  6.43 cm    Tracker     eIoni
-   14  -13.9 cm   36.7 cm   2.03 m     156 eV   3.16 keV   303 mum  6.46 cm    Tracker     eIoni
-   15  -13.9 cm   36.7 cm   2.03 m       0 eV    156 eV   12.6 mum  6.46 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 83,   Parent ID = 80
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.1 cm   36.9 cm   2.03 m      12 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -14.2 cm   36.8 cm   2.03 m    10.4 keV  1.61 keV   943 mum   943 mum   Tracker     eIoni
-    2  -14.2 cm   36.8 cm   2.03 m    8.66 keV  1.72 keV   801 mum  1.74 mm    Tracker     eIoni
-    3  -14.2 cm   36.8 cm   2.03 m    6.92 keV  1.74 keV   663 mum  2.41 mm    Tracker     eIoni
-    4  -14.3 cm   36.8 cm   2.03 m    5.33 keV  1.59 keV   539 mum  2.95 mm    Tracker     eIoni
-    5  -14.3 cm   36.8 cm   2.03 m    3.75 keV  1.59 keV   438 mum  3.38 mm    Tracker     eIoni
-    6  -14.2 cm   36.8 cm   2.03 m    2.06 keV  1.69 keV   335 mum  3.72 mm    Tracker     eIoni
-    7  -14.2 cm   36.8 cm   2.03 m       0 eV   2.06 keV   170 mum  3.89 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 79,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -15.5 cm   37.9 cm   1.61 m    9.26 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -15.5 cm   37.9 cm   1.61 m    7.93 keV  1.32 keV   501 mum   501 mum   Chamber     eIoni
-    2  -15.5 cm   37.9 cm   1.61 m    2.41 keV  5.52 keV   449 mum   950 mum   Chamber     eIoni
-    3  -15.5 cm   37.9 cm   1.61 m       0 eV   2.41 keV   153 mum   1.1 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 78,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -15.1 cm   36.3 cm    1.4 m    18.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -15.2 cm   36.5 cm    1.4 m    15.6 keV  2.93 keV  1.68 mm   1.68 mm    Tracker     eIoni
-    2  -15.2 cm   36.6 cm    1.4 m    14.5 keV  1.09 keV  1.32 mm      3 mm    Tracker     eIoni
-    3  -15.1 cm   36.7 cm    1.4 m    11.5 keV  3.04 keV   1.2 mm    4.2 mm    Tracker     eIoni
-    4  -15.1 cm   36.7 cm    1.4 m    9.31 keV  2.18 keV   898 mum   5.1 mm    Tracker     eIoni
-    5  -15.1 cm   36.6 cm    1.4 m    7.71 keV   1.6 keV   714 mum  5.81 mm    Tracker     eIoni
-    6  -15.2 cm   36.6 cm    1.4 m    6.67 keV  1.04 keV   594 mum  6.41 mm    Tracker     eIoni
-    7  -15.2 cm   36.6 cm    1.4 m    4.25 keV  2.41 keV   523 mum  6.93 mm    Tracker     eIoni
-    8  -15.2 cm   36.6 cm    1.4 m    1.89 keV  2.36 keV   369 mum   7.3 mm    Tracker     eIoni
-    9  -15.2 cm   36.6 cm    1.4 m       0 eV   1.89 keV   149 mum  7.45 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 77,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -14 cm     33 cm   92.9 cm   17.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -13.9 cm     33 cm     93 cm   14.3 keV  3.61 keV   908 mum   908 mum   Chamber     eIoni
-    2  -13.9 cm     33 cm   92.9 cm   9.83 keV  4.45 keV   721 mum  1.63 mm    Chamber     eIoni
-    3  -13.9 cm     33 cm   92.9 cm      0 eV   9.83 keV   524 mum  2.15 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 76,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -11.3 cm   26.2 cm   7.25 cm    131 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -11.6 cm     27 cm   17.4 cm   89.1 keV     0 eV   10.2 cm   10.2 cm    Chamber     compt
-    2  -4.63 cm   15.7 cm      0 fm   89.1 keV     0 eV   21.9 cm   32.1 cm    TrackerTransportation
-    3   19.2 cm  -23.1 cm    -60 cm   89.1 keV     0 eV   75.3 cm   1.07 m     ChamberTransportation
-    4   21.9 cm  -27.4 cm  -66.7 cm      0 eV   34.6 keV   8.4 cm   1.16 m     Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 85,   Parent ID = 76
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   21.9 cm  -27.4 cm  -66.7 cm   54.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   22.2 cm  -27.5 cm  -66.8 cm   50.6 keV  3.94 keV  4.09 mm   4.09 mm    Chamber     eIoni
-    2   22.3 cm  -27.5 cm  -66.6 cm   43.2 keV   7.4 keV  3.64 mm   7.73 mm    Chamber     eIoni
-    3   22.4 cm  -27.5 cm  -66.4 cm   34.8 keV  8.36 keV  2.87 mm   1.06 cm    Chamber     eIoni
-    4   22.4 cm  -27.6 cm  -66.4 cm   30.7 keV  4.15 keV   2.1 mm   1.27 cm    Chamber     eIoni
-    5   22.4 cm  -27.7 cm  -66.4 cm   28.4 keV  2.28 keV  1.76 mm   1.45 cm    Chamber     eIoni
-    6   22.4 cm  -27.8 cm  -66.3 cm   27.3 keV  1.07 keV  1.59 mm   1.61 cm    Chamber     eIoni
-    7   22.4 cm  -27.9 cm  -66.4 cm   22.2 keV  5.08 keV  1.51 mm   1.76 cm    Chamber     eIoni
-    8   22.4 cm  -27.9 cm  -66.4 cm   19.7 keV  2.55 keV  1.17 mm   1.87 cm    Chamber     eIoni
-    9   22.4 cm  -27.9 cm  -66.4 cm      0 eV   19.7 keV  1.01 mm   1.97 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 84,   Parent ID = 76
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -11.6 cm     27 cm   17.4 cm   42.2 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -11.7 cm   26.9 cm   17.6 cm   35.7 keV  6.52 keV  2.78 mm   2.78 mm    Chamber     eIoni
-    2  -11.7 cm     27 cm   17.7 cm   31.5 keV  4.16 keV  2.18 mm   4.95 mm    Chamber     eIoni
-    3  -11.6 cm   27.1 cm   17.7 cm     26 keV  5.51 keV  1.83 mm   6.79 mm    Chamber     eIoni
-    4  -11.7 cm   27.1 cm   17.7 cm   25.8 keV   218 eV   1.42 mm   8.21 mm    Chamber     eIoni
-    5  -11.8 cm   27.1 cm   17.7 cm   20.6 keV  5.22 keV   1.4 mm   9.61 mm    Chamber     eIoni
-    6  -11.8 cm   27.1 cm   17.7 cm   14.4 keV  6.22 keV  1.06 mm   1.07 cm    Chamber     eIoni
-    7  -11.8 cm     27 cm   17.7 cm   12.4 keV  1.97 keV   725 mum  1.14 cm    Chamber     eIoni
-    8  -11.8 cm     27 cm   17.8 cm   9.58 keV   2.8 keV   633 mum   1.2 cm    Chamber     eIoni
-    9  -11.8 cm   27.1 cm   17.8 cm   8.01 keV  1.57 keV   514 mum  1.25 cm    Chamber     eIoni
-   10  -11.8 cm     27 cm   17.8 cm    5.5 keV  2.51 keV   452 mum   1.3 cm    Chamber     eIoni
-   11  -11.8 cm     27 cm   17.8 cm   3.26 keV  2.23 keV   351 mum  1.33 cm    Chamber     eIoni
-   12  -11.8 cm     27 cm   17.8 cm   2.28 keV   984 eV    227 mum  1.36 cm    Chamber     eIoni
-   13  -11.8 cm     27 cm   17.8 cm      0 eV   2.28 keV   141 mum  1.37 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 75,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -10.5 cm     23 cm  -28.2 cm   28.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -10.8 cm   22.9 cm  -28.2 cm   26.3 keV  1.83 keV   3.2 mm    3.2 mm    Tracker     eIoni
-    2    -11 cm     23 cm  -28.2 cm   23.4 keV  2.91 keV  2.87 mm   6.06 mm    Tracker     eIoni
-    3  -11.1 cm   23.1 cm    -28 cm     22 keV  1.41 keV  2.38 mm   8.45 mm    Tracker     eIoni
-    4  -11.2 cm   23.1 cm  -27.8 cm   17.5 keV   4.5 keV  2.17 mm   1.06 cm    Tracker     eIoni
-    5  -11.3 cm   23.1 cm  -27.7 cm   14.8 keV  2.64 keV  1.54 mm   1.22 cm    Tracker     eIoni
-    6  -11.4 cm   23.1 cm  -27.6 cm     13 keV   1.8 keV  1.23 mm   1.34 cm    Tracker     eIoni
-    7  -11.4 cm     23 cm  -27.6 cm   11.7 keV  1.32 keV  1.05 mm   1.44 cm    Tracker     eIoni
-    8  -11.5 cm     23 cm  -27.5 cm   10.1 keV  1.64 keV   919 mum  1.54 cm    Tracker     eIoni
-    9  -11.5 cm     23 cm  -27.4 cm   7.69 keV   2.4 keV   775 mum  1.61 cm    Tracker     eIoni
-   10  -11.4 cm     23 cm  -27.4 cm   6.11 keV  1.58 keV   593 mum  1.67 cm    Tracker     eIoni
-   11  -11.5 cm     23 cm  -27.4 cm   3.87 keV  2.25 keV   487 mum  1.72 cm    Tracker     eIoni
-   12  -11.5 cm     23 cm  -27.4 cm   1.13 keV  2.73 keV   343 mum  1.76 cm    Tracker     eIoni
-   13  -11.5 cm     23 cm  -27.4 cm      0 eV   1.13 keV  72.2 mum  1.76 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 74,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.97 cm   21.2 cm  -48.5 cm   9.85 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    -10 cm   21.2 cm  -48.4 cm   8.87 keV   982 eV    756 mum   756 mum   Tracker     eIoni
-    2  -10.1 cm   21.2 cm  -48.4 cm   6.49 keV  2.38 keV   680 mum  1.44 mm    Tracker     eIoni
-    3  -10.1 cm   21.1 cm  -48.4 cm   5.39 keV   1.1 keV   511 mum  1.95 mm    Tracker     eIoni
-    4  -10.1 cm   21.1 cm  -48.4 cm   3.84 keV  1.54 keV   441 mum  2.39 mm    Tracker     eIoni
-    5  -10.2 cm   21.1 cm  -48.4 cm   1.16 keV  2.68 keV   342 mum  2.73 mm    Tracker     eIoni
-    6  -10.1 cm   21.1 cm  -48.4 cm      0 eV   1.16 keV  74.4 mum   2.8 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 73,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.89 cm   20.9 cm  -51.8 cm   8.73 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -9.95 cm   20.9 cm  -51.8 cm   7.29 keV  1.44 keV   669 mum   669 mum   Tracker     eIoni
-    2  -9.97 cm   20.9 cm  -51.8 cm   4.31 keV  2.98 keV   565 mum  1.23 mm    Tracker     eIoni
-    3  -9.97 cm   20.9 cm  -51.7 cm   2.62 keV  1.69 keV   373 mum  1.61 mm    Tracker     eIoni
-    4  -9.95 cm   20.9 cm  -51.7 cm    981 eV   1.64 keV   240 mum  1.85 mm    Tracker     eIoni
-    5  -9.95 cm   20.9 cm  -51.7 cm      0 eV    981 eV   59.8 mum  1.91 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 72,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.82 cm   20.7 cm  -54.4 cm   52.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -10.7 cm   20.8 cm  -54.5 cm   46.7 keV   5.4 keV  9.01 mm   9.01 mm    Tracker     eIoni
-    2  -11.2 cm     21 cm  -54.1 cm   40.9 keV  5.82 keV  7.49 mm   1.65 cm    Tracker     eIoni
-    3  -11.8 cm   21.1 cm  -53.9 cm   35.5 keV   5.4 keV  5.96 mm   2.25 cm    Tracker     eIoni
-    4  -12.1 cm   21.5 cm    -54 cm   31.1 keV  4.39 keV  4.67 mm   2.71 cm    Tracker     eIoni
-    5  -12.3 cm   21.8 cm  -54.1 cm   27.1 keV  4.01 keV  3.75 mm   3.09 cm    Tracker     eIoni
-    6  -12.1 cm     22 cm    -54 cm     23 keV  4.04 keV     3 mm   3.39 cm    Tracker     eIoni
-    7  -12.1 cm   22.2 cm  -54.1 cm   18.7 keV  4.33 keV  2.32 mm   3.62 cm    Tracker     eIoni
-    8  -12.1 cm   22.3 cm  -54.1 cm   15.4 keV  3.24 keV   1.7 mm   3.79 cm    Tracker     eIoni
-    9    -12 cm   22.4 cm  -54.1 cm   14.1 keV  1.36 keV   1.3 mm   3.92 cm    Tracker     eIoni
-   10    -12 cm   22.5 cm  -54.2 cm   10.8 keV  3.28 keV  1.15 mm   4.04 cm    Tracker     eIoni
-   11    -12 cm   22.6 cm  -54.2 cm   9.08 keV  1.72 keV   838 mum  4.12 cm    Tracker     eIoni
-   12    -12 cm   22.6 cm  -54.3 cm   6.73 keV  2.35 keV   696 mum  4.19 cm    Tracker     eIoni
-   13    -12 cm   22.6 cm  -54.3 cm   5.49 keV  1.24 keV   527 mum  4.24 cm    Tracker     eIoni
-   14    -12 cm   22.6 cm  -54.3 cm   2.65 keV  2.85 keV   448 mum  4.29 cm    Tracker     eIoni
-   15    -12 cm   22.6 cm  -54.3 cm    218 eV   2.43 keV   243 mum  4.31 cm    Tracker     eIoni
-   16    -12 cm   22.6 cm  -54.3 cm      0 eV    218 eV   14.9 mum  4.31 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 71,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -8.99 cm   18.6 cm  -74.3 cm     10 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -8.99 cm   18.6 cm  -74.3 cm   5.04 keV  4.97 keV   531 mum   531 mum   Chamber     eIoni
-    2  -8.97 cm   18.7 cm  -74.3 cm   3.89 keV  1.15 keV   330 mum   861 mum   Chamber     eIoni
-    3  -8.97 cm   18.6 cm  -74.3 cm   3.07 keV   825 eV    270 mum  1.13 mm    Chamber     eIoni
-    4  -8.97 cm   18.6 cm  -74.3 cm      0 eV   3.07 keV   211 mum  1.34 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.25 cm   10.4 cm  -1.47 m    11.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -5.25 cm   10.4 cm  -1.47 m       0 eV   11.7 keV   904 mum   904 mum   Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 69,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    217 mum   189 mum  -2.4 m    1.97 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    109 mum   199 mum  -2.4 m     954 keV     0 eV   2.73 mm   2.73 mm   TargetPV     compt
-    2   74.4 mum  -971 nm   -2.4 m     954 keV     0 eV    294 mum  3.02 mm    TrackerTransportation
-    3  -41.3 cm   -2.4 m    14.6 cm    954 keV     0 eV   3.52 m    3.53 m     WorldPVTransportation
-    4    -50 cm  -2.91 m    68.7 cm    954 keV     0 eV   74.9 cm   4.27 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 86,   Parent ID = 69
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    109 mum   199 mum  -2.4 m    1.01 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    240 mum   244 mum  -2.4 m     618 keV   393 keV   416 mum   416 mum  TargetPV     eIoni
-    2    173 mum   269 mum  -2.4 m     262 keV   356 keV   314 mum   730 mum  TargetPV     eIoni
-    3    171 mum   274 mum  -2.4 m       0 eV    262 keV   120 mum   850 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    227 mum   185 mum  -2.4 m     741 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   58.7 mum   210 mum  -2.4 m     741 keV     0 eV   3.11 mm   3.11 mm    TrackerTransportation
-    2  -4.34 cm   6.75 mm   -1.6 m     741 keV     0 eV   80.1 cm   80.4 cm    ChamberTransportation
-    3  -5.42 cm   8.38 mm   -1.4 m     741 keV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -8.68 cm   1.33 cm    -80 cm    741 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -9.76 cm   1.49 cm    -60 cm    741 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6    -13 cm   1.98 cm  0.114 fm    741 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -14.1 cm   2.15 cm     20 cm    741 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -17.4 cm   2.64 cm     80 cm    741 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -18.4 cm    2.8 cm      1 m     741 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -21.7 cm   3.29 cm    1.6 m     741 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11  -22.8 cm   3.45 cm    1.8 m     741 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12    -26 cm   3.94 cm    2.4 m     741 keV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -28.8 cm   4.36 cm   2.91 m     741 keV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    225 mum   200 mum  -2.4 m    19.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    111 mum   142 mum  -2.4 m    19.6 MeV     0 eV   3.64 mm   3.64 mm    TrackerTransportation
-    2  -2.49 cm  -1.27 cm   -1.6 m    19.6 MeV     0 eV     80 cm   80.4 cm    ChamberTransportation
-    3  -3.12 cm  -1.59 cm   -1.4 m    19.6 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -4.99 cm  -2.56 cm    -80 cm   19.6 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -5.62 cm  -2.88 cm    -60 cm   19.6 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -7.49 cm  -3.85 cm      0 fm   19.6 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -8.12 cm  -4.17 cm     20 cm   19.6 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8    -10 cm  -5.13 cm     80 cm   19.6 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -10.6 cm  -5.45 cm      1 m    19.6 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -12.5 cm  -6.42 cm    1.6 m    19.6 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -13.1 cm  -6.74 cm    1.8 m    19.6 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12    -15 cm  -7.71 cm    2.4 m    19.6 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -16.6 cm  -8.53 cm   2.91 m    19.6 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 17
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    149 mum   189 mum  -2.4 m    98.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    149 mum   190 mum  -2.4 m    77.5 MeV  40.4 keV  36.6 mum  36.6 mum  TargetPV     eBrem
-    2    171 mum   197 mum  -2.4 m    70.8 MeV   606 keV   333 mum   370 mum  TargetPV     eBrem
-    3    173 mum   213 mum  -2.4 m    66.3 MeV   282 keV   221 mum   591 mum  TargetPV     eBrem
-    4    196 mum   230 mum  -2.4 m    21.9 MeV   160 keV   164 mum   755 mum  TargetPV     eBrem
-    5    607 mum   766 mum  -2.4 m    15.3 MeV   2.1 MeV  1.57 mm   2.33 mm   TargetPV     eBrem
-    6    766 mum  1.11 mm   -2.4 m    11.5 MeV  1.03 MeV   893 mum  3.22 mm   TargetPV     eBrem
-    7    792 mum  1.14 mm   -2.4 m      11 MeV   107 keV  81.7 mum   3.3 mm   TargetPV     eBrem
-    8    836 mum  1.21 mm   -2.4 m     654 keV   274 keV   249 mum  3.55 mm   TargetPV     eBrem
-    9    792 mum  1.27 mm   -2.4 m     247 keV   407 keV   326 mum  3.88 mm   TargetPV     eIoni
-   10    783 mum  1.27 mm   -2.4 m       0 eV    247 keV   110 mum  3.99 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 94,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    836 mum  1.21 mm   -2.4 m    10.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    378 mum  3.19 mm   -2.4 m    10.1 MeV     0 eV   2.58 mm   2.58 mm    TrackerTransportation
-    2  -55.3 cm    2.4 m   -48.7 cm   10.1 MeV     0 eV   3.12 m    3.12 m     WorldPVTransportation
-    3  -67.1 cm   2.91 m   -7.98 cm   10.1 MeV     0 eV   66.3 cm   3.78 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 93,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    792 mum  1.14 mm   -2.4 m     409 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    932 mum  1.23 mm   -2.4 m     320 keV    89 keV   348 mum   348 mum  TargetPV     compt
-    2   4.63 mm   3.08 mm   -2.4 m       0 eV    320 keV  4.24 mm   4.59 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 92,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    766 mum  1.11 mm   -2.4 m    2.71 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.02 mm   1.31 mm   -2.4 m    1.85 MeV   859 keV   715 mum   715 mum  TargetPV     compt
-    2   1.09 mm   1.31 mm   -2.4 m    1.85 MeV     0 eV   1.24 mm   1.96 mm    TrackerTransportation
-    3   4.83 cm   2.52 mm   -1.6 m    1.85 MeV     0 eV   80.1 cm   80.3 cm    ChamberTransportation
-    4   6.01 cm   2.82 mm   -1.4 m    1.85 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    5   9.54 cm   3.72 mm    -80 cm   1.85 MeV     0 eV   60.1 cm    1.6 m     ChamberTransportation
-    6   10.7 cm   4.02 mm    -60 cm   1.85 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    7   14.3 cm   4.93 mm      0 fm   1.85 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    8   15.4 cm   5.23 mm     20 cm   1.85 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    9     19 cm   6.14 mm     80 cm   1.85 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-   10   20.2 cm   6.44 mm      1 m    1.85 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   11   23.7 cm   7.34 mm    1.6 m    1.85 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   12   24.9 cm   7.64 mm    1.8 m    1.85 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   13   28.4 cm   8.55 mm    2.4 m    1.85 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   14   31.4 cm   9.32 mm   2.91 m    1.85 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 91,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    607 mum   766 mum  -2.4 m    4.51 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    934 mum   983 mum  -2.4 m    4.51 MeV     0 eV   2.69 mm   2.69 mm    TrackerTransportation
-    2    9.9 cm   6.62 cm   -1.6 m    4.51 MeV     0 eV   80.9 cm   81.1 cm    ChamberTransportation
-    3   12.3 cm   8.25 cm   -1.4 m    4.51 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4   19.7 cm   13.1 cm    -80 cm   4.51 MeV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   22.2 cm   14.8 cm    -60 cm   4.51 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6   29.5 cm   19.7 cm      0 fm   4.51 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7     32 cm   21.3 cm     20 cm   4.51 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8   39.3 cm   26.2 cm     80 cm   4.51 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   41.8 cm   27.8 cm      1 m    4.51 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10   49.1 cm   32.7 cm    1.6 m    4.51 MeV     0 eV   60.6 cm   4.05 m     ChamberTransportation
-   11   51.6 cm   34.3 cm    1.8 m    4.51 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   58.9 cm   39.2 cm    2.4 m    4.51 MeV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   65.2 cm   43.4 cm   2.91 m    4.51 MeV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 90,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    196 mum   230 mum  -2.4 m    44.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    638 mum   690 mum  -2.4 m    44.3 MeV     0 eV    4.1 mm    4.1 mm    TrackerTransportation
-    2   8.81 cm   9.16 cm   -1.6 m    44.3 MeV     0 eV     81 cm   81.4 cm    ChamberTransportation
-    3     11 cm   11.4 cm   -1.4 m    44.3 MeV     0 eV   20.2 cm   1.02 m     TrackerTransportation
-    4   17.6 cm   18.2 cm    -80 cm   44.3 MeV     0 eV   60.7 cm   1.62 m     ChamberTransportation
-    5   19.8 cm   20.5 cm    -60 cm   44.3 MeV     0 eV   20.2 cm   1.83 m     TrackerTransportation
-    6   26.3 cm   27.3 cm      0 fm   44.3 MeV     0 eV   60.7 cm   2.43 m     ChamberTransportation
-    7   28.5 cm   29.6 cm     20 cm   44.3 MeV     0 eV   20.2 cm   2.64 m     TrackerTransportation
-    8   35.1 cm   36.4 cm     80 cm   44.3 MeV     0 eV   60.7 cm   3.24 m     ChamberTransportation
-    9   37.3 cm   38.7 cm      1 m    44.3 MeV     0 eV   20.2 cm   3.45 m     TrackerTransportation
-   10   43.8 cm   45.5 cm    1.6 m    44.3 MeV     0 eV   60.7 cm   4.05 m     ChamberTransportation
-   11     46 cm   47.8 cm    1.8 m    44.3 MeV     0 eV   20.2 cm   4.26 m     TrackerTransportation
-   12   52.6 cm   54.6 cm    2.4 m    44.3 MeV     0 eV   60.7 cm   4.86 m     WorldPVTransportation
-   13   58.1 cm   60.4 cm   2.91 m    44.3 MeV     0 eV   51.6 cm   5.38 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 89,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    173 mum   213 mum  -2.4 m    4.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    633 mum   606 mum  -2.4 m    4.18 MeV     0 eV   4.25 mm   4.25 mm    TrackerTransportation
-    2   8.81 cm   7.53 cm   -1.6 m    4.18 MeV     0 eV   80.8 cm   81.2 cm    ChamberTransportation
-    3     11 cm    9.4 cm   -1.4 m    4.18 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4   17.6 cm     15 cm    -80 cm   4.18 MeV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   19.7 cm   16.9 cm    -60 cm   4.18 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6   26.3 cm   22.5 cm      0 fm   4.18 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   28.5 cm   24.3 cm     20 cm   4.18 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8     35 cm   29.9 cm     80 cm   4.18 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   37.2 cm   31.8 cm      1 m    4.18 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10   43.8 cm   37.4 cm    1.6 m    4.18 MeV     0 eV   60.6 cm   4.05 m     ChamberTransportation
-   11     46 cm   39.3 cm    1.8 m    4.18 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   52.5 cm   44.9 cm    2.4 m    4.18 MeV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   58.1 cm   49.7 cm   2.91 m    4.18 MeV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 88,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    171 mum   197 mum  -2.4 m    6.15 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    385 mum   482 mum  -2.4 m    6.15 MeV     0 eV   4.44 mm   4.44 mm    TrackerTransportation
-    2   3.91 cm   5.19 cm   -1.6 m    6.15 MeV     0 eV   80.3 cm   80.7 cm    ChamberTransportation
-    3   4.88 cm   6.48 cm   -1.4 m    6.15 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   7.78 cm   10.3 cm    -80 cm   6.15 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   8.75 cm   11.6 cm    -60 cm   6.15 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   11.7 cm   15.5 cm      0 fm   6.15 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7   12.6 cm   16.8 cm     20 cm   6.15 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   15.5 cm   20.6 cm     80 cm   6.15 MeV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9   16.5 cm   21.9 cm      1 m    6.15 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   19.4 cm   25.8 cm    1.6 m    6.15 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   20.4 cm   27.1 cm    1.8 m    6.15 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   23.3 cm   30.9 cm    2.4 m    6.15 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13   25.7 cm   34.2 cm   2.91 m    6.15 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 87,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    149 mum   190 mum  -2.4 m    20.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    234 mum   283 mum  -2.4 m    20.7 MeV     0 eV   4.76 mm   4.76 mm    TrackerTransportation
-    2   1.45 cm    1.6 cm   -1.6 m    20.7 MeV     0 eV     80 cm   80.5 cm    ChamberTransportation
-    3    1.8 cm   1.99 cm   -1.4 m    20.7 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.87 cm   3.17 cm    -80 cm   20.7 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   3.23 cm   3.56 cm    -60 cm   20.7 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   4.29 cm   4.73 cm -0.114 fm   20.7 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   4.65 cm   5.13 cm     20 cm   20.7 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   5.72 cm    6.3 cm     80 cm   20.7 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   6.07 cm    6.7 cm      1 m    20.7 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   7.14 cm   7.87 cm    1.6 m    20.7 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11    7.5 cm   8.26 cm    1.8 m    20.7 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   8.56 cm   9.44 cm    2.4 m    20.7 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   9.47 cm   10.4 cm   2.91 m    20.7 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 16,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   32.7 mum  21.1 mum -2.41 m     1.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    147 mum   289 mum  -2.4 m     1.4 MeV     0 eV   1.15 cm   1.15 cm    TrackerTransportation
-    2   8.13 mm   1.89 cm   -1.6 m     1.4 MeV     0 eV     80 cm   81.2 cm    ChamberTransportation
-    3   1.01 cm   2.36 cm   -1.4 m     1.4 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   1.61 cm   3.76 cm    -80 cm    1.4 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   1.81 cm   4.22 cm    -60 cm    1.4 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   2.41 cm   5.62 cm      0 fm    1.4 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   2.61 cm   6.09 cm     20 cm    1.4 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   3.21 cm   7.49 cm     80 cm    1.4 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   3.41 cm   7.95 cm      1 m     1.4 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   4.01 cm   9.35 cm    1.6 m     1.4 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   4.21 cm   9.82 cm    1.8 m     1.4 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   4.81 cm   11.2 cm    2.4 m     1.4 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   5.32 cm   12.4 cm   2.91 m     1.4 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 15,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.5 mum  7.96 mum -2.41 m      14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    220 mum   221 mum  -2.4 m       0 eV   1.25 MeV  1.01 cm   1.01 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 95,   Parent ID = 15
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    220 mum   221 mum  -2.4 m    11.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    346 mum   776 mum  -2.4 m    8.99 MeV  2.73 MeV  2.03 mm   2.03 mm   TargetPV     eIoni
-    2    435 mum   749 mum  -2.4 m    8.45 MeV   538 keV   328 mum  2.36 mm    TrackerTransportation
-    3   48.3 cm   39.8 cm  -1.17 m    8.18 MeV   256 keV  1.38 m    1.39 m     Tracker     eIoni
-    4   64.2 cm   57.5 cm    -80 cm    8.1 MeV  78.4 keV  44.1 cm   1.83 m     ChamberTransportation
-    5   67.2 cm   62.1 cm  -72.4 cm   8.05 MeV  47.7 keV  9.44 cm   1.92 m     TrackerTransportation
-    6   1.03 m    1.05 m       0 fm   7.88 MeV   168 keV  91.6 cm   2.84 m     ChamberTransportation
-    7   1.07 m     1.1 m    7.79 cm   7.84 MeV  47.9 keV  10.4 cm   2.94 m     TrackerTransportation
-    8   1.47 m    1.58 m    65.2 cm   7.66 MeV   155 keV  84.9 cm   3.79 m     Tracker     eIoni
-    9   1.56 m    1.66 m    77.5 cm   7.62 MeV  26.2 keV  17.1 cm   3.96 m     Tracker     eIoni
-   10   2.21 m    2.16 m    1.71 m    7.37 MeV   229 keV  1.25 m    5.21 m     Tracker     eIoni
-   11    2.4 m    2.28 m    1.94 m    7.32 MeV  55.5 keV  31.7 cm   5.53 m     WorldPVTransportation
-   12   2.91 m    2.58 m    2.51 m    7.17 MeV   152 keV    83 cm   6.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 99,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.21 m    2.16 m    1.71 m    15.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.21 m    2.16 m    1.72 m    13.6 keV   1.8 keV   1.3 mm    1.3 mm    Tracker     eIoni
-    2   2.21 m    2.16 m    1.72 m    11.8 keV  1.83 keV  1.11 mm   2.41 mm    Tracker     eIoni
-    3   2.21 m    2.16 m    1.72 m    10.7 keV  1.07 keV   927 mum  3.34 mm    Tracker     eIoni
-    4   2.21 m    2.16 m    1.72 m    9.41 keV  1.33 keV   833 mum  4.17 mm    Tracker     eIoni
-    5   2.21 m    2.16 m    1.72 m    6.99 keV  2.42 keV   722 mum  4.89 mm    Tracker     eIoni
-    6   2.21 m    2.16 m    1.72 m    4.94 keV  2.06 keV   544 mum  5.44 mm    Tracker     eIoni
-    7   2.21 m    2.16 m    1.72 m    2.44 keV   2.5 keV   413 mum  5.85 mm    Tracker     eIoni
-    8   2.21 m    2.16 m    1.72 m     157 eV   2.28 keV   220 mum  6.07 mm    Tracker     eIoni
-    9   2.21 m    2.16 m    1.72 m       0 eV    157 eV   12.6 mum  6.08 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 98,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.56 m    1.66 m    77.5 cm   15.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.56 m    1.66 m    77.5 cm   13.4 keV  2.24 keV  1.33 mm   1.33 mm    Tracker     eIoni
-    2   1.56 m    1.66 m    77.4 cm   11.6 keV  1.87 keV  1.09 mm   2.42 mm    Tracker     eIoni
-    3   1.56 m    1.66 m    77.4 cm   9.55 keV  2.01 keV   904 mum  3.32 mm    Tracker     eIoni
-    4   1.56 m    1.66 m    77.4 cm   6.61 keV  2.95 keV   733 mum  4.05 mm    Tracker     eIoni
-    5   1.56 m    1.66 m    77.4 cm   5.87 keV   742 eV    519 mum  4.57 mm    Tracker     eIoni
-    6   1.56 m    1.66 m    77.3 cm    510 eV   5.36 keV   471 mum  5.04 mm    Tracker     eIoni
-    7   1.56 m    1.66 m    77.3 cm      0 eV    510 eV   28.3 mum  5.07 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 97,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.47 m    1.58 m    65.2 cm   19.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.48 m    1.58 m      65 cm   15.8 keV  3.93 keV  1.84 mm   1.84 mm    Tracker     eIoni
-    2   1.48 m    1.58 m    64.9 cm   13.3 keV  2.51 keV  1.34 mm   3.18 mm    Tracker     eIoni
-    3   1.48 m    1.58 m    64.8 cm   11.3 keV     2 keV  1.07 mm   4.26 mm    Tracker     eIoni
-    4   1.48 m    1.58 m    64.7 cm   8.86 keV  2.43 keV   881 mum  5.14 mm    Tracker     eIoni
-    5   1.48 m    1.58 m    64.7 cm    5.7 keV  3.16 keV   679 mum  5.82 mm    Tracker     eIoni
-    6   1.48 m    1.58 m    64.7 cm   3.63 keV  2.06 keV   460 mum  6.28 mm    Tracker     eIoni
-    7   1.48 m    1.58 m    64.7 cm   3.52 eV   3.63 keV   327 mum   6.6 mm    Tracker     eIoni
-    8   1.48 m    1.58 m    64.7 cm      0 eV   3.52 eV   1.89 mum   6.6 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 96,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   48.3 cm   39.8 cm  -1.17 m      16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   48.4 cm   39.9 cm  -1.17 m    14.9 keV  1.07 keV  1.37 mm   1.37 mm    Tracker     eIoni
-    2   48.4 cm     40 cm  -1.17 m    13.8 keV  1.18 keV  1.24 mm   2.61 mm    Tracker     eIoni
-    3   48.3 cm     40 cm  -1.17 m      12 keV  1.76 keV  1.12 mm   3.73 mm    Tracker     eIoni
-    4   48.3 cm     40 cm  -1.17 m    10.3 keV   1.7 keV   943 mum  4.67 mm    Tracker     eIoni
-    5   48.2 cm     40 cm  -1.17 m    9.29 keV     1 keV   793 mum  5.47 mm    Tracker     eIoni
-    6   48.1 cm     40 cm  -1.17 m    7.58 keV  1.71 keV   713 mum  6.18 mm    Tracker     eIoni
-    7   48.1 cm     40 cm  -1.17 m    6.34 keV  1.24 keV   585 mum  6.76 mm    Tracker     eIoni
-    8   48.1 cm     40 cm  -1.17 m    3.56 keV  2.78 keV   502 mum  7.27 mm    Tracker     eIoni
-    9   48.1 cm     40 cm  -1.17 m       0 eV   3.56 keV   322 mum  7.59 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 14,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   4.02 mum  1.98 mum -2.41 m     583 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    151 mum  70.9 mum  -2.4 m     458 keV   125 keV  1.09 cm   1.09 cm   TargetPV     compt
-    2   -1.4 mm    531 mum  -2.4 m     458 keV     0 eV   2.52 mm   1.35 cm    TrackerTransportation
-    3   -2.4 m    71.3 cm   59.4 cm    458 keV     0 eV    3.9 m    3.92 m     WorldPVTransportation
-    4  -2.91 m    86.5 cm   1.23 m     458 keV     0 eV     83 cm   4.74 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 13,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -6.06 mum  2.52 mum -2.41 m    1.02 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   46.9 mum -24.9 mum -2.41 m     972 keV  48.6 keV  5.54 mm   5.54 mm   TargetPV     compt
-    2   -217 mum   651 mum  -2.4 m     378 keV   595 keV  3.39 mm   8.93 mm   TargetPV     compt
-    3   7.59 mm  -4.92 mm   -2.4 m       0 eV    378 keV  1.02 cm   1.92 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 12,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.08 mum  4.59 mum -2.41 m     610 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -233 mum   144 mum  -2.4 m     610 keV     0 eV    1.4 cm    1.4 cm    TrackerTransportation
-    2  -1.39 cm    8.1 mm   -1.6 m     610 keV     0 eV     80 cm   81.4 cm    ChamberTransportation
-    3  -1.73 cm   1.01 cm   -1.4 m     610 keV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.75 cm   1.61 cm    -80 cm    610 keV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -3.09 cm    1.8 cm    -60 cm    610 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -4.11 cm    2.4 cm -0.114 fm    610 keV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -4.45 cm    2.6 cm     20 cm    610 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -5.47 cm    3.2 cm     80 cm    610 keV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -5.82 cm    3.4 cm      1 m     610 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -6.84 cm   3.99 cm    1.6 m     610 keV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -7.18 cm   4.19 cm    1.8 m     610 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   -8.2 cm   4.79 cm    2.4 m     610 keV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -9.07 cm    5.3 cm   2.91 m     610 keV     0 eV     51 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 4,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    111 nm   -877 nm  -2.41 m    1.24 GeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.24 mum -2.78 mum -2.41 m    1.23 GeV  1.36 MeV   728 mum   728 mum  TargetPV     eBrem
-    2  -2.05 mum -2.34 mum -2.41 m     964 MeV  1.29 MeV  89.6 mum   818 mum  TargetPV     eBrem
-    3  -1.67 mum -2.35 mum -2.41 m     899 MeV   149 keV   127 mum   945 mum  TargetPV     eBrem
-    4  -1.59 mum -2.44 mum -2.41 m     897 MeV  47.1 keV  35.7 mum   981 mum  TargetPV     eBrem
-    5  -1.49 mum -2.53 mum -2.41 m     855 MeV  34.7 keV  29.1 mum  1.01 mm   TargetPV     eBrem
-    6  -2.07 mum -2.63 mum -2.41 m     854 MeV   390 keV   295 mum   1.3 mm   TargetPV     eBrem
-    7  -5.42 mum -7.38 mum -2.41 m     848 MeV   669 keV   617 mum  1.92 mm   TargetPV     eBrem
-    8   -6.8 mum -7.95 mum -2.41 m     327 MeV   193 keV   173 mum  2.09 mm   TargetPV     eBrem
-    9  -6.93 mum -25.9 mum -2.41 m     198 MeV  1.17 MeV   993 mum  3.09 mm   TargetPV     eBrem
-   10  -36.9 mum  86.7 mum -2.41 m     169 MeV  3.41 MeV  2.26 mm   5.35 mm   TargetPV     eBrem
-   11  -52.1 mum   106 mum -2.41 m     156 MeV   255 keV   247 mum   5.6 mm   TargetPV     eBrem
-   12   -180 mum   130 mum -2.41 m     146 MeV  2.15 MeV  1.37 mm   6.96 mm   TargetPV     eBrem
-   13   -185 mum   137 mum -2.41 m     141 MeV  94.7 keV  71.7 mum  7.04 mm   TargetPV     eBrem
-   14   -200 mum   179 mum -2.41 m    68.5 MeV   881 keV   745 mum  7.78 mm   TargetPV     eBrem
-   15   -231 mum   229 mum -2.41 m    63.3 MeV   539 keV   456 mum  8.24 mm   TargetPV     eBrem
-   16   -279 mum   251 mum -2.41 m    61.6 MeV   631 keV   395 mum  8.63 mm   TargetPV     eBrem
-   17   -299 mum   184 mum -2.41 m      61 MeV   200 keV   169 mum   8.8 mm   TargetPV     eBrem
-   18   -315 mum  -142 mum  -2.4 m    55.9 MeV  1.53 MeV  1.04 mm   9.84 mm   TargetPV     eBrem
-   19   -235 mum  -231 mum  -2.4 m    50.1 MeV   436 keV   390 mum  1.02 cm   TargetPV     eBrem
-   20    158 mum  -402 mum  -2.4 m    44.8 MeV  1.38 MeV  1.03 mm   1.13 cm   TargetPV     eBrem
-   21    621 mum  -546 mum  -2.4 m      40 MeV  2.84 MeV  1.79 mm   1.31 cm   TargetPV     eBrem
-   22    726 mum  -869 mum  -2.4 m    23.4 MeV  1.68 MeV  1.22 mm   1.43 cm   TargetPV     eBrem
-   23    607 mum  -937 mum  -2.4 m    22.6 MeV   763 keV   639 mum  1.49 cm    TrackerTransportation
-   24  -10.1 cm  -3.46 cm  -2.11 m    22.3 MeV  58.5 keV  30.5 cm     32 cm    Tracker     eIoni
-   25  -58.9 cm  -19.1 cm  -92.7 cm     22 MeV   261 keV  1.29 m    1.61 m     Tracker     eIoni
-   26  -63.4 cm  -20.1 cm    -80 cm     22 MeV  19.1 keV  13.5 cm   1.75 m     ChamberTransportation
-   27  -66.6 cm  -20.6 cm  -71.5 cm   21.9 MeV  54.5 keV  9.12 cm   1.84 m     Chamber     eBrem
-   28  -67.2 cm  -20.8 cm  -69.6 cm   21.9 MeV  10.1 keV  2.01 cm   1.86 m     TrackerTransportation
-   29  -88.9 cm  -28.5 cm 0.0335 fm   21.7 MeV   145 keV  73.3 cm   2.59 m     ChamberTransportation
-   30  -95.3 cm  -30.6 cm     20 cm   21.6 MeV   113 keV  21.2 cm    2.8 m     TrackerTransportation
-   31  -1.09 m   -38.7 cm     80 cm   21.4 MeV   125 keV  62.2 cm   3.43 m     ChamberTransportation
-   32  -1.14 m   -40.4 cm      1 m    21.3 MeV  80.1 keV  20.6 cm   3.63 m     TrackerTransportation
-   33  -1.16 m   -41.3 cm   1.07 m    21.3 MeV  11.9 keV  7.18 cm    3.7 m     Tracker     eIoni
-   34  -1.31 m   -49.7 cm    1.6 m    21.2 MeV   111 keV  55.8 cm   4.26 m     ChamberTransportation
-   35  -1.35 m   -53.1 cm    1.8 m    20.7 MeV   103 keV  20.3 cm   4.47 m     Chamber     eBrem
-   36  -1.35 m   -53.2 cm    1.8 m    20.7 MeV   703 eV   4.86 mm   4.47 m     TrackerTransportation
-   37  -1.35 m   -53.3 cm   1.81 m    20.7 MeV   488 eV   6.82 mm   4.48 m     Tracker     eIoni
-   38  -1.48 m   -62.7 cm    2.4 m    20.5 MeV   122 keV  61.4 cm   5.09 m     WorldPVTransportation
-   39  -1.58 m   -71.5 cm   2.91 m    20.4 MeV   103 keV  52.7 cm   5.62 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 130,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.35 m   -53.3 cm   1.81 m    25.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.35 m   -53.5 cm   1.81 m    23.6 keV  1.81 keV   2.7 mm    2.7 mm    Tracker     eIoni
-    2  -1.35 m   -53.7 cm   1.81 m    19.2 keV  4.38 keV  2.41 mm    5.1 mm    Tracker     eIoni
-    3  -1.35 m   -53.7 cm   1.81 m    16.8 keV  2.33 keV  1.77 mm   6.87 mm    Tracker     eIoni
-    4  -1.34 m   -53.8 cm    1.8 m      10 keV  6.85 keV  1.46 mm   8.33 mm    Tracker     eIoni
-    5  -1.34 m   -53.8 cm    1.8 m    8.97 keV  1.03 keV   767 mum   9.1 mm    Tracker     eIoni
-    6  -1.34 m   -53.8 cm    1.8 m    6.49 keV  2.48 keV   687 mum  9.79 mm    Tracker     eIoni
-    7  -1.34 m   -53.8 cm    1.8 m    3.92 keV  2.57 keV   511 mum  1.03 cm    Tracker     eIoni
-    8  -1.34 m   -53.8 cm    1.8 m    2.72 keV  1.21 keV   347 mum  1.06 cm    Tracker     eIoni
-    9  -1.34 m   -53.8 cm    1.8 m    40.7 eV   2.67 keV   250 mum  1.09 cm    Tracker     eIoni
-   10  -1.34 m   -53.8 cm    1.8 m       0 eV   40.7 eV   6.42 mum  1.09 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 129,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.35 m   -53.1 cm    1.8 m     404 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.35 m   -53.2 cm    1.8 m     404 keV     0 eV   4.84 mm   4.84 mm    TrackerTransportation
-    2  -1.45 m   -62.1 cm    2.4 m     404 keV     0 eV   61.6 cm     62 cm    WorldPVTransportation
-    3  -1.54 m   -69.7 cm   2.91 m     404 keV     0 eV   52.3 cm   1.14 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 128,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.33 m   -51.5 cm   1.71 m    9.99 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.33 m   -51.5 cm   1.71 m    8.76 keV  1.23 keV   530 mum   530 mum   Chamber     eIoni
-    2  -1.33 m   -51.5 cm   1.71 m     8.2 keV   560 eV    481 mum  1.01 mm    Chamber     eIoni
-    3  -1.33 m   -51.5 cm   1.71 m    2.13 keV  6.07 keV   459 mum  1.47 mm    Chamber     eIoni
-    4  -1.33 m   -51.5 cm   1.71 m       0 eV   2.13 keV   128 mum   1.6 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 127,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.16 m   -41.3 cm   1.07 m    12.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.16 m   -41.3 cm   1.07 m    11.4 keV   864 eV    970 mum   970 mum   Tracker     eIoni
-    2  -1.16 m   -41.2 cm   1.07 m    9.63 keV  1.77 keV   891 mum  1.86 mm    Tracker     eIoni
-    3  -1.16 m   -41.1 cm   1.07 m    3.23 keV   6.4 keV   739 mum   2.6 mm    Tracker     eIoni
-    4  -1.16 m   -41.1 cm   1.07 m     1.7 keV  1.53 keV   296 mum   2.9 mm    Tracker     eIoni
-    5  -1.16 m   -41.1 cm   1.07 m       0 eV    1.7 keV   128 mum  3.02 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 126,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.13 m   -39.9 cm   94.2 cm   14.4 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.13 m   -39.9 cm   94.2 cm   11.1 keV  3.32 keV   727 mum   727 mum   Chamber     eIoni
-    2  -1.13 m   -39.9 cm   94.2 cm   6.83 keV  4.27 keV   578 mum  1.31 mm    Chamber     eIoni
-    3  -1.13 m   -39.9 cm   94.2 cm   4.41 keV  2.42 keV   405 mum  1.71 mm    Chamber     eIoni
-    4  -1.13 m   -39.9 cm   94.2 cm   2.42 keV  1.99 keV   300 mum  2.01 mm    Chamber     eIoni
-    5  -1.13 m   -39.9 cm   94.2 cm      0 eV   2.42 keV   153 mum  2.16 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 125,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -90.2 cm  -28.9 cm   4.15 cm   37.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -90.2 cm  -29.1 cm   4.06 cm   34.4 keV  3.34 keV  2.36 mm   2.36 mm    Chamber     eIoni
-    2  -90.1 cm  -28.9 cm   4.06 cm   30.9 keV  3.51 keV  2.07 mm   4.42 mm    Chamber     eIoni
-    3    -90 cm  -28.9 cm   3.99 cm     25 keV  5.82 keV  1.78 mm    6.2 mm    Chamber     eIoni
-    4    -90 cm  -28.9 cm   3.92 cm   23.4 keV  1.63 keV  1.35 mm   7.55 mm    Chamber     eIoni
-    5    -90 cm  -28.8 cm   3.95 cm   21.2 keV   2.2 keV  1.24 mm   8.79 mm    Chamber     eIoni
-    6  -89.9 cm  -28.9 cm   3.89 cm   17.7 keV  3.48 keV   1.1 mm   9.89 mm    Chamber     eIoni
-    7  -89.9 cm  -28.9 cm   3.93 cm   17.2 keV   571 eV    899 mum  1.08 cm    Chamber     eIoni
-    8  -89.9 cm  -28.9 cm   3.98 cm   15.1 keV  2.02 keV   868 mum  1.17 cm    Chamber     eIoni
-    9  -89.9 cm  -28.9 cm   4.01 cm   13.6 keV  1.54 keV   764 mum  1.24 cm    Chamber     eIoni
-   10  -89.9 cm  -28.9 cm   4.01 cm   12.5 keV  1.05 keV   690 mum  1.31 cm    Chamber     eIoni
-   11  -89.8 cm  -28.9 cm   4.03 cm     11 keV  1.53 keV   641 mum  1.38 cm    Chamber     eIoni
-   12  -89.8 cm  -28.9 cm   4.05 cm   9.74 keV  1.27 keV   574 mum  1.43 cm    Chamber     eIoni
-   13  -89.8 cm  -28.9 cm   4.08 cm   8.65 keV  1.09 keV   520 mum  1.48 cm    Chamber     eIoni
-   14  -89.8 cm  -28.9 cm    4.1 cm   6.49 keV  2.15 keV   477 mum  1.53 cm    Chamber     eIoni
-   15  -89.8 cm  -28.9 cm    4.1 cm    4.1 keV   2.4 keV   392 mum  1.57 cm    Chamber     eIoni
-   16  -89.8 cm  -28.9 cm    4.1 cm   1.77 keV  2.33 keV   283 mum   1.6 cm    Chamber     eIoni
-   17  -89.8 cm  -28.9 cm    4.1 cm      0 eV   1.77 keV  99.7 mum  1.61 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 124,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -66.6 cm  -20.6 cm  -71.5 cm   82.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -67.2 cm  -20.8 cm  -69.6 cm   82.5 keV     0 eV   1.97 cm   1.97 cm    TrackerTransportation
-    2  -88.8 cm  -29.7 cm      0 fm   82.5 keV     0 eV   73.4 cm   75.4 cm    ChamberTransportation
-    3    -95 cm  -32.2 cm     20 cm   82.5 keV     0 eV   21.1 cm   96.5 cm    TrackerTransportation
-    4  -1.14 m   -39.9 cm     80 cm   82.5 keV     0 eV   63.3 cm    1.6 m     ChamberTransportation
-    5   -1.2 m   -42.5 cm      1 m    82.5 keV     0 eV   21.1 cm   1.81 m     TrackerTransportation
-    6  -1.38 m   -50.1 cm    1.6 m    82.5 keV     0 eV   63.3 cm   2.44 m     ChamberTransportation
-    7  -1.45 m   -52.7 cm    1.8 m    82.5 keV     0 eV   21.1 cm   2.65 m     TrackerTransportation
-    8  -1.63 m   -60.4 cm    2.4 m    82.5 keV     0 eV   63.3 cm   3.29 m     WorldPVTransportation
-    9  -1.79 m   -66.9 cm   2.91 m    82.5 keV     0 eV   53.8 cm   3.82 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 123,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -58.9 cm  -19.1 cm  -92.7 cm   8.17 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -58.9 cm    -19 cm  -92.7 cm   6.93 keV  1.23 keV   626 mum   626 mum   Tracker     eIoni
-    2  -58.9 cm    -19 cm  -92.7 cm   5.45 keV  1.48 keV   539 mum  1.17 mm    Tracker     eIoni
-    3    -59 cm    -19 cm  -92.8 cm   1.63 keV  3.82 keV   445 mum  1.61 mm    Tracker     eIoni
-    4    -59 cm    -19 cm  -92.8 cm      0 eV   1.63 keV   120 mum  1.73 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 122,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -10.1 cm  -3.46 cm  -2.11 m     286 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -3.86 cm  -15.5 cm  -2.05 m     252 keV  33.9 keV  16.1 cm   16.1 cm    Tracker     eIoni
-    2  -5.64 mm  -20.1 cm  -2.02 m     221 keV  18.1 keV  6.45 cm   22.6 cm    Tracker     eIoni
-    3   3.71 cm  -24.9 cm     -2 m     193 keV  18.3 keV   7.3 cm   29.9 cm    Tracker     eIoni
-    4   11.4 cm  -23.6 cm  -2.02 m     167 keV  25.8 keV  8.54 cm   38.4 cm    Tracker     eIoni
-    5     13 cm  -29.2 cm     -2 m     147 keV  19.9 keV  6.75 cm   45.2 cm    Tracker     eIoni
-    6   11.2 cm  -33.2 cm  -2.02 m     122 keV  12.3 keV  5.24 cm   50.4 cm    Tracker     eIoni
-    7   10.3 cm  -36.9 cm  -2.03 m     108 keV  13.6 keV  3.95 cm   54.3 cm    Tracker     eIoni
-    8    8.6 cm  -38.3 cm  -2.01 m    95.8 keV  12.4 keV  3.21 cm   57.6 cm    Tracker     eIoni
-    9   9.84 cm  -37.1 cm  -2.02 m    79.1 keV  16.7 keV  2.61 cm   60.2 cm    Tracker     eIoni
-   10   10.8 cm  -38.4 cm  -2.03 m    69.8 keV  9.34 keV  1.87 cm     62 cm    Tracker     eIoni
-   11   10.9 cm  -39.8 cm  -2.03 m    61.7 keV  8.05 keV  1.51 cm   63.5 cm    Tracker     eIoni
-   12   10.3 cm  -40.7 cm  -2.03 m    55.4 keV  6.31 keV  1.21 cm   64.8 cm    Tracker     eIoni
-   13   10.2 cm  -41.6 cm  -2.03 m      49 keV  6.37 keV  1.01 cm   65.8 cm    Tracker     eIoni
-   14   10.1 cm  -42.4 cm  -2.03 m    40.6 keV  8.46 keV  8.16 mm   66.6 cm    Tracker     eIoni
-   15   9.76 cm  -42.8 cm  -2.03 m    33.4 keV  7.18 keV  5.89 mm   67.2 cm    Tracker     eIoni
-   16   9.41 cm  -42.9 cm  -2.03 m    29.2 keV  4.18 keV  4.24 mm   67.6 cm    Tracker     eIoni
-   17   9.08 cm  -42.9 cm  -2.03 m    21.1 keV  8.07 keV  3.39 mm   67.9 cm    Tracker     eIoni
-   18   8.96 cm  -43.1 cm  -2.03 m    18.6 keV  2.58 keV  2.03 mm   68.1 cm    Tracker     eIoni
-   19   8.92 cm  -43.2 cm  -2.03 m    16.9 keV  1.69 keV  1.69 mm   68.3 cm    Tracker     eIoni
-   20    8.8 cm  -43.3 cm  -2.03 m    12.9 keV  4.01 keV  1.47 mm   68.5 cm    Tracker     eIoni
-   21   8.72 cm  -43.3 cm  -2.03 m    11.5 keV  1.35 keV  1.03 mm   68.6 cm    Tracker     eIoni
-   22   8.64 cm  -43.3 cm  -2.03 m    9.79 keV  1.75 keV   902 mum  68.6 cm    Tracker     eIoni
-   23    8.6 cm  -43.4 cm  -2.03 m    8.89 keV   895 eV    751 mum  68.7 cm    Tracker     eIoni
-   24   8.63 cm  -43.4 cm  -2.03 m    2.27 keV  6.62 keV   681 mum  68.8 cm    Tracker     eIoni
-   25   8.62 cm  -43.4 cm  -2.03 m       0 eV   2.27 keV   197 mum  68.8 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 133,   Parent ID = 122
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   11.2 cm  -33.2 cm  -2.02 m    13.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   11.1 cm  -33.2 cm  -2.02 m    11.9 keV  1.34 keV  1.07 mm   1.07 mm    Tracker     eIoni
-    2     11 cm  -33.1 cm  -2.03 m    9.09 keV   2.8 keV   933 mum     2 mm    Tracker     eIoni
-    3     11 cm  -33.2 cm  -2.03 m    4.93 keV  4.17 keV   697 mum   2.7 mm    Tracker     eIoni
-    4     11 cm  -33.1 cm  -2.03 m    3.33 keV   1.6 keV   412 mum  3.11 mm    Tracker     eIoni
-    5     11 cm  -33.1 cm  -2.03 m     732 eV    2.6 keV   304 mum  3.41 mm    Tracker     eIoni
-    6     11 cm  -33.1 cm  -2.03 m       0 eV    732 eV   41.8 mum  3.45 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 132,   Parent ID = 122
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.71 cm  -24.9 cm     -2 m    9.96 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   3.72 cm  -24.9 cm     -2 m    6.19 keV  3.78 keV   764 mum   764 mum   Tracker     eIoni
-    2   3.74 cm    -25 cm     -2 m    3.83 keV  2.36 keV   492 mum  1.26 mm    Tracker     eIoni
-    3   3.73 cm    -25 cm     -2 m    3.06 keV   769 eV    341 mum   1.6 mm    Tracker     eIoni
-    4    3.7 cm    -25 cm     -2 m    1.54 keV  1.52 keV   282 mum  1.88 mm    Tracker     eIoni
-    5    3.7 cm    -25 cm     -2 m       0 eV   1.54 keV   111 mum  1.99 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 131,   Parent ID = 122
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.64 mm  -20.1 cm  -2.02 m      13 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -5.45 mm    -20 cm  -2.02 m    7.54 keV  5.43 keV  1.04 mm   1.04 mm    Tracker     eIoni
-    2   -5.2 mm    -20 cm  -2.02 m    5.27 keV  2.27 keV   582 mum  1.62 mm    Tracker     eIoni
-    3  -5.11 mm    -20 cm  -2.02 m    3.58 keV  1.68 keV   434 mum  2.06 mm    Tracker     eIoni
-    4  -5.19 mm    -20 cm  -2.02 m     537 eV   3.05 keV   324 mum  2.38 mm    Tracker     eIoni
-    5  -5.19 mm    -20 cm  -2.02 m       0 eV    537 eV   29.8 mum  2.41 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 121,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    726 mum  -869 mum  -2.4 m    14.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    609 mum  -939 mum  -2.4 m    14.9 MeV     0 eV    624 mum   624 mum   TrackerTransportation
-    2  -15.3 cm  -9.21 cm   -1.6 m    14.9 MeV     0 eV     82 cm     82 cm    ChamberTransportation
-    3  -19.1 cm  -11.5 cm   -1.4 m    14.9 MeV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4  -30.6 cm  -18.3 cm    -80 cm   14.9 MeV     0 eV   61.5 cm   1.64 m     ChamberTransportation
-    5  -34.4 cm  -20.6 cm    -60 cm   14.9 MeV     0 eV   20.5 cm   1.84 m     TrackerTransportation
-    6  -45.9 cm  -27.5 cm      0 fm   14.9 MeV     0 eV   61.5 cm   2.46 m     ChamberTransportation
-    7  -49.7 cm  -29.7 cm     20 cm   14.9 MeV     0 eV   20.5 cm   2.66 m     TrackerTransportation
-    8  -61.2 cm  -36.6 cm     80 cm   14.9 MeV     0 eV   61.5 cm   3.28 m     ChamberTransportation
-    9  -65.1 cm  -38.8 cm      1 m    14.9 MeV     0 eV   20.5 cm   3.48 m     TrackerTransportation
-   10  -76.6 cm  -45.7 cm    1.6 m    14.9 MeV     0 eV   61.5 cm    4.1 m     ChamberTransportation
-   11  -80.4 cm    -48 cm    1.8 m    14.9 MeV     0 eV   20.5 cm    4.3 m     TrackerTransportation
-   12  -91.9 cm  -54.8 cm    2.4 m    14.9 MeV     0 eV   61.5 cm   4.92 m     WorldPVTransportation
-   13  -1.02 m   -60.6 cm   2.91 m    14.9 MeV     0 eV   52.3 cm   5.44 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 120,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    621 mum  -546 mum  -2.4 m    1.93 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    929 mum -1.22 mm   -2.4 m    1.93 MeV     0 eV   1.92 mm   1.92 mm    TrackerTransportation
-    2   27.9 cm  -61.4 cm    -80 cm   1.93 MeV     0 eV   1.74 m    1.74 m     ChamberTransportation
-    3   30.5 cm  -67.2 cm  -64.8 cm   1.93 MeV     0 eV   16.5 cm    1.9 m     TrackerTransportation
-    4   41.8 cm    -92 cm      0 fm   1.93 MeV     0 eV   70.3 cm   2.61 m     ChamberTransportation
-    5   45.3 cm  -99.7 cm     20 cm   1.93 MeV     0 eV   21.7 cm   2.82 m     TrackerTransportation
-    6   55.7 cm  -1.23 m      80 cm   1.93 MeV     0 eV   65.1 cm   3.47 m     ChamberTransportation
-    7   59.2 cm   -1.3 m       1 m    1.93 MeV     0 eV   21.7 cm   3.69 m     TrackerTransportation
-    8   69.6 cm  -1.53 m     1.6 m    1.93 MeV     0 eV   65.1 cm   4.34 m     ChamberTransportation
-    9   73.1 cm  -1.61 m     1.8 m    1.93 MeV     0 eV   21.7 cm   4.56 m     TrackerTransportation
-   10   83.5 cm  -1.84 m     2.4 m    1.93 MeV     0 eV   65.1 cm   5.21 m     WorldPVTransportation
-   11   92.4 cm  -2.03 m    2.91 m    1.93 MeV     0 eV   55.3 cm   5.76 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 119,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    158 mum  -402 mum  -2.4 m    3.95 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.21 mm  -1.28 mm   -2.4 m    3.95 MeV     0 eV   3.74 mm   3.74 mm    TrackerTransportation
-    2   48.7 cm  -40.5 cm    -80 cm   3.95 MeV     0 eV   1.72 m    1.72 m     ChamberTransportation
-    3   54.7 cm  -45.6 cm    -60 cm   3.95 MeV     0 eV   21.5 cm   1.94 m     TrackerTransportation
-    4   72.9 cm  -60.7 cm  0.114 fm   3.95 MeV     0 eV   64.5 cm   2.58 m     ChamberTransportation
-    5     79 cm  -65.8 cm     20 cm   3.95 MeV     0 eV   21.5 cm    2.8 m     TrackerTransportation
-    6   97.2 cm  -80.9 cm     80 cm   3.95 MeV     0 eV   64.5 cm   3.44 m     ChamberTransportation
-    7   1.03 m     -86 cm      1 m    3.95 MeV     0 eV   21.5 cm   3.66 m     TrackerTransportation
-    8   1.21 m   -1.01 m     1.6 m    3.95 MeV     0 eV   64.5 cm    4.3 m     ChamberTransportation
-    9   1.28 m   -1.06 m     1.8 m    3.95 MeV     0 eV   21.5 cm   4.52 m     TrackerTransportation
-   10   1.46 m   -1.21 m     2.4 m    3.95 MeV     0 eV   64.5 cm   5.16 m     WorldPVTransportation
-   11   1.61 m   -1.34 m    2.91 m    3.95 MeV     0 eV   54.8 cm   5.71 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 118,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -235 mum  -231 mum  -2.4 m    5.37 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.14 mm  -1.17 mm   -2.4 m    5.37 MeV     0 eV   4.72 mm   4.72 mm    TrackerTransportation
-    2     50 cm  -34.1 cm    -80 cm   5.37 MeV     0 eV   1.71 m    1.71 m     ChamberTransportation
-    3   56.3 cm  -38.4 cm    -60 cm   5.37 MeV     0 eV   21.4 cm   1.93 m     TrackerTransportation
-    4     75 cm  -51.2 cm      0 fm   5.37 MeV     0 eV   64.1 cm   2.57 m     ChamberTransportation
-    5   81.2 cm  -55.4 cm     20 cm   5.37 MeV     0 eV   21.4 cm   2.78 m     TrackerTransportation
-    6   99.9 cm  -68.2 cm     80 cm   5.37 MeV     0 eV   64.1 cm   3.43 m     ChamberTransportation
-    7   1.06 m   -72.4 cm      1 m    5.37 MeV     0 eV   21.4 cm   3.64 m     TrackerTransportation
-    8   1.25 m   -85.2 cm    1.6 m    5.37 MeV     0 eV   64.1 cm   4.28 m     ChamberTransportation
-    9   1.31 m   -89.4 cm    1.8 m    5.37 MeV     0 eV   21.4 cm   4.49 m     TrackerTransportation
-   10    1.5 m   -1.02 m     2.4 m    5.37 MeV     0 eV   64.1 cm   5.14 m     WorldPVTransportation
-   11   1.66 m   -1.13 m    2.91 m    5.37 MeV     0 eV   54.5 cm   5.68 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 117,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -315 mum  -142 mum  -2.4 m     3.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    687 mum -1.55 mm   -2.4 m     3.6 MeV     0 eV   5.09 mm   5.09 mm    TrackerTransportation
-    2   16.8 cm  -23.8 cm   -1.6 m     3.6 MeV     0 eV   85.1 cm   85.6 cm    ChamberTransportation
-    3     17 cm    -24 cm  -1.59 m     3.6 MeV     0 eV   8.62 mm   86.4 cm    TrackerTransportation
-    4   33.6 cm  -47.4 cm    -80 cm    3.6 MeV     0 eV   84.2 cm   1.71 m     ChamberTransportation
-    5   37.8 cm  -53.3 cm    -60 cm    3.6 MeV     0 eV   21.3 cm   1.92 m     TrackerTransportation
-    6   50.4 cm    -71 cm      0 fm    3.6 MeV     0 eV   63.8 cm   2.56 m     ChamberTransportation
-    7   54.6 cm  -76.9 cm     20 cm    3.6 MeV     0 eV   21.3 cm   2.77 m     TrackerTransportation
-    8   67.1 cm  -94.6 cm     80 cm    3.6 MeV     0 eV   63.8 cm   3.41 m     ChamberTransportation
-    9   71.3 cm     -1 m       1 m     3.6 MeV     0 eV   21.3 cm   3.62 m     TrackerTransportation
-   10   83.9 cm  -1.18 m     1.6 m     3.6 MeV     0 eV   63.8 cm   4.26 m     ChamberTransportation
-   11   88.1 cm  -1.24 m     1.8 m     3.6 MeV     0 eV   21.3 cm   4.47 m     TrackerTransportation
-   12   1.01 m   -1.42 m     2.4 m     3.6 MeV     0 eV   63.8 cm   5.11 m     WorldPVTransportation
-   13   1.11 m   -1.57 m    2.91 m     3.6 MeV     0 eV   54.2 cm   5.65 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 116,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -299 mum   184 mum -2.41 m     352 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -214 mum  -293 mum  -2.4 m       0 eV    352 keV  1.35 mm   1.35 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 115,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -279 mum   251 mum -2.41 m    1.06 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -866 mum -2.25 mm   -2.4 m    1.06 MeV     0 eV   6.46 mm   6.46 mm    TrackerTransportation
-    2  -23.9 cm  -1.02 m       0 fm   1.06 MeV     0 eV   2.62 m    2.62 m     ChamberTransportation
-    3  -25.8 cm   -1.1 m      20 cm   1.06 MeV     0 eV   21.8 cm   2.84 m     TrackerTransportation
-    4  -31.8 cm  -1.35 m      80 cm   1.06 MeV     0 eV   65.4 cm   3.49 m     ChamberTransportation
-    5  -33.8 cm  -1.44 m       1 m    1.06 MeV     0 eV   21.8 cm   3.71 m     TrackerTransportation
-    6  -39.7 cm  -1.69 m     1.6 m    1.06 MeV     0 eV   65.4 cm   4.37 m     ChamberTransportation
-    7  -41.7 cm  -1.78 m     1.8 m    1.06 MeV     0 eV   21.8 cm   4.58 m     TrackerTransportation
-    8  -47.6 cm  -2.03 m     2.4 m    1.06 MeV     0 eV   65.4 cm   5.24 m     WorldPVTransportation
-    9  -52.7 cm  -2.25 m    2.91 m    1.06 MeV     0 eV   55.6 cm   5.79 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 114,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -231 mum   229 mum -2.41 m    4.64 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -451 mum   431 mum  -2.4 m     367 keV     0 eV   3.14 mm   3.14 mm   TargetPV     compt
-    2  -2.06 mm   1.31 mm   -2.4 m       0 eV    367 keV  1.97 mm   5.11 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 134,   Parent ID = 114
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -451 mum   431 mum  -2.4 m    4.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -468 nm    656 mum  -2.4 m    3.36 MeV   917 keV   957 mum   957 mum  TargetPV     eIoni
-    2    527 mum   482 mum  -2.4 m    2.51 MeV   853 keV   819 mum  1.78 mm   TargetPV     eIoni
-    3    429 mum   398 mum  -2.4 m     289 keV  2.22 MeV   684 mum  2.46 mm   TargetPV     eIoni
-    4    428 mum   402 mum  -2.4 m       0 eV    289 keV   137 mum   2.6 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 113,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -200 mum   179 mum -2.41 m    71.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -554 mum   610 mum  -2.4 m    71.3 MeV     0 eV   6.79 mm   6.79 mm    TrackerTransportation
-    2  -4.24 cm   5.16 cm   -1.6 m    71.3 MeV     0 eV   80.3 cm     81 cm    ChamberTransportation
-    3  -5.29 cm   6.43 cm   -1.4 m    71.3 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4  -8.43 cm   10.3 cm    -80 cm   71.3 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5  -9.47 cm   11.5 cm    -60 cm   71.3 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6  -12.6 cm   15.3 cm      0 fm   71.3 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7  -13.7 cm   16.6 cm     20 cm   71.3 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8  -16.8 cm   20.4 cm     80 cm   71.3 MeV     0 eV   60.2 cm   3.22 m     ChamberTransportation
-    9  -17.8 cm   21.7 cm      1 m    71.3 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10    -21 cm   25.5 cm    1.6 m    71.3 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11    -22 cm   26.8 cm    1.8 m    71.3 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12  -25.2 cm   30.6 cm    2.4 m    71.3 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13  -27.8 cm   33.9 cm   2.91 m    71.3 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 112,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -185 mum   137 mum -2.41 m    4.75 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -214 mum   184 mum -2.41 m     2.2 MeV  2.55 MeV   644 mum   644 mum  TargetPV     compt
-    2   2.56 mm  -1.27 mm   -2.4 m     2.2 MeV     0 eV   7.55 mm   8.19 mm    TrackerTransportation
-    3   64.9 cm  -34.1 cm    -80 cm    2.2 MeV     0 eV   1.76 m    1.77 m     ChamberTransportation
-    4   67.2 cm  -35.3 cm  -74.3 cm    2.2 MeV     0 eV   6.29 cm   1.83 m     TrackerTransportation
-    5   97.2 cm  -51.1 cm      0 fm    2.2 MeV     0 eV   81.6 cm   2.65 m     ChamberTransportation
-    6   1.05 m   -55.3 cm     20 cm    2.2 MeV     0 eV     22 cm   2.87 m     TrackerTransportation
-    7    1.3 m     -68 cm     80 cm    2.2 MeV     0 eV     66 cm   3.53 m     ChamberTransportation
-    8   1.38 m   -72.3 cm      1 m     2.2 MeV     0 eV     22 cm   3.75 m     TrackerTransportation
-    9   1.62 m     -85 cm    1.6 m     2.2 MeV     0 eV     66 cm    4.4 m     ChamberTransportation
-   10    1.7 m   -89.3 cm    1.8 m     2.2 MeV     0 eV     22 cm   4.62 m     TrackerTransportation
-   11   1.94 m   -1.02 m     2.4 m     2.2 MeV     0 eV     66 cm   5.28 m     WorldPVTransportation
-   12   2.15 m   -1.13 m    2.91 m     2.2 MeV     0 eV   56.1 cm   5.84 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 111,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -180 mum   130 mum -2.41 m    8.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -606 mum   777 mum  -2.4 m    8.38 MeV     0 eV   7.62 mm   7.62 mm    TrackerTransportation
-    2  -4.56 cm    6.9 cm   -1.6 m    8.38 MeV     0 eV   80.4 cm   81.2 cm    ChamberTransportation
-    3  -5.68 cm   8.61 cm   -1.4 m    8.38 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4  -9.05 cm   13.7 cm    -80 cm   8.38 MeV     0 eV   60.3 cm   1.62 m     ChamberTransportation
-    5  -10.2 cm   15.4 cm    -60 cm   8.38 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6  -13.5 cm   20.6 cm      0 fm   8.38 MeV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7  -14.7 cm   22.3 cm     20 cm   8.38 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8    -18 cm   27.4 cm     80 cm   8.38 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9  -19.2 cm   29.1 cm      1 m    8.38 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10  -22.5 cm   34.2 cm    1.6 m    8.38 MeV     0 eV   60.3 cm   4.03 m     ChamberTransportation
-   11  -23.7 cm   35.9 cm    1.8 m    8.38 MeV     0 eV   20.1 cm   4.23 m     TrackerTransportation
-   12    -27 cm     41 cm    2.4 m    8.38 MeV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13  -29.9 cm   45.4 cm   2.91 m    8.38 MeV     0 eV   51.3 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 110,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -52.1 mum   106 mum -2.41 m    12.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -105 mum   145 mum -2.41 m       0 eV   11.7 MeV   852 mum   852 mum  TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 135,   Parent ID = 110
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -105 mum   145 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -105 mum   145 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 137,   Parent ID = 135
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -105 mum   145 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    432 mum  -792 mum -2.41 m       0 eV    511 keV  1.09 mm   1.09 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 136,   Parent ID = 135
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -105 mum   145 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -461 mum   768 mum -2.41 m     369 keV   142 keV   723 mum   723 mum  TargetPV     compt
-    2  -1.42 mm   1.69 mm  -2.41 m       0 eV    369 keV  1.82 mm   2.54 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 109,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -36.9 mum  86.7 mum -2.41 m    25.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -163 mum   224 mum -2.41 m       0 eV   6.12 MeV  1.82 mm   1.82 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 139,   Parent ID = 109
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -163 mum   224 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 141,   Parent ID = 139
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.47 mm   6.41 mm   -2.4 m     511 keV     0 eV   9.77 mm   9.77 mm    TrackerTransportation
-    2   63.3 cm    2.4 m    45.7 cm    511 keV     0 eV   3.78 m    3.79 m     WorldPVTransportation
-    3   76.8 cm   2.91 m    1.07 m     511 keV     0 eV   80.6 cm    4.6 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 140,   Parent ID = 139
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -1.5 mm  -4.84 mm  -2.41 m       0 eV    511 keV     8 mm      8 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 138,   Parent ID = 109
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m    18.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -114 mum   259 mum -2.41 m    15.1 MeV   629 keV   388 mum   388 mum  TargetPV     eBrem
-    2   -142 mum   337 mum -2.41 m    12.5 MeV   582 keV   412 mum   799 mum  TargetPV     eBrem
-    3   -196 mum -68.1 mum -2.41 m    11.4 MeV   674 keV   603 mum   1.4 mm   TargetPV     eBrem
-    4   -694 mum -1.01 mm  -2.41 m    8.65 MeV  1.61 MeV  1.23 mm   2.64 mm   TargetPV     eBrem
-    5   -682 mum -1.61 mm  -2.41 m    7.39 MeV   687 keV   654 mum  3.29 mm   TargetPV     eBrem
-    6  -1.09 mm  -1.86 mm  -2.41 m    3.87 MeV  1.38 MeV  1.15 mm   4.44 mm   TargetPV     eBrem
-    7   -847 mum -2.15 mm  -2.41 m     2.7 MeV  1.17 MeV   897 mum  5.34 mm   TargetPV     eIoni
-    8  -1.18 mm  -2.36 mm  -2.41 m    1.98 MeV   714 keV   715 mum  6.05 mm   TargetPV     eIoni
-    9  -1.49 mm  -2.29 mm  -2.41 m    1.42 MeV   566 keV   597 mum  6.65 mm   TargetPV     eIoni
-   10  -1.64 mm  -2.18 mm  -2.41 m     937 keV   481 keV   497 mum  7.15 mm   TargetPV     eIoni
-   11  -1.67 mm   -2.3 mm  -2.41 m     567 keV   369 keV   399 mum  7.55 mm   TargetPV     eIoni
-   12  -1.69 mm  -2.29 mm  -2.41 m    7.81 keV   560 keV   296 mum  7.84 mm   TargetPV     eIoni
-   13  -1.69 mm  -2.29 mm  -2.41 m       0 eV   7.81 keV   495 nm   7.84 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 147,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.09 mm  -1.86 mm  -2.41 m    2.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.31 mm  -2.93 mm  -2.41 m    1.51 MeV   638 keV   1.2 mm    1.2 mm   TargetPV     compt
-    2  -1.26 mm  -3.42 mm  -2.41 m    1.11 MeV   394 keV   496 mum   1.7 mm   TargetPV     compt
-    3  -2.52 mm   -2.1 cm   -2.4 m    1.11 MeV     0 eV    1.9 cm   2.06 cm    TrackerTransportation
-    4  -17.3 cm   -2.4 m   -1.45 m    1.11 MeV     0 eV   2.57 m    2.59 m     WorldPVTransportation
-    5    -21 cm  -2.91 m   -1.25 m    1.11 MeV     0 eV     55 cm   3.14 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 146,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -682 mum -1.61 mm  -2.41 m     568 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.55 mm  -2.09 cm  -2.43 m     399 keV   169 keV  2.85 cm   2.85 cm   TargetPV     compt
-    2  -3.15 mm  -2.16 cm  -2.43 m       0 eV    399 keV   893 mum  2.94 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 145,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -694 mum -1.01 mm  -2.41 m    1.17 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.45 mm  -1.25 cm   -2.4 m     349 keV   819 keV  1.29 cm   1.29 cm   TargetPV     compt
-    2  -3.69 mm  -1.23 cm   -2.4 m       0 eV    349 keV   426 mum  1.33 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 144,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -196 mum -68.1 mum -2.41 m     357 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -228 mum  -134 mum -2.41 m       0 eV    357 keV  73.7 mum  73.7 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 143,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -142 mum   337 mum -2.41 m    2.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.62 mm  -5.38 mm   -2.4 m    2.03 MeV     0 eV    9.4 mm    9.4 mm    TrackerTransportation
-    2  -1.46 m    -2.4 m    36.7 cm   2.03 MeV     0 eV   3.94 m    3.95 m     WorldPVTransportation
-    3  -1.77 m   -2.91 m    95.6 cm   2.03 MeV     0 eV   83.9 cm   4.79 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 142,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -114 mum   259 mum -2.41 m    2.49 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    382 mum  1.04 mm   -2.4 m     965 keV  1.52 MeV  3.09 mm   3.09 mm   TargetPV     compt
-    2   2.73 mm    948 mum  -2.4 m     453 keV   512 keV  2.88 mm   5.97 mm   TargetPV     compt
-    3   4.49 mm   4.34 mm   -2.4 m       0 eV    453 keV  3.84 mm   9.81 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 108,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -6.93 mum -25.9 mum -2.41 m     128 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -41.9 mum -15.8 mum -2.41 m       0 eV      0 eV   1.33 mm   1.33 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 149,   Parent ID = 108
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -41.9 mum -15.8 mum -2.41 m    87.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -42.7 mum -15.7 mum -2.41 m    86.4 MeV  29.8 keV  26.5 mum  26.5 mum  TargetPV     eBrem
-    2  -43.6 mum -16.7 mum -2.41 m    85.7 MeV  74.7 keV  50.3 mum  76.8 mum  TargetPV     eBrem
-    3  -43.4 mum -17.3 mum -2.41 m    76.7 MeV  17.7 keV  14.7 mum  91.4 mum  TargetPV     eBrem
-    4  -38.2 mum -16.9 mum -2.41 m    75.4 MeV   610 keV   426 mum   518 mum  TargetPV     eBrem
-    5  -28.6 mum -16.2 mum -2.41 m      59 MeV   118 keV   121 mum   639 mum  TargetPV     eBrem
-    6   43.6 mum  -115 mum -2.41 m    56.7 MeV   1.9 MeV  1.39 mm   2.03 mm   TargetPV     eBrem
-    7   57.1 mum  -105 mum -2.41 m    50.8 MeV   121 keV   105 mum  2.13 mm   TargetPV     eBrem
-    8   98.5 mum -99.8 mum -2.41 m    49.2 MeV  1.01 MeV   554 mum  2.69 mm   TargetPV     eBrem
-    9    230 mum -89.8 mum -2.41 m    38.3 MeV  1.06 MeV   616 mum   3.3 mm   TargetPV     eBrem
-   10    270 mum -59.2 mum -2.41 m    36.7 MeV   535 keV   373 mum  3.68 mm   TargetPV     eBrem
-   11    282 mum   -61 mum -2.41 m    36.2 MeV   105 keV  88.1 mum  3.76 mm   TargetPV     eBrem
-   12    275 mum -57.2 mum -2.41 m    34.9 MeV   806 keV   340 mum   4.1 mm   TargetPV     eBrem
-   13    376 mum   254 mum  -2.4 m    32.6 MeV     2 MeV  1.31 mm   5.41 mm   TargetPV     eBrem
-   14    571 mum   316 mum  -2.4 m    4.25 MeV  1.42 MeV  1.16 mm   6.58 mm   TargetPV     eBrem
-   15    618 mum   304 mum  -2.4 m    3.39 MeV   268 keV   229 mum  6.81 mm   TargetPV     eBrem
-   16   1.05 mm    232 mum  -2.4 m    1.86 MeV  1.53 MeV   841 mum  7.65 mm   TargetPV     eIoni
-   17   1.16 mm   68.2 mum  -2.4 m     430 keV  1.43 MeV   586 mum  8.24 mm   TargetPV     eIoni
-   18   1.15 mm   95.7 mum  -2.4 m    99.1 keV   331 keV   237 mum  8.47 mm   TargetPV     eIoni
-   19   1.15 mm   93.8 mum  -2.4 m       0 eV   99.1 keV  25.2 mum   8.5 mm   TargetPV     eIoni
-   20   1.15 mm   93.8 mum  -2.4 m       0 eV      0 eV      0 fm    8.5 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 166,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.15 mm   93.8 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.64 mm  -2.77 mm   -2.4 m       0 eV    511 keV  3.23 mm   3.23 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 165,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.15 mm   93.8 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.11 cm   2.36 cm   -2.4 m     454 keV  57.4 keV  2.65 cm   2.65 cm   TargetPV     compt
-    2  -1.12 cm   2.42 cm   -2.4 m       0 eV    454 keV   677 mum  2.72 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 164,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    618 mum   304 mum  -2.4 m     589 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.01 cm  -3.16 mm   -2.4 m       0 eV     88 keV  1.07 cm   1.07 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 167,   Parent ID = 164
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.01 cm  -3.16 mm   -2.4 m     501 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.01 cm  -3.16 mm   -2.4 m     133 keV   369 keV   270 mum   270 mum  TargetPV     eIoni
-    2   1.01 cm  -3.16 mm   -2.4 m       0 eV    133 keV  42.9 mum   313 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 163,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    571 mum   316 mum  -2.4 m      27 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    357 mum  1.09 mm   -2.4 m      27 MeV     0 eV   3.74 mm   3.74 mm    TrackerTransportation
-    2  -4.64 cm   17.2 cm   -1.6 m      27 MeV     0 eV   81.9 cm   82.3 cm    ChamberTransportation
-    3   -5.8 cm   21.4 cm   -1.4 m      27 MeV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4  -9.31 cm   34.2 cm    -80 cm     27 MeV     0 eV   61.4 cm   1.64 m     ChamberTransportation
-    5  -10.5 cm   38.5 cm    -60 cm     27 MeV     0 eV   20.5 cm   1.85 m     TrackerTransportation
-    6    -14 cm   51.2 cm -0.114 fm     27 MeV     0 eV   61.4 cm   2.46 m     ChamberTransportation
-    7  -15.1 cm   55.5 cm     20 cm     27 MeV     0 eV   20.5 cm   2.67 m     TrackerTransportation
-    8  -18.6 cm   68.3 cm     80 cm     27 MeV     0 eV   61.4 cm   3.28 m     ChamberTransportation
-    9  -19.8 cm   72.5 cm      1 m      27 MeV     0 eV   20.5 cm   3.49 m     TrackerTransportation
-   10  -23.3 cm   85.3 cm    1.6 m      27 MeV     0 eV   61.4 cm    4.1 m     ChamberTransportation
-   11  -24.5 cm   89.6 cm    1.8 m      27 MeV     0 eV   20.5 cm    4.3 m     TrackerTransportation
-   12    -28 cm   1.02 m     2.4 m      27 MeV     0 eV   61.4 cm   4.92 m     WorldPVTransportation
-   13    -31 cm   1.13 m    2.91 m      27 MeV     0 eV   52.2 cm   5.44 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 162,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    376 mum   254 mum  -2.4 m     291 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    617 mum   522 mum  -2.4 m       0 eV    291 keV  1.31 mm   1.31 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 161,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    275 mum -57.2 mum -2.41 m     516 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    308 mum   464 mum  -2.4 m     516 keV     0 eV   6.07 mm   6.07 mm    TrackerTransportation
-    2    4.7 mm   6.94 cm   -1.6 m     516 keV     0 eV   80.3 cm   80.9 cm    ChamberTransportation
-    3    5.8 mm   8.66 cm   -1.4 m     516 keV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   9.09 mm   13.8 cm    -80 cm    516 keV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   1.02 cm   15.6 cm    -60 cm    516 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   1.35 cm   20.7 cm  0.114 fm    516 keV     0 eV   60.2 cm   2.42 m     ChamberTransportation
-    7   1.46 cm   22.5 cm     20 cm    516 keV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   1.79 cm   27.6 cm     80 cm    516 keV     0 eV   60.2 cm   3.22 m     ChamberTransportation
-    9    1.9 cm   29.3 cm      1 m     516 keV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   2.23 cm   34.5 cm    1.6 m     516 keV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   2.34 cm   36.2 cm    1.8 m     516 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   2.66 cm   41.4 cm    2.4 m     516 keV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13   2.94 cm   45.8 cm   2.91 m     516 keV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 160,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    282 mum   -61 mum -2.41 m     317 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    297 mum -42.6 mum -2.41 m       0 eV    317 keV   605 mum   605 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 159,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    270 mum -59.2 mum -2.41 m    1.11 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    845 mum  -155 mum  -2.4 m     902 keV   210 keV   4.5 mm    4.5 mm   TargetPV     compt
-    2    858 mum   192 mum  -2.4 m     387 keV   515 keV   827 mum  5.33 mm   TargetPV     compt
-    3    292 mum   786 mum  -2.4 m       0 eV    387 keV   821 mum  6.15 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 158,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    230 mum -89.8 mum -2.41 m    9.83 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    854 mum  21.8 mum  -2.4 m    9.83 MeV     0 eV   6.87 mm   6.87 mm    TrackerTransportation
-    2   7.38 cm   1.31 cm   -1.6 m    9.83 MeV     0 eV   80.3 cm     81 cm    ChamberTransportation
-    3    9.2 cm   1.63 cm   -1.4 m    9.83 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   14.7 cm   2.61 cm    -80 cm   9.83 MeV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   16.5 cm   2.94 cm    -60 cm   9.83 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6     22 cm   3.91 cm      0 fm   9.83 MeV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7   23.8 cm   4.24 cm     20 cm   9.83 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   29.3 cm   5.22 cm     80 cm   9.83 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   31.1 cm   5.54 cm      1 m    9.83 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   36.5 cm   6.52 cm    1.6 m    9.83 MeV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   38.4 cm   6.85 cm    1.8 m    9.83 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   43.8 cm   7.82 cm    2.4 m    9.83 MeV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13   48.5 cm   8.66 cm   2.91 m    9.83 MeV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 157,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   98.5 mum -99.8 mum -2.41 m     532 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.12 mm    248 mum  -2.4 m       0 eV    532 keV  5.03 mm   5.03 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 156,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   57.1 mum  -105 mum -2.41 m     5.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    706 mum   454 mum  -2.4 m     5.8 MeV     0 eV   8.04 mm   8.04 mm    TrackerTransportation
-    2   6.56 cm   5.64 cm   -1.6 m     5.8 MeV     0 eV   80.5 cm   81.3 cm    ChamberTransportation
-    3   8.18 cm   7.04 cm   -1.4 m     5.8 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   13.1 cm   11.2 cm    -80 cm    5.8 MeV     0 eV   60.3 cm   1.62 m     ChamberTransportation
-    5   14.7 cm   12.6 cm    -60 cm    5.8 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6   19.5 cm   16.8 cm      0 fm    5.8 MeV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7   21.2 cm   18.2 cm     20 cm    5.8 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8     26 cm   22.4 cm     80 cm    5.8 MeV     0 eV   60.3 cm   3.23 m     ChamberTransportation
-    9   27.7 cm   23.8 cm      1 m     5.8 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10   32.5 cm     28 cm    1.6 m     5.8 MeV     0 eV   60.3 cm   4.03 m     ChamberTransportation
-   11   34.1 cm   29.4 cm    1.8 m     5.8 MeV     0 eV   20.1 cm   4.23 m     TrackerTransportation
-   12     39 cm   33.6 cm    2.4 m     5.8 MeV     0 eV   60.3 cm   4.84 m     WorldPVTransportation
-   13   43.1 cm   37.2 cm   2.91 m     5.8 MeV     0 eV   51.3 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 155,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   43.6 mum  -115 mum -2.41 m     435 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    793 mum   431 mum  -2.4 m     265 keV   170 keV  7.36 mm   7.36 mm   TargetPV     compt
-    2    995 mum   700 mum  -2.4 m       0 eV    265 keV   339 mum   7.7 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 154,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -28.6 mum -16.2 mum -2.41 m    16.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    765 mum -89.8 mum  -2.4 m       0 eV      0 eV   6.51 mm   6.51 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 169,   Parent ID = 154
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    765 mum -89.8 mum  -2.4 m    9.46 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    452 mum   715 mum  -2.4 m    7.49 MeV  1.96 MeV  1.72 mm   1.72 mm   TargetPV     eIoni
-    2    324 mum  1.05 mm   -2.4 m    5.13 MeV  2.36 MeV  1.45 mm   3.17 mm   TargetPV     eIoni
-    3   65.5 mum  1.28 mm   -2.4 m    4.35 MeV   783 keV   796 mum  3.96 mm    TrackerTransportation
-    4  -18.3 cm   9.91 cm   -1.9 m    4.24 MeV  93.2 keV    54 cm   54.3 cm    Tracker     eIoni
-    5  -23.4 cm   14.9 cm  -1.73 m    4.18 MeV  31.9 keV  18.5 cm   72.8 cm    Tracker     eIoni
-    6    -27 cm   22.1 cm  -1.59 m    4.14 MeV  27.6 keV  16.6 cm   89.5 cm    Tracker     eIoni
-    7  -29.3 cm   25.4 cm   -1.5 m    4.11 MeV  13.3 keV  9.37 cm   98.8 cm    Tracker     eIoni
-    8  -35.7 cm     39 cm  -1.16 m    4.01 MeV  64.8 keV  37.8 cm   1.37 m     Tracker     eIoni
-    9  -42.1 cm   53.1 cm    -80 cm   3.94 MeV  71.8 keV    39 cm   1.76 m     ChamberTransportation
-   10  -48.2 cm   57.2 cm    -60 cm   3.85 MeV  81.1 keV  22.3 cm   1.98 m     TrackerTransportation
-   11    -86 cm   49.4 cm 0.0456 fm   3.73 MeV   115 keV  71.9 cm    2.7 m     ChamberTransportation
-   12  -94.7 cm   45.7 cm     20 cm   3.61 MeV  95.8 keV  23.3 cm   2.93 m     TrackerTransportation
-   13  -1.15 m    37.7 cm   51.2 cm   3.54 MeV  62.7 keV  38.1 cm   3.31 m     Tracker     eIoni
-   14  -1.46 m    30.2 cm     80 cm   3.46 MeV  77.7 keV  43.2 cm   3.75 m     ChamberTransportation
-   15  -1.48 m    30.1 cm   82.3 cm   3.28 MeV  39.1 keV  3.06 cm   3.78 m     Chamber     eIoni
-   16  -1.54 m    29.9 cm   89.1 cm   3.23 MeV  47.2 keV     9 cm   3.87 m     TrackerTransportation
-   17  -1.59 m    31.9 cm   97.1 cm   3.17 MeV  12.8 keV  9.96 cm   3.97 m     Tracker     eIoni
-   18   -1.8 m    38.7 cm   1.21 m    3.11 MeV  53.4 keV  32.4 cm   4.29 m     Tracker     eIoni
-   19   -2.4 m    72.5 cm   2.11 m    2.92 MeV   186 keV  1.15 m    5.44 m     WorldPVTransportation
-   20  -2.91 m    89.6 cm   2.43 m    2.81 MeV   112 keV  63.3 cm   6.07 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 181,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.93 m      46 cm   1.41 m    7.29 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.93 m      46 cm   1.41 m    2.53 keV  4.76 keV   565 mum   565 mum   Tracker     eIoni
-    2  -1.93 m      46 cm   1.41 m     585 eV   1.94 keV   230 mum   795 mum   Tracker     eIoni
-    3  -1.93 m      46 cm   1.41 m       0 eV    585 eV   32.7 mum   828 mum   Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 180,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -1.8 m    38.7 cm   1.21 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   -1.8 m    38.7 cm   1.21 m    8.74 keV   1.4 keV   780 mum   780 mum   Tracker     eIoni
-    2   -1.8 m    38.6 cm   1.21 m     6.8 keV  1.94 keV   669 mum  1.45 mm    Tracker     eIoni
-    3   -1.8 m    38.7 cm   1.21 m    3.92 keV  2.88 keV   531 mum  1.98 mm    Tracker     eIoni
-    4   -1.8 m    38.6 cm   1.21 m    1.85 keV  2.07 keV   347 mum  2.33 mm    Tracker     eIoni
-    5   -1.8 m    38.6 cm   1.21 m       0 eV   1.85 keV   145 mum  2.47 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 179,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 m    31.9 cm   97.1 cm   47.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.59 m    31.7 cm   97.7 cm   33.5 keV  3.73 keV  6.47 mm   6.47 mm    Tracker     eIoni
-    2  -1.59 m    31.4 cm   97.9 cm   31.8 keV  1.73 keV  4.27 mm   1.07 cm    Tracker     eIoni
-    3  -1.59 m    31.1 cm   98.1 cm   28.2 keV   3.6 keV  3.91 mm   1.46 cm    Tracker     eIoni
-    4  -1.59 m    30.8 cm   98.1 cm   25.1 keV  3.13 keV  3.21 mm   1.79 cm    Tracker     eIoni
-    5  -1.58 m    30.7 cm     98 cm     22 keV  3.09 keV  2.65 mm   2.05 cm    Tracker     eIoni
-    6  -1.58 m    30.6 cm   98.1 cm   19.4 keV  2.54 keV  2.17 mm   2.27 cm    Tracker     eIoni
-    7  -1.58 m    30.5 cm   98.2 cm   16.8 keV  2.69 keV   1.8 mm   2.45 cm    Tracker     eIoni
-    8  -1.58 m    30.6 cm   98.3 cm   14.8 keV  1.94 keV  1.45 mm   2.59 cm    Tracker     eIoni
-    9  -1.58 m    30.5 cm   98.3 cm   13.3 keV  1.52 keV  1.23 mm   2.72 cm    Tracker     eIoni
-   10  -1.58 m    30.4 cm   98.4 cm   11.4 keV  1.91 keV  1.07 mm   2.82 cm    Tracker     eIoni
-   11  -1.58 m    30.4 cm   98.4 cm   6.95 keV  4.45 keV   890 mum  2.91 cm    Tracker     eIoni
-   12  -1.58 m    30.4 cm   98.4 cm   4.61 keV  2.34 keV   540 mum  2.97 cm    Tracker     eIoni
-   13  -1.58 m    30.4 cm   98.5 cm   3.46 keV  1.15 keV   392 mum  3.01 cm    Tracker     eIoni
-   14  -1.58 m    30.4 cm   98.5 cm   2.08 keV  1.38 keV   314 mum  3.04 cm    Tracker     eIoni
-   15  -1.58 m    30.4 cm   98.5 cm      0 eV   2.08 keV   173 mum  3.05 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 182,   Parent ID = 179
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 m    31.7 cm   97.7 cm    9.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.59 m    31.7 cm   97.7 cm   8.89 keV   915 eV    752 mum   752 mum   Tracker     eIoni
-    2  -1.59 m    31.7 cm   97.8 cm   5.84 keV  3.05 keV   681 mum  1.43 mm    Tracker     eIoni
-    3  -1.59 m    31.7 cm   97.8 cm   4.37 keV  1.46 keV   469 mum   1.9 mm    Tracker     eIoni
-    4  -1.59 m    31.7 cm   97.8 cm   3.33 keV  1.04 keV   377 mum  2.28 mm    Tracker     eIoni
-    5  -1.59 m    31.7 cm   97.8 cm   1.78 keV  1.55 keV   304 mum  2.58 mm    Tracker     eIoni
-    6  -1.59 m    31.7 cm   97.8 cm      0 eV   1.78 keV   136 mum  2.72 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 178,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.48 m    30.1 cm   82.3 cm    140 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.48 m    30.7 cm   83.4 cm    111 keV    29 keV  1.83 cm   1.83 cm    Chamber     eIoni
-    2  -1.47 m    30.8 cm   83.3 cm    100 keV  10.6 keV  1.25 cm   3.08 cm    Chamber     eIoni
-    3  -1.47 m    31.1 cm   83.1 cm   86.5 keV  13.9 keV  1.07 cm   4.15 cm    Chamber     eIoni
-    4  -1.46 m    31.4 cm   83.1 cm   78.4 keV  8.11 keV  8.42 mm   4.99 cm    Chamber     eIoni
-    5  -1.46 m    31.9 cm   83.1 cm   67.2 keV  11.2 keV   7.2 mm   5.71 cm    Chamber     eIoni
-    6  -1.46 m    32.1 cm   83.3 cm   61.3 keV  5.88 keV  5.65 mm   6.28 cm    Chamber     eIoni
-    7  -1.46 m      32 cm   83.1 cm   52.4 keV  8.93 keV  4.89 mm   6.77 cm    Chamber     eIoni
-    8  -1.46 m    31.8 cm   83.2 cm   49.5 keV  2.86 keV  3.83 mm   7.15 cm    Chamber     eIoni
-    9  -1.46 m    31.5 cm   83.1 cm   37.1 keV  12.5 keV  3.53 mm    7.5 cm    Chamber     eIoni
-   10  -1.46 m    31.4 cm     83 cm   29.3 keV  7.78 keV   2.3 mm   7.73 cm    Chamber     eIoni
-   11  -1.46 m    31.5 cm   83.1 cm   26.7 keV  2.62 keV  1.66 mm    7.9 cm    Chamber     eIoni
-   12  -1.46 m    31.5 cm   83.1 cm   20.8 keV  5.83 keV  1.47 mm   8.04 cm    Chamber     eIoni
-   13  -1.46 m    31.5 cm   83.1 cm   17.3 keV  3.55 keV  1.08 mm   8.15 cm    Chamber     eIoni
-   14  -1.46 m    31.5 cm   83.1 cm   14.1 keV   3.2 keV   874 mum  8.24 cm    Chamber     eIoni
-   15  -1.46 m    31.5 cm   83.1 cm   11.6 keV  2.45 keV   712 mum  8.31 cm    Chamber     eIoni
-   16  -1.46 m    31.5 cm   83.1 cm   8.31 keV  3.33 keV   600 mum  8.37 cm    Chamber     eIoni
-   17  -1.46 m    31.5 cm   83.1 cm   5.52 keV  2.78 keV   463 mum  8.42 cm    Chamber     eIoni
-   18  -1.46 m    31.5 cm   83.1 cm   1.59 keV  3.93 keV   352 mum  8.45 cm    Chamber     eIoni
-   19  -1.46 m    31.5 cm   83.1 cm      0 eV   1.59 keV  85.5 mum  8.46 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 177,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.15 m    37.7 cm   51.2 cm   9.29 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.15 m    37.7 cm   51.1 cm   7.07 keV  2.23 keV   713 mum   713 mum   Tracker     eIoni
-    2  -1.15 m    37.6 cm   51.1 cm   6.06 keV     1 keV   549 mum  1.26 mm    Tracker     eIoni
-    3  -1.15 m    37.6 cm   51.1 cm   2.65 keV  3.41 keV   484 mum  1.75 mm    Tracker     eIoni
-    4  -1.15 m    37.6 cm   51.1 cm      0 eV   2.65 keV   244 mum  1.99 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 176,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -87.6 cm   48.8 cm   3.59 cm   25.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -87.6 cm   48.8 cm   3.65 cm   23.7 keV  1.86 keV  1.39 mm   1.39 mm    Chamber     eIoni
-    2  -87.6 cm   48.8 cm   3.65 cm     16 keV   7.7 keV  1.26 mm   2.65 mm    Chamber     eIoni
-    3  -87.6 cm   48.8 cm   3.63 cm   13.6 keV  2.41 keV   810 mum  3.46 mm    Chamber     eIoni
-    4  -87.6 cm   48.8 cm   3.59 cm   10.9 keV  2.67 keV   690 mum  4.15 mm    Chamber     eIoni
-    5  -87.6 cm   48.8 cm   3.57 cm   9.64 keV   1.3 keV   571 mum  4.72 mm    Chamber     eIoni
-    6  -87.6 cm   48.8 cm    3.6 cm   8.08 keV  1.56 keV   516 mum  5.24 mm    Chamber     eIoni
-    7  -87.6 cm   48.7 cm    3.6 cm   5.25 keV  2.83 keV   454 mum  5.69 mm    Chamber     eIoni
-    8  -87.6 cm   48.7 cm   3.62 cm   2.84 keV   2.4 keV   340 mum  6.03 mm    Chamber     eIoni
-    9  -87.6 cm   48.7 cm   3.62 cm      0 eV   2.84 keV   191 mum  6.22 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 175,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.4 cm   53.3 cm    -79 cm     11 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -42.4 cm   53.3 cm    -79 cm   8.82 keV  2.17 keV   573 mum   573 mum   Chamber     eIoni
-    2  -42.4 cm   53.3 cm  -79.1 cm   5.59 keV  3.24 keV   484 mum  1.06 mm    Chamber     eIoni
-    3  -42.4 cm   53.3 cm  -79.1 cm   1.83 keV  3.75 keV   354 mum  1.41 mm    Chamber     eIoni
-    4  -42.4 cm   53.3 cm  -79.1 cm      0 eV   1.83 keV   104 mum  1.52 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 174,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -35.7 cm     39 cm  -1.16 m    36.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    -36 cm   39.3 cm  -1.16 m    31.8 keV  5.01 keV  4.97 mm   4.97 mm    Tracker     eIoni
-    2  -36.4 cm   39.2 cm  -1.16 m    29.1 keV  2.66 keV   3.9 mm   8.87 mm    Tracker     eIoni
-    3  -36.6 cm     39 cm  -1.16 m    25.7 keV  3.46 keV  3.38 mm   1.22 cm    Tracker     eIoni
-    4  -36.8 cm     39 cm  -1.16 m    23.4 keV  2.24 keV  2.75 mm    1.5 cm    Tracker     eIoni
-    5  -36.9 cm   38.9 cm  -1.16 m    20.5 keV  2.89 keV  2.39 mm   1.74 cm    Tracker     eIoni
-    6  -36.7 cm   38.9 cm  -1.16 m    18.9 keV  1.63 keV  1.95 mm   1.93 cm    Tracker     eIoni
-    7  -36.8 cm   38.8 cm  -1.16 m      17 keV  1.93 keV  1.73 mm   2.11 cm    Tracker     eIoni
-    8  -36.7 cm   38.8 cm  -1.17 m    15.1 keV  1.88 keV  1.48 mm   2.25 cm    Tracker     eIoni
-    9  -36.6 cm   38.8 cm  -1.17 m      11 keV   4.1 keV  1.26 mm   2.38 cm    Tracker     eIoni
-   10  -36.6 cm   38.8 cm  -1.17 m    9.61 keV  1.37 keV   854 mum  2.47 cm    Tracker     eIoni
-   11  -36.6 cm   38.8 cm  -1.17 m    6.81 keV   2.8 keV   737 mum  2.54 cm    Tracker     eIoni
-   12  -36.6 cm   38.8 cm  -1.17 m    4.55 keV  2.26 keV   532 mum  2.59 cm    Tracker     eIoni
-   13  -36.5 cm   38.8 cm  -1.17 m    2.81 keV  1.74 keV   388 mum  2.63 cm    Tracker     eIoni
-   14  -36.5 cm   38.8 cm  -1.17 m    1.04 keV  1.77 keV   259 mum  2.66 cm    Tracker     eIoni
-   15  -36.5 cm   38.8 cm  -1.17 m       0 eV   1.04 keV  64.6 mum  2.66 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 173,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -29.3 cm   25.4 cm   -1.5 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -29.3 cm   25.5 cm   -1.5 m    8.83 keV  1.25 keV   775 mum   775 mum   Tracker     eIoni
-    2  -29.3 cm   25.5 cm   -1.5 m    5.63 keV   3.2 keV   677 mum  1.45 mm    Tracker     eIoni
-    3  -29.3 cm   25.5 cm   -1.5 m    1.97 keV  3.66 keV   456 mum  1.91 mm    Tracker     eIoni
-    4  -29.3 cm   25.5 cm   -1.5 m       0 eV   1.97 keV   159 mum  2.07 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 172,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -27 cm   22.1 cm  -1.59 m    17.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    -27 cm   22.2 cm  -1.59 m    15.9 keV  1.45 keV  1.52 mm   1.52 mm    Tracker     eIoni
-    2    -27 cm   22.3 cm  -1.59 m    14.7 keV  1.14 keV  1.35 mm   2.87 mm    Tracker     eIoni
-    3  -27.1 cm   22.4 cm  -1.59 m    12.9 keV  1.82 keV  1.22 mm    4.1 mm    Tracker     eIoni
-    4  -27.2 cm   22.5 cm  -1.59 m    9.72 keV  3.21 keV  1.04 mm   5.13 mm    Tracker     eIoni
-    5  -27.1 cm   22.4 cm  -1.59 m    7.11 keV  2.61 keV   745 mum  5.88 mm    Tracker     eIoni
-    6  -27.1 cm   22.4 cm  -1.59 m    5.25 keV  1.86 keV   552 mum  6.43 mm    Tracker     eIoni
-    7  -27.1 cm   22.4 cm  -1.59 m    3.89 keV  1.36 keV   432 mum  6.86 mm    Tracker     eIoni
-    8    -27 cm   22.4 cm  -1.59 m     544 eV   3.35 keV   345 mum  7.21 mm    Tracker     eIoni
-    9    -27 cm   22.4 cm  -1.59 m       0 eV    544 eV   30.2 mum  7.24 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 171,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -23.4 cm   14.9 cm  -1.73 m    31.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -23.5 cm   14.6 cm  -1.73 m    27.6 keV  3.67 keV   3.8 mm    3.8 mm    Tracker     eIoni
-    2  -23.3 cm   14.5 cm  -1.73 m    16.4 keV  11.2 keV   3.1 mm    6.9 mm    Tracker     eIoni
-    3  -23.2 cm   14.5 cm  -1.73 m    15.3 keV  1.16 keV  1.42 mm   8.32 mm    Tracker     eIoni
-    4  -23.3 cm   14.5 cm  -1.73 m    13.9 keV  1.34 keV  1.28 mm    9.6 mm    Tracker     eIoni
-    5  -23.3 cm   14.5 cm  -1.73 m    9.26 keV  4.69 keV  1.14 mm   1.07 cm    Tracker     eIoni
-    6  -23.3 cm   14.4 cm  -1.73 m     5.8 keV  3.45 keV   710 mum  1.15 cm    Tracker     eIoni
-    7  -23.4 cm   14.4 cm  -1.73 m    3.95 keV  1.85 keV   466 mum  1.19 cm    Tracker     eIoni
-    8  -23.3 cm   14.4 cm  -1.73 m    2.96 keV   996 eV    349 mum  1.23 cm    Tracker     eIoni
-    9  -23.3 cm   14.4 cm  -1.73 m    1.46 keV   1.5 keV   273 mum  1.25 cm    Tracker     eIoni
-   10  -23.3 cm   14.4 cm  -1.73 m       0 eV   1.46 keV   102 mum  1.26 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 170,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -18.3 cm   9.91 cm   -1.9 m      11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -18.2 cm   9.89 cm   -1.9 m    9.41 keV  1.63 keV   859 mum   859 mum   Tracker     eIoni
-    2  -18.2 cm    9.9 cm   -1.9 m    8.04 keV  1.38 keV   722 mum  1.58 mm    Tracker     eIoni
-    3  -18.1 cm   9.86 cm   -1.9 m    6.33 keV  1.71 keV   617 mum   2.2 mm    Tracker     eIoni
-    4  -18.1 cm   9.83 cm   -1.9 m    4.99 keV  1.34 keV   501 mum   2.7 mm    Tracker     eIoni
-    5  -18.1 cm   9.82 cm   -1.9 m    2.41 keV  2.59 keV   416 mum  3.12 mm    Tracker     eIoni
-    6  -18.1 cm   9.83 cm   -1.9 m       0 eV   2.41 keV   215 mum  3.33 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 168,   Parent ID = 154
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    765 mum -89.8 mum  -2.4 m    5.77 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    624 mum  -154 mum  -2.4 m    4.29 MeV   888 keV   794 mum   794 mum  TargetPV     eBrem
-    2   1.33 mm   -234 mum  -2.4 m    3.08 MeV  1.21 MeV   959 mum  1.75 mm   TargetPV     eIoni
-    3   1.72 mm   68.4 mum  -2.4 m    2.27 MeV   814 keV   776 mum  2.53 mm   TargetPV     eIoni
-    4   1.83 mm    163 mum  -2.4 m    1.61 MeV   659 keV   645 mum  3.18 mm   TargetPV     eIoni
-    5    1.8 mm    335 mum  -2.4 m     992 keV   259 keV   273 mum  3.45 mm   TargetPV     eBrem
-    6   1.75 mm    433 mum  -2.4 m     194 keV   312 keV   316 mum  3.76 mm   TargetPV     eBrem
-    7   1.75 mm    439 mum  -2.4 m       0 eV    194 keV  76.6 mum  3.84 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 185,   Parent ID = 168
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.75 mm    433 mum  -2.4 m     486 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.88 mm   4.58 mm   -2.4 m       0 eV    486 keV  4.99 mm   4.99 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 184,   Parent ID = 168
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.8 mm    335 mum  -2.4 m     359 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.57 mm   1.41 mm   -2.4 m       0 eV    359 keV  2.05 mm   2.05 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 183,   Parent ID = 168
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    624 mum  -154 mum  -2.4 m     589 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.59 mm  -3.27 mm   -2.4 m     205 keV   384 keV  4.47 mm   4.47 mm   TargetPV     compt
-    2   3.51 mm   -2.8 mm   -2.4 m       0 eV    205 keV   993 mum  5.47 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 153,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.2 mum -16.9 mum -2.41 m     761 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.04 mm    181 mum  -2.4 m       0 eV    761 keV  8.49 mm   8.49 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 152,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.4 mum -17.3 mum -2.41 m     8.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    254 mum  -380 mum  -2.4 m     8.9 MeV     0 eV      1 cm      1 cm    TrackerTransportation
-    2    2.4 cm  -2.93 cm   -1.6 m     8.9 MeV     0 eV   80.1 cm   81.1 cm    ChamberTransportation
-    3   2.99 cm  -3.66 cm   -1.4 m     8.9 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   4.77 cm  -5.83 cm    -80 cm    8.9 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   5.37 cm  -6.55 cm    -60 cm    8.9 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   7.15 cm  -8.72 cm      0 fm    8.9 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   7.74 cm  -9.44 cm     20 cm    8.9 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   9.52 cm  -11.6 cm     80 cm    8.9 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9   10.1 cm  -12.3 cm      1 m     8.9 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   11.9 cm  -14.5 cm    1.6 m     8.9 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   12.5 cm  -15.2 cm    1.8 m     8.9 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   14.3 cm  -17.4 cm    2.4 m     8.9 MeV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13   15.8 cm  -19.2 cm   2.91 m     8.9 MeV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 151,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.6 mum -16.7 mum -2.41 m     631 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    130 mum  -453 mum  -2.4 m     631 keV     0 eV   1.01 cm   1.01 cm    TrackerTransportation
-    2    1.4 cm  -3.52 cm   -1.6 m     631 keV     0 eV   80.1 cm   81.1 cm    ChamberTransportation
-    3   1.74 cm  -4.39 cm   -1.4 m     631 keV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.78 cm  -6.99 cm    -80 cm    631 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   3.13 cm  -7.86 cm    -60 cm    631 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   4.16 cm  -10.5 cm      0 fm    631 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   4.51 cm  -11.3 cm     20 cm    631 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   5.55 cm  -13.9 cm     80 cm    631 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9   5.89 cm  -14.8 cm      1 m     631 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   6.93 cm  -17.4 cm    1.6 m     631 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   7.28 cm  -18.3 cm    1.8 m     631 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   8.31 cm  -20.9 cm    2.4 m     631 keV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13    9.2 cm  -23.1 cm   2.91 m     631 keV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 150,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.7 mum -15.7 mum -2.41 m     903 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -257 mum  -162 mum  -2.4 m     408 keV   496 keV  9.21 mm   9.21 mm   TargetPV     compt
-    2   -705 mum  2.39 mm   -2.4 m     408 keV     0 eV   2.74 mm    1.2 cm    TrackerTransportation
-    3  -42.1 cm    2.4 m   -1.57 m     408 keV     0 eV   2.57 m    2.58 m     WorldPVTransportation
-    4  -51.1 cm   2.91 m   -1.39 m     408 keV     0 eV   54.7 cm   3.13 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 148,   Parent ID = 108
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -41.9 mum -15.8 mum -2.41 m    40.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    354 mum   137 mum -2.41 m    36.6 MeV  3.16 MeV  2.42 mm   2.42 mm   TargetPV     eBrem
-    2    469 mum   129 mum -2.41 m    35.3 MeV   904 keV   596 mum  3.01 mm   TargetPV     eBrem
-    3    103 mum -1.29 mm   -2.4 m      25 MeV  10.3 MeV  4.95 mm   7.96 mm   TargetPV     eIoni
-    4   17.1 mum -1.36 mm   -2.4 m    6.72 MeV  17.1 MeV  1.46 mm   9.42 mm   TargetPV     eBrem
-    5   -249 mum -1.99 mm   -2.4 m    5.23 MeV  1.49 MeV  1.31 mm   1.07 cm   TargetPV     eIoni
-    6   -224 mum -2.71 mm   -2.4 m    3.98 MeV  1.25 MeV   1.1 mm   1.18 cm   TargetPV     eIoni
-    7   -278 mum -2.71 mm   -2.4 m    2.95 MeV  1.03 MeV   913 mum  1.27 cm   TargetPV     eIoni
-    8   -579 mum -3.02 mm   -2.4 m    2.19 MeV   762 keV   755 mum  1.35 cm   TargetPV     eIoni
-    9   -363 mum -3.11 mm   -2.4 m    1.55 MeV   635 keV   632 mum  1.41 cm   TargetPV     eIoni
-   10   -258 mum -3.17 mm   -2.4 m    1.07 MeV   487 keV   522 mum  1.46 cm   TargetPV     eIoni
-   11   -330 mum -3.12 mm   -2.4 m     589 keV   478 keV   428 mum  1.51 cm   TargetPV     eIoni
-   12   -351 mum -3.18 mm   -2.4 m     187 keV   402 keV   304 mum  1.54 cm   TargetPV     eIoni
-   13   -355 mum -3.18 mm   -2.4 m       0 eV    187 keV  72.9 mum  1.54 cm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 188,   Parent ID = 148
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.1 mum -1.36 mm   -2.4 m    1.25 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -595 mum -2.51 mm   -2.4 m    1.25 MeV     0 eV   1.62 mm   1.62 mm    TrackerTransportation
-    2  -1.27 m    -2.4 m   -42.6 cm   1.25 MeV     0 eV   3.35 m    3.36 m     WorldPVTransportation
-    3  -1.54 m   -2.91 m   -6.58 mm   1.25 MeV     0 eV   71.3 cm   4.07 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 187,   Parent ID = 148
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    469 mum   129 mum -2.41 m     342 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    259 mum   784 mum  -2.4 m       0 eV    342 keV  5.71 mm   5.71 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 186,   Parent ID = 148
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    354 mum   137 mum -2.41 m     362 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    812 mum   342 mum  -2.4 m       0 eV    362 keV  3.02 mm   3.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 107,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -6.8 mum -7.95 mum -2.41 m     520 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -64 mum -25.8 mum -2.41 m       0 eV      0 eV   7.03 mm   7.03 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 190,   Parent ID = 107
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -64 mum -25.8 mum -2.41 m     201 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -64.8 mum   -26 mum -2.41 m     200 MeV   220 keV  51.9 mum  51.9 mum  TargetPV     eBrem
-    2  -67.3 mum -25.8 mum -2.41 m     198 MeV   435 keV   102 mum   154 mum  TargetPV     eBrem
-    3  -65.6 mum -32.9 mum  -2.4 m     196 MeV  1.77 MeV   983 mum  1.14 mm   TargetPV     eBrem
-    4  -89.4 mum -75.6 mum  -2.4 m     184 MeV   714 keV   649 mum  1.79 mm   TargetPV     eBrem
-    5  -91.1 mum -77.2 mum  -2.4 m     183 MeV   309 keV   207 mum  1.99 mm   TargetPV     eBrem
-    6  -92.5 mum -81.2 mum  -2.4 m     181 MeV   103 keV  93.5 mum  2.09 mm   TargetPV     eBrem
-    7   -118 mum  -148 mum  -2.4 m     179 MeV  1.51 MeV  1.06 mm   3.14 mm   TargetPV     eBrem
-    8   -159 mum  -194 mum  -2.4 m    70.8 MeV   965 keV   766 mum  3.91 mm   TargetPV     eBrem
-    9   -165 mum  -228 mum  -2.4 m    63.8 MeV   712 keV   386 mum  4.29 mm   TargetPV     eBrem
-   10   -295 mum  -328 mum  -2.4 m    62.1 MeV   1.7 MeV  1.14 mm   5.44 mm    TrackerTransportation
-   11  -3.34 cm  -3.37 mm  -2.21 m    62.1 MeV  37.1 keV  19.6 cm   20.2 cm    Tracker     eIoni
-   12  -12.8 cm  -9.15 mm  -1.66 m    61.1 MeV   121 keV  55.7 cm   75.9 cm    Tracker     eIoni
-   13  -13.8 cm  -9.29 mm   -1.6 m    61.1 MeV  18.9 keV  5.83 cm   81.7 cm    ChamberTransportation
-   14  -17.1 cm  -1.04 cm   -1.4 m    60.9 MeV   134 keV  20.3 cm   1.02 m     TrackerTransportation
-   15  -27.3 cm  -9.32 mm    -80 cm   60.8 MeV   133 keV  60.9 cm   1.63 m     ChamberTransportation
-   16  -30.3 cm  -1.09 cm  -63.4 cm   60.6 MeV   128 keV  16.9 cm    1.8 m     Chamber     eIoni
-   17  -30.8 cm  -1.04 cm    -60 cm   60.6 MeV  14.7 keV  3.44 cm   1.83 m     TrackerTransportation
-   18  -38.1 cm  -9.47 mm  -8.18 mm   60.4 MeV   126 keV  59.6 cm   2.43 m     Tracker     eIoni
-   19  -38.2 cm  -9.34 mm -0.00355 fm   60.4 MeV   1.7 keV  8.25 mm   2.44 m     ChamberTransportation
-   20  -39.4 cm  -7.67 mm    8.1 cm   59.9 MeV  63.5 keV  8.18 cm   2.52 m     Chamber     eBrem
-   21  -40.9 cm  -3.36 mm     20 cm   59.8 MeV  58.6 keV    12 cm   2.64 m     TrackerTransportation
-   22  -47.7 cm    9.8 mm   72.5 cm   59.7 MeV   115 keV  52.9 cm   3.17 m     Tracker     eIoni
-   23  -48.6 cm   1.19 cm     80 cm   59.7 MeV  15.6 keV  7.59 cm   3.24 m     ChamberTransportation
-   24  -51.1 cm   1.63 cm      1 m    59.5 MeV   132 keV  20.2 cm   3.45 m     TrackerTransportation
-   25  -59.2 cm   3.32 cm    1.6 m    59.4 MeV   127 keV  60.6 cm   4.05 m     ChamberTransportation
-   26  -61.8 cm   4.38 cm    1.8 m    59.2 MeV   128 keV  20.2 cm   4.25 m     TrackerTransportation
-   27  -71.9 cm   9.84 cm    2.4 m    59.1 MeV   136 keV  61.1 cm   4.86 m     WorldPVTransportation
-   28  -78.6 cm   13.9 cm    2.8 m      59 MeV  91.7 keV  40.5 cm   5.27 m     WorldPV     eIoni
-   29  -79.1 cm   14.2 cm   2.83 m    58.9 MeV  13.3 keV  3.43 cm    5.3 m     WorldPV     eIoni
-   30  -80.4 cm   15.1 cm   2.91 m    58.9 MeV  13.4 keV  8.03 cm   5.38 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 210,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -79.1 cm   14.2 cm   2.83 m    34.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -79.3 cm   13.9 cm   2.83 m    30.7 keV   3.5 keV   4.4 mm    4.4 mm    WorldPV     eIoni
-    2  -79.6 cm   13.9 cm   2.83 m    25.1 keV  5.53 keV  3.67 mm   8.07 mm    WorldPV     eIoni
-    3  -79.8 cm   13.8 cm   2.83 m    22.7 keV  2.48 keV  2.66 mm   1.07 cm    WorldPV     eIoni
-    4    -80 cm   13.7 cm   2.83 m    19.5 keV  3.11 keV  2.27 mm    1.3 cm    WorldPV     eIoni
-    5  -80.2 cm   13.7 cm   2.83 m    17.8 keV  1.75 keV  1.81 mm   1.48 cm    WorldPV     eIoni
-    6  -80.3 cm   13.7 cm   2.83 m    15.7 keV  2.12 keV  1.58 mm   1.64 cm    WorldPV     eIoni
-    7  -80.4 cm   13.7 cm   2.83 m    14.3 keV  1.37 keV  1.33 mm   1.77 cm    WorldPV     eIoni
-    8  -80.4 cm   13.7 cm   2.83 m      13 keV  1.26 keV  1.17 mm   1.89 cm    WorldPV     eIoni
-    9  -80.4 cm   13.6 cm   2.83 m    4.42 keV  8.62 keV  1.05 mm   1.99 cm    WorldPV     eIoni
-   10  -80.4 cm   13.6 cm   2.83 m    3.52 keV   896 eV    380 mum  2.03 cm    WorldPV     eIoni
-   11  -80.4 cm   13.6 cm   2.83 m     1.8 keV  1.72 keV   319 mum  2.06 cm    WorldPV     eIoni
-   12  -80.4 cm   13.6 cm   2.83 m       0 eV    1.8 keV   139 mum  2.08 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 209,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.6 cm   13.9 cm    2.8 m    33.6 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -78.2 cm     14 cm    2.8 m    30.1 keV   3.5 keV  4.28 mm   4.28 mm    WorldPV     eIoni
-    2    -78 cm   13.7 cm    2.8 m    25.9 keV  4.18 keV  3.55 mm   7.83 mm    WorldPV     eIoni
-    3  -77.8 cm   13.6 cm    2.8 m    23.9 keV     2 keV  2.79 mm   1.06 cm    WorldPV     eIoni
-    4  -77.8 cm   13.6 cm    2.8 m    17.7 keV  6.17 keV  2.46 mm   1.31 cm    WorldPV     eIoni
-    5  -77.7 cm   13.6 cm    2.8 m    15.3 keV  2.43 keV  1.57 mm   1.47 cm    WorldPV     eIoni
-    6  -77.7 cm   13.7 cm    2.8 m    11.2 keV  4.09 keV  1.29 mm   1.59 cm    WorldPV     eIoni
-    7  -77.7 cm   13.8 cm    2.8 m    9.67 keV  1.55 keV   874 mum  1.68 cm    WorldPV     eIoni
-    8  -77.8 cm   13.8 cm    2.8 m    7.73 keV  1.94 keV   742 mum  1.76 cm    WorldPV     eIoni
-    9  -77.8 cm   13.8 cm    2.8 m     4.9 keV  2.83 keV   596 mum  1.82 cm    WorldPV     eIoni
-   10  -77.8 cm   13.8 cm    2.8 m    3.49 keV  1.41 keV   410 mum  1.86 cm    WorldPV     eIoni
-   11  -77.8 cm   13.8 cm    2.8 m    2.55 keV   944 eV    317 mum  1.89 cm    WorldPV     eIoni
-   12  -77.8 cm   13.8 cm    2.8 m    35.9 eV   2.51 keV   232 mum  1.91 cm    WorldPV     eIoni
-   13  -77.8 cm   13.8 cm    2.8 m       0 eV   35.9 eV   6.03 mum  1.91 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 208,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.4 cm   3.42 cm   1.62 m    10.1 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -59.4 cm    3.4 cm   1.62 m    8.83 keV  1.25 keV   534 mum   534 mum   Chamber     eIoni
-    2  -59.4 cm   3.38 cm   1.62 m    4.43 keV   4.4 keV   484 mum  1.02 mm    Chamber     eIoni
-    3  -59.4 cm   3.39 cm   1.62 m    1.72 keV  2.72 keV   301 mum  1.32 mm    Chamber     eIoni
-    4  -59.4 cm   3.39 cm   1.62 m       0 eV   1.72 keV  95.4 mum  1.41 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 207,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -50.3 cm   1.49 cm   93.6 cm   11.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -50.3 cm   1.48 cm   93.6 cm   10.8 keV  1.15 keV   613 mum   613 mum   Chamber     eIoni
-    2  -50.3 cm   1.49 cm   93.7 cm   9.34 keV  1.44 keV   564 mum  1.18 mm    Chamber     eIoni
-    3  -50.3 cm   1.48 cm   93.6 cm   7.98 keV  1.37 keV   505 mum  1.68 mm    Chamber     eIoni
-    4  -50.3 cm   1.48 cm   93.7 cm   6.81 keV  1.17 keV   450 mum  2.13 mm    Chamber     eIoni
-    5  -50.3 cm    1.5 cm   93.6 cm   5.86 keV   951 eV    404 mum  2.54 mm    Chamber     eIoni
-    6  -50.3 cm   1.51 cm   93.6 cm   4.58 keV  1.28 keV   366 mum   2.9 mm    Chamber     eIoni
-    7  -50.4 cm    1.5 cm   93.6 cm   2.04 keV  2.54 keV   308 mum  3.21 mm    Chamber     eIoni
-    8  -50.4 cm    1.5 cm   93.6 cm      0 eV   2.04 keV   121 mum  3.33 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 206,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -47.7 cm    9.8 mm   72.5 cm   19.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -47.7 cm   8.09 mm   72.5 cm   16.4 keV  3.02 keV  1.79 mm   1.79 mm    Tracker     eIoni
-    2  -47.6 cm    7.2 mm   72.4 cm   12.9 keV  3.45 keV  1.41 mm    3.2 mm    Tracker     eIoni
-    3  -47.5 cm   6.53 mm   72.4 cm   10.6 keV   2.3 keV  1.03 mm   4.23 mm    Tracker     eIoni
-    4  -47.5 cm   5.88 mm   72.4 cm   9.33 keV  1.28 keV   821 mum  5.06 mm    Tracker     eIoni
-    5  -47.4 cm   5.45 mm   72.4 cm   8.17 keV  1.16 keV   716 mum  5.77 mm    Tracker     eIoni
-    6  -47.4 cm      5 mm   72.4 cm   7.29 keV   878 eV    626 mum   6.4 mm    Tracker     eIoni
-    7  -47.4 cm   4.56 mm   72.4 cm   5.92 keV  1.37 keV   565 mum  6.96 mm    Tracker     eIoni
-    8  -47.4 cm   4.42 mm   72.4 cm   1.19 keV  4.74 keV   474 mum  7.44 mm    Tracker     eIoni
-    9  -47.4 cm   4.45 mm   72.4 cm      0 eV   1.19 keV    77 mum  7.51 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 205,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -39.4 cm  -7.67 mm    8.1 cm    516 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1    -41 cm  -4.86 mm     20 cm    516 keV     0 eV     12 cm     12 cm    TrackerTransportation
-    2  -49.3 cm   9.28 mm     80 cm    516 keV     0 eV   60.6 cm   72.6 cm    ChamberTransportation
-    3    -52 cm    1.4 cm      1 m     516 keV     0 eV   20.2 cm   92.8 cm    TrackerTransportation
-    4  -60.2 cm   2.81 cm    1.6 m     516 keV     0 eV   60.6 cm   1.53 m     ChamberTransportation
-    5    -63 cm   3.29 cm    1.8 m     516 keV     0 eV   20.2 cm   1.74 m     TrackerTransportation
-    6  -71.2 cm    4.7 cm    2.4 m     516 keV     0 eV   60.6 cm   2.34 m     WorldPVTransportation
-    7  -78.2 cm    5.9 cm   2.91 m     516 keV     0 eV   51.5 cm   2.86 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 204,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.1 cm  -9.47 mm  -8.18 mm     11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -38.1 cm  -1.02 cm  -7.81 mm   9.39 keV  1.62 keV   856 mum   856 mum   Tracker     eIoni
-    2  -38.1 cm  -1.06 cm  -7.28 mm   7.03 keV  2.36 keV   720 mum  1.58 mm    Tracker     eIoni
-    3  -38.1 cm  -1.11 cm  -7.13 mm   5.32 keV  1.72 keV   547 mum  2.12 mm    Tracker     eIoni
-    4  -38.1 cm  -1.14 cm  -7.33 mm    4.6 keV   715 eV    437 mum  2.56 mm    Tracker     eIoni
-    5  -38.1 cm  -1.16 cm  -7.65 mm   3.93 keV   673 eV    392 mum  2.95 mm    Tracker     eIoni
-    6  -38.1 cm  -1.14 cm  -7.39 mm   2.36 keV  1.57 keV   347 mum   3.3 mm    Tracker     eIoni
-    7  -38.1 cm  -1.13 cm  -7.31 mm      0 eV   2.36 keV   209 mum  3.51 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 203,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -30.3 cm  -1.09 cm  -63.4 cm   74.8 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -30.8 cm  -1.14 cm  -63.4 cm   62.8 keV    12 keV  6.67 mm   6.67 mm    Chamber     eIoni
-    2  -31.1 cm  -1.06 cm  -63.6 cm   58.6 keV  4.16 keV  5.07 mm   1.17 cm    Chamber     eIoni
-    3  -30.8 cm  -8.94 mm  -63.7 cm   52.5 keV  6.18 keV  4.57 mm   1.63 cm    Chamber     eIoni
-    4  -30.7 cm  -6.25 mm  -63.7 cm   45.7 keV  6.72 keV  3.84 mm   2.02 cm    Chamber     eIoni
-    5  -30.7 cm  -6.51 mm  -63.4 cm   40.8 keV  4.96 keV  3.13 mm   2.33 cm    Chamber     eIoni
-    6  -30.9 cm  -6.71 mm  -63.4 cm   34.3 keV  6.46 keV  2.64 mm   2.59 cm    Chamber     eIoni
-    7    -31 cm  -6.42 mm  -63.5 cm   30.8 keV  3.49 keV  2.06 mm    2.8 cm    Chamber     eIoni
-    8    -31 cm  -5.57 mm  -63.4 cm     18 keV  12.8 keV  1.77 mm   2.98 cm    Chamber     eIoni
-    9  -30.9 cm  -6.01 mm  -63.4 cm   15.2 keV  2.82 keV   914 mum  3.07 cm    Chamber     eIoni
-   10  -30.9 cm  -5.92 mm  -63.4 cm   11.4 keV  3.82 keV   766 mum  3.15 cm    Chamber     eIoni
-   11  -30.9 cm  -5.96 mm  -63.3 cm   10.1 keV  1.23 keV   588 mum   3.2 cm    Chamber     eIoni
-   12  -30.9 cm  -6.06 mm  -63.3 cm   3.46 keV  6.67 keV   536 mum  3.26 cm    Chamber     eIoni
-   13  -30.9 cm  -6.12 mm  -63.3 cm    291 eV   3.17 keV   242 mum  3.28 cm    Chamber     eIoni
-   14  -30.9 cm  -6.12 mm  -63.3 cm      0 eV    291 eV   13.5 mum  3.28 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 202,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.1 cm  -9.41 mm  -1.58 m    13.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -14.1 cm  -9.19 mm  -1.58 m    10.2 keV  3.24 keV   683 mum   683 mum   Chamber     eIoni
-    2  -14.1 cm  -9.39 mm  -1.58 m    8.38 keV  1.84 keV   540 mum  1.22 mm    Chamber     eIoni
-    3  -14.1 cm  -9.46 mm  -1.58 m    4.84 keV  3.54 keV   466 mum  1.69 mm    Chamber     eIoni
-    4  -14.1 cm  -9.49 mm  -1.58 m     157 eV   4.68 keV   321 mum  2.01 mm    Chamber     eIoni
-    5  -14.1 cm  -9.49 mm  -1.58 m       0 eV    157 eV   9.62 mum  2.02 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 201,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -12.8 cm  -9.15 mm  -1.66 m     849 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -21.4 cm   1.34 cm   -1.6 m     832 keV  17.3 keV  10.7 cm   10.7 cm    ChamberTransportation
-    2    -24 cm   2.11 cm  -1.58 m     812 keV  19.8 keV  4.09 cm   14.8 cm    TrackerTransportation
-    3    -86 cm   15.8 cm  -1.27 m     683 keV   129 keV  72.7 cm   87.5 cm    Tracker     eIoni
-    4  -1.35 m    17.1 cm  -1.24 m     533 keV  95.8 keV  51.6 cm   1.39 m     Tracker     eIoni
-    5  -1.67 m    22.3 cm  -1.46 m     462 keV  70.7 keV  40.9 cm    1.8 m     Tracker     eIoni
-    6  -1.76 m      24 cm  -1.48 m     438 keV  14.4 keV  9.48 cm   1.89 m     Tracker     eIoni
-    7  -2.01 m    30.3 cm  -1.34 m     384 keV  53.9 keV  30.8 cm    2.2 m     Tracker     eIoni
-    8  -2.22 m    39.3 cm  -1.23 m     339 keV  45.4 keV  25.3 cm   2.46 m     Tracker     eIoni
-    9  -2.26 m    41.8 cm  -1.26 m     306 keV  18.8 keV  6.29 cm   2.52 m     Tracker     eIoni
-   10   -2.4 m    44.2 cm  -1.35 m     265 keV  40.6 keV  17.9 cm    2.7 m     Tracker     eIoni
-   11   -2.4 m    44.2 cm  -1.35 m     264 keV   644 eV   3.41 mm    2.7 m     WorldPVTransportation
-   12  -2.53 m    41.2 cm   -1.4 m     233 keV  31.6 keV  14.2 cm   2.84 m     WorldPV     eIoni
-   13  -2.58 m    42.7 cm  -1.31 m     195 keV  38.2 keV  11.6 cm   2.96 m     WorldPV     eIoni
-   14  -2.62 m    36.4 cm  -1.27 m     174 keV  20.9 keV  8.66 cm   3.05 m     WorldPV     eIoni
-   15  -2.62 m    35.8 cm  -1.26 m     161 keV  2.21 keV  7.84 mm   3.05 m     WorldPV     eIoni
-   16  -2.66 m    31.5 cm  -1.25 m     142 keV  19.7 keV  6.35 cm   3.12 m     WorldPV     eIoni
-   17  -2.68 m    27.1 cm  -1.26 m     120 keV  21.7 keV  5.11 cm   3.17 m     WorldPV     eIoni
-   18  -2.69 m    26.3 cm  -1.26 m    96.9 keV  14.5 keV  1.07 cm   3.18 m     WorldPV     eIoni
-   19   -2.7 m    24.4 cm  -1.27 m    87.1 keV  9.84 keV  2.67 cm   3.21 m     WorldPV     eIoni
-   20  -2.72 m    23.5 cm  -1.26 m    72.3 keV  14.8 keV  2.21 cm   3.23 m     WorldPV     eIoni
-   21  -2.74 m      23 cm  -1.26 m    63.7 keV  8.61 keV   1.6 cm   3.24 m     WorldPV     eIoni
-   22  -2.75 m    22.9 cm  -1.25 m    55.9 keV  7.76 keV  1.28 cm   3.26 m     WorldPV     eIoni
-   23  -2.75 m    22.3 cm  -1.26 m    50.1 keV  5.85 keV  1.02 cm   3.27 m     WorldPV     eIoni
-   24  -2.76 m    21.8 cm  -1.26 m    42.3 keV  7.78 keV  8.45 mm   3.27 m     WorldPV     eIoni
-   25  -2.76 m    21.4 cm  -1.26 m    37.4 keV  4.85 keV  6.31 mm   3.28 m     WorldPV     eIoni
-   26  -2.77 m    21.1 cm  -1.26 m    33.6 keV  3.88 keV  5.13 mm   3.29 m     WorldPV     eIoni
-   27  -2.77 m    20.7 cm  -1.26 m    29.2 keV  4.35 keV  4.28 mm   3.29 m     WorldPV     eIoni
-   28  -2.77 m    20.5 cm  -1.26 m    24.4 keV  4.81 keV  3.39 mm   3.29 m     WorldPV     eIoni
-   29  -2.77 m    20.3 cm  -1.26 m    21.9 keV  2.47 keV  2.54 mm    3.3 m     WorldPV     eIoni
-   30  -2.77 m    20.1 cm  -1.26 m    16.9 keV  5.02 keV  2.16 mm    3.3 m     WorldPV     eIoni
-   31  -2.77 m      20 cm  -1.26 m    12.2 keV  4.71 keV  1.47 mm    3.3 m     WorldPV     eIoni
-   32  -2.77 m      20 cm  -1.26 m      11 keV  1.21 keV   962 mum   3.3 m     WorldPV     eIoni
-   33  -2.77 m      20 cm  -1.26 m    10.2 keV   804 eV    853 mum   3.3 m     WorldPV     eIoni
-   34  -2.77 m      20 cm  -1.26 m    7.95 keV  2.22 keV   783 mum   3.3 m     WorldPV     eIoni
-   35  -2.77 m      20 cm  -1.26 m    6.64 keV  1.31 keV   611 mum   3.3 m     WorldPV     eIoni
-   36  -2.77 m      20 cm  -1.26 m    4.82 keV  1.81 keV   521 mum   3.3 m     WorldPV     eIoni
-   37  -2.77 m      20 cm  -1.26 m    3.01 keV  1.82 keV   405 mum   3.3 m     WorldPV     eIoni
-   38  -2.77 m      20 cm  -1.26 m     455 eV   2.55 keV   278 mum   3.3 m     WorldPV     eIoni
-   39  -2.77 m      20 cm  -1.26 m       0 eV    455 eV   25.4 mum   3.3 m     WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 215,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.69 m    26.3 cm  -1.26 m    8.65 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.69 m    26.3 cm  -1.26 m    6.36 keV  2.29 keV   662 mum   662 mum   WorldPV     eIoni
-    2  -2.69 m    26.3 cm  -1.26 m    4.96 keV   1.4 keV   503 mum  1.17 mm    WorldPV     eIoni
-    3  -2.69 m    26.3 cm  -1.26 m     3.7 keV  1.26 keV   414 mum  1.58 mm    WorldPV     eIoni
-    4  -2.69 m    26.3 cm  -1.26 m    2.14 keV  1.55 keV   332 mum  1.91 mm    WorldPV     eIoni
-    5  -2.69 m    26.3 cm  -1.26 m       0 eV   2.14 keV   181 mum  2.09 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 214,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.62 m    35.8 cm  -1.26 m    10.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.62 m    35.7 cm  -1.26 m     6.4 keV  3.77 keV   782 mum   782 mum   WorldPV     eIoni
-    2  -2.62 m    35.7 cm  -1.26 m     4.5 keV   1.9 keV   505 mum  1.29 mm    WorldPV     eIoni
-    3  -2.62 m    35.7 cm  -1.26 m    3.11 keV  1.39 keV   385 mum  1.67 mm    WorldPV     eIoni
-    4  -2.62 m    35.7 cm  -1.26 m     237 eV   2.87 keV   286 mum  1.96 mm    WorldPV     eIoni
-    5  -2.62 m    35.7 cm  -1.26 m       0 eV    237 eV   15.6 mum  1.97 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 213,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.26 m    41.8 cm  -1.26 m    14.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -2.26 m    41.9 cm  -1.27 m    11.5 keV  2.98 keV  1.19 mm   1.19 mm    Tracker     eIoni
-    2  -2.26 m      42 cm  -1.27 m    8.95 keV  2.54 keV   898 mum  2.09 mm    Tracker     eIoni
-    3  -2.26 m      42 cm  -1.27 m    5.25 keV   3.7 keV   686 mum  2.77 mm    Tracker     eIoni
-    4  -2.26 m    42.1 cm  -1.27 m    3.49 keV  1.76 keV   433 mum  3.21 mm    Tracker     eIoni
-    5  -2.26 m    42.1 cm  -1.27 m    1.67 keV  1.82 keV   316 mum  3.52 mm    Tracker     eIoni
-    6  -2.26 m    42.1 cm  -1.27 m       0 eV   1.67 keV   124 mum  3.65 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 212,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.76 m      24 cm  -1.48 m    9.63 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.76 m      24 cm  -1.48 m    7.87 keV  1.76 keV   739 mum   739 mum   Tracker     eIoni
-    2  -1.76 m    24.1 cm  -1.48 m    5.89 keV  1.97 keV   605 mum  1.34 mm    Tracker     eIoni
-    3  -1.76 m      24 cm  -1.48 m    5.03 keV   860 eV    472 mum  1.82 mm    Tracker     eIoni
-    4  -1.76 m      24 cm  -1.48 m    3.71 keV  1.32 keV   419 mum  2.24 mm    Tracker     eIoni
-    5  -1.76 m      24 cm  -1.48 m    1.18 keV  2.53 keV   333 mum  2.57 mm    Tracker     eIoni
-    6  -1.76 m      24 cm  -1.48 m       0 eV   1.18 keV    76 mum  2.64 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 211,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.35 m    17.1 cm  -1.24 m    54.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.35 m    16.4 cm  -1.24 m      49 keV  5.42 keV  9.75 mm   9.75 mm    Tracker     eIoni
-    2  -1.35 m    15.7 cm  -1.24 m    44.4 keV  4.57 keV  8.14 mm   1.79 cm    Tracker     eIoni
-    3  -1.35 m    15.8 cm  -1.24 m    40.8 keV  3.57 keV  6.85 mm   2.47 cm    Tracker     eIoni
-    4  -1.36 m    15.8 cm  -1.25 m    36.1 keV  4.72 keV  5.95 mm   3.07 cm    Tracker     eIoni
-    5  -1.36 m    15.4 cm  -1.24 m    28.8 keV  7.31 keV  4.81 mm   3.55 cm    Tracker     eIoni
-    6  -1.36 m    15.3 cm  -1.25 m    26.1 keV  2.65 keV  3.32 mm   3.88 cm    Tracker     eIoni
-    7  -1.37 m    15.2 cm  -1.25 m    22.4 keV  3.75 keV  2.84 mm   4.17 cm    Tracker     eIoni
-    8  -1.37 m      15 cm  -1.25 m    17.4 keV  4.98 keV  2.23 mm   4.39 cm    Tracker     eIoni
-    9  -1.37 m    14.9 cm  -1.25 m    15.8 keV  1.61 keV  1.53 mm   4.54 cm    Tracker     eIoni
-   10  -1.37 m    14.8 cm  -1.25 m    13.4 keV  2.39 keV  1.34 mm   4.68 cm    Tracker     eIoni
-   11  -1.37 m    14.8 cm  -1.25 m    11.4 keV  2.01 keV  1.08 mm   4.78 cm    Tracker     eIoni
-   12  -1.37 m    14.7 cm  -1.25 m    10.3 keV  1.12 keV   891 mum  4.87 cm    Tracker     eIoni
-   13  -1.37 m    14.6 cm  -1.25 m    8.13 keV  2.16 keV   793 mum  4.95 cm    Tracker     eIoni
-   14  -1.37 m    14.6 cm  -1.25 m    5.75 keV  2.38 keV   623 mum  5.01 cm    Tracker     eIoni
-   15  -1.37 m    14.5 cm  -1.25 m    2.59 keV  3.16 keV   463 mum  5.06 cm    Tracker     eIoni
-   16  -1.37 m    14.5 cm  -1.25 m       0 eV   2.59 keV   237 mum  5.08 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 200,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.34 cm  -3.37 mm  -2.21 m      21 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -3.19 cm  -2.16 mm  -2.21 m    18.4 keV  2.56 keV  2.01 mm   2.01 mm    Tracker     eIoni
-    2   -3.1 cm   -831 mum -2.21 m    16.8 keV  1.62 keV  1.67 mm   3.68 mm    Tracker     eIoni
-    3  -3.03 cm  -97.5 mum -2.21 m    10.3 keV  6.51 keV  1.46 mm   5.14 mm    Tracker     eIoni
-    4  -3.02 cm    290 mum  -2.2 m    8.54 keV  1.76 keV   794 mum  5.93 mm    Tracker     eIoni
-    5  -3.05 cm   -279 mum  -2.2 m    7.04 keV   1.5 keV   654 mum  6.58 mm    Tracker     eIoni
-    6  -3.07 cm   -588 mum  -2.2 m    5.68 keV  1.35 keV   547 mum  7.13 mm    Tracker     eIoni
-    7  -3.04 cm   -339 mum -2.21 m    3.55 keV  2.13 keV   459 mum  7.59 mm    Tracker     eIoni
-    8  -3.01 cm   -254 mum -2.21 m    1.89 keV  1.67 keV   321 mum  7.91 mm    Tracker     eIoni
-    9  -3.02 cm   -274 mum  -2.2 m       0 eV   1.89 keV   149 mum  8.06 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 199,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -165 mum  -228 mum  -2.4 m    6.27 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -300 mum  -331 mum  -2.4 m    6.27 MeV     0 eV   1.14 mm   1.14 mm    TrackerTransportation
-    2  -9.58 cm  -7.36 cm   -1.6 m    6.27 MeV     0 eV   80.9 cm     81 cm    ChamberTransportation
-    3    -12 cm  -9.19 cm   -1.4 m    6.27 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4  -19.1 cm  -14.7 cm    -80 cm   6.27 MeV     0 eV   60.7 cm   1.62 m     ChamberTransportation
-    5  -21.5 cm  -16.5 cm    -60 cm   6.27 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6  -28.7 cm    -22 cm -0.114 fm   6.27 MeV     0 eV   60.7 cm   2.43 m     ChamberTransportation
-    7  -31.1 cm  -23.9 cm     20 cm   6.27 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8  -38.2 cm  -29.3 cm     80 cm   6.27 MeV     0 eV   60.7 cm   3.24 m     ChamberTransportation
-    9  -40.6 cm  -31.2 cm      1 m    6.27 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10  -47.8 cm  -36.7 cm    1.6 m    6.27 MeV     0 eV   60.7 cm   4.05 m     ChamberTransportation
-   11  -50.2 cm  -38.5 cm    1.8 m    6.27 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12  -57.4 cm    -44 cm    2.4 m    6.27 MeV     0 eV   60.7 cm   4.86 m     WorldPVTransportation
-   13  -63.4 cm  -48.7 cm   2.91 m    6.27 MeV     0 eV   51.6 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 198,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -159 mum  -194 mum  -2.4 m     107 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -233 mum  -295 mum  -2.4 m     107 MeV     0 eV   1.51 mm   1.51 mm    TrackerTransportation
-    2  -3.94 cm  -5.41 cm   -1.6 m     107 MeV     0 eV   80.3 cm   80.4 cm    ChamberTransportation
-    3  -4.92 cm  -6.76 cm   -1.4 m     107 MeV     0 eV   20.1 cm      1 m     TrackerTransportation
-    4  -7.85 cm  -10.8 cm    -80 cm    107 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5  -8.83 cm  -12.1 cm    -60 cm    107 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6  -11.8 cm  -16.2 cm      0 fm    107 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7  -12.7 cm  -17.5 cm     20 cm    107 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8  -15.7 cm  -21.6 cm     80 cm    107 MeV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9  -16.7 cm  -22.9 cm      1 m     107 MeV     0 eV   20.1 cm   3.41 m     TrackerTransportation
-   10  -19.6 cm  -26.9 cm    1.6 m     107 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11  -20.6 cm  -28.3 cm    1.8 m     107 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12  -23.5 cm  -32.3 cm    2.4 m     107 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13    -26 cm  -35.7 cm   2.91 m     107 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 197,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -118 mum  -148 mum  -2.4 m     614 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -159 mum  -296 mum  -2.4 m     614 keV     0 eV   2.28 mm   2.28 mm    TrackerTransportation
-    2  -1.48 cm  -5.25 cm   -1.6 m     614 keV     0 eV   80.2 cm   80.4 cm    ChamberTransportation
-    3  -1.85 cm  -6.55 cm   -1.4 m     614 keV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -2.95 cm  -10.5 cm    -80 cm    614 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -3.31 cm  -11.8 cm    -60 cm    614 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -4.41 cm  -15.7 cm      0 fm    614 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -4.78 cm    -17 cm     20 cm    614 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -5.87 cm  -20.9 cm     80 cm    614 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -6.24 cm  -22.2 cm      1 m     614 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -7.34 cm  -26.1 cm    1.6 m     614 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   -7.7 cm  -27.4 cm    1.8 m     614 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   -8.8 cm  -31.3 cm    2.4 m     614 keV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -9.74 cm  -34.7 cm   2.91 m     614 keV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 196,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -92.5 mum -81.2 mum  -2.4 m     2.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -127 mum  -211 mum  -2.4 m     2.5 MeV     0 eV   3.33 mm   3.33 mm    TrackerTransportation
-    2  -8.46 mm  -3.14 cm   -1.6 m     2.5 MeV     0 eV   80.1 cm   80.4 cm    ChamberTransportation
-    3  -1.05 cm  -3.92 cm   -1.4 m     2.5 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -1.61 cm  -5.98 cm  -87.1 cm    416 keV     0 eV   52.9 cm   1.53 m     Tracker     compt
-    5    2.4 m    21.6 cm  -89.6 cm    416 keV     0 eV   2.43 m    3.97 m     WorldPVTransportation
-    6   2.91 m    27.4 cm  -90.1 cm    416 keV     0 eV   51.3 cm   4.48 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 216,   Parent ID = 196
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.61 cm  -5.98 cm  -87.1 cm   2.08 MeV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -2.85 cm  -6.39 cm    -80 cm   2.08 MeV  9.69 keV  7.23 cm   7.23 cm    ChamberTransportation
-    2  -3.98 cm  -10.1 cm  -67.8 cm   1.61 MeV  63.1 keV  13.4 cm   20.6 cm    Chamber     eBrem
-    3  -7.02 cm  -8.52 cm  -63.2 cm   1.48 MeV  24.7 keV  5.87 cm   26.5 cm    Chamber     eIoni
-    4  -9.01 cm   -7.8 cm    -60 cm   1.46 MeV  13.7 keV  4.02 cm   30.5 cm    TrackerTransportation
-    5  -41.8 cm  -13.6 cm      0 fm   1.35 MeV   115 keV  71.1 cm   1.02 m     ChamberTransportation
-    6  -51.3 cm  -4.17 cm     20 cm   1.16 MeV   165 keV  41.3 cm   1.43 m     TrackerTransportation
-    7  -17.2 cm  -5.31 cm   59.7 cm   1.06 MeV  87.5 keV  53.2 cm   1.96 m     Tracker     eIoni
-    8   3.03 cm   6.63 mm     80 cm   1.02 MeV  40.8 keV    30 cm   2.26 m     ChamberTransportation
-    9   10.4 cm   3.61 cm   97.9 cm    853 keV   171 keV    33 cm   2.59 m     Chamber     eIoni
-   10   5.86 cm    3.3 cm   84.3 cm    624 keV   136 keV  25.8 cm   2.85 m     Chamber     eIoni
-   11   4.89 cm   1.71 cm     80 cm    580 keV  43.4 keV  6.09 cm   2.91 m     TrackerTransportation
-   12  -8.95 cm   7.39 cm   40.9 cm    491 keV  89.3 keV    46 cm   3.37 m     Tracker     eIoni
-   13  -32.4 cm     21 cm   22.1 cm    423 keV  67.7 keV  36.3 cm   3.73 m     Tracker     eIoni
-   14    -37 cm     25 cm     20 cm    412 keV  11.3 keV  6.57 cm    3.8 m     ChamberTransportation
-   15  -35.7 cm   28.4 cm   15.3 cm    364 keV  48.3 keV  9.68 cm   3.89 m     Chamber     eIoni
-   16  -35.9 cm   28.8 cm   11.3 cm    303 keV  60.5 keV  8.07 cm   3.98 m     Chamber     eIoni
-   17  -34.4 cm   32.3 cm   9.12 cm    262 keV  41.3 keV  6.15 cm   4.04 m     Chamber     eIoni
-   18  -34.9 cm   35.7 cm   9.06 cm    217 keV  44.5 keV  4.91 cm   4.09 m     Chamber     eIoni
-   19  -34.7 cm   33.2 cm    8.3 cm    180 keV  36.9 keV  3.68 cm   4.12 m     Chamber     eIoni
-   20  -36.1 cm   34.6 cm   8.74 cm    153 keV  27.3 keV  2.74 cm   4.15 m     Chamber     eIoni
-   21  -36.3 cm   33.5 cm   7.68 cm    139 keV  14.3 keV   2.1 cm   4.17 m     Chamber     eIoni
-   22  -35.7 cm   32.5 cm   6.99 cm    121 keV  17.8 keV   1.8 cm   4.19 m     Chamber     eIoni
-   23  -34.8 cm   32.8 cm   6.59 cm   89.7 keV  31.3 keV  1.44 cm    4.2 m     Chamber     eIoni
-   24  -34.5 cm   32.3 cm   6.35 cm   61.4 keV  28.3 keV  8.89 mm   4.21 m     Chamber     eIoni
-   25  -34.2 cm   32.4 cm   6.17 cm   53.8 keV  7.61 keV   4.9 mm   4.22 m     Chamber     eIoni
-   26  -34.3 cm   32.2 cm   6.31 cm   47.8 keV  5.94 keV     4 mm   4.22 m     Chamber     eIoni
-   27  -34.4 cm   32.2 cm   6.14 cm   44.7 keV  3.17 keV  3.35 mm   4.23 m     Chamber     eIoni
-   28  -34.4 cm   32.1 cm    6.3 cm   42.9 keV   1.8 keV  3.02 mm   4.23 m     Chamber     eIoni
-   29  -34.3 cm     32 cm    6.2 cm   34.3 keV  8.55 keV  2.84 mm   4.23 m     Chamber     eIoni
-   30  -34.4 cm   31.9 cm   6.12 cm   29.6 keV  4.72 keV  2.06 mm   4.23 m     Chamber     eIoni
-   31  -34.4 cm   31.8 cm   6.12 cm   23.2 keV  6.44 keV  1.68 mm   4.23 m     Chamber     eIoni
-   32  -34.3 cm   31.9 cm   6.12 cm   18.8 keV  4.32 keV  1.23 mm   4.24 m     Chamber     eIoni
-   33  -34.4 cm   31.9 cm   6.18 cm     16 keV  2.82 keV   963 mum  4.24 m     Chamber     eIoni
-   34  -34.4 cm   31.9 cm   6.19 cm   15.7 keV   290 eV    810 mum  4.24 m     Chamber     eIoni
-   35  -34.4 cm   31.8 cm   6.21 cm   11.8 keV   3.9 keV   795 mum  4.24 m     Chamber     eIoni
-   36  -34.4 cm   31.8 cm   6.23 cm   10.6 keV  1.22 keV   609 mum  4.24 m     Chamber     eIoni
-   37  -34.4 cm   31.8 cm   6.25 cm   8.99 keV  1.63 keV   557 mum  4.24 m     Chamber     eIoni
-   38  -34.4 cm   31.8 cm   6.24 cm   7.25 keV  1.74 keV   491 mum  4.24 m     Chamber     eIoni
-   39  -34.4 cm   31.8 cm   6.24 cm    240 eV   7.01 keV   422 mum  4.24 m     Chamber     eIoni
-   40  -34.4 cm   31.8 cm   6.24 cm      0 eV    240 eV     12 mum  4.24 m     Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 222,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.86 cm    3.3 cm   84.3 cm   93.1 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   5.34 cm   3.73 cm   84.4 cm   80.8 keV  12.3 keV  9.44 mm   9.44 mm    Chamber     eIoni
-    2   4.98 cm   4.09 cm   84.6 cm   73.4 keV  7.34 keV  7.55 mm    1.7 cm    Chamber     eIoni
-    3   4.64 cm    4.4 cm   84.7 cm   61.1 keV  12.4 keV  6.49 mm   2.35 cm    Chamber     eIoni
-    4   4.77 cm   4.11 cm   84.5 cm   53.2 keV   7.9 keV  4.86 mm   2.83 cm    Chamber     eIoni
-    5   4.64 cm   4.23 cm   84.3 cm   46.6 keV  6.55 keV  3.93 mm   3.23 cm    Chamber     eIoni
-    6   4.82 cm   4.09 cm   84.3 cm   42.9 keV  3.69 keV  3.23 mm   3.55 cm    Chamber     eIoni
-    7   4.71 cm   3.92 cm   84.3 cm   31.9 keV  11.1 keV  2.85 mm   3.83 cm    Chamber     eIoni
-    8    4.6 cm    3.9 cm   84.4 cm   29.6 keV  2.27 keV  1.86 mm   4.02 cm    Chamber     eIoni
-    9   4.53 cm   3.95 cm   84.3 cm     28 keV  1.64 keV  1.68 mm   4.19 cm    Chamber     eIoni
-   10   4.57 cm   4.06 cm   84.3 cm   25.4 keV  2.55 keV  1.56 mm   4.34 cm    Chamber     eIoni
-   11   4.59 cm      4 cm   84.2 cm   19.9 keV  5.52 keV  1.37 mm   4.48 cm    Chamber     eIoni
-   12   4.59 cm   4.03 cm   84.3 cm     12 keV   7.9 keV  1.02 mm   4.58 cm    Chamber     eIoni
-   13   4.58 cm      4 cm   84.3 cm   8.67 keV  3.33 keV   615 mum  4.65 cm    Chamber     eIoni
-   14   4.59 cm   3.99 cm   84.3 cm   4.56 keV  4.11 keV   478 mum  4.69 cm    Chamber     eIoni
-   15   4.59 cm   3.99 cm   84.3 cm    560 eV      4 keV   307 mum  4.72 cm    Chamber     eIoni
-   16   4.59 cm   3.99 cm   84.3 cm      0 eV    560 eV   23.8 mum  4.73 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 221,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -17.2 cm  -5.31 cm   59.7 cm     11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -17.1 cm  -5.39 cm   59.7 cm   9.66 keV  1.35 keV   856 mum   856 mum   Tracker     eIoni
-    2  -17.1 cm   -5.4 cm   59.7 cm   7.26 keV   2.4 keV   741 mum   1.6 mm    Tracker     eIoni
-    3    -17 cm  -5.37 cm   59.7 cm   4.94 keV  2.32 keV   563 mum  2.16 mm    Tracker     eIoni
-    4    -17 cm  -5.38 cm   59.7 cm   3.87 keV  1.07 keV   413 mum  2.57 mm    Tracker     eIoni
-    5    -17 cm  -5.36 cm   59.7 cm   1.34 keV  2.53 keV   343 mum  2.92 mm    Tracker     eIoni
-    6    -17 cm  -5.36 cm   59.7 cm      0 eV   1.34 keV  90.3 mum  3.01 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 220,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.7 cm  -11.6 cm    4.1 cm   9.07 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -43.7 cm  -11.6 cm   4.12 cm   5.38 keV  3.69 keV   494 mum   494 mum   Chamber     eIoni
-    2  -43.7 cm  -11.6 cm   4.11 cm   3.25 keV  2.13 keV   345 mum   839 mum   Chamber     eIoni
-    3  -43.7 cm  -11.7 cm    4.1 cm   1.57 keV  1.68 keV   226 mum  1.07 mm    Chamber     eIoni
-    4  -43.7 cm  -11.7 cm    4.1 cm      0 eV   1.57 keV  84.4 mum  1.15 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 219,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -45.6 cm  -9.81 cm      8 cm   9.68 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -45.6 cm  -9.79 cm   8.01 cm   3.02 keV  6.66 keV   518 mum   518 mum   Chamber     eIoni
-    2  -45.6 cm  -9.79 cm   8.01 cm      0 eV   3.02 keV   207 mum   726 mum   Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 218,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -7.02 cm  -8.52 cm  -63.2 cm    107 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -6.47 cm  -9.04 cm  -62.8 cm     94 keV  13.1 keV  1.18 cm   1.18 cm    Chamber     eIoni
-    2  -6.18 cm  -9.36 cm  -63.3 cm   86.6 keV  7.45 keV   9.6 mm   2.14 cm    Chamber     eIoni
-    3  -6.51 cm  -9.87 cm  -63.2 cm   78.3 keV  8.25 keV  8.43 mm   2.99 cm    Chamber     eIoni
-    4  -6.44 cm  -10.2 cm  -63.6 cm   52.5 keV  25.9 keV  7.18 mm    3.7 cm    Chamber     eIoni
-    5  -6.67 cm    -10 cm  -63.6 cm   49.2 keV   3.3 keV  3.84 mm   4.09 cm    Chamber     eIoni
-    6  -6.86 cm  -10.2 cm  -63.7 cm   45.9 keV  3.26 keV   3.5 mm   4.44 cm    Chamber     eIoni
-    7  -6.67 cm  -10.2 cm  -63.8 cm   41.3 keV  4.66 keV  3.15 mm   4.75 cm    Chamber     eIoni
-    8  -6.71 cm  -10.1 cm  -63.7 cm   40.1 keV  1.21 keV  2.69 mm   5.02 cm    Chamber     eIoni
-    9  -6.81 cm  -9.99 cm  -63.8 cm   37.5 keV  2.54 keV  2.58 mm   5.28 cm    Chamber     eIoni
-   10  -6.77 cm    -10 cm  -63.7 cm   34.6 keV  2.96 keV  2.34 mm   5.51 cm    Chamber     eIoni
-   11  -6.81 cm    -10 cm  -63.8 cm      0 eV   34.6 keV  2.08 mm   5.72 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 217,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.98 cm  -10.1 cm  -67.8 cm    405 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -2.19 cm  -8.94 cm    -60 cm    405 keV     0 eV   8.04 cm   8.04 cm    TrackerTransportation
-    2   11.6 cm    523 mum     0 fm    405 keV     0 eV   62.2 cm   70.3 cm    ChamberTransportation
-    3   16.3 cm   3.05 cm     20 cm    405 keV     0 eV   20.7 cm     91 cm    TrackerTransportation
-    4   30.1 cm     12 cm     80 cm    405 keV     0 eV   62.2 cm   1.53 m     ChamberTransportation
-    5   34.7 cm     15 cm      1 m     405 keV     0 eV   20.7 cm   1.74 m     TrackerTransportation
-    6   48.6 cm     24 cm    1.6 m     405 keV     0 eV   62.2 cm   2.36 m     ChamberTransportation
-    7   53.2 cm     27 cm    1.8 m     405 keV     0 eV   20.7 cm   2.57 m     TrackerTransportation
-    8     67 cm     36 cm    2.4 m     405 keV     0 eV   62.2 cm   3.19 m     WorldPVTransportation
-    9   78.8 cm   43.6 cm   2.91 m     405 keV     0 eV   52.9 cm   3.72 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 195,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -91.1 mum -77.2 mum  -2.4 m     492 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -91.2 mum  -214 mum  -2.4 m     492 keV     0 eV   3.42 mm   3.42 mm    TrackerTransportation
-    2   -127 mum -3.22 cm   -1.6 m     492 keV     0 eV   80.1 cm   80.4 cm    ChamberTransportation
-    3   -135 mum -4.02 cm   -1.4 m     492 keV     0 eV     20 cm      1 m     TrackerTransportation
-    4   -162 mum -6.42 cm    -80 cm    492 keV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5   -171 mum -7.22 cm    -60 cm    492 keV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6   -197 mum -9.62 cm  0.114 fm    492 keV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   -206 mum -10.4 cm     20 cm    492 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -233 mum -12.8 cm     80 cm    492 keV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   -242 mum -13.6 cm      1 m     492 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   -268 mum   -16 cm    1.6 m     492 keV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   -277 mum -16.8 cm    1.8 m     492 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   -304 mum -19.2 cm    2.4 m     492 keV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   -326 mum -21.3 cm   2.91 m     492 keV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 194,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -89.4 mum -75.6 mum  -2.4 m    10.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -189 mum -59.3 mum  -2.4 m    10.8 MeV     0 eV   3.63 mm   3.63 mm    TrackerTransportation
-    2  -2.21 cm   3.53 mm   -1.6 m    10.8 MeV     0 eV     80 cm   80.4 cm    ChamberTransportation
-    3  -2.76 cm   4.42 mm   -1.4 m    10.8 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -4.41 cm   7.11 mm    -80 cm   10.8 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -4.96 cm   8.01 mm    -60 cm   10.8 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6   -6.6 cm   1.07 cm      0 fm   10.8 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -7.15 cm   1.16 cm     20 cm   10.8 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8   -8.8 cm   1.43 cm     80 cm   10.8 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -9.34 cm   1.52 cm      1 m    10.8 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10    -11 cm   1.79 cm    1.6 m    10.8 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -11.5 cm   1.88 cm    1.8 m    10.8 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -13.2 cm   2.15 cm    2.4 m    10.8 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -14.6 cm   2.37 cm   2.91 m    10.8 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 193,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -65.6 mum -32.9 mum  -2.4 m     767 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -171 mum  -243 mum  -2.4 m     767 keV     0 eV   4.28 mm   4.28 mm    TrackerTransportation
-    2     -2 cm  -3.96 cm   -1.6 m     767 keV     0 eV   80.1 cm   80.5 cm    ChamberTransportation
-    3  -2.49 cm  -4.94 cm   -1.4 m     767 keV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -3.98 cm  -7.89 cm    -80 cm    767 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -4.48 cm  -8.88 cm    -60 cm    767 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -5.96 cm  -11.8 cm      0 fm    767 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -6.46 cm  -12.8 cm     20 cm    767 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -7.94 cm  -15.8 cm     80 cm    767 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -8.44 cm  -16.7 cm      1 m     767 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -9.93 cm  -19.7 cm    1.6 m     767 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11  -10.4 cm  -20.7 cm    1.8 m     767 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -11.9 cm  -23.6 cm    2.4 m     767 keV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -13.2 cm  -26.1 cm   2.91 m     767 keV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 192,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -67.3 mum -25.8 mum -2.41 m    1.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -183 mum -98.7 mum  -2.4 m    1.09 MeV     0 eV   5.26 mm   5.26 mm    TrackerTransportation
-    2  -1.78 cm  -1.12 cm   -1.6 m    1.09 MeV     0 eV     80 cm   80.6 cm    ChamberTransportation
-    3  -2.22 cm   -1.4 cm   -1.4 m    1.09 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -3.53 cm  -2.23 cm    -80 cm   1.09 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -3.97 cm  -2.51 cm    -60 cm   1.09 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -5.29 cm  -3.34 cm      0 fm   1.09 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -5.73 cm  -3.62 cm     20 cm   1.09 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -7.05 cm  -4.45 cm     80 cm   1.09 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -7.49 cm  -4.73 cm      1 m    1.09 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -8.81 cm  -5.56 cm    1.6 m    1.09 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -9.25 cm  -5.84 cm    1.8 m    1.09 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -10.6 cm  -6.67 cm    2.4 m    1.09 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -11.7 cm  -7.38 cm   2.91 m    1.09 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 191,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -64.8 mum   -26 mum -2.41 m     542 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -121 mum -23.9 mum  -2.4 m     192 keV   351 keV  2.51 mm   2.51 mm   TargetPV     compt
-    2   -869 mum  43.1 mum  -2.4 m       0 eV    192 keV  1.11 mm   3.62 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 189,   Parent ID = 107
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -64 mum -25.8 mum -2.41 m     318 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -64.2 mum -25.9 mum -2.41 m     309 MeV  42.4 keV  35.3 mum  35.3 mum  TargetPV     eBrem
-    2  -80.4 mum -34.1 mum  -2.4 m     277 MeV  1.03 MeV   735 mum   770 mum  TargetPV     eBrem
-    3  -83.2 mum   -22 mum  -2.4 m     270 MeV   583 keV   461 mum  1.23 mm   TargetPV     eBrem
-    4  -87.9 mum -6.42 mum  -2.4 m     138 MeV   1.2 MeV   762 mum  1.99 mm   TargetPV     eBrem
-    5  -94.7 mum  -300 nm   -2.4 m    80.1 MeV   454 keV   364 mum  2.36 mm   TargetPV     eBrem
-    6  -41.8 mum  43.9 mum  -2.4 m    77.5 MeV   944 keV   681 mum  3.04 mm   TargetPV     eBrem
-    7   53.4 mum   143 mum  -2.4 m    51.4 MeV  1.36 MeV  1.01 mm   4.05 mm   TargetPV     eBrem
-    8   64.8 mum   145 mum  -2.4 m    45.8 MeV  62.7 keV  66.2 mum  4.12 mm   TargetPV     eBrem
-    9   65.7 mum   145 mum  -2.4 m    45.3 MeV  7.77 keV  8.33 mum  4.13 mm   TargetPV     eBrem
-   10   83.5 mum   240 mum  -2.4 m    42.5 MeV   2.1 MeV  1.04 mm   5.17 mm   TargetPV     eBrem
-   11    110 mum   210 mum  -2.4 m      42 MeV   515 keV   269 mum  5.44 mm    TrackerTransportation
-   12   5.56 cm   -6.3 cm  -1.98 m    41.9 MeV    87 keV  42.7 cm   43.3 cm    Tracker     eIoni
-   13   10.6 cm  -11.5 cm   -1.6 m    41.8 MeV  80.9 keV  38.8 cm   82.1 cm    ChamberTransportation
-   14   13.2 cm  -13.9 cm  -1.44 m    41.7 MeV   104 keV  16.4 cm   98.4 cm    Chamber     eBrem
-   15   13.8 cm  -14.5 cm   -1.4 m    41.7 MeV  11.9 keV   4.1 cm   1.03 m     TrackerTransportation
-   16     23 cm    -23 cm    -80 cm   41.5 MeV   134 keV  61.3 cm   1.64 m     ChamberTransportation
-   17   24.8 cm  -24.9 cm  -65.4 cm   41.5 MeV  67.2 keV  14.9 cm   1.79 m     Chamber     eBrem
-   18   25.5 cm  -26.1 cm    -60 cm   41.4 MeV  41.1 keV  5.53 cm   1.84 m     TrackerTransportation
-   19   31.4 cm    -38 cm 0.0241 fm   41.3 MeV   127 keV  61.5 cm   2.46 m     ChamberTransportation
-   20   32.6 cm  -41.6 cm   17.6 cm   40.9 MeV   108 keV    18 cm   2.64 m     Chamber     eIoni
-   21   32.8 cm  -42.3 cm     20 cm   40.9 MeV  17.1 keV  2.46 cm   2.66 m     TrackerTransportation
-   22     37 cm    -59 cm     80 cm   40.8 MeV   131 keV  62.4 cm   3.29 m     ChamberTransportation
-   23   38.4 cm  -64.5 cm      1 m    40.7 MeV  89.2 keV  20.8 cm   3.49 m     TrackerTransportation
-   24   44.3 cm    -83 cm    1.6 m    40.5 MeV   134 keV  63.1 cm   4.13 m     ChamberTransportation
-   25   46.3 cm  -89.5 cm    1.8 m    40.4 MeV   102 keV  21.1 cm   4.34 m     TrackerTransportation
-   26   51.7 cm  -1.12 m    2.37 m    40.3 MeV   122 keV  61.8 cm   4.95 m     Tracker     eIoni
-   27     52 cm  -1.13 m     2.4 m    40.3 MeV  5.62 keV  2.79 cm   4.98 m     WorldPVTransportation
-   28   57.7 cm  -1.32 m    2.91 m    40.1 MeV   117 keV  54.8 cm   5.53 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 239,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   51.7 cm  -1.12 m    2.37 m    17.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   51.6 cm  -1.12 m    2.37 m    14.4 keV  3.46 keV  1.59 mm   1.59 mm    Tracker     eIoni
-    2   51.6 cm  -1.12 m    2.38 m     6.1 keV  8.27 keV  1.18 mm   2.77 mm    Tracker     eIoni
-    3   51.6 cm  -1.12 m    2.38 m    3.31 keV   2.8 keV   486 mum  3.25 mm    Tracker     eIoni
-    4   51.6 cm  -1.12 m    2.38 m    1.79 keV  1.51 keV   302 mum  3.55 mm    Tracker     eIoni
-    5   51.6 cm  -1.12 m    2.38 m       0 eV   1.79 keV   138 mum  3.69 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 238,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   46.1 cm  -88.7 cm   1.78 m    31.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     46 cm  -88.7 cm   1.78 m    29.2 keV   2.7 keV  1.87 mm   1.87 mm    Chamber     eIoni
-    2   45.9 cm  -88.8 cm   1.77 m    27.9 keV  1.31 keV  1.65 mm   3.52 mm    Chamber     eIoni
-    3   45.8 cm  -88.9 cm   1.78 m    18.3 keV  9.62 keV  1.56 mm   5.08 mm    Chamber     eIoni
-    4   45.8 cm  -88.9 cm   1.78 m    15.2 keV  3.09 keV   931 mum  6.01 mm    Chamber     eIoni
-    5   45.8 cm  -88.9 cm   1.77 m    11.8 keV  3.45 keV   768 mum  6.77 mm    Chamber     eIoni
-    6   45.8 cm  -88.9 cm   1.77 m    8.44 keV  3.32 keV   605 mum  7.38 mm    Chamber     eIoni
-    7   45.8 cm  -88.9 cm   1.77 m     4.3 keV  4.14 keV   468 mum  7.85 mm    Chamber     eIoni
-    8   45.8 cm  -88.9 cm   1.77 m       0 eV    4.3 keV   294 mum  8.14 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 237,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   37.5 cm    -61 cm   87.2 cm   19.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   37.5 cm    -61 cm   87.2 cm   17.5 keV   2.2 keV  1.01 mm   1.01 mm    Chamber     eIoni
-    2   37.4 cm    -61 cm   87.2 cm    1.9 keV  15.6 keV   887 mum   1.9 mm    Chamber     eIoni
-    3   37.4 cm    -61 cm   87.2 cm      0 eV    1.9 keV   109 mum  2.01 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 236,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   32.6 cm  -41.6 cm   17.6 cm    250 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   34.6 cm  -41.2 cm   18.7 cm    220 keV  29.8 keV  4.57 cm   4.57 cm    Chamber     eIoni
-    2   36.1 cm  -42.1 cm   19.5 cm    192 keV  28.3 keV  3.75 cm   8.32 cm    Chamber     eIoni
-    3   37.5 cm  -43.2 cm   19.5 cm    166 keV  25.6 keV  3.01 cm   11.3 cm    Chamber     eIoni
-    4   37.4 cm  -43.1 cm   19.4 cm    125 keV   641 eV   1.67 mm   11.5 cm    Chamber     eIoni
-    5   36.4 cm  -43.2 cm     19 cm    108 keV  17.2 keV  1.52 cm     13 cm    Chamber     eIoni
-    6     37 cm  -43.2 cm   19.4 cm   94.4 keV  13.6 keV   1.2 cm   14.2 cm    Chamber     eIoni
-    7   37.4 cm  -43.3 cm   19.8 cm   88.5 keV  5.85 keV  9.66 mm   15.2 cm    Chamber     eIoni
-    8   37.6 cm  -43.6 cm     20 cm   80.2 keV  8.34 keV  8.72 mm   16.1 cm    Chamber     eIoni
-    9   37.6 cm  -43.6 cm     20 cm   80.2 keV     0 eV   1.89 mum  16.1 cm    TrackerTransportation
-   10   38.6 cm    -42 cm   20.3 cm   69.4 keV  10.8 keV  1.92 cm     18 cm    Tracker     eIoni
-   11   38.5 cm  -40.9 cm   21.2 cm   58.5 keV  10.9 keV  1.49 cm   19.5 cm    Tracker     eIoni
-   12   38.3 cm  -40.2 cm   21.9 cm   53.7 keV   4.8 keV  1.11 cm   20.6 cm    Tracker     eIoni
-   13   38.4 cm  -39.6 cm   22.6 cm   48.5 keV  5.23 keV  9.52 mm   21.5 cm    Tracker     eIoni
-   14   38.1 cm  -39.1 cm   23.1 cm   38.6 keV  9.86 keV     8 mm   22.3 cm    Tracker     eIoni
-   15   37.8 cm  -38.7 cm   23.4 cm   34.6 keV  4.01 keV  5.41 mm   22.9 cm    Tracker     eIoni
-   16   37.4 cm  -38.5 cm   23.5 cm   31.5 keV  3.07 keV  4.49 mm   23.3 cm    Tracker     eIoni
-   17   37.6 cm  -38.5 cm   23.8 cm   29.7 keV  1.85 keV  3.85 mm   23.7 cm    Tracker     eIoni
-   18   37.8 cm  -38.4 cm     24 cm   27.9 keV   1.8 keV  3.48 mm     24 cm    Tracker     eIoni
-   19   37.8 cm  -38.1 cm   24.2 cm   26.1 keV  1.76 keV  3.15 mm   24.4 cm    Tracker     eIoni
-   20   37.5 cm    -38 cm   24.2 cm   22.9 keV   3.2 keV  2.83 mm   24.6 cm    Tracker     eIoni
-   21   37.5 cm  -38.1 cm     24 cm   21.4 keV  1.53 keV  2.31 mm   24.9 cm    Tracker     eIoni
-   22   37.4 cm  -38.2 cm   23.9 cm   18.6 keV  2.82 keV  2.07 mm   25.1 cm    Tracker     eIoni
-   23   37.3 cm  -38.4 cm   23.8 cm   14.2 keV  4.37 keV  1.68 mm   25.3 cm    Tracker     eIoni
-   24   37.3 cm  -38.4 cm   23.9 cm   11.5 keV  2.72 keV  1.16 mm   25.4 cm    Tracker     eIoni
-   25   37.2 cm  -38.4 cm   23.9 cm   9.55 keV  1.93 keV   897 mum  25.5 cm    Tracker     eIoni
-   26   37.2 cm  -38.4 cm   23.9 cm   8.17 keV  1.37 keV   732 mum  25.5 cm    Tracker     eIoni
-   27   37.2 cm  -38.4 cm     24 cm   4.11 keV  4.06 keV   627 mum  25.6 cm    Tracker     eIoni
-   28   37.2 cm  -38.4 cm     24 cm   1.44 keV  2.67 keV   360 mum  25.6 cm    Tracker     eIoni
-   29   37.2 cm  -38.4 cm     24 cm      0 eV   1.44 keV   101 mum  25.6 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 240,   Parent ID = 236
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   37.4 cm  -43.1 cm   19.4 cm   40.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   37.3 cm  -43.2 cm   19.6 cm   37.3 keV  3.01 keV   2.6 mm    2.6 mm    Chamber     eIoni
-    2   37.4 cm  -43.1 cm   19.7 cm   15.2 keV  22.1 keV  2.32 mm   4.92 mm    Chamber     eIoni
-    3   37.5 cm  -43.1 cm   19.7 cm   10.8 keV  4.34 keV   766 mum  5.68 mm    Chamber     eIoni
-    4   37.5 cm  -43.1 cm   19.7 cm   2.07 keV  8.76 keV   567 mum  6.25 mm    Chamber     eIoni
-    5   37.5 cm  -43.1 cm   19.7 cm      0 eV   2.07 keV   124 mum  6.37 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 235,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.8 cm  -24.9 cm  -65.4 cm   4.45 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   24.9 cm    -25 cm  -65.1 cm      0 eV   4.45 keV  3.02 mm   3.02 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 234,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   13.2 cm  -13.9 cm  -1.44 m    3.66 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   13.2 cm    -14 cm  -1.44 m       0 eV   3.66 keV  4.45 mm   4.45 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 233,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.56 cm   -6.3 cm  -1.98 m      14 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   5.66 cm  -6.28 cm  -1.98 m    11.5 keV  2.47 keV  1.14 mm   1.14 mm    Tracker     eIoni
-    2   5.72 cm  -6.23 cm  -1.98 m    10.4 keV  1.13 keV   899 mum  2.04 mm    Tracker     eIoni
-    3   5.75 cm   -6.3 cm  -1.98 m    8.08 keV  2.29 keV   800 mum  2.84 mm    Tracker     eIoni
-    4    5.8 cm  -6.33 cm  -1.98 m    3.99 keV  4.08 keV   620 mum  3.46 mm    Tracker     eIoni
-    5   5.81 cm  -6.33 cm  -1.98 m     824 eV   3.17 keV   351 mum  3.81 mm    Tracker     eIoni
-    6   5.81 cm  -6.33 cm  -1.98 m       0 eV    824 eV   48.1 mum  3.86 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 232,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   83.5 mum   240 mum  -2.4 m     757 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    113 mum   206 mum  -2.4 m     757 keV     0 eV    269 mum   269 mum   TrackerTransportation
-    2   9.03 cm  -10.3 cm   -1.6 m     757 keV     0 eV   81.2 cm   81.2 cm    ChamberTransportation
-    3   11.3 cm  -12.9 cm   -1.4 m     757 keV     0 eV   20.3 cm   1.01 m     TrackerTransportation
-    4     18 cm  -20.7 cm    -80 cm    757 keV     0 eV   60.9 cm   1.62 m     ChamberTransportation
-    5   20.3 cm  -23.3 cm    -60 cm    757 keV     0 eV   20.3 cm   1.83 m     TrackerTransportation
-    6   27.1 cm  -31.1 cm      0 fm    757 keV     0 eV   60.9 cm   2.44 m     ChamberTransportation
-    7   29.3 cm  -33.6 cm     20 cm    757 keV     0 eV   20.3 cm   2.64 m     TrackerTransportation
-    8   36.1 cm  -41.4 cm     80 cm    757 keV     0 eV   60.9 cm   3.25 m     ChamberTransportation
-    9   38.3 cm    -44 cm      1 m     757 keV     0 eV   20.3 cm   3.45 m     TrackerTransportation
-   10   45.1 cm  -51.8 cm    1.6 m     757 keV     0 eV   60.9 cm   4.06 m     ChamberTransportation
-   11   47.3 cm  -54.4 cm    1.8 m     757 keV     0 eV   20.3 cm   4.26 m     TrackerTransportation
-   12   54.1 cm  -62.1 cm    2.4 m     757 keV     0 eV   60.9 cm   4.87 m     WorldPVTransportation
-   13   59.8 cm  -68.7 cm   2.91 m     757 keV     0 eV   51.7 cm   5.39 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 231,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   65.7 mum   145 mum  -2.4 m     464 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    194 mum   169 mum  -2.4 m     464 keV     0 eV   1.31 mm   1.31 mm    TrackerTransportation
-    2   7.94 cm   1.49 cm   -1.6 m     464 keV     0 eV   80.4 cm   80.5 cm    ChamberTransportation
-    3   9.92 cm   1.86 cm   -1.4 m     464 keV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   15.9 cm   2.96 cm    -80 cm    464 keV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   17.8 cm   3.33 cm    -60 cm    464 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   23.8 cm   4.44 cm      0 fm    464 keV     0 eV   60.3 cm   2.41 m     ChamberTransportation
-    7   25.8 cm   4.81 cm     20 cm    464 keV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   31.7 cm   5.91 cm     80 cm    464 keV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   33.7 cm   6.28 cm      1 m     464 keV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   39.6 cm   7.38 cm    1.6 m     464 keV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   41.6 cm   7.75 cm    1.8 m     464 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   47.5 cm   8.86 cm    2.4 m     464 keV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13   52.6 cm    9.8 cm   2.91 m     464 keV     0 eV   51.3 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 230,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   64.8 mum   145 mum  -2.4 m     5.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    223 mum   164 mum  -2.4 m     5.5 MeV     0 eV   1.32 mm   1.32 mm    TrackerTransportation
-    2   9.68 cm   1.17 cm   -1.6 m     5.5 MeV     0 eV   80.6 cm   80.7 cm    ChamberTransportation
-    3   12.1 cm   1.46 cm   -1.4 m     5.5 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   19.3 cm   2.33 cm    -80 cm    5.5 MeV     0 eV   60.4 cm   1.61 m     ChamberTransportation
-    5   21.8 cm   2.61 cm    -60 cm    5.5 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6     29 cm   3.48 cm  0.114 fm    5.5 MeV     0 eV   60.4 cm   2.42 m     ChamberTransportation
-    7   31.4 cm   3.77 cm     20 cm    5.5 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   38.7 cm   4.64 cm     80 cm    5.5 MeV     0 eV   60.4 cm   3.22 m     ChamberTransportation
-    9   41.1 cm   4.92 cm      1 m     5.5 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10   48.3 cm   5.79 cm    1.6 m     5.5 MeV     0 eV   60.4 cm   4.03 m     ChamberTransportation
-   11   50.7 cm   6.08 cm    1.8 m     5.5 MeV     0 eV   20.1 cm   4.23 m     TrackerTransportation
-   12     58 cm   6.95 cm    2.4 m     5.5 MeV     0 eV   60.4 cm   4.84 m     WorldPVTransportation
-   13   64.1 cm   7.68 cm   2.91 m     5.5 MeV     0 eV   51.4 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 229,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   53.4 mum   143 mum  -2.4 m    24.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    277 mum   192 mum  -2.4 m    24.7 MeV     0 eV   1.39 mm   1.39 mm    TrackerTransportation
-    2     13 cm   2.85 cm   -1.6 m    24.7 MeV     0 eV   81.1 cm   81.2 cm    ChamberTransportation
-    3   16.3 cm   3.56 cm   -1.4 m    24.7 MeV     0 eV   20.3 cm   1.02 m     TrackerTransportation
-    4     26 cm   5.69 cm    -80 cm   24.7 MeV     0 eV   60.8 cm   1.62 m     ChamberTransportation
-    5   29.3 cm   6.39 cm    -60 cm   24.7 MeV     0 eV   20.3 cm   1.83 m     TrackerTransportation
-    6     39 cm   8.52 cm      0 fm   24.7 MeV     0 eV   60.8 cm   2.43 m     ChamberTransportation
-    7   42.3 cm   9.23 cm     20 cm   24.7 MeV     0 eV   20.3 cm   2.64 m     TrackerTransportation
-    8     52 cm   11.4 cm     80 cm   24.7 MeV     0 eV   60.8 cm   3.25 m     ChamberTransportation
-    9   55.3 cm   12.1 cm      1 m    24.7 MeV     0 eV   20.3 cm   3.45 m     TrackerTransportation
-   10     65 cm   14.2 cm    1.6 m    24.7 MeV     0 eV   60.8 cm   4.06 m     ChamberTransportation
-   11   68.2 cm   14.9 cm    1.8 m    24.7 MeV     0 eV   20.3 cm   4.26 m     TrackerTransportation
-   12     78 cm     17 cm    2.4 m    24.7 MeV     0 eV   60.8 cm   4.87 m     WorldPVTransportation
-   13   86.3 cm   18.8 cm   2.91 m    24.7 MeV     0 eV   51.7 cm   5.38 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 228,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -41.8 mum  43.9 mum  -2.4 m    1.73 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    170 mum   103 mum  -2.4 m    1.73 MeV     0 eV   2.39 mm   2.39 mm    TrackerTransportation
-    2   7.16 cm   2.01 cm   -1.6 m    1.73 MeV     0 eV   80.3 cm   80.6 cm    ChamberTransportation
-    3   8.94 cm   2.51 cm   -1.4 m    1.73 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   14.3 cm      4 cm    -80 cm   1.73 MeV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   16.1 cm    4.5 cm    -60 cm   1.73 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   21.4 cm      6 cm      0 fm   1.73 MeV     0 eV   60.3 cm   2.41 m     ChamberTransportation
-    7   23.2 cm    6.5 cm     20 cm   1.73 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   28.6 cm   7.99 cm     80 cm   1.73 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   30.4 cm   8.49 cm      1 m    1.73 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   35.7 cm   9.99 cm    1.6 m    1.73 MeV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   37.5 cm   10.5 cm    1.8 m    1.73 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   42.9 cm     12 cm    2.4 m    1.73 MeV     0 eV   60.3 cm   4.82 m     WorldPVTransportation
-   13   47.4 cm   13.3 cm   2.91 m    1.73 MeV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 227,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.7 mum  -300 nm   -2.4 m    57.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -38.7 mum  65.7 mum  -2.4 m       0 eV      0 eV   1.74 mm   1.74 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 242,   Parent ID = 227
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.7 mum  65.7 mum  -2.4 m      43 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   13.6 mum   131 mum  -2.4 m    41.5 MeV  1.52 MeV  1.33 mm   1.33 mm    TrackerTransportation
-    2   37.3 cm   1.13 cm  -1.59 m    41.3 MeV   191 keV  88.9 cm   89.1 cm    Tracker     eIoni
-    3   50.7 cm    1.9 cm  -1.31 m    41.2 MeV  58.3 keV  31.6 cm   1.21 m     Tracker     eIoni
-    4   57.2 cm   2.25 cm  -1.16 m    41.2 MeV  36.4 keV  15.8 cm   1.36 m     Tracker     eIoni
-    5   76.5 cm   4.09 cm  -72.6 cm     41 MeV   105 keV  47.8 cm   1.84 m     Tracker     eIoni
-    6   1.04 m    6.12 cm  -14.4 cm   40.9 MeV   138 keV  64.3 cm   2.49 m     Tracker     eIoni
-    7    1.1 m    6.58 cm      0 fm   40.8 MeV  29.5 keV  15.5 cm   2.64 m     ChamberTransportation
-    8    1.1 m    6.64 cm   1.97 cm   40.8 MeV  11.1 keV  2.13 cm   2.66 m     TrackerTransportation
-    9   1.42 m    9.33 cm     80 cm   40.6 MeV   182 keV  84.3 cm   3.51 m     ChamberTransportation
-   10   1.44 m    9.39 cm   84.4 cm   40.5 MeV    38 keV  4.75 cm   3.55 m     Chamber     eIoni
-   11   1.49 m    10.1 cm   96.7 cm   40.3 MeV  96.2 keV  13.2 cm   3.69 m     Chamber     eIoni
-   12    1.5 m    10.2 cm      1 m    40.3 MeV  31.9 keV  3.58 cm   3.72 m     TrackerTransportation
-   13   1.63 m    10.2 cm    1.3 m    40.2 MeV  65.4 keV  32.3 cm   4.04 m     Tracker     eIoni
-   14   1.77 m    10.1 cm    1.6 m    40.1 MeV  77.8 keV  33.4 cm   4.38 m     ChamberTransportation
-   15   1.86 m      10 cm    1.8 m      40 MeV   128 keV  21.9 cm    4.6 m     TrackerTransportation
-   16   2.12 m    11.6 cm    2.4 m    39.8 MeV   142 keV  65.6 cm   5.25 m     WorldPVTransportation
-   17    2.3 m    12.1 cm   2.78 m    39.8 MeV  88.6 keV  41.3 cm   5.67 m     WorldPV     eIoni
-   18    2.3 m    12.1 cm   2.78 m    39.7 MeV   625 eV   5.27 mm   5.67 m     WorldPV     eIoni
-   19   2.35 m    12.1 cm   2.91 m    39.7 MeV  25.9 keV  14.1 cm   5.81 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 253,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.3 m    12.1 cm   2.78 m    8.66 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.3 m    12.1 cm   2.78 m    7.56 keV  1.11 keV   664 mum   664 mum   WorldPV     eIoni
-    2    2.3 m      12 cm   2.78 m    6.31 keV  1.25 keV   584 mum  1.25 mm    WorldPV     eIoni
-    3    2.3 m      12 cm   2.78 m    2.82 keV  3.49 keV   500 mum  1.75 mm    WorldPV     eIoni
-    4    2.3 m      12 cm   2.78 m     631 eV   2.18 keV   260 mum  2.01 mm    WorldPV     eIoni
-    5    2.3 m      12 cm   2.78 m       0 eV    631 eV   35.3 mum  2.04 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 252,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.3 m    12.1 cm   2.78 m    8.31 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.3 m      12 cm   2.78 m    5.84 keV  2.46 keV   636 mum   636 mum   WorldPV     eIoni
-    2    2.3 m      12 cm   2.78 m    4.41 keV  1.43 keV   469 mum   1.1 mm    WorldPV     eIoni
-    3    2.3 m      12 cm   2.77 m     356 eV   4.06 keV   380 mum  1.48 mm    WorldPV     eIoni
-    4    2.3 m      12 cm   2.77 m       0 eV    356 eV   20.5 mum   1.5 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 251,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.83 m    10.1 cm   1.73 m    9.61 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.83 m      10 cm   1.73 m    8.01 keV   1.6 keV   515 mum   515 mum   Chamber     eIoni
-    2   1.83 m    10.1 cm   1.73 m    5.34 keV  2.67 keV   452 mum   967 mum   Chamber     eIoni
-    3   1.83 m    10.1 cm   1.73 m     686 eV   4.65 keV   344 mum  1.31 mm    Chamber     eIoni
-    4   1.83 m    10.1 cm   1.73 m       0 eV    686 eV   29.6 mum  1.34 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 250,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.63 m    10.2 cm    1.3 m      11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.63 m    10.1 cm    1.3 m       9 keV  2.01 keV   856 mum   856 mum   Tracker     eIoni
-    2   1.63 m    10.1 cm    1.3 m       8 keV   998 eV    690 mum  1.55 mm    Tracker     eIoni
-    3   1.63 m    10.2 cm    1.3 m    6.54 keV  1.46 keV   614 mum  2.16 mm    Tracker     eIoni
-    4   1.63 m    10.1 cm   1.29 m    5.27 keV  1.27 keV   514 mum  2.67 mm    Tracker     eIoni
-    5   1.63 m    10.2 cm   1.29 m    2.52 keV  2.75 keV   434 mum  3.11 mm    Tracker     eIoni
-    6   1.63 m    10.2 cm   1.29 m     748 eV   1.77 keV   229 mum  3.34 mm    Tracker     eIoni
-    7   1.63 m    10.2 cm   1.29 m       0 eV    748 eV   42.8 mum  3.38 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 249,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.49 m    10.1 cm   96.7 cm     93 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.49 m    10.2 cm   96.7 cm   83.3 keV   1.3 keV  1.19 mm   1.19 mm    Chamber     eBrem
-    2   1.48 m    10.4 cm   96.8 cm   74.7 keV  8.66 keV  7.93 mm   9.12 mm    Chamber     eIoni
-    3   1.48 m    10.8 cm   96.5 cm   60.6 keV  14.1 keV  6.65 mm   1.58 cm    Chamber     eIoni
-    4   1.48 m    10.9 cm   96.4 cm   30.4 keV  30.2 keV  4.81 mm   2.06 cm    Chamber     eIoni
-    5   1.48 m    10.9 cm   96.5 cm   24.4 keV  5.96 keV  1.74 mm   2.23 cm    Chamber     eIoni
-    6   1.48 m    10.9 cm   96.5 cm   23.8 keV   668 eV   1.31 mm   2.36 cm    Chamber     eIoni
-    7   1.48 m    10.8 cm   96.5 cm   19.7 keV  4.07 keV  1.27 mm   2.49 cm    Chamber     eIoni
-    8   1.48 m    10.8 cm   96.5 cm   16.9 keV  2.83 keV  1.01 mm   2.59 cm    Chamber     eIoni
-    9   1.48 m    10.8 cm   96.5 cm     14 keV  2.85 keV   854 mum  2.68 cm    Chamber     eIoni
-   10   1.48 m    10.8 cm   96.5 cm   11.7 keV  2.35 keV   709 mum  2.75 cm    Chamber     eIoni
-   11   1.48 m    10.8 cm   96.4 cm   4.68 keV     7 keV   602 mum  2.81 cm    Chamber     eIoni
-   12   1.48 m    10.8 cm   96.5 cm   2.53 keV  2.15 keV   313 mum  2.84 cm    Chamber     eIoni
-   13   1.48 m    10.8 cm   96.5 cm      0 eV   2.53 keV   163 mum  2.86 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 254,   Parent ID = 249
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.49 m    10.2 cm   96.7 cm   8.38 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.49 m    10.3 cm   96.8 cm      0 eV   8.38 keV  1.31 mm   1.31 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 248,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.44 m    9.39 cm   84.4 cm    109 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.45 m    9.96 cm   84.8 cm   98.8 keV  10.1 keV  1.21 cm   1.21 cm    Chamber     eIoni
-    2   1.45 m    10.2 cm   84.6 cm   86.6 keV  12.3 keV  1.04 cm   2.26 cm    Chamber     eIoni
-    3   1.46 m    10.6 cm   84.9 cm     79 keV  7.52 keV  8.42 mm    3.1 cm    Chamber     eIoni
-    4   1.46 m    10.9 cm   85.3 cm   72.3 keV  6.73 keV  7.29 mm   3.83 cm    Chamber     eIoni
-    5   1.46 m    10.9 cm   85.7 cm   52.4 keV  19.9 keV  6.33 mm   4.46 cm    Chamber     eIoni
-    6   1.46 m    11.1 cm   85.5 cm   47.3 keV  5.13 keV  3.84 mm   4.84 cm    Chamber     eIoni
-    7   1.46 m    11.2 cm   85.6 cm   40.5 keV  6.78 keV   3.3 mm   5.17 cm    Chamber     eIoni
-    8   1.46 m    11.3 cm   85.7 cm   38.1 keV  2.45 keV  2.62 mm   5.44 cm    Chamber     eIoni
-    9   1.46 m    11.2 cm   85.6 cm   35.9 keV  2.15 keV  2.39 mm   5.67 cm    Chamber     eIoni
-   10   1.46 m    11.4 cm   85.7 cm     32 keV  3.85 keV  2.19 mm   5.89 cm    Chamber     eIoni
-   11   1.46 m    11.3 cm   85.6 cm   29.5 keV  2.58 keV  1.88 mm   6.08 cm    Chamber     eIoni
-   12   1.46 m    11.3 cm   85.6 cm   26.3 keV   3.2 keV  1.67 mm   6.25 cm    Chamber     eIoni
-   13   1.46 m    11.2 cm   85.6 cm   22.3 keV  3.93 keV  1.44 mm   6.39 cm    Chamber     eIoni
-   14   1.46 m    11.2 cm   85.7 cm   18.8 keV  3.56 keV  1.17 mm   6.51 cm    Chamber     eIoni
-   15   1.46 m    11.2 cm   85.6 cm   16.4 keV  2.37 keV   959 mum  6.61 cm    Chamber     eIoni
-   16   1.46 m    11.2 cm   85.6 cm   7.51 keV   8.9 keV   830 mum  6.69 cm    Chamber     eIoni
-   17   1.46 m    11.2 cm   85.7 cm   3.55 keV  3.97 keV   432 mum  6.73 cm    Chamber     eIoni
-   18   1.46 m    11.2 cm   85.6 cm      0 eV   3.55 keV   248 mum  6.76 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 247,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.04 m    6.12 cm  -14.4 cm   15.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.04 m    6.01 cm  -14.3 cm   13.1 keV  2.41 keV  1.31 mm   1.31 mm    Tracker     eIoni
-    2   1.04 m    5.92 cm  -14.3 cm   11.8 keV  1.31 keV  1.05 mm   2.37 mm    Tracker     eIoni
-    3   1.04 m    5.89 cm  -14.2 cm   10.9 keV   887 eV    927 mum  3.29 mm    Tracker     eIoni
-    4   1.04 m    5.88 cm  -14.2 cm   8.62 keV  2.31 keV   849 mum  4.14 mm    Tracker     eIoni
-    5   1.04 m    5.82 cm  -14.2 cm    6.2 keV  2.42 keV   660 mum   4.8 mm    Tracker     eIoni
-    6   1.04 m    5.78 cm  -14.2 cm    593 eV   5.61 keV   493 mum   5.3 mm    Tracker     eIoni
-    7   1.04 m    5.78 cm  -14.2 cm      0 eV    593 eV   33.1 mum  5.33 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 246,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   76.5 cm   4.09 cm  -72.6 cm   41.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1     76 cm   3.96 cm  -72.4 cm     38 keV  3.39 keV  6.09 mm   6.09 mm    Tracker     eIoni
-    2   75.8 cm   3.71 cm    -72 cm   35.6 keV  2.35 keV  5.26 mm   1.13 cm    Tracker     eIoni
-    3   75.5 cm   3.76 cm  -71.7 cm   32.5 keV  3.11 keV  4.71 mm   1.61 cm    Tracker     eIoni
-    4   75.6 cm   3.58 cm  -71.3 cm   30.1 keV  2.39 keV  4.06 mm   2.01 cm    Tracker     eIoni
-    5   75.6 cm   3.52 cm    -71 cm   25.6 keV  4.49 keV  3.56 mm   2.37 cm    Tracker     eIoni
-    6   75.3 cm   3.41 cm  -70.9 cm   21.7 keV  3.93 keV  2.75 mm   2.64 cm    Tracker     eIoni
-    7   75.3 cm   3.54 cm  -70.7 cm   19.5 keV  2.23 keV  2.12 mm   2.85 cm    Tracker     eIoni
-    8   75.2 cm   3.65 cm  -70.6 cm   17.9 keV  1.61 keV  1.81 mm   3.04 cm    Tracker     eIoni
-    9   75.3 cm   3.74 cm  -70.5 cm   16.3 keV   1.6 keV  1.59 mm   3.19 cm    Tracker     eIoni
-   10   75.3 cm   3.77 cm  -70.4 cm     14 keV  2.32 keV   1.4 mm   3.33 cm    Tracker     eIoni
-   11   75.4 cm   3.82 cm  -70.4 cm   11.8 keV  2.17 keV  1.14 mm   3.45 cm    Tracker     eIoni
-   12   75.4 cm   3.87 cm  -70.4 cm   10.2 keV   1.6 keV   925 mum  3.54 cm    Tracker     eIoni
-   13   75.5 cm   3.94 cm  -70.4 cm   8.56 keV  1.63 keV   785 mum  3.62 cm    Tracker     eIoni
-   14   75.4 cm   3.95 cm  -70.4 cm   7.53 keV  1.03 keV   656 mum  3.69 cm    Tracker     eIoni
-   15   75.4 cm   3.97 cm  -70.4 cm   3.37 keV  4.16 keV   582 mum  3.74 cm    Tracker     eIoni
-   16   75.4 cm   3.98 cm  -70.4 cm   2.58 keV   790 eV    307 mum  3.77 cm    Tracker     eIoni
-   17   75.4 cm   3.97 cm  -70.4 cm    1.3 keV  1.28 keV   236 mum   3.8 cm    Tracker     eIoni
-   18   75.4 cm   3.96 cm  -70.4 cm      0 eV    1.3 keV  86.7 mum  3.81 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 245,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   57.2 cm   2.25 cm  -1.16 m    12.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   57.1 cm   2.24 cm  -1.16 m    10.6 keV   1.5 keV   957 mum   957 mum   Tracker     eIoni
-    2   57.1 cm   2.24 cm  -1.16 m    8.93 keV   1.7 keV   823 mum  1.78 mm    Tracker     eIoni
-    3   57.1 cm    2.2 cm  -1.16 m    5.03 keV   3.9 keV   685 mum  2.46 mm    Tracker     eIoni
-    4     57 cm   2.19 cm  -1.16 m    2.98 keV  2.05 keV   418 mum  2.88 mm    Tracker     eIoni
-    5   57.1 cm   2.18 cm  -1.16 m     286 eV    2.7 keV   275 mum  3.16 mm    Tracker     eIoni
-    6   57.1 cm   2.18 cm  -1.16 m       0 eV    286 eV   17.5 mum  3.18 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 244,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   50.7 cm    1.9 cm  -1.31 m    34.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   51.1 cm    1.9 cm  -1.31 m    30.8 keV  4.14 keV  4.56 mm   4.56 mm    Tracker     eIoni
-    2   51.3 cm   2.18 cm  -1.31 m    28.6 keV  2.21 keV  3.69 mm   8.26 mm    Tracker     eIoni
-    3   51.5 cm   2.35 cm  -1.31 m    25.1 keV  3.45 keV  3.28 mm   1.15 cm    Tracker     eIoni
-    4   51.6 cm   2.45 cm  -1.31 m    23.2 keV  1.96 keV  2.65 mm   1.42 cm    Tracker     eIoni
-    5   51.4 cm   2.41 cm  -1.31 m    19.8 keV  3.36 keV  2.35 mm   1.65 cm    Tracker     eIoni
-    6   51.5 cm    2.5 cm   -1.3 m    16.4 keV  3.43 keV  1.85 mm   1.84 cm    Tracker     eIoni
-    7   51.5 cm   2.55 cm   -1.3 m    15.1 keV  1.26 keV  1.41 mm   1.98 cm    Tracker     eIoni
-    8   51.6 cm   2.66 cm   -1.3 m    12.5 keV  2.58 keV  1.27 mm   2.11 cm    Tracker     eIoni
-    9   51.6 cm   2.73 cm   -1.3 m     7.1 keV  5.44 keV   997 mum  2.21 cm    Tracker     eIoni
-   10   51.6 cm   2.68 cm   -1.3 m    6.58 keV   518 eV    552 mum  2.26 cm    Tracker     eIoni
-   11   51.6 cm   2.72 cm   -1.3 m    4.57 keV  2.01 keV   517 mum  2.31 cm    Tracker     eIoni
-   12   51.6 cm   2.71 cm   -1.3 m    3.07 keV  1.51 keV   390 mum  2.35 cm    Tracker     eIoni
-   13   51.6 cm   2.69 cm   -1.3 m    1.23 keV  1.84 keV   283 mum  2.38 cm    Tracker     eIoni
-   14   51.6 cm   2.69 cm   -1.3 m       0 eV   1.23 keV  80.8 mum  2.39 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 243,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   37.3 cm   1.13 cm  -1.59 m    18.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   37.4 cm   9.67 mm  -1.59 m    12.9 keV   5.5 keV  1.67 mm   1.67 mm    Tracker     eIoni
-    2   37.4 cm   9.13 mm  -1.59 m    12.1 keV   851 eV   1.04 mm    2.7 mm    Tracker     eIoni
-    3   37.5 cm   8.64 mm  -1.59 m    8.61 keV  3.47 keV   951 mum  3.66 mm    Tracker     eIoni
-    4   37.4 cm   8.72 mm  -1.59 m       7 keV  1.62 keV   660 mum  4.31 mm    Tracker     eIoni
-    5   37.4 cm   8.83 mm  -1.59 m    5.55 keV  1.45 keV   544 mum  4.86 mm    Tracker     eIoni
-    6   37.4 cm   8.93 mm  -1.59 m    3.01 keV  2.54 keV   451 mum  5.31 mm    Tracker     eIoni
-    7   37.3 cm   9.02 mm  -1.59 m    1.51 keV   1.5 keV   278 mum  5.59 mm    Tracker     eIoni
-    8   37.3 cm   9.04 mm  -1.59 m       0 eV   1.51 keV   107 mum   5.7 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 241,   Parent ID = 227
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.7 mum  65.7 mum  -2.4 m    13.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -50.1 mum  51.2 mum  -2.4 m      12 MeV   176 keV   177 mum   177 mum  TargetPV     eBrem
-    2  -43.2 mum  44.5 mum  -2.4 m      11 MeV  62.3 keV  50.9 mum   228 mum  TargetPV     eBrem
-    3  -24.3 mum  -124 mum  -2.4 m    8.21 MeV   595 keV   475 mum   703 mum  TargetPV     eBrem
-    4   -156 mum  35.8 mum  -2.4 m    6.37 MeV  1.36 MeV   338 mum  1.04 mm   TargetPV     eBrem
-    5   -451 mum  18.6 mum  -2.4 m    5.05 MeV   763 keV   756 mum   1.8 mm   TargetPV     eBrem
-    6  -1.21 mm   96.5 mum  -2.4 m    3.76 MeV  1.29 MeV  1.07 mm   2.87 mm   TargetPV     eIoni
-    7  -1.33 mm   -134 mum  -2.4 m    2.95 MeV   809 keV   879 mum  3.75 mm   TargetPV     eIoni
-    8   -870 mum  -126 mum  -2.4 m    1.76 MeV   748 keV   720 mum  4.47 mm   TargetPV     eBrem
-    9   -707 mum  -109 mum  -2.4 m    1.23 MeV   533 keV   559 mum  5.02 mm   TargetPV     eIoni
-   10   -605 mum -82.1 mum  -2.4 m     183 keV  1.04 MeV   460 mum  5.48 mm   TargetPV     eIoni
-   11   -609 mum   -81 mum  -2.4 m       0 eV    183 keV  70.5 mum  5.55 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 260,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -870 mum  -126 mum  -2.4 m     440 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.69 mm    703 mum -2.41 m     350 keV  89.9 keV  8.15 mm   8.15 mm   TargetPV     compt
-    2  -2.89 mm    739 mum -2.41 m       0 eV    350 keV   235 mum  8.39 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 259,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -451 mum  18.6 mum  -2.4 m     558 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.09 cm  -8.21 mm   -2.4 m     367 keV   191 keV  1.37 cm   1.37 cm   TargetPV     compt
-    2  -1.03 cm  -1.96 cm   -2.4 m       0 eV    367 keV  1.15 cm   2.52 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 258,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -156 mum  35.8 mum  -2.4 m     473 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.47 mm  -4.64 mm  -2.41 m     400 keV  73.4 keV  9.15 mm   9.15 mm   TargetPV     compt
-    2  -4.15 mm  -5.98 mm  -2.41 m       0 eV    400 keV  2.14 mm   1.13 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 257,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -24.3 mum  -124 mum  -2.4 m    2.25 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.54 mm   8.62 mm  -2.41 m       0 eV   1.23 MeV  1.19 cm   1.19 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 261,   Parent ID = 257
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.54 mm   8.62 mm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.54 mm   8.62 mm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 263,   Parent ID = 261
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.54 mm   8.62 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -5.83 mm   6.59 mm  -2.41 m       0 eV    511 keV  4.01 mm   4.01 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 262,   Parent ID = 261
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.54 mm   8.62 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -274 mum     1 cm  -2.41 m     173 keV   338 keV  2.76 mm   2.76 mm   TargetPV     compt
-    2   -480 mum  9.95 mm  -2.41 m       0 eV    173 keV   249 mum  3.01 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 256,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.2 mum  44.5 mum  -2.4 m     910 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -38.4 mum -50.7 mum  -2.4 m     910 keV     0 eV   1.09 mm   1.09 mm    TrackerTransportation
-    2   3.43 mm  -7.01 cm   -1.6 m     910 keV     0 eV   80.3 cm   80.4 cm    ChamberTransportation
-    3    4.3 mm  -8.76 cm   -1.4 m     910 keV     0 eV   20.1 cm      1 m     TrackerTransportation
-    4   6.91 mm    -14 cm    -80 cm    910 keV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   7.77 mm  -15.8 cm    -60 cm    910 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   1.04 cm    -21 cm      0 fm    910 keV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7   1.12 cm  -22.8 cm     20 cm    910 keV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   1.38 cm    -28 cm     80 cm    910 keV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9   1.47 cm  -29.8 cm      1 m     910 keV     0 eV   20.1 cm   3.41 m     TrackerTransportation
-   10   1.73 cm    -35 cm    1.6 m     910 keV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   1.82 cm  -36.8 cm    1.8 m     910 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   2.08 cm    -42 cm    2.4 m     910 keV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13    2.3 cm  -46.5 cm   2.91 m     910 keV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 255,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -50.1 mum  51.2 mum  -2.4 m     1.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    145 mum  -215 mum  -2.4 m     1.3 MeV     0 eV   1.18 mm   1.18 mm    TrackerTransportation
-    2   13.7 cm  -18.8 cm   -1.6 m     1.3 MeV     0 eV   83.3 cm   83.4 cm    ChamberTransportation
-    3   17.1 cm  -23.4 cm   -1.4 m     1.3 MeV     0 eV   20.8 cm   1.04 m     TrackerTransportation
-    4   27.4 cm  -37.5 cm    -80 cm    1.3 MeV     0 eV   62.5 cm   1.67 m     ChamberTransportation
-    5   30.9 cm  -42.2 cm    -60 cm    1.3 MeV     0 eV   20.8 cm   1.88 m     TrackerTransportation
-    6   41.1 cm  -56.2 cm      0 fm    1.3 MeV     0 eV   62.5 cm    2.5 m     ChamberTransportation
-    7   44.6 cm  -60.9 cm     20 cm    1.3 MeV     0 eV   20.8 cm   2.71 m     TrackerTransportation
-    8   54.8 cm    -75 cm     80 cm    1.3 MeV     0 eV   62.5 cm   3.33 m     ChamberTransportation
-    9   58.3 cm  -79.7 cm      1 m     1.3 MeV     0 eV   20.8 cm   3.54 m     TrackerTransportation
-   10   68.5 cm  -93.7 cm    1.6 m     1.3 MeV     0 eV   62.5 cm   4.17 m     ChamberTransportation
-   11     72 cm  -98.4 cm    1.8 m     1.3 MeV     0 eV   20.8 cm   4.37 m     TrackerTransportation
-   12   82.3 cm  -1.12 m     2.4 m     1.3 MeV     0 eV   62.5 cm      5 m     WorldPVTransportation
-   13     91 cm  -1.24 m    2.91 m     1.3 MeV     0 eV   53.1 cm   5.53 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 226,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -87.9 mum -6.42 mum  -2.4 m     131 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -107 mum   -24 mum  -2.4 m     131 MeV     0 eV   3.42 mm   3.42 mm    TrackerTransportation
-    2  -4.67 mm  -4.15 mm   -1.6 m     131 MeV     0 eV     80 cm   80.3 cm    ChamberTransportation
-    3  -5.81 mm  -5.18 mm   -1.4 m     131 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -9.24 mm  -8.27 mm    -80 cm    131 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -1.04 cm  -9.31 mm    -60 cm    131 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -1.38 cm  -1.24 cm -0.114 fm    131 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -1.49 cm  -1.34 cm     20 cm    131 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -1.84 cm  -1.65 cm     80 cm    131 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -1.95 cm  -1.76 cm      1 m     131 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10  -2.29 cm  -2.06 cm    1.6 m     131 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11  -2.41 cm  -2.17 cm    1.8 m     131 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12  -2.75 cm  -2.48 cm    2.4 m     131 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13  -3.04 cm  -2.74 cm   2.91 m     131 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 225,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -83.2 mum   -22 mum  -2.4 m    6.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -72 mum -13.3 mum  -2.4 m    2.52 MeV     0 eV   2.83 mm   2.83 mm   TargetPV     compt
-    2   -349 mum   661 mum  -2.4 m    2.52 MeV     0 eV   1.53 mm   4.36 mm    TrackerTransportation
-    3  -98.7 cm    2.4 m     2.4 m    2.52 MeV     0 eV   5.45 m    5.46 m     WorldPVTransportation
-    4  -1.09 m    2.66 m    2.91 m    2.52 MeV     0 eV   58.5 cm   6.04 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 264,   Parent ID = 225
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -72 mum -13.3 mum  -2.4 m    3.66 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -180 mum   266 mum  -2.4 m    2.72 MeV   938 keV   865 mum   865 mum  TargetPV     eIoni
-    2   48.9 mum   157 mum  -2.4 m    1.87 MeV   852 keV   719 mum  1.58 mm   TargetPV     eIoni
-    3  -32.4 mum -17.1 mum  -2.4 m    1.06 MeV   813 keV   578 mum  2.16 mm   TargetPV     eIoni
-    4  -39.7 mum   128 mum  -2.4 m     406 keV   333 keV   357 mum  2.52 mm   TargetPV     eBrem
-    5  -51.5 mum   129 mum  -2.4 m       0 eV    406 keV   219 mum  2.74 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 265,   Parent ID = 264
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -39.7 mum   128 mum  -2.4 m     317 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -70.4 mum   176 mum  -2.4 m     317 keV     0 eV    220 mum   220 mum   TrackerTransportation
-    2  -11.6 cm   18.3 cm   -1.6 m     317 keV     0 eV   82.9 cm   82.9 cm    ChamberTransportation
-    3  -14.5 cm   22.9 cm   -1.4 m     317 keV     0 eV   20.7 cm   1.04 m     TrackerTransportation
-    4  -23.2 cm   36.6 cm    -80 cm    317 keV     0 eV   62.2 cm   1.66 m     ChamberTransportation
-    5  -26.1 cm   41.1 cm    -60 cm    317 keV     0 eV   20.7 cm   1.86 m     TrackerTransportation
-    6  -34.8 cm   54.8 cm      0 fm    317 keV     0 eV   62.2 cm   2.49 m     ChamberTransportation
-    7  -37.7 cm   59.4 cm     20 cm    317 keV     0 eV   20.7 cm   2.69 m     TrackerTransportation
-    8  -46.4 cm   73.1 cm     80 cm    317 keV     0 eV   62.2 cm   3.32 m     ChamberTransportation
-    9  -49.3 cm   77.7 cm      1 m     317 keV     0 eV   20.7 cm   3.52 m     TrackerTransportation
-   10    -58 cm   91.4 cm    1.6 m     317 keV     0 eV   62.2 cm   4.14 m     ChamberTransportation
-   11  -60.9 cm   95.9 cm    1.8 m     317 keV     0 eV   20.7 cm   4.35 m     TrackerTransportation
-   12  -69.6 cm    1.1 m     2.4 m     317 keV     0 eV   62.2 cm   4.97 m     WorldPVTransportation
-   13    -77 cm   1.21 m    2.91 m     317 keV     0 eV   52.8 cm    5.5 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 224,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -80.4 mum -34.1 mum  -2.4 m    30.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -97.9 mum  31.8 mum  -2.4 m    30.8 MeV     0 eV   4.64 mm   4.64 mm    TrackerTransportation
-    2  -3.11 mm   1.14 cm   -1.6 m    30.8 MeV     0 eV     80 cm   80.5 cm    ChamberTransportation
-    3  -3.86 mm   1.42 cm   -1.4 m    30.8 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -6.11 mm   2.28 cm    -80 cm   30.8 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -6.87 mm   2.56 cm    -60 cm   30.8 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -9.12 mm   3.41 cm      0 fm   30.8 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -9.88 mm    3.7 cm     20 cm   30.8 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -1.21 cm   4.55 cm     80 cm   30.8 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -1.29 cm   4.83 cm      1 m    30.8 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -1.51 cm   5.68 cm    1.6 m    30.8 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -1.59 cm   5.97 cm    1.8 m    30.8 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -1.81 cm   6.82 cm    2.4 m    30.8 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -2.01 cm   7.54 cm   2.91 m    30.8 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 223,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -64.2 mum -25.9 mum -2.41 m    9.85 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -89.6 mum -34.2 mum  -2.4 m       0 eV      0 eV    3.9 mm    3.9 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 267,   Parent ID = 223
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -89.6 mum -34.2 mum  -2.4 m    4.05 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    402 mum  72.7 mum  -2.4 m    3.06 MeV   992 keV   945 mum   945 mum  TargetPV     eIoni
-    2    217 mum   460 mum  -2.4 m    2.23 MeV   827 keV   789 mum  1.73 mm   TargetPV     eIoni
-    3  -16.7 mum   449 mum  -2.4 m    1.59 MeV   647 keV   651 mum  2.38 mm   TargetPV     eIoni
-    4   -211 mum   416 mum  -2.4 m     802 keV   785 keV   536 mum  2.92 mm   TargetPV     eIoni
-    5   -229 mum   440 mum  -2.4 m     104 keV   699 keV   372 mum  3.29 mm   TargetPV     eIoni
-    6   -232 mum   438 mum  -2.4 m       0 eV    104 keV  27.1 mum  3.32 mm   TargetPV     eIoni
-    7   -232 mum   438 mum  -2.4 m       0 eV      0 eV      0 fm   3.32 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 269,   Parent ID = 267
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -232 mum   438 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -359 mum   529 mum  -2.4 m     511 keV     0 eV    204 mum   204 mum   TrackerTransportation
-    2   -2.4 m    1.71 m    8.07 cm    511 keV     0 eV   3.85 m    3.85 m     WorldPVTransportation
-    3  -2.91 m    2.07 m    60.8 cm    511 keV     0 eV   81.8 cm   4.67 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 268,   Parent ID = 267
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -232 mum   438 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.18 mm  -1.99 mm   -2.4 m       0 eV    511 keV  5.48 mm   5.48 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 266,   Parent ID = 223
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -89.6 mum -34.2 mum  -2.4 m    4.78 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -439 mum   101 mum  -2.4 m    3.56 MeV   877 keV   721 mum   721 mum  TargetPV     eBrem
-    2   -256 mum   518 mum  -2.4 m    2.07 MeV   687 keV   646 mum  1.37 mm   TargetPV     eBrem
-    3  -94.5 mum   471 mum  -2.4 m    1.17 MeV   505 keV   484 mum  1.85 mm   TargetPV     eBrem
-    4   -174 mum   470 mum  -2.4 m     432 keV   167 keV   174 mum  2.03 mm   TargetPV     eBrem
-    5   -183 mum   481 mum  -2.4 m    18.5 keV   413 keV   235 mum  2.26 mm   TargetPV     eIoni
-    6   -183 mum   481 mum  -2.4 m       0 eV   18.5 keV  1.82 mum  2.26 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 273,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -174 mum   470 mum  -2.4 m     571 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    961 mum   825 mum  -2.4 m     571 keV     0 eV   1.94 mm   1.94 mm    TrackerTransportation
-    2    2.4 m      75 cm   83.7 cm    571 keV     0 eV    4.1 m     4.1 m     WorldPVTransportation
-    3   2.91 m      91 cm   1.53 m     571 keV     0 eV   87.1 cm   4.97 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 272,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.5 mum   471 mum  -2.4 m     391 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    145 mum   718 mum -2.41 m       0 eV    391 keV  3.82 mm   3.82 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 271,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -256 mum   518 mum  -2.4 m     811 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -6.65 mm   1.47 mm  -2.42 m     755 keV  55.9 keV   1.8 cm    1.8 cm   TargetPV     compt
-    2  -7.49 mm    519 mum -2.42 m     608 keV   147 keV  5.85 mm   2.39 cm   TargetPV     compt
-    3  -7.53 mm   1.08 mm  -2.43 m       0 eV    608 keV  1.43 mm   2.53 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 270,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -439 mum   101 mum  -2.4 m     335 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.01 mm   1.44 mm   -2.4 m       0 eV    335 keV  1.47 mm   1.47 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 106,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.42 mum -7.38 mum -2.41 m     6.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -80.1 mum -83.3 mum  -2.4 m     6.1 MeV     0 eV   1.26 cm   1.26 cm    TrackerTransportation
-    2  -4.82 mm   -4.9 mm   -1.6 m     6.1 MeV     0 eV     80 cm   81.3 cm    ChamberTransportation
-    3  -6.01 mm  -6.11 mm   -1.4 m     6.1 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -9.56 mm  -9.72 mm    -80 cm    6.1 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -1.07 cm  -1.09 cm    -60 cm    6.1 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -1.43 cm  -1.45 cm      0 fm    6.1 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -1.55 cm  -1.57 cm     20 cm    6.1 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -1.9 cm  -1.94 cm     80 cm    6.1 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -2.02 cm  -2.06 cm      1 m     6.1 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -2.38 cm  -2.42 cm    1.6 m     6.1 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   -2.5 cm  -2.54 cm    1.8 m     6.1 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -2.85 cm   -2.9 cm    2.4 m     6.1 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -3.15 cm  -3.21 cm   2.91 m     6.1 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 105,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.07 mum -2.63 mum -2.41 m     654 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -47.4 mum -30.6 mum  -2.4 m     595 keV  58.3 keV  1.21 cm   1.21 cm   TargetPV     compt
-    2   -480 mum  -197 mum  -2.4 m     595 keV     0 eV    1.2 mm   1.33 cm    TrackerTransportation
-    3  -62.9 cm  -24.2 cm    -80 cm    595 keV     0 eV   1.74 m    1.75 m     ChamberTransportation
-    4  -67.2 cm  -25.9 cm  -68.9 cm    595 keV     0 eV     12 cm   1.87 m     TrackerTransportation
-    5  -94.3 cm  -36.3 cm      0 fm    595 keV     0 eV   74.8 cm   2.62 m     ChamberTransportation
-    6  -1.02 m   -39.3 cm     20 cm    595 keV     0 eV   21.7 cm   2.83 m     TrackerTransportation
-    7  -1.26 m   -48.4 cm     80 cm    595 keV     0 eV   65.1 cm   3.48 m     ChamberTransportation
-    8  -1.34 m   -51.4 cm      1 m     595 keV     0 eV   21.7 cm    3.7 m     TrackerTransportation
-    9  -1.57 m   -60.5 cm    1.6 m     595 keV     0 eV   65.1 cm   4.35 m     ChamberTransportation
-   10  -1.65 m   -63.5 cm    1.8 m     595 keV     0 eV   21.7 cm   4.57 m     TrackerTransportation
-   11  -1.88 m   -72.6 cm    2.4 m     595 keV     0 eV   65.1 cm   5.22 m     WorldPVTransportation
-   12  -2.09 m   -80.3 cm   2.91 m     595 keV     0 eV   55.3 cm   5.77 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 104,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 mum -2.53 mum -2.41 m    41.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -755 nm  -2.98 mum -2.41 m       0 eV   6.32 MeV   412 mum   412 mum  TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 275,   Parent ID = 104
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -755 nm  -2.98 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 277,   Parent ID = 275
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   5.18 mum  9.01 mm  -2.42 m       0 eV    511 keV  9.69 mm   9.69 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 276,   Parent ID = 275
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.52 mum -4.21 mm  -2.41 m     308 keV   203 keV  4.52 mm   4.52 mm   TargetPV     compt
-    2    192 mum -4.23 mm  -2.41 m     298 keV  10.2 keV   284 mum  4.81 mm   TargetPV     compt
-    3   4.01 mm  -6.27 mm  -2.41 m       0 eV    298 keV  5.29 mm   1.01 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 274,   Parent ID = 104
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m    33.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   83.6 mum   138 mum -2.41 m    26.3 MeV  1.35 MeV  1.02 mm   1.02 mm   TargetPV     eBrem
-    2   77.4 mum   143 mum -2.41 m    22.4 MeV  91.5 keV  98.9 mum  1.12 mm   TargetPV     eBrem
-    3   81.8 mum   151 mum -2.41 m    10.8 MeV   216 keV  82.7 mum   1.2 mm   TargetPV     eBrem
-    4  -91.4 mum   257 mum -2.41 m    8.49 MeV   637 keV   591 mum  1.79 mm   TargetPV     eBrem
-    5    213 mum  -815 mum -2.41 m     6.7 MeV  1.78 MeV  1.55 mm   3.34 mm   TargetPV     eIoni
-    6   -642 mum  -248 mum -2.41 m    4.98 MeV  1.73 MeV   1.3 mm   4.64 mm   TargetPV     eIoni
-    7   -802 mum  -256 mum -2.41 m    4.36 MeV   215 keV   200 mum  4.84 mm   TargetPV     eBrem
-    8  -1.18 mm   -558 mum -2.41 m    1.45 MeV  2.91 MeV   969 mum  5.81 mm   TargetPV     eIoni
-    9  -1.36 mm   -603 mum -2.41 m     755 keV   697 keV   503 mum  6.32 mm   TargetPV     eIoni
-   10  -1.35 mm   -578 mum -2.41 m     310 keV   446 keV   355 mum  6.67 mm   TargetPV     eIoni
-   11  -1.35 mm   -586 mum -2.41 m       0 eV    310 keV   152 mum  6.82 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 282,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -802 mum  -256 mum -2.41 m     403 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -979 mum  -518 mum -2.41 m     386 keV  17.6 keV   861 mum   861 mum  TargetPV     compt
-    2  -1.15 mm   -664 mum -2.41 m       0 eV    386 keV   349 mum  1.21 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 281,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -91.4 mum   257 mum -2.41 m    1.67 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -966 mum    -1 cm   -2.4 m    1.67 MeV     0 eV   1.54 cm   1.54 cm    TrackerTransportation
-    2  -20.5 cm   -2.4 m    25.4 cm   1.67 MeV     0 eV   3.58 m    3.59 m     WorldPVTransportation
-    3  -24.8 cm  -2.91 m    82.1 cm   1.67 MeV     0 eV   76.3 cm   4.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 280,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   81.8 mum   151 mum -2.41 m    11.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    269 mum   743 mum  -2.4 m    11.4 MeV     0 eV   1.19 cm   1.19 cm    TrackerTransportation
-    2   1.28 cm   4.05 cm   -1.6 m    11.4 MeV     0 eV   80.1 cm   81.3 cm    ChamberTransportation
-    3   1.59 cm   5.04 cm   -1.4 m    11.4 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.53 cm   8.02 cm    -80 cm   11.4 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   2.84 cm   9.01 cm    -60 cm   11.4 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   3.78 cm     12 cm  0.114 fm   11.4 MeV     0 eV   60.1 cm   2.42 m     ChamberTransportation
-    7    4.1 cm     13 cm     20 cm   11.4 MeV     0 eV     20 cm   2.62 m     TrackerTransportation
-    8   5.04 cm     16 cm     80 cm   11.4 MeV     0 eV   60.1 cm   3.22 m     ChamberTransportation
-    9   5.35 cm     17 cm      1 m    11.4 MeV     0 eV     20 cm   3.42 m     TrackerTransportation
-   10   6.29 cm   19.9 cm    1.6 m    11.4 MeV     0 eV   60.1 cm   4.02 m     ChamberTransportation
-   11    6.6 cm   20.9 cm    1.8 m    11.4 MeV     0 eV     20 cm   4.22 m     TrackerTransportation
-   12   7.54 cm   23.9 cm    2.4 m    11.4 MeV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13   8.34 cm   26.4 cm   2.91 m    11.4 MeV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 279,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   77.4 mum   143 mum -2.41 m    3.85 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -201 mum     1 mm   -2.4 m    3.85 MeV     0 eV    1.2 cm    1.2 cm    TrackerTransportation
-    2  -1.88 cm   5.83 cm   -1.6 m    3.85 MeV     0 eV   80.2 cm   81.4 cm    ChamberTransportation
-    3  -2.34 cm   7.27 cm   -1.4 m    3.85 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4  -3.73 cm   11.6 cm    -80 cm   3.85 MeV     0 eV   60.2 cm   1.62 m     ChamberTransportation
-    5   -4.2 cm     13 cm    -60 cm   3.85 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6  -5.59 cm   17.3 cm      0 fm   3.85 MeV     0 eV   60.2 cm   2.42 m     ChamberTransportation
-    7  -6.05 cm   18.7 cm     20 cm   3.85 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8  -7.45 cm     23 cm     80 cm   3.85 MeV     0 eV   60.2 cm   3.22 m     ChamberTransportation
-    9  -7.91 cm   24.5 cm      1 m    3.85 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   -9.3 cm   28.8 cm    1.6 m    3.85 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11  -9.77 cm   30.2 cm    1.8 m    3.85 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12  -11.2 cm   34.5 cm    2.4 m    3.85 MeV     0 eV   60.2 cm   4.83 m     WorldPVTransportation
-   13  -12.3 cm   38.2 cm   2.91 m    3.85 MeV     0 eV   51.1 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 278,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   83.6 mum   138 mum -2.41 m    6.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -245 mum   333 mum  -2.4 m    6.23 MeV     0 eV   1.21 cm   1.21 cm    TrackerTransportation
-    2  -2.19 cm   1.32 cm   -1.6 m    6.23 MeV     0 eV     80 cm   81.3 cm    ChamberTransportation
-    3  -2.74 cm   1.64 cm   -1.4 m    6.23 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -4.36 cm   2.61 cm    -80 cm   6.23 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -4.91 cm   2.93 cm    -60 cm   6.23 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -6.53 cm    3.9 cm  0.114 fm   6.23 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -7.08 cm   4.22 cm     20 cm   6.23 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -8.71 cm   5.18 cm     80 cm   6.23 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -9.25 cm   5.51 cm      1 m    6.23 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -10.9 cm   6.47 cm    1.6 m    6.23 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -11.4 cm   6.79 cm    1.8 m    6.23 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12    -13 cm   7.76 cm    2.4 m    6.23 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -14.4 cm   8.58 cm   2.91 m    6.23 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 103,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 mum -2.44 mum -2.41 m    1.88 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   24.7 mum -21.5 mum  -2.4 m       0 eV    860 keV  1.01 cm   1.01 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 283,   Parent ID = 103
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 mum -21.5 mum  -2.4 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   24.7 mum -21.5 mum  -2.4 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 285,   Parent ID = 283
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 mum -21.5 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    382 mum  2.78 mm   -2.4 m     271 keV   240 keV  2.98 mm   2.98 mm   TargetPV     compt
-    2    941 mum  2.99 mm   -2.4 m       0 eV    271 keV   814 mum  3.79 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 284,   Parent ID = 283
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 mum -21.5 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -862 mum -6.96 mm   -2.4 m       0 eV    511 keV  7.39 mm   7.39 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 102,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.67 mum -2.35 mum -2.41 m    65.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   29.3 mum -14.8 mum  -2.4 m       0 eV      0 eV   1.02 cm   1.02 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 287,   Parent ID = 102
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.3 mum -14.8 mum  -2.4 m    47.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   51.6 mum -16.6 mum  -2.4 m    42.3 MeV  5.34 MeV   3.5 mm    3.5 mm    TrackerTransportation
-    2   6.42 cm   3.61 cm   -1.6 m    42.1 MeV   175 keV  80.3 cm   80.7 cm    ChamberTransportation
-    3   7.87 cm   4.73 cm   -1.4 m    41.8 MeV   109 keV  20.1 cm   1.01 m     Chamber     eIoni
-    4   7.87 cm   4.73 cm   -1.4 m    41.8 MeV     0 eV   27.6 mum  1.01 m     TrackerTransportation
-    5   11.7 cm   5.74 cm    -80 cm   41.7 MeV   129 keV  60.1 cm   1.61 m     ChamberTransportation
-    6   12.9 cm      6 cm    -60 cm   41.6 MeV  84.5 keV    20 cm   1.81 m     TrackerTransportation
-    7   14.4 cm   5.48 cm  -37.4 cm   41.5 MeV  44.8 keV  22.7 cm   2.04 m     Tracker     eIoni
-    8   16.9 cm   4.76 cm -0.0568 fm   41.4 MeV  75.7 keV  37.5 cm   2.41 m     ChamberTransportation
-    9   18.2 cm   4.14 cm     20 cm   41.3 MeV   112 keV  20.1 cm   2.61 m     TrackerTransportation
-   10   21.6 cm   3.43 cm     80 cm   41.1 MeV   119 keV  60.1 cm   3.21 m     ChamberTransportation
-   11   22.5 cm   3.04 cm      1 m      41 MeV   116 keV    20 cm   3.41 m     TrackerTransportation
-   12   22.6 cm   2.43 cm   1.53 m    40.9 MeV   113 keV  52.6 cm   3.94 m     Tracker     eIoni
-   13   22.6 cm   2.23 cm    1.6 m    40.9 MeV  16.3 keV  7.45 cm   4.01 m     ChamberTransportation
-   14   22.9 cm   2.24 cm   1.77 m    40.7 MeV   110 keV  16.8 cm   4.18 m     Chamber     eIoni
-   15   22.8 cm   2.08 cm    1.8 m    40.7 MeV  16.1 keV  3.23 cm   4.21 m     TrackerTransportation
-   16   22.6 cm  -1.62 cm    2.4 m    40.6 MeV   129 keV  60.1 cm   4.81 m     WorldPVTransportation
-   17   22.6 cm  -1.72 cm   2.42 m    40.6 MeV     8 keV  2.37 cm   4.84 m     WorldPV     eIoni
-   18   22.3 cm   -4.2 cm   2.91 m    40.5 MeV   101 keV  48.7 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 296,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   22.6 cm  -1.72 cm   2.42 m    11.6 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   22.6 cm  -1.64 cm   2.42 m    10.4 keV  1.16 keV   907 mum   907 mum   WorldPV     eIoni
-    2   22.6 cm  -1.58 cm   2.42 m    5.12 keV   5.3 keV   805 mum  1.71 mm    WorldPV     eIoni
-    3   22.6 cm  -1.55 cm   2.42 m    3.61 keV  1.52 keV   425 mum  2.14 mm    WorldPV     eIoni
-    4   22.6 cm  -1.54 cm   2.42 m    2.22 keV  1.38 keV   325 mum  2.46 mm    WorldPV     eIoni
-    5   22.6 cm  -1.53 cm   2.42 m       0 eV   2.22 keV   191 mum  2.65 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 295,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   22.9 cm   2.24 cm   1.77 m    48.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     23 cm    2.4 cm   1.77 m      45 keV   3.5 keV  3.43 mm   3.43 mm    Chamber     eIoni
-    2   23.1 cm   2.51 cm   1.77 m    39.7 keV  5.36 keV  3.06 mm   6.49 mm    Chamber     eIoni
-    3     23 cm    2.4 cm   1.77 m    33.9 keV  5.78 keV  2.54 mm   9.03 mm    Chamber     eIoni
-    4   22.9 cm   2.38 cm   1.77 m    31.1 keV  2.78 keV  2.03 mm   1.11 cm    Chamber     eIoni
-    5   22.9 cm   2.25 cm   1.77 m    28.9 keV   2.2 keV   1.8 mm   1.29 cm    Chamber     eIoni
-    6     23 cm   2.24 cm   1.77 m    27.5 keV  1.39 keV  1.63 mm   1.45 cm    Chamber     eIoni
-    7   23.1 cm   2.26 cm   1.77 m    23.6 keV  3.94 keV  1.53 mm    1.6 cm    Chamber     eIoni
-    8   23.1 cm    2.2 cm   1.77 m    13.8 keV  9.79 keV  1.25 mm   1.73 cm    Chamber     eIoni
-    9   23.1 cm   2.21 cm   1.77 m    10.9 keV  2.88 keV   699 mum   1.8 cm    Chamber     eIoni
-   10   23.1 cm   2.19 cm   1.77 m    7.82 keV  3.09 keV   570 mum  1.85 cm    Chamber     eIoni
-   11   23.1 cm   2.21 cm   1.77 m    2.83 keV  4.99 keV   444 mum   1.9 cm    Chamber     eIoni
-   12   23.1 cm   2.21 cm   1.77 m       0 eV   2.83 keV   190 mum  1.92 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 294,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   22.6 cm   2.43 cm   1.53 m    12.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   22.6 cm   2.52 cm   1.53 m    12.4 keV   455 eV   1.03 mm   1.03 mm    Tracker     eIoni
-    2   22.6 cm   2.61 cm   1.53 m    11.4 keV  1.06 keV   985 mum  2.02 mm    Tracker     eIoni
-    3   22.6 cm   2.68 cm   1.53 m    8.98 keV  2.38 keV   887 mum   2.9 mm    Tracker     eIoni
-    4   22.6 cm   2.73 cm   1.53 m    7.97 keV  1.01 keV   689 mum  3.59 mm    Tracker     eIoni
-    5   22.6 cm    2.7 cm   1.53 m    7.29 keV   677 eV    612 mum   4.2 mm    Tracker     eIoni
-    6   22.6 cm   2.68 cm   1.53 m    5.96 keV  1.33 keV   565 mum  4.77 mm    Tracker     eIoni
-    7   22.6 cm   2.66 cm   1.53 m    4.17 keV  1.79 keV   477 mum  5.25 mm    Tracker     eIoni
-    8   22.6 cm   2.63 cm   1.53 m    2.31 keV  1.86 keV   364 mum  5.61 mm    Tracker     eIoni
-    9   22.6 cm   2.62 cm   1.53 m       0 eV   2.31 keV   203 mum  5.81 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 293,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   21.8 cm   3.35 cm   83.8 cm   11.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   21.8 cm   3.32 cm   83.9 cm      9 keV  2.33 keV   587 mum   587 mum   Chamber     eIoni
-    2   21.7 cm   3.31 cm   83.9 cm   6.75 keV  2.25 keV   491 mum  1.08 mm    Chamber     eIoni
-    3   21.7 cm   3.31 cm   83.9 cm      0 eV   6.75 keV   402 mum  1.48 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 292,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.7 cm   4.34 cm   13.4 cm   16.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   17.7 cm   4.38 cm   13.4 cm   10.1 keV   6.8 keV   854 mum   854 mum   Chamber     eIoni
-    2   17.7 cm   4.39 cm   13.4 cm   8.69 keV  1.39 keV   534 mum  1.39 mm    Chamber     eIoni
-    3   17.7 cm   4.39 cm   13.4 cm   7.25 keV  1.44 keV   478 mum  1.87 mm    Chamber     eIoni
-    4   17.8 cm   4.39 cm   13.4 cm   5.43 keV  1.82 keV   422 mum  2.29 mm    Chamber     eIoni
-    5   17.8 cm   4.39 cm   13.4 cm      0 eV   5.43 keV   348 mum  2.64 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 291,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.4 cm   5.48 cm  -37.4 cm   60.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   14.6 cm   4.53 cm  -36.8 cm   54.6 keV  6.19 keV  1.18 cm   1.18 cm    Tracker     eIoni
-    2   14.4 cm   3.61 cm  -36.8 cm   50.7 keV  3.92 keV  9.81 mm   2.16 cm    Tracker     eIoni
-    3   14.9 cm   2.94 cm  -36.8 cm   30.2 keV  20.5 keV  8.62 mm   3.03 cm    Tracker     eIoni
-    4     15 cm   2.61 cm  -36.7 cm   23.8 keV  6.43 keV  3.57 mm   3.38 cm    Tracker     eIoni
-    5   15.1 cm    2.4 cm  -36.7 cm   21.1 keV  2.64 keV  2.44 mm   3.63 cm    Tracker     eIoni
-    6   15.2 cm    2.3 cm  -36.6 cm   19.3 keV  1.84 keV  2.03 mm   3.83 cm    Tracker     eIoni
-    7   15.1 cm   2.33 cm  -36.5 cm   8.72 keV  10.6 keV  1.78 mm   4.01 cm    Tracker     eIoni
-    8   15.1 cm    2.3 cm  -36.4 cm   7.66 keV  1.07 keV   668 mum  4.07 cm    Tracker     eIoni
-    9   15.2 cm   2.26 cm  -36.4 cm   5.49 keV  2.17 keV   591 mum  4.13 cm    Tracker     eIoni
-   10   15.2 cm   2.27 cm  -36.4 cm   3.83 keV  1.66 keV   447 mum  4.18 cm    Tracker     eIoni
-   11   15.2 cm   2.26 cm  -36.4 cm      0 eV   3.83 keV   341 mum  4.21 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 290,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   12.7 cm   5.96 cm  -63.1 cm   16.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   12.7 cm   5.99 cm  -63.1 cm   14.8 keV  1.78 keV   840 mum   840 mum   Chamber     eIoni
-    2   12.7 cm   5.98 cm  -63.1 cm   11.4 keV  3.41 keV   748 mum  1.59 mm    Chamber     eIoni
-    3   12.7 cm      6 cm  -63.1 cm   10.5 keV   931 eV    591 mum  2.18 mm    Chamber     eIoni
-    4   12.7 cm      6 cm  -63.1 cm   9.37 keV  1.12 keV   552 mum  2.73 mm    Chamber     eIoni
-    5   12.7 cm   5.99 cm  -63.1 cm   8.35 keV  1.02 keV   506 mum  3.24 mm    Chamber     eIoni
-    6   12.7 cm   5.96 cm  -63.1 cm   7.33 keV  1.02 keV   464 mum   3.7 mm    Chamber     eIoni
-    7   12.7 cm   5.95 cm  -63.1 cm   4.55 keV  2.78 keV   425 mum  4.13 mm    Chamber     eIoni
-    8   12.7 cm   5.94 cm  -63.1 cm   4.37 keV   184 eV    307 mum  4.43 mm    Chamber     eIoni
-    9   12.7 cm   5.94 cm  -63.1 cm    638 eV   3.73 keV   298 mum  4.73 mm    Chamber     eIoni
-   10   12.7 cm   5.94 cm  -63.1 cm      0 eV    638 eV   27.3 mum  4.76 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 289,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.87 cm   4.73 cm   -1.4 m     163 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   7.88 cm   4.73 cm   -1.4 m     163 keV     0 eV   90.8 mum  90.8 mum   TrackerTransportation
-    2   13.3 cm   4.49 cm  -1.37 m     138 keV  24.6 keV  6.45 cm   6.46 cm    Tracker     eIoni
-    3   17.4 cm   6.87 cm  -1.37 m     121 keV  17.2 keV   4.9 cm   11.4 cm    Tracker     eIoni
-    4   20.6 cm   6.18 cm  -1.35 m     106 keV  14.7 keV  3.91 cm   15.3 cm    Tracker     eIoni
-    5   19.9 cm    5.1 cm  -1.32 m      93 keV  13.3 keV  3.12 cm   18.4 cm    Tracker     eIoni
-    6   19.8 cm   5.52 cm   -1.3 m    79.4 keV  13.6 keV  2.47 cm   20.9 cm    Tracker     eIoni
-    7   21.3 cm   6.11 cm  -1.29 m    69.8 keV  9.57 keV  1.88 cm   22.7 cm    Tracker     eIoni
-    8   22.6 cm   5.59 cm   -1.3 m      56 keV  13.8 keV  1.51 cm   24.3 cm    Tracker     eIoni
-    9   23.6 cm   5.45 cm   -1.3 m    46.9 keV  9.17 keV  1.03 cm   25.3 cm    Tracker     eIoni
-   10   24.1 cm   5.06 cm   -1.3 m    41.5 keV  5.36 keV  7.54 mm     26 cm    Tracker     eIoni
-   11   24.3 cm    5.2 cm  -1.31 m    38.5 keV  2.95 keV  6.11 mm   26.6 cm    Tracker     eIoni
-   12   24.3 cm   5.04 cm  -1.31 m    35.6 keV  2.98 keV   5.4 mm   27.2 cm    Tracker     eIoni
-   13   24.2 cm   5.22 cm  -1.32 m    29.6 keV  5.93 keV  4.69 mm   27.7 cm    Tracker     eIoni
-   14   24.1 cm   5.18 cm  -1.32 m    24.5 keV   5.1 keV  3.47 mm     28 cm    Tracker     eIoni
-   15     24 cm   5.11 cm  -1.32 m    20.8 keV  3.73 keV  2.56 mm   28.3 cm    Tracker     eIoni
-   16     24 cm   4.92 cm  -1.32 m    18.1 keV   2.7 keV  1.98 mm   28.5 cm    Tracker     eIoni
-   17     24 cm   4.77 cm  -1.32 m    16.5 keV  1.61 keV  1.62 mm   28.6 cm    Tracker     eIoni
-   18   23.9 cm   4.64 cm  -1.32 m    14.8 keV  1.64 keV  1.42 mm   28.8 cm    Tracker     eIoni
-   19   23.9 cm   4.53 cm  -1.32 m    11.9 keV  2.94 keV  1.23 mm   28.9 cm    Tracker     eIoni
-   20   23.8 cm   4.46 cm  -1.32 m    10.1 keV  1.81 keV   934 mum    29 cm    Tracker     eIoni
-   21   23.8 cm   4.43 cm  -1.32 m    8.89 keV  1.19 keV   775 mum  29.1 cm    Tracker     eIoni
-   22   23.8 cm   4.37 cm  -1.32 m    6.67 keV  2.23 keV   681 mum  29.1 cm    Tracker     eIoni
-   23   23.8 cm    4.4 cm  -1.32 m    5.22 keV  1.45 keV   523 mum  29.2 cm    Tracker     eIoni
-   24   23.8 cm   4.37 cm  -1.32 m    2.37 keV  2.84 keV   430 mum  29.2 cm    Tracker     eIoni
-   25   23.8 cm   4.37 cm  -1.32 m       0 eV   2.37 keV   211 mum  29.2 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 288,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    7.1 cm   4.14 cm  -1.51 m      14 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   7.11 cm   4.16 cm  -1.51 m      13 keV   988 eV    710 mum   710 mum   Chamber     eIoni
-    2   7.09 cm   4.13 cm  -1.51 m    11.5 keV  1.54 keV   664 mum  1.37 mm    Chamber     eIoni
-    3    7.1 cm   4.15 cm  -1.51 m    6.19 keV  5.32 keV   595 mum  1.97 mm    Chamber     eIoni
-    4    7.1 cm   4.16 cm  -1.51 m     468 eV   5.72 keV   380 mum  2.35 mm    Chamber     eIoni
-    5    7.1 cm   4.16 cm  -1.51 m       0 eV    468 eV   19.9 mum  2.37 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 286,   Parent ID = 102
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.3 mum -14.8 mum  -2.4 m    16.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    365 mum   223 mum  -2.4 m    9.59 MeV  2.26 MeV  1.28 mm   1.28 mm   TargetPV     eBrem
-    2    238 mum   457 mum  -2.4 m    6.91 MeV  2.68 MeV   1.7 mm   2.98 mm   TargetPV     eIoni
-    3  -27.7 mum   223 mum  -2.4 m    5.43 MeV  1.48 MeV  1.14 mm   4.11 mm    TrackerTransportation
-    4   43.5 cm  -36.6 cm  -2.14 m     5.3 MeV   107 keV  62.7 cm   63.1 cm    Tracker     eIoni
-    5   51.7 cm  -43.2 cm   -2.1 m    5.28 MeV  15.1 keV  11.2 cm   74.3 cm    Tracker     eIoni
-    6   1.52 m    -1.2 m   -1.62 m    5.03 MeV   240 keV  1.36 m     2.1 m     Tracker     eIoni
-    7   1.54 m   -1.21 m   -1.62 m    5.01 MeV   4.3 keV  1.52 cm   2.12 m     Tracker     eIoni
-    8    2.4 m   -1.46 m   -1.26 m    4.84 MeV   171 keV  97.5 cm   3.09 m     WorldPVTransportation
-    9   2.91 m   -1.59 m   -1.12 m    4.75 MeV  93.1 keV  54.8 cm   3.64 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 301,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.54 m   -1.21 m   -1.62 m    11.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.54 m   -1.21 m   -1.62 m    9.39 keV  2.44 keV   928 mum   928 mum   Tracker     eIoni
-    2   1.54 m    -1.2 m   -1.62 m    3.28 keV  6.11 keV   720 mum  1.65 mm    Tracker     eIoni
-    3   1.54 m    -1.2 m   -1.62 m     894 eV   2.39 keV   300 mum  1.95 mm    Tracker     eIoni
-    4   1.54 m    -1.2 m   -1.62 m       0 eV    894 eV   53.1 mum     2 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 300,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.52 m    -1.2 m   -1.62 m    8.21 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.52 m    -1.2 m   -1.63 m    5.91 keV  2.31 keV   629 mum   629 mum   Tracker     eIoni
-    2   1.52 m    -1.2 m   -1.63 m    4.53 keV  1.38 keV   473 mum   1.1 mm    Tracker     eIoni
-    3   1.52 m    -1.2 m   -1.63 m    3.22 keV  1.31 keV   387 mum  1.49 mm    Tracker     eIoni
-    4   1.52 m    -1.2 m   -1.63 m    1.38 keV  1.84 keV   295 mum  1.79 mm    Tracker     eIoni
-    5   1.52 m    -1.2 m   -1.63 m       0 eV   1.38 keV  94.7 mum  1.88 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 299,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   51.7 cm  -43.2 cm   -2.1 m    11.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   51.7 cm  -43.3 cm   -2.1 m    10.2 keV  1.22 keV   893 mum   893 mum   Tracker     eIoni
-    2   51.6 cm  -43.3 cm   -2.1 m    9.14 keV  1.07 keV   785 mum  1.68 mm    Tracker     eIoni
-    3   51.6 cm  -43.3 cm   -2.1 m    6.31 keV  2.83 keV   701 mum  2.38 mm    Tracker     eIoni
-    4   51.6 cm  -43.3 cm   -2.1 m    5.24 keV  1.07 keV   500 mum  2.88 mm    Tracker     eIoni
-    5   51.6 cm  -43.4 cm   -2.1 m    4.04 keV   1.2 keV   432 mum  3.31 mm    Tracker     eIoni
-    6   51.5 cm  -43.4 cm   -2.1 m     781 eV   3.26 keV   355 mum  3.67 mm    Tracker     eIoni
-    7   51.5 cm  -43.4 cm   -2.1 m       0 eV    781 eV   45.1 mum  3.71 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 298,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   43.5 cm  -36.6 cm  -2.14 m    21.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   43.6 cm  -36.5 cm  -2.14 m    17.7 keV  3.45 keV  2.03 mm   2.03 mm    Tracker     eIoni
-    2   43.7 cm  -36.4 cm  -2.14 m    13.5 keV  4.12 keV  1.56 mm   3.59 mm    Tracker     eIoni
-    3   43.8 cm  -36.4 cm  -2.14 m    12.8 keV   752 eV    1.1 mm   4.69 mm    Tracker     eIoni
-    4   43.8 cm  -36.3 cm  -2.14 m      11 keV  1.77 keV  1.02 mm   5.71 mm    Tracker     eIoni
-    5   43.9 cm  -36.4 cm  -2.14 m    8.75 keV  2.27 keV   857 mum  6.57 mm    Tracker     eIoni
-    6     44 cm  -36.3 cm  -2.14 m    7.54 keV  1.21 keV   670 mum  7.24 mm    Tracker     eIoni
-    7     44 cm  -36.3 cm  -2.14 m    4.61 keV  2.92 keV   582 mum  7.82 mm    Tracker     eIoni
-    8     44 cm  -36.3 cm  -2.14 m     936 eV   3.68 keV   392 mum  8.22 mm    Tracker     eIoni
-    9     44 cm  -36.3 cm  -2.14 m       0 eV    936 eV   56.2 mum  8.27 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 297,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    365 mum   223 mum  -2.4 m    4.94 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.55 mm   -243 mum  -2.4 m    4.94 MeV     0 eV   2.57 mm   2.57 mm    TrackerTransportation
-    2    2.4 m     -94 cm    2.1 m    4.94 MeV     0 eV   5.18 m    5.19 m     WorldPVTransportation
-    3   2.83 m   -1.11 m    2.91 m    4.94 MeV     0 eV   93.4 cm   6.12 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 101,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.05 mum -2.34 mum -2.41 m     267 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -68.7 nm  -2.92 mum -2.41 m       0 eV      0 eV   2.08 mm   2.08 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 303,   Parent ID = 101
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -68.7 nm  -2.92 mum -2.41 m     205 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.19 mum -8.44 mum -2.41 m     203 MeV   535 keV   380 mum   380 mum  TargetPV     eBrem
-    2  -1.05 mum -24.3 mum -2.41 m     198 MeV   577 keV   445 mum   826 mum  TargetPV     eBrem
-    3    165 nm  -32.4 mum -2.41 m     197 MeV   226 keV   209 mum  1.04 mm   TargetPV     eBrem
-    4  -82.4 mum  -133 mum -2.41 m     184 MeV  2.97 MeV  2.32 mm   3.35 mm   TargetPV     eBrem
-    5  -79.3 mum  -150 mum -2.41 m    96.5 MeV   623 keV   466 mum  3.82 mm   TargetPV     eBrem
-    6  -80.4 mum  -150 mum -2.41 m    66.5 MeV  82.8 keV  77.9 mum   3.9 mm   TargetPV     eBrem
-    7  -94.5 mum  -168 mum -2.41 m    59.8 MeV   652 keV   440 mum  4.34 mm   TargetPV     eBrem
-    8  -65.4 mum  -116 mum -2.41 m    48.9 MeV  3.69 MeV  1.35 mm   5.69 mm   TargetPV     eBrem
-    9  -52.7 mum  -125 mum -2.41 m    31.8 MeV   934 keV   359 mum  6.04 mm   TargetPV     eBrem
-   10  -6.67 mum  -224 mum -2.41 m    22.7 MeV   484 keV   365 mum  6.41 mm   TargetPV     eBrem
-   11   75.5 mum  -272 mum  -2.4 m    21.7 MeV   529 keV   449 mum  6.86 mm   TargetPV     eBrem
-   12    266 mum   259 mum  -2.4 m    14.8 MeV  2.26 MeV  1.89 mm   8.75 mm   TargetPV     eBrem
-   13    370 mum   209 mum  -2.4 m    13.5 MeV   742 keV   582 mum  9.33 mm   TargetPV     eBrem
-   14   -370 mum  94.5 mum  -2.4 m     9.9 MeV  2.15 MeV   1.8 mm   1.11 cm   TargetPV     eBrem
-   15   -266 mum  -308 mum  -2.4 m    8.19 MeV   473 keV   438 mum  1.16 cm   TargetPV     eBrem
-   16    172 mum  -646 mum  -2.4 m    6.79 MeV   724 keV   642 mum  1.22 cm   TargetPV     eBrem
-   17    381 mum  -707 mum  -2.4 m    2.49 MeV   334 keV   319 mum  1.25 cm   TargetPV     eBrem
-   18    456 mum  -950 mum  -2.4 m     1.5 MeV   990 keV   694 mum  1.32 cm   TargetPV     eIoni
-   19    237 mum -1.15 mm   -2.4 m    1.03 MeV   468 keV   519 mum  1.37 cm   TargetPV     eIoni
-   20    222 mum  -959 mum  -2.4 m     633 keV   395 keV   425 mum  1.42 cm   TargetPV     eIoni
-   21    149 mum  -915 mum  -2.4 m     272 keV   361 keV   323 mum  1.45 cm   TargetPV     eIoni
-   22    146 mum  -907 mum  -2.4 m       0 eV    272 keV   125 mum  1.46 cm   TargetPV     eIoni
-   23    146 mum  -907 mum  -2.4 m       0 eV      0 eV      0 fm   1.46 cm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 322,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    146 mum  -907 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.55 mm    273 mum  -2.4 m       0 eV    511 keV  4.61 mm   4.61 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 321,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    146 mum  -907 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.28 mm  -1.75 mm   -2.4 m     511 keV     0 eV    3.3 mm    3.3 mm    TrackerTransportation
-    2   -2.4 m   -83.4 cm  -36.5 cm    511 keV     0 eV   3.25 m    3.26 m     WorldPVTransportation
-    3  -2.91 m   -1.01 m    6.84 cm    511 keV     0 eV   69.2 cm   3.95 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 320,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    381 mum  -707 mum  -2.4 m    3.97 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.46 cm  -9.38 mm  -2.41 m    2.11 MeV  1.86 MeV  1.82 cm   1.82 cm   TargetPV     compt
-    2    2.5 cm  -2.49 cm  -2.41 m    2.11 MeV     0 eV    1.9 cm   3.72 cm    WorldPVTransportation
-    3   1.59 m   -2.38 m   -2.91 m    2.11 MeV     0 eV   2.87 m    2.91 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 319,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    172 mum  -646 mum  -2.4 m     682 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    1.2 cm  -5.56 mm   -2.4 m     350 keV   332 keV  1.33 cm   1.33 cm   TargetPV     compt
-    2   1.31 cm   -4.6 mm   -2.4 m       0 eV    350 keV  1.62 mm   1.49 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 318,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -266 mum  -308 mum  -2.4 m    1.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.46 cm   -2.5 cm  -2.42 m    1.23 MeV     0 eV   3.43 cm   3.43 cm    WorldPVTransportation
-    2   40.5 cm  -67.4 cm  -2.91 m    1.23 MeV     0 eV   90.2 cm   93.6 cm OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 317,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -370 mum  94.5 mum  -2.4 m    1.48 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.69 mm  -7.74 mm  -2.41 m     608 keV   874 keV   9.4 mm    9.4 mm   TargetPV     compt
-    2   7.27 mm  -8.15 mm  -2.41 m     192 keV   415 keV  6.58 mm    1.6 cm   TargetPV     compt
-    3      7 mm  -8.36 mm  -2.41 m       0 eV    192 keV   398 mum  1.64 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 316,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    370 mum   209 mum  -2.4 m     562 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   21.1 mum   730 mum  -2.4 m       0 eV    562 keV  2.13 mm   2.13 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 315,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    266 mum   259 mum  -2.4 m    4.56 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    419 mum  -149 mum  -2.4 m    4.56 MeV     0 eV   3.08 mm   3.08 mm    TrackerTransportation
-    2   4.04 cm  -10.7 cm   -1.6 m    4.56 MeV     0 eV   80.8 cm   81.1 cm    ChamberTransportation
-    3   5.05 cm  -13.4 cm   -1.4 m    4.56 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4   8.05 cm  -21.4 cm    -80 cm   4.56 MeV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   9.05 cm  -24.1 cm    -60 cm   4.56 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6     12 cm  -32.1 cm      0 fm   4.56 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   13.1 cm  -34.8 cm     20 cm   4.56 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8   16.1 cm  -42.8 cm     80 cm   4.56 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   17.1 cm  -45.5 cm      1 m    4.56 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10   20.1 cm  -53.6 cm    1.6 m    4.56 MeV     0 eV   60.6 cm   4.04 m     ChamberTransportation
-   11   21.1 cm  -56.2 cm    1.8 m    4.56 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   24.1 cm  -64.3 cm    2.4 m    4.56 MeV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   26.6 cm  -71.1 cm   2.91 m    4.56 MeV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 314,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   75.5 mum  -272 mum  -2.4 m     516 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    516 mum  -119 mum  -2.4 m     516 keV     0 eV   4.84 mm   4.84 mm    TrackerTransportation
-    2   7.36 cm   2.53 cm   -1.6 m     516 keV     0 eV   80.4 cm   80.9 cm    ChamberTransportation
-    3   9.18 cm   3.17 cm   -1.4 m     516 keV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   14.7 cm   5.07 cm    -80 cm    516 keV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   16.5 cm   5.71 cm    -60 cm    516 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6     22 cm   7.61 cm      0 fm    516 keV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7   23.8 cm   8.25 cm     20 cm    516 keV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   29.3 cm   10.2 cm     80 cm    516 keV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   31.1 cm   10.8 cm      1 m     516 keV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   36.6 cm   12.7 cm    1.6 m     516 keV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   38.4 cm   13.3 cm    1.8 m     516 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   43.9 cm   15.2 cm    2.4 m     516 keV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13   48.5 cm   16.9 cm   2.91 m     516 keV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 313,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -6.67 mum  -224 mum -2.41 m    8.59 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    327 mum  -828 mum  -2.4 m    8.59 MeV     0 eV    5.3 mm    5.3 mm    TrackerTransportation
-    2   5.12 cm  -9.28 cm   -1.6 m    8.59 MeV     0 eV   80.7 cm   81.2 cm    ChamberTransportation
-    3   6.01 cm  -10.9 cm  -1.46 m       0 eV      0 eV   14.1 cm   95.3 cm    Chamber      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 324,   Parent ID = 313
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.01 cm  -10.9 cm  -1.46 m    3.37 MeV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   6.08 cm  -12.2 cm   -1.4 m    3.35 MeV  22.8 keV  6.23 cm   6.23 cm    TrackerTransportation
-    2   9.23 cm  -10.2 cm  -1.25 m    3.31 MeV  23.2 keV  15.6 cm   21.8 cm    Tracker     eIoni
-    3   9.74 cm  -9.12 cm  -1.18 m    3.23 MeV  14.5 keV  7.17 cm     29 cm    Tracker     eIoni
-    4   13.6 cm  -3.68 cm    -80 cm   3.16 MeV  74.1 keV  38.6 cm   67.6 cm    ChamberTransportation
-    5   15.1 cm  -1.99 cm    -60 cm   3.06 MeV  86.8 keV  21.4 cm     89 cm    TrackerTransportation
-    6   16.3 cm  -5.49 cm  -54.4 cm   3.03 MeV  11.1 keV   6.7 cm   95.7 cm    Tracker     eIoni
-    7   16.8 cm  -7.01 cm    -52 cm   3.02 MeV  5.85 keV   2.9 cm   98.6 cm    Tracker     eIoni
-    8   29.7 cm  -39.6 cm      0 fm   2.91 MeV   108 keV  63.4 cm   1.62 m     ChamberTransportation
-    9   34.8 cm  -48.5 cm     20 cm    2.8 MeV  97.4 keV  24.4 cm   1.86 m     TrackerTransportation
-   10   53.7 cm  -81.7 cm     23 cm   2.74 MeV  53.2 keV  38.5 cm   2.25 m     Tracker     eIoni
-   11   1.01 m   -1.51 m      32 cm   2.58 MeV   143 keV    85 cm    3.1 m     Tracker     eIoni
-   12   1.18 m    -1.7 m    35.7 cm   2.53 MeV  49.3 keV    26 cm   3.36 m     Tracker     eIoni
-   13   1.38 m   -1.87 m    43.2 cm   2.48 MeV  41.9 keV  27.2 cm   3.63 m     Tracker     eIoni
-   14   2.05 m    -2.4 m    64.9 cm   2.33 MeV   146 keV  89.9 cm   4.53 m     WorldPVTransportation
-   15   2.48 m   -2.88 m    72.9 cm    2.2 MeV   106 keV  65.5 cm   5.18 m     WorldPV     eIoni
-   16   2.53 m   -2.91 m    73.1 cm   2.19 MeV  8.99 keV  5.83 cm   5.24 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 335,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.48 m   -2.88 m    72.9 cm   23.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.48 m   -2.88 m    73.1 cm   19.5 keV  3.81 keV  2.37 mm   2.37 mm    WorldPV     eIoni
-    2   2.48 m   -2.88 m    73.2 cm   18.1 keV  1.41 keV  1.81 mm   4.18 mm    WorldPV     eIoni
-    3   2.48 m   -2.88 m    73.3 cm   15.8 keV  2.28 keV  1.62 mm    5.8 mm    WorldPV     eIoni
-    4   2.48 m   -2.87 m    73.3 cm   14.8 keV  1.04 keV  1.34 mm   7.14 mm    WorldPV     eIoni
-    5   2.48 m   -2.87 m    73.2 cm   12.4 keV  2.36 keV  1.23 mm   8.37 mm    WorldPV     eIoni
-    6   2.48 m   -2.87 m    73.2 cm   10.8 keV  1.59 keV   984 mum  9.35 mm    WorldPV     eIoni
-    7   2.48 m   -2.87 m    73.1 cm   7.36 keV  3.46 keV   840 mum  1.02 cm    WorldPV     eIoni
-    8   2.48 m   -2.87 m      73 cm   5.36 keV     2 keV   570 mum  1.08 cm    WorldPV     eIoni
-    9   2.48 m   -2.87 m      73 cm   2.95 keV  2.41 keV   439 mum  1.12 cm    WorldPV     eIoni
-   10   2.48 m   -2.87 m      73 cm   1.38 keV  1.57 keV   273 mum  1.15 cm    WorldPV     eIoni
-   11   2.48 m   -2.87 m      73 cm      0 eV   1.38 keV  94.7 mum  1.16 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 334,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.38 m   -1.87 m    43.2 cm   8.72 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.38 m   -1.87 m    43.3 cm    6.8 keV  1.91 keV   668 mum   668 mum   Tracker     eIoni
-    2   1.38 m   -1.87 m    43.2 cm   4.74 keV  2.07 keV   531 mum   1.2 mm    Tracker     eIoni
-    3   1.38 m   -1.87 m    43.2 cm    3.1 keV  1.63 keV   400 mum   1.6 mm    Tracker     eIoni
-    4   1.38 m   -1.87 m    43.2 cm    969 eV   2.13 keV   286 mum  1.88 mm    Tracker     eIoni
-    5   1.38 m   -1.87 m    43.2 cm      0 eV    969 eV   58.9 mum  1.94 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 333,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.18 m    -1.7 m    35.7 cm   8.22 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.18 m    -1.7 m    35.8 cm   6.07 keV  2.15 keV   630 mum   630 mum   Tracker     eIoni
-    2   1.18 m    -1.7 m    35.8 cm   4.27 keV   1.8 keV   484 mum  1.11 mm    Tracker     eIoni
-    3   1.18 m    -1.7 m    35.8 cm   1.82 keV  2.45 keV   370 mum  1.48 mm    Tracker     eIoni
-    4   1.18 m    -1.7 m    35.8 cm      0 eV   1.82 keV   141 mum  1.62 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 332,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.01 m   -1.51 m      32 cm   13.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.01 m   -1.51 m      32 cm   11.7 keV  1.63 keV  1.07 mm   1.07 mm    Tracker     eIoni
-    2   1.01 m   -1.51 m      32 cm      9 keV  2.65 keV   913 mum  1.98 mm    Tracker     eIoni
-    3   1.01 m   -1.51 m      32 cm   6.88 keV  2.13 keV   690 mum  2.68 mm    Tracker     eIoni
-    4   1.01 m   -1.51 m      32 cm   5.23 keV  1.65 keV   536 mum  3.21 mm    Tracker     eIoni
-    5   1.01 m   -1.51 m      32 cm    4.3 keV   927 eV    431 mum  3.64 mm    Tracker     eIoni
-    6   1.02 m   -1.51 m    32.1 cm   1.18 keV  3.12 keV   373 mum  4.02 mm    Tracker     eIoni
-    7   1.01 m   -1.51 m    32.1 cm      0 eV   1.18 keV  76.2 mum  4.09 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 331,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   53.7 cm  -81.7 cm     23 cm   9.79 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   53.7 cm  -81.7 cm     23 cm   8.39 keV   1.4 keV   751 mum   751 mum   Tracker     eIoni
-    2   53.7 cm  -81.7 cm   22.9 cm   6.02 keV  2.38 keV   642 mum  1.39 mm    Tracker     eIoni
-    3   53.7 cm  -81.7 cm   22.9 cm   2.45 keV  3.57 keV   481 mum  1.87 mm    Tracker     eIoni
-    4   53.7 cm  -81.7 cm   22.9 cm      0 eV   2.45 keV   221 mum   2.1 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 330,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0     30 cm    -40 cm   9.42 mm     11 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     30 cm    -40 cm    9.6 mm   9.04 keV     2 keV   575 mum   575 mum   Chamber     eIoni
-    2     30 cm    -40 cm   9.44 mm   6.89 keV  2.15 keV   493 mum  1.07 mm    Chamber     eIoni
-    3     30 cm    -40 cm   9.38 mm   4.67 keV  2.22 keV   407 mum  1.48 mm    Chamber     eIoni
-    4     30 cm    -40 cm   9.46 mm   3.47 keV   1.2 keV   313 mum  1.79 mm    Chamber     eIoni
-    5     30 cm    -40 cm   9.46 mm   64.4 eV   3.41 keV   243 mum  2.03 mm    Chamber     eIoni
-    6     30 cm    -40 cm   9.46 mm      0 eV   64.4 eV   6.17 mum  2.04 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 329,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   16.8 cm  -7.01 cm    -52 cm   8.16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   16.8 cm  -6.96 cm    -52 cm   5.97 keV  2.19 keV   625 mum   625 mum   Tracker     eIoni
-    2   16.9 cm  -6.93 cm    -52 cm    4.9 keV  1.07 keV   477 mum   1.1 mm    Tracker     eIoni
-    3   16.9 cm   -6.9 cm    -52 cm   4.08 keV   813 eV    410 mum  1.51 mm    Tracker     eIoni
-    4   16.9 cm  -6.87 cm    -52 cm   2.74 keV  1.34 keV   358 mum  1.87 mm    Tracker     eIoni
-    5   16.9 cm  -6.88 cm    -52 cm    399 eV   2.34 keV   252 mum  2.12 mm    Tracker     eIoni
-    6   16.9 cm  -6.88 cm    -52 cm      0 eV    399 eV   22.6 mum  2.15 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 328,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   16.3 cm  -5.49 cm  -54.4 cm   14.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   16.2 cm  -5.47 cm  -54.4 cm   10.3 keV  4.52 keV  1.23 mm   1.23 mm    Tracker     eIoni
-    2   16.1 cm  -5.52 cm  -54.4 cm   7.76 keV  2.51 keV   792 mum  2.02 mm    Tracker     eIoni
-    3   16.1 cm  -5.55 cm  -54.3 cm   3.19 keV  4.57 keV   598 mum  2.62 mm    Tracker     eIoni
-    4   16.1 cm  -5.54 cm  -54.3 cm    852 eV   2.34 keV   293 mum  2.91 mm    Tracker     eIoni
-    5   16.1 cm  -5.54 cm  -54.3 cm      0 eV    852 eV   50.1 mum  2.96 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 327,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.4 cm  -2.79 cm  -69.5 cm   9.62 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   14.4 cm  -2.78 cm  -69.5 cm      7 keV  2.62 keV   516 mum   516 mum   Chamber     eIoni
-    2   14.4 cm  -2.79 cm  -69.5 cm   5.78 keV  1.22 keV   412 mum   927 mum   Chamber     eIoni
-    3   14.4 cm   -2.8 cm  -69.5 cm   2.86 keV  2.93 keV   362 mum  1.29 mm    Chamber     eIoni
-    4   14.4 cm   -2.8 cm  -69.5 cm      0 eV   2.86 keV   192 mum  1.48 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 326,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.74 cm  -9.12 cm  -1.18 m      64 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.58 cm  -10.1 cm  -1.17 m      56 keV  7.95 keV  1.29 cm   1.29 cm    Tracker     eIoni
-    2   9.04 cm  -10.3 cm  -1.16 m    44.1 keV  11.9 keV  1.03 cm   2.32 cm    Tracker     eIoni
-    3   8.94 cm  -10.9 cm  -1.16 m    39.1 keV  4.95 keV  6.76 mm   2.99 cm    Tracker     eIoni
-    4   8.47 cm  -11.2 cm  -1.16 m    35.8 keV  3.33 keV  5.54 mm   3.55 cm    Tracker     eIoni
-    5   8.18 cm  -11.5 cm  -1.16 m    33.5 keV  2.31 keV  4.75 mm   4.02 cm    Tracker     eIoni
-    6   7.79 cm  -11.6 cm  -1.16 m    29.2 keV  4.32 keV  4.26 mm   4.45 cm    Tracker     eIoni
-    7   7.59 cm  -11.9 cm  -1.16 m    23.7 keV  5.46 keV  3.38 mm   4.79 cm    Tracker     eIoni
-    8    7.4 cm    -12 cm  -1.16 m    21.6 keV  2.05 keV  2.43 mm   5.03 cm    Tracker     eIoni
-    9    7.4 cm  -12.1 cm  -1.16 m      19 keV  2.69 keV  2.11 mm   5.24 cm    Tracker     eIoni
-   10   7.33 cm  -12.3 cm  -1.15 m    16.8 keV  2.16 keV  1.74 mm   5.41 cm    Tracker     eIoni
-   11   7.35 cm  -12.4 cm  -1.15 m    12.7 keV  4.05 keV  1.46 mm   5.56 cm    Tracker     eIoni
-   12   7.31 cm  -12.5 cm  -1.15 m    8.27 keV  4.47 keV  1.02 mm   5.66 cm    Tracker     eIoni
-   13   7.29 cm  -12.5 cm  -1.15 m    6.87 keV   1.4 keV   633 mum  5.72 cm    Tracker     eIoni
-   14   7.28 cm  -12.6 cm  -1.15 m    5.49 keV  1.38 keV   535 mum  5.78 cm    Tracker     eIoni
-   15   7.26 cm  -12.6 cm  -1.15 m    3.11 keV  2.38 keV   447 mum  5.82 cm    Tracker     eIoni
-   16   7.28 cm  -12.6 cm  -1.15 m    1.19 keV  1.92 keV   286 mum  5.85 cm    Tracker     eIoni
-   17   7.28 cm  -12.6 cm  -1.15 m       0 eV   1.19 keV  77.2 mum  5.86 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 325,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.23 cm  -10.2 cm  -1.25 m    18.6 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.36 cm  -10.3 cm  -1.25 m    16.9 keV  1.63 keV  1.68 mm   1.68 mm    Tracker     eIoni
-    2   9.42 cm  -10.4 cm  -1.25 m    14.8 keV  2.12 keV  1.47 mm   3.16 mm    Tracker     eIoni
-    3   9.44 cm  -10.5 cm  -1.25 m    13.2 keV  1.66 keV  1.23 mm   4.39 mm    Tracker     eIoni
-    4    9.4 cm  -10.5 cm  -1.25 m    11.9 keV  1.26 keV  1.06 mm   5.45 mm    Tracker     eIoni
-    5   9.32 cm  -10.6 cm  -1.25 m    9.61 keV  2.28 keV   934 mum  6.38 mm    Tracker     eIoni
-    6   9.34 cm  -10.6 cm  -1.25 m    5.55 keV  4.06 keV   737 mum  7.12 mm    Tracker     eIoni
-    7   9.37 cm  -10.6 cm  -1.25 m    3.82 keV  1.73 keV   451 mum  7.57 mm    Tracker     eIoni
-    8   9.35 cm  -10.6 cm  -1.25 m    2.34 keV  1.48 keV   340 mum  7.91 mm    Tracker     eIoni
-    9   9.33 cm  -10.6 cm  -1.25 m       0 eV   2.34 keV   206 mum  8.12 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 323,   Parent ID = 313
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.01 cm  -10.9 cm  -1.46 m     4.2 MeV     0 eV      0 fm      0 fm    Chamber   initStep
-    1    6.7 cm    -11 cm   -1.4 m    4.16 MeV  31.3 keV  6.12 cm   6.12 cm    TrackerTransportation
-    2   7.16 cm  -11.2 cm  -1.37 m    4.16 MeV  3.75 keV  2.79 cm   8.91 cm    Tracker     eBrem
-    3   7.18 cm  -11.2 cm  -1.37 m    4.08 MeV   251 eV    956 mum  9.01 cm    Tracker     eIoni
-    4   14.8 cm  -13.4 cm    -80 cm   3.99 MeV  95.8 keV    58 cm   67.1 cm    ChamberTransportation
-    5   14.7 cm  -15.6 cm    -60 cm   3.88 MeV  91.3 keV  21.3 cm   88.3 cm    TrackerTransportation
-    6   9.31 cm  -18.4 cm    -21 cm    3.8 MeV  64.6 keV  39.5 cm   1.28 m     Tracker     eIoni
-    7   6.47 cm  -18.9 cm 0.0284 fm   3.78 MeV  29.6 keV  21.2 cm   1.49 m     ChamberTransportation
-    8   3.85 cm  -24.5 cm   13.7 cm   3.67 MeV  66.8 keV  15.3 cm   1.64 m     Chamber     eIoni
-    9   3.13 cm  -25.5 cm     20 cm   3.64 MeV  23.4 keV  6.54 cm   1.71 m     TrackerTransportation
-   10   1.26 cm  -40.3 cm     80 cm   3.54 MeV   107 keV  62.3 cm   2.33 m     ChamberTransportation
-   11   3.44 cm  -42.7 cm      1 m    3.44 MeV  88.9 keV  21.7 cm   2.55 m     TrackerTransportation
-   12   9.05 cm  -47.5 cm    1.4 m    3.35 MeV  66.7 keV  40.8 cm   2.96 m     Tracker     eIoni
-   13   9.64 cm    -51 cm   1.56 m    3.31 MeV    26 keV  16.8 cm   3.13 m     Tracker     eIoni
-   14   9.83 cm  -51.7 cm    1.6 m    3.31 MeV  3.83 keV  3.67 cm   3.16 m     ChamberTransportation
-   15   10.3 cm  -55.9 cm    1.8 m    3.21 MeV  77.8 keV  22.1 cm   3.38 m     TrackerTransportation
-   16   15.6 cm  -69.8 cm    2.4 m    3.11 MeV   102 keV  62.4 cm   4.01 m     WorldPVTransportation
-   17     17 cm  -87.2 cm   2.91 m    3.01 MeV  93.9 keV  54.4 cm   4.55 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 344,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0     10 cm  -53.3 cm   1.68 m    18.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     10 cm  -53.3 cm   1.68 m    13.2 keV  5.38 keV   946 mum   946 mum   Chamber     eIoni
-    2     10 cm  -53.3 cm   1.68 m      11 keV  2.19 keV   670 mum  1.62 mm    Chamber     eIoni
-    3     10 cm  -53.2 cm   1.68 m    8.92 keV  2.06 keV   573 mum  2.19 mm    Chamber     eIoni
-    4     10 cm  -53.2 cm   1.68 m     550 eV   8.37 keV   488 mum  2.68 mm    Chamber     eIoni
-    5     10 cm  -53.2 cm   1.68 m       0 eV    550 eV   23.3 mum   2.7 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 343,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.64 cm    -51 cm   1.56 m    10.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.66 cm  -50.9 cm   1.56 m    7.37 keV  3.31 keV   828 mum   828 mum   Tracker     eIoni
-    2   9.61 cm  -50.9 cm   1.56 m    6.07 keV   1.3 keV   571 mum   1.4 mm    Tracker     eIoni
-    3   9.58 cm  -50.9 cm   1.56 m    3.46 keV  2.61 keV   484 mum  1.88 mm    Tracker     eIoni
-    4   9.56 cm  -50.9 cm   1.56 m     1.7 keV  1.76 keV   315 mum   2.2 mm    Tracker     eIoni
-    5   9.56 cm  -50.9 cm   1.56 m       0 eV    1.7 keV   128 mum  2.33 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 342,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.05 cm  -47.5 cm    1.4 m    21.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.03 cm  -47.3 cm    1.4 m    18.3 keV  3.37 keV  2.12 mm   2.12 mm    Tracker     eIoni
-    2   9.13 cm  -47.2 cm    1.4 m    12.9 keV  5.44 keV  1.66 mm   3.78 mm    Tracker     eIoni
-    3   9.14 cm  -47.3 cm    1.4 m    11.8 keV  1.13 keV  1.03 mm   4.81 mm    Tracker     eIoni
-    4    9.2 cm  -47.3 cm    1.4 m    10.6 keV  1.21 keV   923 mum  5.73 mm    Tracker     eIoni
-    5   9.15 cm  -47.2 cm    1.4 m    8.53 keV  2.03 keV   817 mum  6.55 mm    Tracker     eIoni
-    6   9.13 cm  -47.2 cm    1.4 m    7.48 keV  1.05 keV   653 mum  7.21 mm    Tracker     eIoni
-    7    9.1 cm  -47.1 cm    1.4 m    3.37 keV  4.12 keV   579 mum  7.78 mm    Tracker     eIoni
-    8   9.12 cm  -47.1 cm    1.4 m     899 eV   2.47 keV   307 mum  8.09 mm    Tracker     eIoni
-    9   9.12 cm  -47.1 cm    1.4 m       0 eV    899 eV   53.5 mum  8.14 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 341,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.34 cm  -41.5 cm   89.9 cm   10.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   2.31 cm  -41.5 cm   89.9 cm   9.69 keV  1.02 keV   561 mum   561 mum   Chamber     eIoni
-    2   2.32 cm  -41.5 cm   89.9 cm   8.26 keV  1.43 keV   518 mum  1.08 mm    Chamber     eIoni
-    3   2.33 cm  -41.5 cm   89.9 cm    4.6 keV  3.66 keV   461 mum  1.54 mm    Chamber     eIoni
-    4   2.32 cm  -41.5 cm   89.9 cm    2.7 keV   1.9 keV   309 mum  1.85 mm    Chamber     eIoni
-    5   2.32 cm  -41.5 cm   89.9 cm      0 eV    2.7 keV   178 mum  2.03 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 340,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.85 cm  -24.5 cm   13.7 cm   42.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   3.94 cm  -24.4 cm   13.9 cm   24.7 keV  18.3 keV  2.85 mm   2.85 mm    Chamber     eIoni
-    2   4.01 cm  -24.4 cm   13.9 cm   17.6 keV  7.11 keV  1.32 mm   4.17 mm    Chamber     eIoni
-    3   3.96 cm  -24.4 cm     14 cm   14.8 keV  2.74 keV   889 mum  5.06 mm    Chamber     eIoni
-    4   3.97 cm  -24.5 cm     14 cm   4.99 keV  9.82 keV   747 mum  5.81 mm    Chamber     eIoni
-    5   3.96 cm  -24.5 cm     14 cm   2.88 keV  2.11 keV   328 mum  6.13 mm    Chamber     eIoni
-    6   3.96 cm  -24.5 cm     14 cm      0 eV   2.88 keV   195 mum  6.33 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 339,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.31 cm  -18.4 cm    -21 cm   8.76 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.27 cm  -18.3 cm    -21 cm   6.75 keV  2.01 keV   671 mum   671 mum   Tracker     eIoni
-    2   9.24 cm  -18.3 cm  -20.9 cm   5.33 keV  1.41 keV   528 mum   1.2 mm    Tracker     eIoni
-    3   9.22 cm  -18.3 cm    -21 cm   4.23 keV   1.1 keV   438 mum  1.64 mm    Tracker     eIoni
-    4   9.19 cm  -18.3 cm    -21 cm   2.95 keV  1.29 keV   368 mum     2 mm    Tracker     eIoni
-    5    9.2 cm  -18.3 cm  -20.9 cm   1.72 keV  1.22 keV   272 mum  2.28 mm    Tracker     eIoni
-    6   9.21 cm  -18.3 cm  -20.9 cm      0 eV   1.72 keV   130 mum  2.41 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 338,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.8 cm  -14.4 cm  -71.4 cm     18 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   14.7 cm  -14.4 cm  -71.3 cm   16.4 keV  1.53 keV   912 mum   912 mum   Chamber     eIoni
-    2   14.7 cm  -14.3 cm  -71.3 cm   15.3 keV  1.11 keV   830 mum  1.74 mm    Chamber     eIoni
-    3   14.7 cm  -14.4 cm  -71.3 cm   13.3 keV  2.02 keV   773 mum  2.52 mm    Chamber     eIoni
-    4   14.6 cm  -14.4 cm  -71.3 cm   12.2 keV  1.12 keV   676 mum  3.19 mm    Chamber     eIoni
-    5   14.6 cm  -14.4 cm  -71.4 cm   11.4 keV   797 eV    624 mum  3.82 mm    Chamber     eIoni
-    6   14.6 cm  -14.4 cm  -71.3 cm    902 eV   10.5 keV   590 mum   4.4 mm    Chamber     eIoni
-    7   14.6 cm  -14.4 cm  -71.3 cm      0 eV    902 eV   40.9 mum  4.45 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 337,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.18 cm  -11.2 cm  -1.37 m      75 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   7.52 cm  -12.8 cm  -1.37 m    67.6 keV   7.4 keV   1.7 cm    1.7 cm    Tracker     eIoni
-    2   8.08 cm  -13.3 cm  -1.36 m    62.5 keV  5.06 keV  1.42 cm   3.12 cm    Tracker     eIoni
-    3   8.35 cm  -13.8 cm  -1.35 m    55.9 keV  6.58 keV  1.24 cm   4.36 cm    Tracker     eIoni
-    4    8.9 cm  -13.6 cm  -1.34 m    49.3 keV  6.61 keV  1.02 cm   5.39 cm    Tracker     eIoni
-    5   9.52 cm  -13.8 cm  -1.33 m    42.9 keV  6.43 keV  8.23 mm   6.21 cm    Tracker     eIoni
-    6   9.97 cm  -14.2 cm  -1.33 m    34.5 keV  8.37 keV  6.45 mm   6.85 cm    Tracker     eIoni
-    7   10.3 cm  -14.4 cm  -1.33 m    31.5 keV  2.97 keV  4.48 mm    7.3 cm    Tracker     eIoni
-    8   10.4 cm  -14.5 cm  -1.34 m    28.6 keV  2.93 keV  3.85 mm   7.69 cm    Tracker     eIoni
-    9   10.6 cm  -14.4 cm  -1.34 m    17.5 keV  11.1 keV  3.28 mm   8.02 cm    Tracker     eIoni
-   10   10.8 cm  -14.5 cm  -1.34 m      16 keV  1.53 keV  1.54 mm   8.17 cm    Tracker     eIoni
-   11   10.8 cm  -14.6 cm  -1.34 m      15 keV   916 eV   1.36 mm   8.31 cm    Tracker     eIoni
-   12   10.9 cm  -14.7 cm  -1.34 m    12.9 keV  2.17 keV  1.26 mm   8.43 cm    Tracker     eIoni
-   13   10.8 cm  -14.7 cm  -1.34 m    10.5 keV  2.32 keV  1.03 mm   8.53 cm    Tracker     eIoni
-   14   10.8 cm  -14.7 cm  -1.34 m    9.81 keV   730 eV    815 mum  8.62 cm    Tracker     eIoni
-   15   10.7 cm  -14.8 cm  -1.34 m    8.24 keV  1.58 keV   753 mum  8.69 cm    Tracker     eIoni
-   16   10.7 cm  -14.8 cm  -1.34 m    5.78 keV  2.45 keV   631 mum  8.75 cm    Tracker     eIoni
-   17   10.6 cm  -14.8 cm  -1.34 m       0 eV   5.78 keV   465 mum   8.8 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 336,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.16 cm  -11.2 cm  -1.37 m     1.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    7.3 cm  -11.4 cm  -1.37 m       0 eV    1.4 keV  5.33 mm   5.33 mm    Tracker      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 312,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -52.7 mum  -125 mum -2.41 m    16.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    551 mum -1.26 mm   -2.4 m    16.2 MeV     0 eV   5.75 mm   5.75 mm    TrackerTransportation
-    2   8.68 cm  -16.3 cm   -1.6 m    16.2 MeV     0 eV   82.1 cm   82.6 cm    ChamberTransportation
-    3   10.8 cm  -20.3 cm   -1.4 m    16.2 MeV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4   17.3 cm  -32.4 cm    -80 cm   16.2 MeV     0 eV   61.6 cm   1.65 m     ChamberTransportation
-    5   19.5 cm  -36.5 cm    -60 cm   16.2 MeV     0 eV   20.5 cm   1.85 m     TrackerTransportation
-    6   25.9 cm  -48.6 cm      0 fm   16.2 MeV     0 eV   61.6 cm   2.47 m     ChamberTransportation
-    7   28.1 cm  -52.6 cm     20 cm   16.2 MeV     0 eV   20.5 cm   2.67 m     TrackerTransportation
-    8   34.5 cm  -64.7 cm     80 cm   16.2 MeV     0 eV   61.6 cm   3.29 m     ChamberTransportation
-    9   36.7 cm  -68.8 cm      1 m    16.2 MeV     0 eV   20.5 cm   3.49 m     TrackerTransportation
-   10   43.2 cm  -80.9 cm    1.6 m    16.2 MeV     0 eV   61.6 cm   4.11 m     ChamberTransportation
-   11   45.3 cm  -84.9 cm    1.8 m    16.2 MeV     0 eV   20.5 cm   4.31 m     TrackerTransportation
-   12   51.8 cm    -97 cm    2.4 m    16.2 MeV     0 eV   61.6 cm   4.93 m     WorldPVTransportation
-   13   57.3 cm  -1.07 m    2.91 m    16.2 MeV     0 eV   52.3 cm   5.45 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 311,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -65.4 mum  -116 mum -2.41 m    7.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   39.8 mum  -592 mum  -2.4 m    5.57 MeV     0 eV   5.88 mm   5.88 mm   TargetPV     compt
-    2   38.6 mum  -580 mum  -2.4 m    5.57 MeV     0 eV   99.5 mum  5.98 mm    TrackerTransportation
-    3     -1 cm   9.76 cm   -1.6 m    5.57 MeV     0 eV   80.6 cm   81.2 cm    ChamberTransportation
-    4  -1.25 cm   12.2 cm   -1.4 m    5.57 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    5     -2 cm   19.6 cm    -80 cm   5.57 MeV     0 eV   60.5 cm   1.62 m     ChamberTransportation
-    6  -2.26 cm     22 cm    -60 cm   5.57 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    7  -3.01 cm   29.4 cm -0.114 fm   5.57 MeV     0 eV   60.5 cm   2.42 m     ChamberTransportation
-    8  -3.26 cm   31.9 cm     20 cm   5.57 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    9  -4.01 cm   39.2 cm     80 cm   5.57 MeV     0 eV   60.5 cm   3.23 m     ChamberTransportation
-   10  -4.26 cm   41.7 cm      1 m    5.57 MeV     0 eV   20.2 cm   3.43 m     TrackerTransportation
-   11  -5.02 cm     49 cm    1.6 m    5.57 MeV     0 eV   60.5 cm   4.04 m     ChamberTransportation
-   12  -5.27 cm   51.5 cm    1.8 m    5.57 MeV     0 eV   20.2 cm   4.24 m     TrackerTransportation
-   13  -6.02 cm   58.9 cm    2.4 m    5.57 MeV     0 eV   60.5 cm   4.84 m     WorldPVTransportation
-   14  -6.66 cm   65.1 cm   2.91 m    5.57 MeV     0 eV   51.4 cm   5.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 345,   Parent ID = 311
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   39.8 mum  -592 mum  -2.4 m    1.66 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   51.6 mum  -667 mum  -2.4 m    1.45 MeV   212 keV   267 mum   267 mum   TrackerTransportation
-    2  -59.2 cm   92.3 cm  -2.16 m    1.23 MeV   201 keV  1.18 m    1.18 m     Tracker     eIoni
-    3  -1.06 m    1.33 m   -2.07 m    1.11 MeV   108 keV  65.7 cm   1.83 m     Tracker     eIoni
-    4  -1.49 m     1.9 m   -1.99 m     978 keV   127 keV  75.1 cm   2.59 m     Tracker     eIoni
-    5  -1.76 m    2.24 m   -1.89 m     860 keV  76.8 keV  46.9 cm   3.05 m     Tracker     eIoni
-    6  -1.84 m    2.28 m   -1.87 m     829 keV  17.4 keV  9.45 cm   3.15 m     Tracker     eIoni
-    7  -1.82 m     2.4 m   -1.85 m     808 keV  20.8 keV    13 cm   3.28 m     WorldPVTransportation
-    8  -1.73 m    2.91 m   -1.76 m     707 keV   101 keV  56.4 cm   3.84 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 350,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.84 m    2.28 m   -1.87 m    12.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.85 m    2.28 m   -1.87 m      12 keV   911 eV   1.03 mm   1.03 mm    Tracker     eIoni
-    2  -1.85 m    2.28 m   -1.87 m    9.04 keV  2.97 keV   943 mum  1.98 mm    Tracker     eIoni
-    3  -1.85 m    2.28 m   -1.87 m    7.77 keV  1.27 keV   693 mum  2.67 mm    Tracker     eIoni
-    4  -1.85 m    2.27 m   -1.87 m    7.05 keV   726 eV    599 mum  3.27 mm    Tracker     eIoni
-    5  -1.85 m    2.27 m   -1.87 m    6.33 keV   716 eV    548 mum  3.82 mm    Tracker     eIoni
-    6  -1.85 m    2.27 m   -1.87 m    5.35 keV   981 eV    501 mum  4.32 mm    Tracker     eIoni
-    7  -1.85 m    2.27 m   -1.87 m    2.48 keV  2.87 keV   439 mum  4.76 mm    Tracker     eIoni
-    8  -1.85 m    2.27 m   -1.87 m     347 eV   2.13 keV   224 mum  4.98 mm    Tracker     eIoni
-    9  -1.85 m    2.27 m   -1.87 m       0 eV    347 eV   20.2 mum     5 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 349,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.76 m    2.24 m   -1.89 m    41.6 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.76 m    2.25 m   -1.89 m    37.6 keV  3.97 keV  6.13 mm   6.13 mm    Tracker     eIoni
-    2  -1.76 m    2.25 m   -1.89 m    31.8 keV   5.8 keV  5.17 mm   1.13 cm    Tracker     eIoni
-    3  -1.76 m    2.25 m   -1.89 m    29.7 keV  2.12 keV  3.91 mm   1.52 cm    Tracker     eIoni
-    4  -1.76 m    2.25 m   -1.89 m    25.8 keV  3.91 keV  3.48 mm   1.87 cm    Tracker     eIoni
-    5  -1.76 m    2.25 m   -1.89 m    23.1 keV  2.69 keV  2.77 mm   2.15 cm    Tracker     eIoni
-    6  -1.77 m    2.25 m   -1.89 m    20.8 keV  2.31 keV  2.33 mm   2.38 cm    Tracker     eIoni
-    7  -1.77 m    2.25 m   -1.89 m    18.3 keV  2.51 keV  1.98 mm   2.58 cm    Tracker     eIoni
-    8  -1.77 m    2.25 m   -1.89 m    16.5 keV  1.75 keV  1.64 mm   2.74 cm    Tracker     eIoni
-    9  -1.77 m    2.25 m   -1.89 m    14.1 keV  2.42 keV  1.43 mm   2.88 cm    Tracker     eIoni
-   10  -1.77 m    2.25 m   -1.89 m    11.6 keV  2.45 keV  1.15 mm      3 cm    Tracker     eIoni
-   11  -1.77 m    2.25 m   -1.89 m    10.1 keV  1.58 keV   912 mum  3.09 cm    Tracker     eIoni
-   12  -1.77 m    2.25 m   -1.89 m    8.96 keV   1.1 keV   773 mum  3.17 cm    Tracker     eIoni
-   13  -1.77 m    2.25 m   -1.89 m    7.57 keV   1.4 keV   687 mum  3.24 cm    Tracker     eIoni
-   14  -1.77 m    2.25 m   -1.89 m    6.38 keV  1.18 keV   584 mum  3.29 cm    Tracker     eIoni
-   15  -1.77 m    2.25 m   -1.89 m    3.72 keV  2.66 keV   504 mum  3.34 cm    Tracker     eIoni
-   16  -1.77 m    2.25 m   -1.89 m    2.13 keV  1.59 keV   333 mum  3.38 cm    Tracker     eIoni
-   17  -1.77 m    2.25 m   -1.89 m       0 eV   2.13 keV   179 mum   3.4 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 348,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 m     1.9 m   -1.99 m    8.22 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.49 m     1.9 m   -1.99 m    4.95 keV  3.27 keV   630 mum   630 mum   Tracker     eIoni
-    2  -1.49 m     1.9 m   -1.99 m     154 eV    4.8 keV   414 mum  1.04 mm    Tracker     eIoni
-    3  -1.49 m     1.9 m   -1.99 m       0 eV    154 eV   12.5 mum  1.06 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 347,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.06 m    1.33 m   -2.07 m    11.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.06 m    1.33 m   -2.07 m    8.92 keV  2.52 keV   894 mum   894 mum   Tracker     eIoni
-    2  -1.06 m    1.33 m   -2.07 m    6.21 keV   2.7 keV   683 mum  1.58 mm    Tracker     eIoni
-    3  -1.06 m    1.33 m   -2.07 m    4.54 keV  1.67 keV   494 mum  2.07 mm    Tracker     eIoni
-    4  -1.06 m    1.33 m   -2.07 m    2.25 keV  2.29 keV   388 mum  2.46 mm    Tracker     eIoni
-    5  -1.06 m    1.33 m   -2.07 m       0 eV   2.25 keV   195 mum  2.65 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 346,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.2 cm   92.3 cm  -2.16 m    14.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -59.3 cm   92.2 cm  -2.16 m    12.7 keV  1.34 keV  1.15 mm   1.15 mm    Tracker     eIoni
-    2  -59.4 cm   92.2 cm  -2.16 m    11.3 keV  1.47 keV  1.02 mm   2.17 mm    Tracker     eIoni
-    3  -59.5 cm   92.2 cm  -2.16 m     9.9 keV  1.37 keV   879 mum  3.05 mm    Tracker     eIoni
-    4  -59.5 cm   92.3 cm  -2.16 m    8.19 keV  1.71 keV   759 mum  3.81 mm    Tracker     eIoni
-    5  -59.5 cm   92.3 cm  -2.16 m    5.55 keV  2.64 keV   627 mum  4.43 mm    Tracker     eIoni
-    6  -59.6 cm   92.3 cm  -2.16 m    4.05 keV   1.5 keV   451 mum  4.88 mm    Tracker     eIoni
-    7  -59.5 cm   92.3 cm  -2.16 m    1.22 keV  2.82 keV   355 mum  5.24 mm    Tracker     eIoni
-    8  -59.5 cm   92.3 cm  -2.16 m       0 eV   1.22 keV  79.8 mum  5.32 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 310,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.5 mum  -168 mum -2.41 m    6.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -183 mum  -512 mum  -2.4 m    6.03 MeV     0 eV   7.31 mm   7.31 mm    TrackerTransportation
-    2  -9.93 mm  -3.82 cm   -1.6 m    6.03 MeV     0 eV   80.1 cm   80.8 cm    ChamberTransportation
-    3  -1.24 cm  -4.77 cm   -1.4 m    6.03 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -1.97 cm  -7.59 cm    -80 cm   6.03 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -2.21 cm  -8.54 cm    -60 cm   6.03 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -2.94 cm  -11.4 cm      0 fm   6.03 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -3.19 cm  -12.3 cm     20 cm   6.03 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -3.92 cm  -15.1 cm     80 cm   6.03 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -4.16 cm  -16.1 cm      1 m    6.03 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -4.89 cm  -18.9 cm    1.6 m    6.03 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11  -5.13 cm  -19.9 cm    1.8 m    6.03 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -5.87 cm  -22.7 cm    2.4 m    6.03 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -6.49 cm  -25.1 cm   2.91 m    6.03 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 309,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -80.4 mum  -150 mum -2.41 m    29.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -218 mum  -228 mum  -2.4 m    29.9 MeV     0 eV   7.75 mm   7.75 mm    TrackerTransportation
-    2  -1.44 cm  -8.29 mm   -1.6 m    29.9 MeV     0 eV     80 cm   80.8 cm    ChamberTransportation
-    3   -1.8 cm  -1.03 cm   -1.4 m    29.9 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.86 cm  -1.63 cm    -80 cm   29.9 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -3.22 cm  -1.84 cm    -60 cm   29.9 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -4.28 cm  -2.44 cm  0.114 fm   29.9 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -4.64 cm  -2.64 cm     20 cm   29.9 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -5.7 cm  -3.25 cm     80 cm   29.9 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -6.06 cm  -3.45 cm      1 m    29.9 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -7.12 cm  -4.05 cm    1.6 m    29.9 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -7.48 cm  -4.25 cm    1.8 m    29.9 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -8.54 cm  -4.86 cm    2.4 m    29.9 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -9.45 cm  -5.37 cm   2.91 m    29.9 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 308,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -79.3 mum  -150 mum -2.41 m    86.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -191 mum  -250 mum  -2.4 m    86.6 MeV     0 eV   7.82 mm   7.82 mm    TrackerTransportation
-    2  -1.16 cm  -1.06 cm   -1.6 m    86.6 MeV     0 eV     80 cm   80.8 cm    ChamberTransportation
-    3  -1.45 cm  -1.32 cm   -1.4 m    86.6 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.31 cm  -2.09 cm    -80 cm   86.6 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   -2.6 cm  -2.35 cm    -60 cm   86.6 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -3.45 cm  -3.12 cm      0 fm   86.6 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -3.74 cm  -3.38 cm     20 cm   86.6 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -4.6 cm  -4.15 cm     80 cm   86.6 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -4.89 cm  -4.41 cm      1 m    86.6 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -5.74 cm  -5.19 cm    1.6 m    86.6 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -6.03 cm  -5.44 cm    1.8 m    86.6 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -6.89 cm  -6.22 cm    2.4 m    86.6 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -7.62 cm  -6.88 cm   2.91 m    86.6 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 307,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -82.4 mum  -133 mum -2.41 m    10.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -106 mum  -295 mum  -2.4 m    10.8 MeV     0 eV   8.29 mm   8.29 mm    TrackerTransportation
-    2  -2.41 mm   -1.6 cm   -1.6 m    10.8 MeV     0 eV     80 cm   80.8 cm    ChamberTransportation
-    3  -2.98 mm  -1.99 cm   -1.4 m    10.8 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -4.71 mm  -3.17 cm    -80 cm   10.8 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -5.28 mm  -3.56 cm    -60 cm   10.8 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -7.01 mm  -4.74 cm -0.114 fm   10.8 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -7.59 mm  -5.14 cm     20 cm   10.8 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -9.31 mm  -6.31 cm     80 cm   10.8 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -9.89 mm  -6.71 cm      1 m    10.8 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -1.16 cm  -7.88 cm    1.6 m    10.8 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -1.22 cm  -8.28 cm    1.8 m    10.8 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -1.39 cm  -9.46 cm    2.4 m    10.8 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -1.54 cm  -10.5 cm   2.91 m    10.8 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 306,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    165 nm  -32.4 mum -2.41 m     434 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -13.3 mum  -197 mum -2.41 m       0 eV    434 keV  4.47 mm   4.47 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 305,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.05 mum -24.3 mum -2.41 m     4.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -9.48 mum  -352 mum  -2.4 m     4.7 MeV     0 eV   1.08 cm   1.08 cm    TrackerTransportation
-    2   -633 mum -2.46 cm   -1.6 m     4.7 MeV     0 eV     80 cm   81.1 cm    ChamberTransportation
-    3   -789 mum -3.07 cm   -1.4 m     4.7 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -1.26 mm  -4.89 cm    -80 cm    4.7 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -1.41 mm  -5.49 cm    -60 cm    4.7 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -1.88 mm  -7.31 cm      0 fm    4.7 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -2.04 mm  -7.92 cm     20 cm    4.7 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -2.5 mm  -9.74 cm     80 cm    4.7 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -2.66 mm  -10.3 cm      1 m     4.7 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -3.13 mm  -12.2 cm    1.6 m     4.7 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -3.28 mm  -12.8 cm    1.8 m     4.7 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -3.75 mm  -14.6 cm    2.4 m     4.7 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -4.15 mm  -16.1 cm   2.91 m     4.7 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 304,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.19 mum -8.44 mum -2.41 m     703 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -7.6 mum -46.9 mum -2.41 m     697 keV   5.9 keV  2.14 mm   2.14 mm   TargetPV     compt
-    2    603 mum  -987 mum  -2.4 m     697 keV     0 eV   9.19 mm   1.13 cm    TrackerTransportation
-    3   5.42 cm  -8.35 cm   -1.6 m     697 keV     0 eV   80.6 cm   81.7 cm    ChamberTransportation
-    4   6.76 cm  -10.4 cm   -1.4 m     697 keV     0 eV   20.2 cm   1.02 m     TrackerTransportation
-    5   10.8 cm  -16.6 cm    -80 cm    697 keV     0 eV   60.5 cm   1.62 m     ChamberTransportation
-    6   12.1 cm  -18.7 cm    -60 cm    697 keV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    7   16.1 cm  -24.8 cm      0 fm    697 keV     0 eV   60.5 cm   2.43 m     ChamberTransportation
-    8   17.5 cm  -26.9 cm     20 cm    697 keV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    9   21.5 cm  -33.1 cm     80 cm    697 keV     0 eV   60.5 cm   3.24 m     ChamberTransportation
-   10   22.8 cm  -35.2 cm      1 m     697 keV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   11   26.9 cm  -41.3 cm    1.6 m     697 keV     0 eV   60.5 cm   4.04 m     ChamberTransportation
-   12   28.2 cm  -43.4 cm    1.8 m     697 keV     0 eV   20.2 cm   4.24 m     TrackerTransportation
-   13   32.2 cm  -49.6 cm    2.4 m     697 keV     0 eV   60.5 cm   4.85 m     WorldPVTransportation
-   14   35.6 cm  -54.8 cm   2.91 m     697 keV     0 eV   51.4 cm   5.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 302,   Parent ID = 101
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -68.7 nm  -2.92 mum -2.41 m    60.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    510 mum   305 mum -2.41 m    47.1 MeV  5.06 MeV  3.55 mm   3.55 mm   TargetPV     eBrem
-    2    511 mum   311 mum -2.41 m    46.5 MeV   145 keV   124 mum  3.67 mm   TargetPV     eBrem
-    3    485 mum   449 mum -2.41 m      45 MeV   914 keV   706 mum  4.38 mm   TargetPV     eBrem
-    4    493 mum   365 mum -2.41 m    40.2 MeV  1.84 MeV  1.31 mm   5.69 mm   TargetPV     eBrem
-    5    490 mum   370 mum -2.41 m    39.7 MeV  42.4 keV  27.9 mum  5.72 mm   TargetPV     eBrem
-    6    466 mum   454 mum -2.41 m      38 MeV   545 keV   494 mum  6.21 mm   TargetPV     eBrem
-    7   51.4 mum   700 mum  -2.4 m    35.4 MeV  1.79 MeV  1.34 mm   7.56 mm   TargetPV     eBrem
-    8    -65 mum   723 mum  -2.4 m      33 MeV   533 keV   456 mum  8.01 mm   TargetPV     eBrem
-    9  -78.6 mum   509 mum  -2.4 m    30.7 MeV   695 keV   474 mum  8.49 mm   TargetPV     eBrem
-   10  -99.4 mum   540 mum  -2.4 m    28.2 MeV   124 keV  81.4 mum  8.57 mm   TargetPV     eBrem
-   11   -379 mum  1.24 mm   -2.4 m    25.4 MeV  1.73 MeV  1.36 mm   9.93 mm   TargetPV     eBrem
-   12   -417 mum  1.76 mm   -2.4 m    19.8 MeV  1.48 MeV     1 mm   1.09 cm   TargetPV     eBrem
-   13   -503 mum  2.01 mm   -2.4 m    17.9 MeV   579 keV   408 mum  1.13 cm   TargetPV     eBrem
-   14   -716 mum  2.74 mm   -2.4 m    13.6 MeV  4.24 MeV  1.46 mm   1.28 cm    TrackerTransportation
-   15  -1.33 m    34.6 cm  -1.55 m    13.3 MeV   304 keV  1.61 m    1.62 m     Tracker     eIoni
-   16   -2.4 m    52.4 cm  -82.6 cm   13.1 MeV   245 keV  1.31 m    2.94 m     WorldPVTransportation
-   17  -2.51 m    54.2 cm  -74.9 cm     13 MeV  27.9 keV  13.8 cm   3.07 m     WorldPV     eIoni
-   18   -2.7 m    56.9 cm  -63.4 cm   12.9 MeV    42 keV  22.3 cm    3.3 m     WorldPV     eIoni
-   19  -2.75 m    57.4 cm  -60.1 cm   12.8 MeV  11.5 keV  6.28 cm   3.36 m     WorldPV     eIoni
-   20  -2.81 m      58 cm  -56.8 cm   12.8 MeV  15.3 keV  6.49 cm   3.42 m     WorldPV     eIoni
-   21  -2.91 m    58.9 cm  -50.8 cm   12.8 MeV    24 keV  11.7 cm   3.54 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 368,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.81 m      58 cm  -56.8 cm   11.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.81 m      58 cm  -56.8 cm   9.24 keV  1.98 keV   875 mum   875 mum   WorldPV     eIoni
-    2  -2.81 m    58.1 cm  -56.8 cm   6.78 keV  2.46 keV   708 mum  1.58 mm    WorldPV     eIoni
-    3  -2.81 m    58.1 cm  -56.8 cm   5.15 keV  1.63 keV   530 mum  2.11 mm    WorldPV     eIoni
-    4  -2.81 m    58.1 cm  -56.8 cm   3.48 keV  1.67 keV   426 mum  2.54 mm    WorldPV     eIoni
-    5  -2.81 m    58.1 cm  -56.9 cm   1.63 keV  1.84 keV   316 mum  2.85 mm    WorldPV     eIoni
-    6  -2.81 m    58.1 cm  -56.9 cm      0 eV   1.63 keV   120 mum  2.97 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 367,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.75 m    57.4 cm  -60.1 cm   36.7 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.75 m    57.3 cm  -59.7 cm   21.7 keV  2.23 keV  4.19 mm   4.19 mm    WorldPV     eIoni
-    2  -2.75 m    57.2 cm  -59.7 cm     13 keV  8.72 keV  2.12 mm   6.31 mm    WorldPV     eIoni
-    3  -2.75 m    57.1 cm  -59.7 cm   11.5 keV  1.43 keV  1.04 mm   7.35 mm    WorldPV     eIoni
-    4  -2.75 m    57.1 cm  -59.7 cm   8.19 keV  3.35 keV   903 mum  8.25 mm    WorldPV     eIoni
-    5  -2.75 m    57.1 cm  -59.7 cm    7.1 keV   1.1 keV   628 mum  8.88 mm    WorldPV     eIoni
-    6  -2.75 m      57 cm  -59.7 cm   5.78 keV  1.32 keV   551 mum  9.43 mm    WorldPV     eIoni
-    7  -2.75 m      57 cm  -59.6 cm   3.62 keV  2.16 keV   465 mum  9.89 mm    WorldPV     eIoni
-    8  -2.75 m      57 cm  -59.6 cm   1.99 keV  1.63 keV   326 mum  1.02 cm    WorldPV     eIoni
-    9  -2.75 m      57 cm  -59.6 cm      0 eV   1.99 keV   161 mum  1.04 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 369,   Parent ID = 367
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.75 m    57.3 cm  -59.7 cm   12.8 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.75 m    57.3 cm  -59.6 cm   9.85 keV  2.92 keV  1.02 mm   1.02 mm    WorldPV     eIoni
-    2  -2.75 m    57.2 cm  -59.6 cm   8.79 keV  1.06 keV   755 mum  1.78 mm    WorldPV     eIoni
-    3  -2.75 m    57.2 cm  -59.6 cm   5.76 keV  3.03 keV   673 mum  2.45 mm    WorldPV     eIoni
-    4  -2.75 m    57.2 cm  -59.6 cm   4.37 keV  1.38 keV   463 mum  2.91 mm    WorldPV     eIoni
-    5  -2.75 m    57.2 cm  -59.6 cm   3.12 keV  1.26 keV   377 mum  3.29 mm    WorldPV     eIoni
-    6  -2.75 m    57.2 cm  -59.5 cm      0 eV   3.12 keV   287 mum  3.58 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 366,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.7 m    56.9 cm  -63.4 cm    105 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -2.7 m    57.7 cm  -63.3 cm   75.3 keV  1.66 keV  7.64 mm   7.64 mm    WorldPV     eIoni
-    2   -2.7 m      58 cm  -61.7 cm   69.8 keV  5.52 keV  1.71 cm   2.48 cm    WorldPV     eIoni
-    3  -2.71 m    58.2 cm  -60.4 cm   62.1 keV  7.62 keV  1.51 cm   3.98 cm    WorldPV     eIoni
-    4  -2.71 m      59 cm  -59.6 cm   55.7 keV  6.45 keV  1.23 cm   5.21 cm    WorldPV     eIoni
-    5  -2.72 m    59.3 cm  -58.9 cm   50.6 keV  5.11 keV  1.02 cm   6.22 cm    WorldPV     eIoni
-    6  -2.72 m    59.2 cm  -58.1 cm   46.3 keV  4.26 keV  8.59 mm   7.08 cm    WorldPV     eIoni
-    7  -2.72 m    59.8 cm  -58.5 cm   39.5 keV  6.83 keV  7.39 mm   7.82 cm    WorldPV     eIoni
-    8  -2.72 m    60.2 cm  -58.9 cm   30.8 keV  8.69 keV  5.63 mm   8.39 cm    WorldPV     eIoni
-    9  -2.72 m    60.2 cm  -59.1 cm   28.7 keV  2.09 keV   3.7 mm   8.76 cm    WorldPV     eIoni
-   10  -2.72 m    60.4 cm  -59.4 cm   24.8 keV  3.88 keV   3.3 mm   9.09 cm    WorldPV     eIoni
-   11  -2.72 m    60.3 cm  -59.5 cm   22.7 keV  2.14 keV  2.61 mm   9.35 cm    WorldPV     eIoni
-   12  -2.73 m    60.2 cm  -59.6 cm   19.7 keV     3 keV  2.28 mm   9.57 cm    WorldPV     eIoni
-   13  -2.72 m    60.2 cm  -59.8 cm   17.9 keV  1.83 keV  1.83 mm   9.76 cm    WorldPV     eIoni
-   14  -2.72 m    60.1 cm  -59.9 cm   15.6 keV  2.29 keV  1.59 mm   9.92 cm    WorldPV     eIoni
-   15  -2.72 m    60.2 cm    -60 cm   13.3 keV  2.28 keV  1.32 mm     10 cm    WorldPV     eIoni
-   16  -2.72 m    60.1 cm  -60.1 cm   11.4 keV  1.92 keV  1.07 mm   10.2 cm    WorldPV     eIoni
-   17  -2.72 m      60 cm  -60.1 cm   10.5 keV   846 eV    889 mum  10.2 cm    WorldPV     eIoni
-   18  -2.72 m    59.9 cm  -60.1 cm   9.27 keV  1.26 keV   815 mum  10.3 cm    WorldPV     eIoni
-   19  -2.72 m    59.9 cm  -60.1 cm   7.09 keV  2.18 keV   711 mum  10.4 cm    WorldPV     eIoni
-   20  -2.72 m    59.8 cm  -60.1 cm    335 eV   6.76 keV   551 mum  10.5 cm    WorldPV     eIoni
-   21  -2.72 m    59.8 cm  -60.1 cm      0 eV    335 eV   19.6 mum  10.5 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 370,   Parent ID = 366
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.7 m    57.7 cm  -63.3 cm   28.4 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -2.7 m    57.9 cm  -63.4 cm   24.7 keV  3.63 keV  3.24 mm   3.24 mm    WorldPV     eIoni
-    2   -2.7 m      58 cm  -63.6 cm   20.2 keV  4.58 keV  2.59 mm   5.83 mm    WorldPV     eIoni
-    3  -2.71 m    58.2 cm  -63.5 cm   18.4 keV  1.72 keV   1.9 mm   7.73 mm    WorldPV     eIoni
-    4  -2.71 m    58.3 cm  -63.6 cm   16.6 keV  1.89 keV  1.67 mm    9.4 mm    WorldPV     eIoni
-    5  -2.71 m    58.4 cm  -63.6 cm   13.9 keV  2.69 keV  1.43 mm   1.08 cm    WorldPV     eIoni
-    6   -2.7 m    58.5 cm  -63.7 cm   12.5 keV  1.37 keV  1.13 mm    1.2 cm    WorldPV     eIoni
-    7   -2.7 m    58.6 cm  -63.7 cm   11.1 keV  1.36 keV   992 mum  1.29 cm    WorldPV     eIoni
-    8   -2.7 m    58.6 cm  -63.8 cm   9.34 keV  1.79 keV   867 mum  1.38 cm    WorldPV     eIoni
-    9   -2.7 m    58.7 cm  -63.8 cm   4.18 keV  5.16 keV   716 mum  1.45 cm    WorldPV     eIoni
-   10   -2.7 m    58.7 cm  -63.8 cm    1.8 keV  2.38 keV   364 mum  1.49 cm    WorldPV     eIoni
-   11   -2.7 m    58.7 cm  -63.8 cm      0 eV    1.8 keV   139 mum   1.5 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 365,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.51 m    54.2 cm  -74.9 cm   22.7 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.51 m    54.3 cm  -75.1 cm   18.5 keV   4.2 keV  2.27 mm   2.27 mm    WorldPV     eIoni
-    2  -2.51 m    54.2 cm  -75.1 cm   16.9 keV  1.52 keV  1.67 mm   3.94 mm    WorldPV     eIoni
-    3  -2.51 m    54.2 cm  -75.1 cm   14.5 keV  2.46 keV  1.48 mm   5.42 mm    WorldPV     eIoni
-    4  -2.51 m    54.2 cm  -75.2 cm   13.1 keV  1.42 keV  1.19 mm   6.61 mm    WorldPV     eIoni
-    5  -2.51 m    54.2 cm  -75.3 cm   10.8 keV   2.3 keV  1.05 mm   7.66 mm    WorldPV     eIoni
-    6  -2.51 m    54.2 cm  -75.3 cm   6.92 keV  3.85 keV   835 mum   8.5 mm    WorldPV     eIoni
-    7  -2.51 m    54.3 cm  -75.3 cm    4.7 keV  2.22 keV   539 mum  9.03 mm    WorldPV     eIoni
-    8  -2.51 m    54.3 cm  -75.3 cm   1.52 keV  3.18 keV   397 mum  9.43 mm    WorldPV     eIoni
-    9  -2.51 m    54.3 cm  -75.3 cm      0 eV   1.52 keV   108 mum  9.54 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 364,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.33 m    34.6 cm  -1.55 m    13.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.33 m    34.6 cm  -1.55 m    12.5 keV  1.19 keV  1.11 mm   1.11 mm    Tracker     eIoni
-    2  -1.33 m    34.6 cm  -1.55 m    11.2 keV  1.27 keV   994 mum  2.11 mm    Tracker     eIoni
-    3  -1.33 m    34.6 cm  -1.55 m     9.9 keV  1.34 keV   877 mum  2.98 mm    Tracker     eIoni
-    4  -1.33 m    34.6 cm  -1.55 m    7.67 keV  2.23 keV   760 mum  3.74 mm    Tracker     eIoni
-    5  -1.33 m    34.7 cm  -1.55 m    6.18 keV  1.49 keV   591 mum  4.34 mm    Tracker     eIoni
-    6  -1.33 m    34.7 cm  -1.55 m    5.09 keV  1.08 keV   491 mum  4.83 mm    Tracker     eIoni
-    7  -1.33 m    34.7 cm  -1.55 m       0 eV   5.09 keV   423 mum  5.25 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 363,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -503 mum  2.01 mm   -2.4 m    1.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -685 mum  2.72 mm   -2.4 m    1.28 MeV     0 eV   1.32 mm   1.32 mm    TrackerTransportation
-    2  -61.9 cm    2.4 m    1.35 m    1.28 MeV     0 eV   4.49 m    4.49 m     WorldPVTransportation
-    3  -75.1 cm   2.91 m    2.15 m    1.28 MeV     0 eV   95.6 cm   5.45 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 362,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -417 mum  1.76 mm   -2.4 m    4.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -696 mum  2.44 mm   -2.4 m    4.14 MeV     0 eV   1.59 mm   1.59 mm    TrackerTransportation
-    2  -79.1 cm   1.93 m     1.6 m    4.14 MeV     0 eV   4.51 m    4.51 m     ChamberTransportation
-    3  -80.5 cm   1.97 m    1.67 m    4.14 MeV     0 eV   7.96 cm   4.59 m     TrackerTransportation
-    4  -94.9 cm   2.32 m     2.4 m    4.14 MeV     0 eV   82.3 cm   5.42 m     WorldPVTransportation
-    5  -1.05 m    2.57 m    2.91 m    4.14 MeV     0 eV   57.5 cm   5.99 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 361,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -379 mum  1.24 mm   -2.4 m     1.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -710 mum  2.08 mm   -2.4 m     1.1 MeV     0 eV   2.43 mm   2.43 mm    TrackerTransportation
-    2  -23.5 cm   59.9 cm    -80 cm    1.1 MeV     0 eV   1.72 m    1.73 m     ChamberTransportation
-    3  -26.4 cm   67.2 cm  -60.3 cm    1.1 MeV     0 eV   21.2 cm   1.94 m     TrackerTransportation
-    4  -35.3 cm   89.7 cm  0.114 fm    1.1 MeV     0 eV     65 cm   2.59 m     ChamberTransportation
-    5  -38.2 cm   97.2 cm     20 cm    1.1 MeV     0 eV   21.5 cm    2.8 m     TrackerTransportation
-    6    -47 cm    1.2 m      80 cm    1.1 MeV     0 eV   64.6 cm   3.45 m     ChamberTransportation
-    7    -50 cm   1.27 m       1 m     1.1 MeV     0 eV   21.5 cm   3.67 m     TrackerTransportation
-    8  -58.8 cm   1.49 m     1.6 m     1.1 MeV     0 eV   64.6 cm   4.31 m     ChamberTransportation
-    9  -61.7 cm   1.57 m     1.8 m     1.1 MeV     0 eV   21.5 cm   4.53 m     TrackerTransportation
-   10  -70.5 cm   1.79 m     2.4 m     1.1 MeV     0 eV   64.6 cm   5.17 m     WorldPVTransportation
-   11    -78 cm   1.98 m    2.91 m     1.1 MeV     0 eV   54.9 cm   5.72 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 360,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -99.4 mum   540 mum  -2.4 m    2.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -753 mum  1.53 mm   -2.4 m     645 keV     0 eV   2.94 mm   2.94 mm   TargetPV     compt
-    2  -5.58 mum  1.46 mm   -2.4 m     645 keV     0 eV   1.01 mm   3.95 mm    TrackerTransportation
-    3    2.4 m   -21.9 cm  -24.8 cm    645 keV     0 eV   3.23 m    3.23 m     WorldPVTransportation
-    4   2.91 m   -26.6 cm   20.9 cm    645 keV     0 eV   68.7 cm   3.92 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 371,   Parent ID = 360
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -753 mum  1.53 mm   -2.4 m    1.74 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.03 mm   1.57 mm   -2.4 m    1.21 MeV   533 keV   555 mum   555 mum  TargetPV     eIoni
-    2   -907 mum  1.53 mm   -2.4 m     726 keV   480 keV   456 mum  1.01 mm   TargetPV     eIoni
-    3   -885 mum  1.52 mm   -2.4 m    91.2 keV   635 keV   347 mum  1.36 mm   TargetPV     eIoni
-    4   -887 mum  1.52 mm   -2.4 m       0 eV   91.2 keV  23.7 mum  1.38 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 359,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.6 mum   509 mum  -2.4 m    1.56 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -894 mum  1.39 mm   -2.4 m       0 eV     88 keV  2.89 mm   2.89 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 372,   Parent ID = 359
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -894 mum  1.39 mm   -2.4 m    1.47 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -900 mum  1.39 mm   -2.4 m     846 keV  14.4 keV  11.3 mum  11.3 mum  TargetPV     eBrem
-    2   -927 mum  1.41 mm   -2.4 m    14.1 keV   832 keV   309 mum   320 mum  TargetPV     eBrem
-    3   -927 mum  1.41 mm   -2.4 m       0 eV   14.1 keV  1.19 mum   321 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 373,   Parent ID = 372
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -900 mum  1.39 mm   -2.4 m     611 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -934 mum  1.84 mm   -2.4 m     611 keV     0 eV    918 mum   918 mum   TrackerTransportation
-    2  -18.4 cm    2.4 m    1.83 m     611 keV     0 eV   4.87 m    4.87 m     WorldPVTransportation
-    3  -22.3 cm   2.91 m    2.73 m     611 keV     0 eV   1.04 m    5.91 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 358,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -65 mum   723 mum  -2.4 m     1.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -628 mum -1.49 mm   -2.4 m     1.9 MeV     0 eV   4.48 mm   4.48 mm    TrackerTransportation
-    2  -61.1 cm   -2.4 m    1.78 m     1.9 MeV     0 eV   4.86 m    4.86 m     WorldPVTransportation
-    3  -74.1 cm  -2.91 m    2.67 m     1.9 MeV     0 eV   1.03 m     5.9 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 357,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   51.4 mum   700 mum  -2.4 m     832 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.42 mm    657 mum  -2.4 m     832 keV     0 eV   4.54 mm   4.54 mm    TrackerTransportation
-    2  -55.1 cm  -1.53 cm    -80 cm    832 keV     0 eV   1.69 m     1.7 m     ChamberTransportation
-    3  -61.9 cm  -1.72 cm    -60 cm    832 keV     0 eV   21.1 cm   1.91 m     TrackerTransportation
-    4  -82.5 cm  -2.32 cm      0 fm    832 keV     0 eV   63.4 cm   2.54 m     ChamberTransportation
-    5  -89.4 cm  -2.52 cm     20 cm    832 keV     0 eV   21.1 cm   2.75 m     TrackerTransportation
-    6   -1.1 m   -3.12 cm     80 cm    832 keV     0 eV   63.4 cm   3.39 m     ChamberTransportation
-    7  -1.17 m   -3.32 cm      1 m     832 keV     0 eV   21.1 cm    3.6 m     TrackerTransportation
-    8  -1.37 m   -3.91 cm    1.6 m     832 keV     0 eV   63.4 cm   4.23 m     ChamberTransportation
-    9  -1.44 m   -4.11 cm    1.8 m     832 keV     0 eV   21.1 cm   4.45 m     TrackerTransportation
-   10  -1.65 m   -4.71 cm    2.4 m     832 keV     0 eV   63.4 cm   5.08 m     WorldPVTransportation
-   11  -1.82 m   -5.21 cm   2.91 m     832 keV     0 eV   53.9 cm   5.62 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 356,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    466 mum   454 mum -2.41 m    1.12 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.72 mm    500 mum  -2.4 m    1.12 MeV     0 eV   5.95 mm   5.95 mm    TrackerTransportation
-    2  -63.4 cm   1.37 cm    -80 cm   1.12 MeV     0 eV   1.72 m    1.73 m     ChamberTransportation
-    3  -67.2 cm   1.45 cm  -70.4 cm   1.12 MeV     0 eV   10.3 cm   1.83 m     TrackerTransportation
-    4    -95 cm   2.04 cm  0.114 fm   1.12 MeV     0 eV   75.7 cm   2.59 m     ChamberTransportation
-    5  -1.03 m     2.2 cm     20 cm   1.12 MeV     0 eV   21.5 cm    2.8 m     TrackerTransportation
-    6  -1.27 m     2.7 cm     80 cm   1.12 MeV     0 eV   64.5 cm   3.45 m     ChamberTransportation
-    7  -1.35 m    2.86 cm      1 m    1.12 MeV     0 eV   21.5 cm   3.66 m     TrackerTransportation
-    8  -1.42 m    3.03 cm    1.2 m     258 keV     0 eV   21.6 cm   3.88 m     Tracker     compt
-    9  -72.8 cm  -41.8 cm      1 m     258 keV     0 eV   85.3 cm   4.73 m     ChamberTransportation
-   10   -3.4 cm  -86.4 cm     80 cm    258 keV     0 eV   84.9 cm   5.58 m     TrackerTransportation
-   11   2.36 m    -2.4 m    11.1 cm    258 keV     0 eV   2.92 m     8.5 m     WorldPVTransportation
-   12   2.91 m   -2.76 m   -4.87 cm    258 keV     0 eV   67.7 cm   9.18 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 374,   Parent ID = 356
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.42 m    3.03 cm    1.2 m     867 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.65 m    8.23 cm    1.6 m     790 keV  76.2 keV  48.7 cm   48.7 cm    ChamberTransportation
-    2  -1.68 m    19.1 cm   1.68 m     613 keV   178 keV  23.8 cm   72.5 cm    Chamber     eIoni
-    3  -1.62 m    17.1 cm    1.7 m     451 keV  81.4 keV  11.7 cm   84.2 cm    Chamber     eIoni
-    4  -1.57 m    22.5 cm   1.71 m     356 keV  95.6 keV    11 cm   95.3 cm    Chamber     eIoni
-    5  -1.58 m    17.9 cm   1.68 m     327 keV  28.8 keV  7.81 cm   1.03 m     Chamber     eIoni
-    6  -1.58 m    14.7 cm   1.72 m     285 keV  41.7 keV  6.88 cm    1.1 m     Chamber     eIoni
-    7  -1.58 m    17.3 cm   1.74 m     204 keV  19.1 keV  4.21 cm   1.14 m     Chamber     eIoni
-    8  -1.57 m    19.3 cm   1.73 m     183 keV  20.8 keV  3.32 cm   1.17 m     Chamber     eIoni
-    9  -1.58 m    17.9 cm   1.71 m     169 keV  13.9 keV   2.8 cm    1.2 m     Chamber     eIoni
-   10  -1.58 m    18.9 cm    1.7 m     115 keV  6.75 keV  1.82 cm   1.22 m     Chamber     eIoni
-   11  -1.57 m    19.6 cm    1.7 m     104 keV  10.5 keV  1.32 cm   1.23 m     Chamber     eIoni
-   12  -1.57 m    19.8 cm   1.69 m    91.4 keV  12.9 keV  1.13 cm   1.25 m     Chamber     eIoni
-   13  -1.58 m      20 cm   1.69 m    81.7 keV  9.75 keV  9.16 mm   1.25 m     Chamber     eIoni
-   14  -1.58 m    20.3 cm   1.69 m    77.9 keV  3.73 keV  7.69 mm   1.26 m     Chamber     eIoni
-   15  -1.58 m    20.7 cm   1.69 m    71.3 keV  6.65 keV  7.12 mm   1.27 m     Chamber     eIoni
-   16  -1.58 m    20.3 cm   1.69 m    63.3 keV  8.01 keV   6.2 mm   1.28 m     Chamber     eIoni
-   17  -1.58 m    20.1 cm   1.69 m      54 keV  9.31 keV  5.13 mm   1.28 m     Chamber     eIoni
-   18  -1.58 m    20.3 cm   1.69 m    49.3 keV  4.64 keV  4.02 mm   1.28 m     Chamber     eIoni
-   19  -1.58 m    20.2 cm   1.69 m    44.6 keV  4.74 keV  3.51 mm   1.29 m     Chamber     eIoni
-   20  -1.58 m    20.1 cm   1.69 m    40.4 keV  4.15 keV  3.01 mm   1.29 m     Chamber     eIoni
-   21  -1.58 m    20.1 cm   1.69 m    15.2 keV  25.2 keV  2.61 mm   1.29 m     Chamber     eIoni
-   22  -1.58 m    20.1 cm   1.69 m      13 keV  2.22 keV   767 mum  1.29 m     Chamber     eIoni
-   23  -1.58 m    20.1 cm   1.69 m    8.95 keV  4.03 keV   661 mum   1.3 m     Chamber     eIoni
-   24  -1.58 m    20.1 cm   1.69 m       0 eV   8.95 keV   489 mum   1.3 m     Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 377,   Parent ID = 374
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.58 m    18.9 cm    1.7 m    47.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.58 m    19.1 cm    1.7 m    40.2 keV  7.37 keV  3.32 mm   3.32 mm    Chamber     eIoni
-    2  -1.57 m      19 cm    1.7 m    37.3 keV   2.9 keV  2.59 mm   5.91 mm    Chamber     eIoni
-    3  -1.57 m    18.9 cm    1.7 m    34.3 keV  2.95 keV  2.32 mm   8.22 mm    Chamber     eIoni
-    4  -1.57 m    18.9 cm    1.7 m      26 keV   8.3 keV  2.06 mm   1.03 cm    Chamber     eIoni
-    5  -1.57 m    18.8 cm    1.7 m      17 keV  9.03 keV  1.42 mm   1.17 cm    Chamber     eIoni
-    6  -1.57 m    18.9 cm    1.7 m    12.8 keV  4.19 keV   858 mum  1.26 cm    Chamber     eIoni
-    7  -1.57 m    18.9 cm    1.7 m    10.5 keV  2.33 keV   652 mum  1.32 cm    Chamber     eIoni
-    8  -1.57 m    18.9 cm    1.7 m    8.89 keV  1.56 keV   550 mum  1.38 cm    Chamber     eIoni
-    9  -1.57 m    18.9 cm    1.7 m    8.03 keV   867 eV    487 mum  1.43 cm    Chamber     eIoni
-   10  -1.57 m    18.9 cm    1.7 m    7.06 keV   963 eV    452 mum  1.47 cm    Chamber     eIoni
-   11  -1.57 m    18.9 cm    1.7 m    5.47 keV  1.59 keV   414 mum  1.51 cm    Chamber     eIoni
-   12  -1.57 m    18.9 cm    1.7 m     518 eV   4.95 keV   350 mum  1.55 cm    Chamber     eIoni
-   13  -1.57 m    18.9 cm    1.7 m       0 eV    518 eV     22 mum  1.55 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 376,   Parent ID = 374
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.58 m    17.3 cm   1.74 m    62.2 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.58 m    16.9 cm   1.74 m    53.9 keV  8.28 keV     5 mm      5 mm    Chamber     eIoni
-    2  -1.58 m    16.9 cm   1.74 m    50.6 keV  3.36 keV  4.02 mm   9.02 mm    Chamber     eIoni
-    3  -1.58 m    17.1 cm   1.74 m    44.2 keV  6.42 keV  3.64 mm   1.27 cm    Chamber     eIoni
-    4  -1.58 m    17.1 cm   1.74 m    37.8 keV  6.33 keV  2.97 mm   1.56 cm    Chamber     eIoni
-    5  -1.58 m    17.2 cm   1.74 m    34.5 keV  3.33 keV  2.37 mm    1.8 cm    Chamber     eIoni
-    6  -1.58 m    17.1 cm   1.74 m    26.8 keV  7.67 keV  2.08 mm   2.01 cm    Chamber     eIoni
-    7  -1.58 m    17.1 cm   1.74 m    21.8 keV  5.01 keV  1.48 mm   2.15 cm    Chamber     eIoni
-    8  -1.58 m    17.1 cm   1.74 m    15.6 keV  6.21 keV  1.14 mm   2.27 cm    Chamber     eIoni
-    9  -1.58 m    17.1 cm   1.74 m    9.34 keV  6.26 keV   788 mum  2.35 cm    Chamber     eIoni
-   10  -1.58 m    17.1 cm   1.74 m    8.19 keV  1.15 keV   505 mum   2.4 cm    Chamber     eIoni
-   11  -1.58 m    17.1 cm   1.74 m     882 eV   7.31 keV   458 mum  2.44 cm    Chamber     eIoni
-   12  -1.58 m    17.1 cm   1.74 m       0 eV    882 eV   39.8 mum  2.45 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 375,   Parent ID = 374
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.62 m    17.1 cm    1.7 m    79.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.62 m    17.5 cm    1.7 m    71.4 keV  8.52 keV  7.42 mm   7.42 mm    Chamber     eIoni
-    2  -1.62 m    17.8 cm   1.71 m    52.7 keV  18.7 keV  6.21 mm   1.36 cm    Chamber     eIoni
-    3  -1.62 m    17.9 cm   1.71 m    47.1 keV  5.56 keV  3.86 mm   1.75 cm    Chamber     eIoni
-    4  -1.62 m    17.8 cm   1.71 m    43.3 keV  3.82 keV  3.28 mm   2.08 cm    Chamber     eIoni
-    5  -1.62 m    17.6 cm   1.71 m    40.8 keV   2.5 keV  2.88 mm   2.37 cm    Chamber     eIoni
-    6  -1.62 m    17.6 cm    1.7 m    36.5 keV  4.26 keV  2.64 mm   2.63 cm    Chamber     eIoni
-    7  -1.62 m    17.7 cm   1.71 m    31.3 keV  5.26 keV  2.25 mm   2.85 cm    Chamber     eIoni
-    8  -1.62 m    17.8 cm   1.71 m      29 keV  2.26 keV  1.81 mm   3.04 cm    Chamber     eIoni
-    9  -1.62 m    17.9 cm   1.71 m    24.7 keV  4.35 keV  1.64 mm    3.2 cm    Chamber     eIoni
-   10  -1.62 m    17.9 cm   1.71 m    19.8 keV  4.81 keV  1.32 mm   3.33 cm    Chamber     eIoni
-   11  -1.62 m    17.9 cm   1.71 m    17.8 keV  2.07 keV  1.02 mm   3.43 cm    Chamber     eIoni
-   12  -1.62 m    17.9 cm   1.71 m    9.81 keV  7.95 keV   901 mum  3.52 cm    Chamber     eIoni
-   13  -1.62 m    17.9 cm   1.71 m     6.3 keV  3.51 keV   523 mum  3.58 cm    Chamber     eIoni
-   14  -1.62 m    17.9 cm   1.71 m    3.44 keV  2.87 keV   384 mum  3.61 cm    Chamber     eIoni
-   15  -1.62 m    17.9 cm   1.71 m       0 eV   3.44 keV   241 mum  3.64 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 355,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    490 mum   370 mum -2.41 m     454 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -239 mum  1.54 mm   -2.4 m     454 keV     0 eV   6.18 mm   6.18 mm    TrackerTransportation
-    2  -9.72 cm   15.7 cm   -1.6 m     454 keV     0 eV   82.1 cm   82.7 cm    ChamberTransportation
-    3  -12.1 cm   19.6 cm   -1.4 m     454 keV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4  -19.4 cm   31.3 cm    -80 cm    454 keV     0 eV   61.6 cm   1.65 m     ChamberTransportation
-    5  -21.8 cm   35.2 cm    -60 cm    454 keV     0 eV   20.5 cm   1.85 m     TrackerTransportation
-    6  -29.1 cm   46.9 cm      0 fm    454 keV     0 eV   61.6 cm   2.47 m     ChamberTransportation
-    7  -31.5 cm   50.8 cm     20 cm    454 keV     0 eV   20.5 cm   2.67 m     TrackerTransportation
-    8  -38.8 cm   62.5 cm     80 cm    454 keV     0 eV   61.6 cm   3.29 m     ChamberTransportation
-    9  -41.2 cm   66.4 cm      1 m     454 keV     0 eV   20.5 cm   3.49 m     TrackerTransportation
-   10  -48.5 cm   78.1 cm    1.6 m     454 keV     0 eV   61.6 cm   4.11 m     ChamberTransportation
-   11  -50.9 cm     82 cm    1.8 m     454 keV     0 eV   20.5 cm   4.32 m     TrackerTransportation
-   12  -58.2 cm   93.7 cm    2.4 m     454 keV     0 eV   61.6 cm   4.93 m     WorldPVTransportation
-   13  -64.4 cm   1.04 m    2.91 m     454 keV     0 eV   52.3 cm   5.45 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 354,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    493 mum   365 mum -2.41 m    2.94 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -340 mum  1.79 mm   -2.4 m    2.94 MeV     0 eV   6.27 mm   6.27 mm    TrackerTransportation
-    2    -11 cm     19 cm   -1.6 m    2.94 MeV     0 eV   82.9 cm   83.5 cm    ChamberTransportation
-    3  -13.8 cm   23.7 cm   -1.4 m    2.94 MeV     0 eV   20.7 cm   1.04 m     TrackerTransportation
-    4  -22.1 cm   37.8 cm    -80 cm   2.94 MeV     0 eV   62.2 cm   1.66 m     ChamberTransportation
-    5  -24.8 cm   42.5 cm    -60 cm   2.94 MeV     0 eV   20.7 cm   1.87 m     TrackerTransportation
-    6  -33.1 cm   56.6 cm      0 fm   2.94 MeV     0 eV   62.2 cm   2.49 m     ChamberTransportation
-    7  -35.8 cm   61.3 cm     20 cm   2.94 MeV     0 eV   20.7 cm    2.7 m     TrackerTransportation
-    8  -44.1 cm   75.4 cm     80 cm   2.94 MeV     0 eV   62.2 cm   3.32 m     ChamberTransportation
-    9  -46.8 cm   80.1 cm      1 m    2.94 MeV     0 eV   20.7 cm   3.53 m     TrackerTransportation
-   10  -55.1 cm   94.2 cm    1.6 m    2.94 MeV     0 eV   62.2 cm   4.15 m     ChamberTransportation
-   11  -57.8 cm   98.9 cm    1.8 m    2.94 MeV     0 eV   20.7 cm   4.36 m     TrackerTransportation
-   12  -66.1 cm   1.13 m     2.4 m    2.94 MeV     0 eV   62.2 cm   4.98 m     WorldPVTransportation
-   13  -73.1 cm   1.25 m    2.91 m    2.94 MeV     0 eV   52.9 cm   5.51 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 353,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    485 mum   449 mum -2.41 m     594 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   56.3 mum   779 mum  -2.4 m     594 keV     0 eV   7.37 mm   7.37 mm    TrackerTransportation
-    2  -4.27 cm   3.36 cm  -1.67 m     481 keV     0 eV   73.4 cm   74.1 cm    Tracker     compt
-    3    -10 cm   4.65 cm   -1.6 m     481 keV     0 eV      9 cm   83.1 cm    ChamberTransportation
-    4    -24 cm   7.79 cm  -1.44 m     481 keV     0 eV   21.8 cm   1.05 m     TrackerTransportation
-    5   -2.4 m    56.2 cm   1.11 m     481 keV     0 eV   3.38 m    4.43 m     WorldPVTransportation
-    6  -2.91 m    67.7 cm   1.72 m     481 keV     0 eV   79.7 cm   5.22 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 378,   Parent ID = 353
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -4.27 cm   3.36 cm  -1.67 m     114 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.23 cm   3.76 cm  -1.65 m     102 keV  11.9 keV   3.5 cm    3.5 cm    Tracker     eIoni
-    2   9.29 mm   4.76 cm  -1.64 m    90.8 keV    11 keV   2.9 cm   6.41 cm    Tracker     eIoni
-    3   1.93 cm   5.87 cm  -1.62 m    77.9 keV  12.9 keV  2.37 cm   8.78 cm    Tracker     eIoni
-    4   6.38 mm   5.25 cm  -1.63 m    70.8 keV  7.03 keV  1.82 cm   10.6 cm    Tracker     eIoni
-    5   -2.2 mm   4.14 cm  -1.64 m      58 keV  12.8 keV  1.55 cm   12.1 cm    Tracker     eIoni
-    6  -1.13 cm   3.88 cm  -1.64 m    50.6 keV  7.42 keV  1.09 cm   13.2 cm    Tracker     eIoni
-    7   -1.9 cm   3.92 cm  -1.64 m      41 keV  9.59 keV   8.6 mm   14.1 cm    Tracker     eIoni
-    8  -2.35 cm   3.64 cm  -1.64 m      38 keV  3.06 keV     6 mm   14.7 cm    Tracker     eIoni
-    9  -2.85 cm   3.63 cm  -1.64 m    35.3 keV  2.63 keV  5.25 mm   15.2 cm    Tracker     eIoni
-   10  -2.96 cm   3.59 cm  -1.64 m    26.4 keV   559 eV   1.87 mm   15.4 cm    Tracker     eIoni
-   11  -3.14 cm   3.48 cm  -1.64 m    23.7 keV  2.67 keV  2.88 mm   15.7 cm    Tracker     eIoni
-   12  -3.27 cm    3.4 cm  -1.65 m    21.8 keV  1.91 keV  2.44 mm   15.9 cm    Tracker     eIoni
-   13  -3.31 cm   3.34 cm  -1.65 m    19.2 keV  2.57 keV  2.14 mm   16.2 cm    Tracker     eIoni
-   14  -3.45 cm   3.33 cm  -1.65 m    16.6 keV  2.61 keV  1.78 mm   16.3 cm    Tracker     eIoni
-   15  -3.58 cm    3.3 cm  -1.65 m    14.3 keV  2.34 keV  1.44 mm   16.5 cm    Tracker     eIoni
-   16  -3.61 cm   3.24 cm  -1.65 m      13 keV  1.29 keV  1.17 mm   16.6 cm    Tracker     eIoni
-   17  -3.63 cm   3.19 cm  -1.65 m    12.4 keV   591 eV   1.04 mm   16.7 cm    Tracker     eIoni
-   18  -3.56 cm   3.13 cm  -1.65 m    11.2 keV  1.18 keV   985 mum  16.8 cm    Tracker     eIoni
-   19  -3.55 cm    3.1 cm  -1.65 m    9.39 keV  1.85 keV   876 mum  16.9 cm    Tracker     eIoni
-   20  -3.51 cm   3.07 cm  -1.65 m    7.78 keV  1.61 keV   720 mum    17 cm    Tracker     eIoni
-   21  -3.48 cm   3.02 cm  -1.65 m    6.72 keV  1.06 keV   599 mum    17 cm    Tracker     eIoni
-   22  -3.53 cm   2.99 cm  -1.65 m    4.21 keV  2.51 keV   526 mum  17.1 cm    Tracker     eIoni
-   23  -3.53 cm   2.97 cm  -1.65 m    1.36 keV  2.85 keV   367 mum  17.1 cm    Tracker     eIoni
-   24  -3.54 cm   2.97 cm  -1.65 m       0 eV   1.36 keV  92.7 mum  17.1 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 379,   Parent ID = 378
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.96 cm   3.59 cm  -1.64 m    8.36 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -2.91 cm   3.57 cm  -1.64 m    6.97 keV  1.39 keV   640 mum   640 mum   Tracker     eIoni
-    2   -2.9 cm   3.56 cm  -1.64 m    5.48 keV  1.49 keV   543 mum  1.18 mm    Tracker     eIoni
-    3  -2.87 cm   3.59 cm  -1.64 m    1.52 keV  3.97 keV   447 mum  1.63 mm    Tracker     eIoni
-    4  -2.87 cm    3.6 cm  -1.64 m       0 eV   1.52 keV   108 mum  1.74 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 352,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    511 mum   311 mum -2.41 m     442 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    482 mum   420 mum -2.41 m       0 eV    442 keV  1.02 mm   1.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 351,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    510 mum   305 mum -2.41 m    8.74 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    498 mum   382 mum -2.41 m       0 eV   7.72 MeV  1.28 mm   1.28 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 380,   Parent ID = 351
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    498 mum   382 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1    498 mum   382 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 382,   Parent ID = 380
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    498 mum   382 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -139 mum  5.58 mm   -2.4 m       0 eV     88 keV  6.67 mm   6.67 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 383,   Parent ID = 382
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -139 mum  5.58 mm   -2.4 m     423 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -141 mum   5.6 mm   -2.4 m       0 eV    423 keV   230 mum   230 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 381,   Parent ID = 380
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    498 mum   382 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    541 mum  32.4 mum -2.41 m       0 eV    511 keV   449 mum   449 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 100,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.24 mum -2.78 mum -2.41 m    4.07 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   16.9 mum  41.4 mum  -2.4 m    4.07 MeV     0 eV   1.38 cm   1.38 cm    TrackerTransportation
-    2   1.13 mm    2.6 mm   -1.6 m    4.07 MeV     0 eV     80 cm   81.4 cm    ChamberTransportation
-    3    1.4 mm   3.24 mm   -1.4 m    4.07 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.24 mm   5.16 mm    -80 cm   4.07 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   2.51 mm    5.8 mm    -60 cm   4.07 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   3.35 mm   7.72 mm      0 fm   4.07 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   3.62 mm   8.36 mm     20 cm   4.07 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   4.46 mm   1.03 cm     80 cm   4.07 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   4.73 mm   1.09 cm      1 m    4.07 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   5.57 mm   1.28 cm    1.6 m    4.07 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   5.84 mm   1.35 cm    1.8 m    4.07 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   6.68 mm   1.54 cm    2.4 m    4.07 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   7.38 mm    1.7 cm   2.91 m    4.07 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 3,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.3 nm   -850 nm  -2.42 m     441 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.04 mum  8.08 mum -2.42 m     439 MeV   258 keV   218 mum   218 mum  TargetPV     eBrem
-    2  -5.83 mum  13.8 mum -2.42 m     236 MeV   180 keV   139 mum   357 mum  TargetPV     eBrem
-    3  -7.71 mum  19.8 mum -2.42 m     220 MeV   330 keV   155 mum   513 mum  TargetPV     eBrem
-    4  -9.51 mum  36.2 mum -2.42 m    46.2 MeV   391 keV   286 mum   799 mum  TargetPV     eBrem
-    5   2.57 mum  53.1 mum -2.42 m    13.7 MeV   306 keV   262 mum  1.06 mm   TargetPV     eBrem
-    6    179 mum  -656 mum -2.42 m    8.31 MeV  4.31 MeV  1.61 mm   2.68 mm   TargetPV     eBrem
-    7    530 mum -1.82 mm  -2.42 m    6.61 MeV   1.7 MeV  1.52 mm    4.2 mm   TargetPV     eIoni
-    8    1.3 mm   -1.7 mm  -2.41 m    3.63 MeV  2.98 MeV  1.29 mm   5.49 mm   TargetPV     eIoni
-    9   1.28 mm  -1.66 mm  -2.41 m    2.56 MeV  53.4 keV  51.6 mum  5.54 mm   TargetPV     eBrem
-   10   1.11 mm  -1.28 mm  -2.41 m    1.81 MeV   757 keV   694 mum  6.23 mm   TargetPV     eIoni
-   11   1.05 mm  -1.48 mm  -2.41 m    1.27 MeV   532 keV   567 mum   6.8 mm   TargetPV     eIoni
-   12    870 mum -1.47 mm  -2.41 m     738 keV   537 keV   470 mum  7.27 mm   TargetPV     eIoni
-   13    923 mum -1.49 mm  -2.41 m     345 keV   393 keV   350 mum  7.62 mm   TargetPV     eIoni
-   14    932 mum -1.49 mm  -2.41 m       0 eV    345 keV   177 mum   7.8 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 390,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.28 mm  -1.66 mm  -2.41 m    1.02 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.03 mm    947 mum -2.42 m     454 keV   562 keV  4.92 mm   4.92 mm   TargetPV     compt
-    2   5.99 mm   3.26 mm  -2.42 m       0 eV    454 keV  3.43 mm   8.35 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 389,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    179 mum  -656 mum -2.42 m    1.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.26 mm  -6.25 mm  -2.41 m     243 keV   842 keV  1.18 cm   1.18 cm   TargetPV     compt
-    2   1.63 mm  -5.78 mm  -2.41 m       0 eV    243 keV   817 mum  1.26 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 388,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.57 mum  53.1 mum -2.42 m    32.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -127 mum  4.51 mum -2.41 m       0 eV      0 eV   1.04 cm   1.04 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 392,   Parent ID = 388
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -127 mum  4.51 mum -2.41 m    2.72 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -461 mum  -175 mum -2.41 m    1.95 MeV   771 keV   732 mum   732 mum  TargetPV     eIoni
-    2   -351 mum  -526 mum -2.41 m    1.14 MeV   805 keV   601 mum  1.33 mm   TargetPV     eIoni
-    3   -275 mum  -588 mum -2.41 m     659 keV   156 keV   159 mum  1.49 mm   TargetPV     eBrem
-    4   -219 mum  -615 mum -2.41 m    77.2 keV   582 keV   331 mum  1.82 mm   TargetPV     eIoni
-    5   -222 mum  -616 mum -2.41 m       0 eV   77.2 keV  16.5 mum  1.84 mm   TargetPV     eIoni
-    6   -222 mum  -616 mum -2.41 m       0 eV      0 eV      0 fm   1.84 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 395,   Parent ID = 392
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -222 mum  -616 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   6.67 mm  -2.72 mm  -2.41 m     273 keV   238 keV  7.61 mm   7.61 mm   TargetPV     compt
-    2    6.2 mm     -3 mm  -2.41 m       0 eV    273 keV  1.98 mm   9.59 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 394,   Parent ID = 392
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -222 mum  -616 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.11 cm   2.69 mm   -2.4 m       0 eV    511 keV   1.2 cm    1.2 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 393,   Parent ID = 392
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -275 mum  -588 mum -2.41 m     326 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    357 mum  -834 mum -2.41 m       0 eV    326 keV  1.15 mm   1.15 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 391,   Parent ID = 388
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -127 mum  4.51 mum -2.41 m    28.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   32.7 mum  -132 mum -2.41 m    5.05 MeV   1.6 MeV  1.28 mm   1.28 mm   TargetPV     eBrem
-    2   -426 mum  -130 mum -2.41 m    2.61 MeV  2.44 MeV  1.07 mm   2.35 mm   TargetPV     eIoni
-    3   -187 mum  -317 mum -2.41 m    1.67 MeV   939 keV   701 mum  3.05 mm   TargetPV     eIoni
-    4   -311 mum  -397 mum -2.41 m    1.05 MeV   620 keV   543 mum  3.59 mm   TargetPV     eIoni
-    5   -211 mum  -483 mum -2.41 m     499 keV   550 keV   424 mum  4.02 mm   TargetPV     eIoni
-    6   -199 mum  -456 mum -2.41 m    61.3 keV   437 keV   269 mum  4.28 mm   TargetPV     eIoni
-    7   -198 mum  -456 mum -2.41 m       0 eV   61.3 keV  12.5 mum   4.3 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 396,   Parent ID = 391
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   32.7 mum  -132 mum -2.41 m    21.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    709 mum  86.7 mum  -2.4 m    21.8 MeV     0 eV   5.92 mm   5.92 mm    TrackerTransportation
-    2   9.27 cm   2.98 cm   -1.6 m    21.8 MeV     0 eV   80.6 cm   81.2 cm    ChamberTransportation
-    3   11.6 cm   3.72 cm   -1.4 m    21.8 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   18.5 cm   5.95 cm    -80 cm   21.8 MeV     0 eV   60.4 cm   1.62 m     ChamberTransportation
-    5   20.8 cm   6.69 cm    -60 cm   21.8 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6   27.7 cm   8.92 cm      0 fm   21.8 MeV     0 eV   60.4 cm   2.42 m     ChamberTransportation
-    7     30 cm   9.67 cm     20 cm   21.8 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   36.9 cm   11.9 cm     80 cm   21.8 MeV     0 eV   60.4 cm   3.23 m     ChamberTransportation
-    9   39.2 cm   12.6 cm      1 m    21.8 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10   46.1 cm   14.9 cm    1.6 m    21.8 MeV     0 eV   60.4 cm   4.04 m     ChamberTransportation
-   11   48.4 cm   15.6 cm    1.8 m    21.8 MeV     0 eV   20.1 cm   4.24 m     TrackerTransportation
-   12   55.3 cm   17.8 cm    2.4 m    21.8 MeV     0 eV   60.4 cm   4.84 m     WorldPVTransportation
-   13   61.2 cm   19.7 cm   2.91 m    21.8 MeV     0 eV   51.4 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 387,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.51 mum  36.2 mum -2.42 m     174 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -27 mum   222 mum -2.41 m       0 eV      0 eV    4.8 mm    4.8 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 398,   Parent ID = 387
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -27 mum   222 mum -2.41 m    59.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -35.4 mum   258 mum -2.41 m    58.6 MeV   512 keV   434 mum   434 mum  TargetPV     eBrem
-    2  -51.2 mum   267 mum -2.41 m    49.4 MeV   238 keV   241 mum   675 mum  TargetPV     eBrem
-    3   -220 mum   205 mum -2.41 m    44.8 MeV  1.71 MeV  1.41 mm   2.08 mm   TargetPV     eBrem
-    4   -604 mum   213 mum -2.41 m    38.9 MeV  1.84 MeV   1.1 mm   3.18 mm   TargetPV     eBrem
-    5   -652 mum   224 mum -2.41 m    37.8 MeV   153 keV   133 mum  3.32 mm   TargetPV     eBrem
-    6   -981 mum   259 mum -2.41 m    34.4 MeV  1.96 MeV   740 mum  4.06 mm   TargetPV     eBrem
-    7  -1.98 mm    487 mum -2.41 m    6.11 MeV  2.64 MeV  2.13 mm   6.18 mm   TargetPV     eBrem
-    8  -2.12 mm    567 mum -2.41 m    5.22 MeV   528 keV   287 mum  6.47 mm   TargetPV     eBrem
-    9  -2.27 mm    180 mum -2.41 m       4 MeV   489 keV   470 mum  6.94 mm   TargetPV     eBrem
-   10  -3.03 mm    139 mum -2.41 m    3.04 MeV   953 keV   936 mum  7.87 mm   TargetPV     eIoni
-   11  -3.23 mm    472 mum -2.41 m    1.51 MeV   738 keV   618 mum  8.49 mm   TargetPV     eBrem
-   12  -3.47 mm    646 mum -2.41 m     997 keV   516 keV   523 mum  9.01 mm   TargetPV     eIoni
-   13  -3.33 mm    525 mum -2.41 m     560 keV   437 keV   418 mum  9.43 mm   TargetPV     eIoni
-   14  -3.28 mm    554 mum -2.41 m     113 keV   447 keV   297 mum  9.73 mm   TargetPV     eIoni
-   15  -3.28 mm    552 mum -2.41 m       0 eV    113 keV  31.2 mum  9.76 mm   TargetPV     eIoni
-   16  -3.28 mm    552 mum -2.41 m       0 eV      0 eV      0 fm   9.76 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 410,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.28 mm    552 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.96 mm    484 mum -2.41 m     447 keV  63.7 keV  3.94 mm   3.94 mm   TargetPV     compt
-    2  -2.95 mm   -1.6 mm  -2.41 m     186 keV   261 keV  3.97 mm   7.91 mm   TargetPV     compt
-    3  -2.82 mm  -1.34 mm  -2.41 m     108 keV  78.3 keV   288 mum  8.19 mm   TargetPV     compt
-    4  -2.88 mm  -1.44 mm  -2.41 m       0 eV    108 keV   120 mum  8.31 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 409,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.28 mm    552 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.44 mm    587 mum  -2.4 m       0 eV    511 keV  2.08 mm   2.08 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 408,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.23 mm    472 mum -2.41 m     793 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -5.15 mm   1.01 cm  -2.41 m       0 eV    793 keV  1.06 cm   1.06 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 407,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.27 mm    180 mum -2.41 m     737 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.95 mm    107 mum  -2.4 m     277 keV   460 keV  2.89 mm   2.89 mm   TargetPV     compt
-    2  -3.79 mm  -77.8 mum  -2.4 m     223 keV  54.6 keV   251 mum  3.14 mm   TargetPV     compt
-    3  -3.99 mm   -667 mum  -2.4 m     136 keV    87 keV   636 mum  3.78 mm   TargetPV     compt
-    4  -4.47 mm   -163 mum  -2.4 m       0 eV    136 keV   701 mum  4.48 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 406,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.12 mm    567 mum -2.41 m     364 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.99 mm  -1.33 mm  -2.41 m     196 keV   168 keV  3.66 mm   3.66 mm   TargetPV     compt
-    2   -4.5 mm   -308 mum  -2.4 m       0 eV    196 keV  1.91 mm   5.57 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 405,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.98 mm    487 mum -2.41 m    25.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -6.17 mm    313 mum  -2.4 m    25.7 MeV     0 eV   8.43 mm   8.43 mm    TrackerTransportation
-    2   -2.4 m   -9.87 cm   1.78 m    25.7 MeV     0 eV   4.82 m    4.83 m     WorldPVTransportation
-    3  -2.91 m     -12 cm   2.67 m    25.7 MeV     0 eV   1.03 m    5.85 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 404,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -981 mum   259 mum -2.41 m    1.36 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.81 mm    277 mum -2.41 m     260 keV   1.1 MeV  2.51 mm   2.51 mm   TargetPV     compt
-    2  -1.93 mm    161 mum -2.41 m     144 keV   116 keV   271 mum  2.78 mm   TargetPV     compt
-    3  -1.95 mm    122 mum -2.41 m       0 eV    144 keV   150 mum  2.93 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 403,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -652 mum   224 mum -2.41 m    1.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.19 mm    461 mum  -2.4 m    1.03 MeV     0 eV   1.04 cm   1.04 cm    TrackerTransportation
-    2  -58.1 cm    3.9 cm    -80 cm   1.03 MeV     0 eV    1.7 m    1.71 m     ChamberTransportation
-    3  -65.3 cm   4.39 cm    -60 cm   1.03 MeV     0 eV   21.3 cm   1.92 m     TrackerTransportation
-    4    -87 cm   5.83 cm      0 fm   1.03 MeV     0 eV   63.8 cm   2.56 m     ChamberTransportation
-    5  -94.2 cm   6.32 cm     20 cm   1.03 MeV     0 eV   21.3 cm   2.78 m     TrackerTransportation
-    6  -1.16 m    7.76 cm     80 cm   1.03 MeV     0 eV   63.8 cm   3.41 m     ChamberTransportation
-    7  -1.23 m    8.25 cm      1 m    1.03 MeV     0 eV   21.3 cm   3.63 m     TrackerTransportation
-    8  -1.45 m    9.69 cm    1.6 m    1.03 MeV     0 eV   63.8 cm   4.26 m     ChamberTransportation
-    9  -1.52 m    10.2 cm    1.8 m    1.03 MeV     0 eV   21.3 cm   4.48 m     TrackerTransportation
-   10  -1.74 m    11.6 cm    2.4 m    1.03 MeV     0 eV   63.8 cm   5.11 m     WorldPVTransportation
-   11  -1.92 m    12.9 cm   2.91 m    1.03 MeV     0 eV   54.2 cm   5.66 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 402,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -604 mum   213 mum -2.41 m    3.98 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.56 mm    675 mum  -2.4 m    3.98 MeV     0 eV   1.07 cm   1.07 cm    TrackerTransportation
-    2  -64.2 cm   7.51 cm    -80 cm   3.98 MeV     0 eV   1.72 m    1.73 m     ChamberTransportation
-    3  -67.2 cm   7.87 cm  -72.5 cm   3.98 MeV     0 eV   8.12 cm   1.82 m     TrackerTransportation
-    4  -96.1 cm   11.2 cm      0 fm   3.98 MeV     0 eV   78.1 cm    2.6 m     ChamberTransportation
-    5  -1.04 m    12.2 cm     20 cm   3.98 MeV     0 eV   21.5 cm   2.81 m     TrackerTransportation
-    6  -1.28 m      15 cm     80 cm   3.98 MeV     0 eV   64.6 cm   3.46 m     ChamberTransportation
-    7  -1.36 m    15.9 cm      1 m    3.98 MeV     0 eV   21.5 cm   3.67 m     TrackerTransportation
-    8   -1.6 m    18.7 cm    1.6 m    3.98 MeV     0 eV   64.6 cm   4.32 m     ChamberTransportation
-    9  -1.68 m    19.6 cm    1.8 m    3.98 MeV     0 eV   21.5 cm   4.54 m     TrackerTransportation
-   10  -1.92 m    22.4 cm    2.4 m    3.98 MeV     0 eV   64.6 cm   5.18 m     WorldPVTransportation
-   11  -2.12 m    24.8 cm   2.91 m    3.98 MeV     0 eV   54.9 cm   5.73 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 401,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -220 mum   205 mum -2.41 m    2.96 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -3.3 mm   1.13 mm   -2.4 m    2.96 MeV     0 eV   1.14 cm   1.14 cm    TrackerTransportation
-    2  -22.8 cm   6.85 cm   -1.6 m    2.96 MeV     0 eV   83.4 cm   84.5 cm    ChamberTransportation
-    3    -24 cm    7.2 cm  -1.56 m    2.96 MeV     0 eV   4.29 cm   88.8 cm    TrackerTransportation
-    4  -45.4 cm   13.6 cm    -80 cm   2.96 MeV     0 eV   79.1 cm   1.68 m     ChamberTransportation
-    5    -51 cm   15.3 cm    -60 cm   2.96 MeV     0 eV   20.8 cm   1.89 m     TrackerTransportation
-    6  -67.9 cm   20.3 cm      0 fm   2.96 MeV     0 eV   62.5 cm   2.51 m     ChamberTransportation
-    7  -73.5 cm     22 cm     20 cm   2.96 MeV     0 eV   20.8 cm   2.72 m     TrackerTransportation
-    8  -90.4 cm   27.1 cm     80 cm   2.96 MeV     0 eV   62.5 cm   3.35 m     ChamberTransportation
-    9    -96 cm   28.8 cm      1 m    2.96 MeV     0 eV   20.8 cm   3.56 m     TrackerTransportation
-   10  -1.13 m    33.8 cm    1.6 m    2.96 MeV     0 eV   62.5 cm   4.18 m     ChamberTransportation
-   11  -1.19 m    35.5 cm    1.8 m    2.96 MeV     0 eV   20.8 cm   4.39 m     TrackerTransportation
-   12  -1.35 m    40.6 cm    2.4 m    2.96 MeV     0 eV   62.5 cm   5.01 m     WorldPVTransportation
-   13   -1.5 m    44.9 cm   2.91 m    2.96 MeV     0 eV   53.2 cm   5.55 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 400,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -51.2 mum   267 mum -2.41 m     8.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -580 mum   466 mum -2.41 m    1.29 MeV  7.61 MeV  3.87 mm   3.87 mm   TargetPV     compt
-    2   6.15 mm   4.84 mm   -2.4 m    1.29 MeV     0 eV   1.17 cm   1.56 cm    TrackerTransportation
-    3    2.4 m    1.56 m    63.3 cm   1.29 MeV     0 eV   4.17 m    4.18 m     WorldPVTransportation
-    4   2.91 m    1.89 m    1.28 m    1.29 MeV     0 eV   88.8 cm   5.07 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 399,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -35.4 mum   258 mum -2.41 m     506 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -338 mum   327 mum -2.41 m       0 eV    506 keV  3.22 mm   3.22 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 397,   Parent ID = 387
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -27 mum   222 mum -2.41 m     113 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -48 mum   242 mum -2.41 m     112 MeV   784 keV   581 mum   581 mum  TargetPV     eBrem
-    2  -38.9 mum   248 mum -2.41 m     109 MeV   233 keV   184 mum   765 mum  TargetPV     eBrem
-    3   6.04 mum   269 mum -2.41 m     107 MeV  1.89 MeV  1.06 mm   1.82 mm   TargetPV     eBrem
-    4    140 mum   240 mum -2.41 m    95.9 MeV  1.68 MeV  1.26 mm   3.08 mm   TargetPV     eBrem
-    5    159 mum   215 mum -2.41 m    81.6 MeV   446 keV   426 mum   3.5 mm   TargetPV     eBrem
-    6    160 mum   212 mum -2.41 m    81.2 MeV  28.8 keV  27.4 mum  3.53 mm   TargetPV     eBrem
-    7    164 mum   199 mum -2.41 m    80.7 MeV   112 keV  92.1 mum  3.62 mm   TargetPV     eBrem
-    8    184 mum   164 mum -2.41 m    77.3 MeV   384 keV   253 mum  3.88 mm   TargetPV     eBrem
-    9    183 mum   152 mum -2.41 m    74.2 MeV  77.1 keV  62.1 mum  3.94 mm   TargetPV     eBrem
-   10    183 mum   144 mum -2.41 m    71.8 MeV    88 keV  42.6 mum  3.98 mm   TargetPV     eBrem
-   11    218 mum  -118 mum -2.41 m    56.7 MeV  1.71 MeV  1.06 mm   5.04 mm   TargetPV     eBrem
-   12    528 mum -1.08 mm  -2.41 m    48.1 MeV  3.76 MeV  2.93 mm   7.98 mm   TargetPV     eBrem
-   13    195 mum -1.44 mm   -2.4 m    42.4 MeV  3.67 MeV  2.65 mm   1.06 cm   TargetPV     eBrem
-   14    191 mum -1.47 mm   -2.4 m    32.4 MeV  76.6 keV  44.4 mum  1.07 cm   TargetPV     eBrem
-   15    182 mum -1.63 mm   -2.4 m    31.2 MeV   295 keV   220 mum  1.09 cm   TargetPV     eBrem
-   16    164 mum -1.68 mm   -2.4 m    27.7 MeV   142 keV  87.2 mum   1.1 cm   TargetPV     eBrem
-   17    113 mum  -1.9 mm   -2.4 m    26.9 MeV   480 keV   330 mum  1.13 cm   TargetPV     eBrem
-   18   7.17 mum -2.44 mm   -2.4 m    14.6 MeV   858 keV   740 mum   1.2 cm   TargetPV     eBrem
-   19  -14.1 mum -2.54 mm   -2.4 m    14.1 MeV   143 keV   123 mum  1.22 cm   TargetPV     eBrem
-   20  -14.7 mum -2.54 mm   -2.4 m    12.9 MeV  1.31 keV  2.21 mum  1.22 cm   TargetPV     eBrem
-   21   -405 mum -3.44 mm   -2.4 m      10 MeV  2.93 MeV  2.13 mm   1.43 cm   TargetPV     eIoni
-   22   -523 mum -3.58 mm   -2.4 m    9.76 MeV   239 keV   231 mum  1.45 cm    TrackerTransportation
-   23  -18.4 cm  -17.8 cm  -2.29 m     9.7 MeV  49.5 keV  27.6 cm     29 cm    Tracker     eIoni
-   24  -87.5 cm  -61.3 cm  -1.88 m    9.52 MeV   170 keV  91.3 cm    1.2 m     Tracker     eIoni
-   25  -1.44 m   -1.05 m   -1.46 m    9.36 MeV   145 keV    83 cm   2.03 m     Tracker     eIoni
-   26  -1.72 m   -1.26 m   -1.25 m    9.24 MeV  74.7 keV  41.1 cm   2.44 m     Tracker     eIoni
-   27  -1.75 m   -1.28 m   -1.24 m    9.16 MeV  6.14 keV  3.61 cm   2.48 m     Tracker     eIoni
-   28   -2.4 m   -1.82 m   -78.4 cm   8.97 MeV   186 keV  96.3 cm   3.44 m     WorldPVTransportation
-   29   -2.4 m   -1.82 m   -78.3 cm   8.94 MeV   135 eV    1.4 mm   3.45 m     WorldPV     eIoni
-   30  -2.91 m   -2.48 m   -27.2 cm   8.77 MeV   177 keV  97.9 cm   4.42 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 436,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.4 m   -1.82 m   -78.3 cm   28.5 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -2.4 m   -1.82 m   -78.3 cm   28.2 keV   312 eV    972 mum   972 mum   TrackerTransportation
-    2   -2.4 m   -1.83 m   -78.2 cm   25.1 keV  3.02 keV   3.2 mm   4.18 mm    Tracker     eIoni
-    3   -2.4 m   -1.83 m   -78.1 cm   22.3 keV  2.85 keV  2.66 mm   6.83 mm    Tracker     eIoni
-    4  -2.39 m   -1.83 m   -77.9 cm   20.1 keV  2.21 keV  2.21 mm   9.05 mm    Tracker     eIoni
-    5  -2.39 m   -1.83 m   -77.7 cm   17.9 keV  2.19 keV  1.89 mm   1.09 cm    Tracker     eIoni
-    6  -2.39 m   -1.83 m   -77.7 cm   14.7 keV   3.2 keV   1.6 mm   1.25 cm    Tracker     eIoni
-    7  -2.39 m   -1.83 m   -77.6 cm   12.9 keV   1.8 keV  1.22 mm   1.37 cm    Tracker     eIoni
-    8  -2.39 m   -1.83 m   -77.6 cm   11.5 keV  1.45 keV  1.03 mm   1.48 cm    Tracker     eIoni
-    9  -2.39 m   -1.83 m   -77.6 cm   8.62 keV  2.84 keV   896 mum  1.57 cm    Tracker     eIoni
-   10  -2.39 m   -1.83 m   -77.7 cm    5.8 keV  2.82 keV   660 mum  1.63 cm    Tracker     eIoni
-   11  -2.39 m   -1.83 m   -77.7 cm   4.51 keV  1.29 keV   466 mum  1.68 cm    Tracker     eIoni
-   12  -2.39 m   -1.83 m   -77.7 cm   2.36 keV  2.15 keV   386 mum  1.72 cm    Tracker     eIoni
-   13  -2.39 m   -1.83 m   -77.7 cm      0 eV   2.36 keV   209 mum  1.74 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 435,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.75 m   -1.28 m   -1.24 m    78.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.76 m   -1.27 m   -1.23 m    71.3 keV  7.07 keV  1.84 cm   1.84 cm    Tracker     eIoni
-    2  -1.76 m   -1.25 m   -1.23 m    54.6 keV  16.7 keV  1.56 cm    3.4 cm    Tracker     eIoni
-    3  -1.77 m   -1.25 m   -1.23 m    47.4 keV  7.18 keV  9.81 mm   4.38 cm    Tracker     eIoni
-    4  -1.77 m   -1.24 m   -1.23 m    42.8 keV  4.66 keV   7.7 mm   5.15 cm    Tracker     eIoni
-    5  -1.78 m   -1.24 m   -1.23 m    39.7 keV  3.03 keV  6.42 mm    5.8 cm    Tracker     eIoni
-    6  -1.78 m   -1.23 m   -1.22 m    36.7 keV  3.06 keV  5.68 mm   6.36 cm    Tracker     eIoni
-    7  -1.78 m   -1.23 m   -1.22 m    32.5 keV   4.2 keV  4.94 mm   6.86 cm    Tracker     eIoni
-    8  -1.78 m   -1.23 m   -1.22 m    27.5 keV  4.98 keV  4.05 mm   7.26 cm    Tracker     eIoni
-    9  -1.78 m   -1.22 m   -1.22 m    25.2 keV  2.33 keV  3.08 mm   7.57 cm    Tracker     eIoni
-   10  -1.79 m   -1.22 m   -1.22 m    20.3 keV   4.9 keV  2.66 mm   7.84 cm    Tracker     eIoni
-   11  -1.79 m   -1.22 m   -1.22 m    18.2 keV  2.09 keV  1.91 mm   8.03 cm    Tracker     eIoni
-   12  -1.79 m   -1.22 m   -1.22 m    16.9 keV  1.25 keV  1.63 mm   8.19 cm    Tracker     eIoni
-   13  -1.79 m   -1.22 m   -1.22 m    15.3 keV  1.59 keV  1.47 mm   8.34 cm    Tracker     eIoni
-   14  -1.79 m   -1.22 m   -1.22 m    13.1 keV  2.21 keV  1.29 mm   8.47 cm    Tracker     eIoni
-   15  -1.79 m   -1.22 m   -1.22 m    12.3 keV   813 eV   1.05 mm   8.57 cm    Tracker     eIoni
-   16  -1.79 m   -1.22 m   -1.22 m    10.9 keV  1.37 keV   973 mum  8.67 cm    Tracker     eIoni
-   17  -1.79 m   -1.22 m   -1.22 m    9.75 keV  1.18 keV   849 mum  8.75 cm    Tracker     eIoni
-   18  -1.79 m   -1.22 m   -1.22 m    7.56 keV  2.19 keV   748 mum  8.83 cm    Tracker     eIoni
-   19  -1.79 m   -1.22 m   -1.22 m    5.42 keV  2.15 keV   584 mum  8.89 cm    Tracker     eIoni
-   20  -1.79 m   -1.22 m   -1.22 m    3.59 keV  1.82 keV   443 mum  8.93 cm    Tracker     eIoni
-   21  -1.79 m   -1.22 m   -1.22 m     2.2 keV  1.39 keV   324 mum  8.96 cm    Tracker     eIoni
-   22  -1.79 m   -1.22 m   -1.22 m       0 eV    2.2 keV   188 mum  8.98 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 434,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.72 m   -1.26 m   -1.25 m    43.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.73 m   -1.26 m   -1.25 m    38.3 keV  5.17 keV  6.58 mm   6.58 mm    Tracker     eIoni
-    2  -1.73 m   -1.26 m   -1.26 m    32.1 keV  6.15 keV  5.33 mm   1.19 cm    Tracker     eIoni
-    3  -1.73 m   -1.26 m   -1.26 m    27.6 keV   4.5 keV  3.97 mm   1.59 cm    Tracker     eIoni
-    4  -1.73 m   -1.26 m   -1.26 m    24.2 keV  3.37 keV   3.1 mm    1.9 cm    Tracker     eIoni
-    5  -1.73 m   -1.25 m   -1.26 m      21 keV  3.26 keV  2.51 mm   2.15 cm    Tracker     eIoni
-    6  -1.73 m   -1.25 m   -1.26 m    18.9 keV  2.04 keV  2.01 mm   2.35 cm    Tracker     eIoni
-    7  -1.73 m   -1.25 m   -1.26 m    15.8 keV  3.14 keV  1.73 mm   2.52 cm    Tracker     eIoni
-    8  -1.74 m   -1.25 m   -1.26 m    10.3 keV  5.52 keV  1.34 mm   2.66 cm    Tracker     eIoni
-    9  -1.74 m   -1.25 m   -1.26 m     9.2 keV  1.08 keV   792 mum  2.74 cm    Tracker     eIoni
-   10  -1.74 m   -1.25 m   -1.26 m    1.68 keV  7.52 keV   705 mum  2.81 cm    Tracker     eIoni
-   11  -1.74 m   -1.25 m   -1.26 m       0 eV   1.68 keV   125 mum  2.82 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 433,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.44 m   -1.05 m   -1.46 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.44 m   -1.05 m   -1.46 m    9.08 keV  1.02 keV   777 mum   777 mum   Tracker     eIoni
-    2  -1.44 m   -1.05 m   -1.46 m    8.14 keV   947 eV    696 mum  1.47 mm    Tracker     eIoni
-    3  -1.44 m   -1.05 m   -1.46 m    7.03 keV   1.1 keV   624 mum   2.1 mm    Tracker     eIoni
-    4  -1.44 m   -1.05 m   -1.46 m     5.8 keV  1.24 keV   547 mum  2.64 mm    Tracker     eIoni
-    5  -1.44 m   -1.05 m   -1.46 m    2.98 keV  2.82 keV   466 mum  3.11 mm    Tracker     eIoni
-    6  -1.44 m   -1.05 m   -1.46 m       0 eV   2.98 keV   275 mum  3.39 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 432,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -87.5 cm  -61.3 cm  -1.88 m    13.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -87.5 cm  -61.4 cm  -1.88 m    11.4 keV  1.85 keV  1.06 mm   1.06 mm    Tracker     eIoni
-    2  -87.4 cm  -61.4 cm  -1.89 m    9.44 keV  1.91 keV   886 mum  1.95 mm    Tracker     eIoni
-    3  -87.3 cm  -61.5 cm  -1.89 m    8.09 keV  1.35 keV   724 mum  2.67 mm    Tracker     eIoni
-    4  -87.3 cm  -61.4 cm  -1.89 m    6.56 keV  1.54 keV   621 mum  3.29 mm    Tracker     eIoni
-    5  -87.3 cm  -61.4 cm  -1.89 m    5.44 keV  1.11 keV   516 mum  3.81 mm    Tracker     eIoni
-    6  -87.3 cm  -61.4 cm  -1.89 m     511 eV   4.93 keV   445 mum  4.25 mm    Tracker     eIoni
-    7  -87.3 cm  -61.4 cm  -1.89 m       0 eV    511 eV   28.4 mum  4.28 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 431,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -18.4 cm  -17.8 cm  -2.29 m    8.21 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -18.4 cm  -17.8 cm  -2.29 m    6.71 keV   1.5 keV   629 mum   629 mum   Tracker     eIoni
-    2  -18.4 cm  -17.9 cm  -2.29 m    5.14 keV  1.57 keV   526 mum  1.15 mm    Tracker     eIoni
-    3  -18.4 cm  -17.9 cm  -2.29 m    3.31 keV  1.83 keV   426 mum  1.58 mm    Tracker     eIoni
-    4  -18.4 cm  -17.9 cm  -2.29 m    2.06 keV  1.25 keV   302 mum  1.88 mm    Tracker     eIoni
-    5  -18.4 cm  -17.9 cm  -2.29 m       0 eV   2.06 keV   170 mum  2.05 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 430,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.7 mum -2.54 mm   -2.4 m    1.21 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -903 mum -4.64 mm   -2.4 m    1.21 MeV     0 eV   2.83 mm   2.83 mm    TrackerTransportation
-    2  -1.01 m    -2.4 m     -48 cm   1.21 MeV     0 eV   3.23 m    3.24 m     WorldPVTransportation
-    3  -1.23 m   -2.91 m   -7.09 cm   1.21 MeV     0 eV   68.8 cm   3.92 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 429,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.1 mum -2.54 mm   -2.4 m     316 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -126 mum -2.83 mm   -2.4 m     247 keV  69.2 keV   393 mum   393 mum  TargetPV     compt
-    2    257 mum -3.69 mm   -2.4 m       0 eV    247 keV   939 mum  1.33 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 428,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.17 mum -2.44 mm   -2.4 m    11.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -618 mum -4.42 mm   -2.4 m    11.5 MeV     0 eV   2.71 mm   2.71 mm    TrackerTransportation
-    2  -75.9 cm   -2.4 m   -27.1 cm   11.5 MeV     0 eV   3.29 m     3.3 m     WorldPVTransportation
-    3    -92 cm  -2.91 m    18.2 cm   11.5 MeV     0 eV   70.1 cm      4 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 427,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    113 mum  -1.9 mm   -2.4 m     293 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -259 mum -3.22 mm   -2.4 m     224 keV  69.7 keV  2.13 mm   2.13 mm   TargetPV     compt
-    2  -1.37 mm  -3.24 mm   -2.4 m       0 eV    224 keV  1.19 mm   3.33 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 426,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    164 mum -1.68 mm   -2.4 m    3.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -573 mum -3.68 mm   -2.4 m    3.38 MeV     0 eV   3.27 mm   3.27 mm    TrackerTransportation
-    2  -88.3 cm   -2.4 m    57.1 cm   3.38 MeV     0 eV   3.92 m    3.92 m     WorldPVTransportation
-    3  -1.07 m   -2.91 m     1.2 m    3.38 MeV     0 eV   83.4 cm   4.75 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 425,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    182 mum -1.63 mm   -2.4 m     885 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -410 mum -3.64 mm   -2.4 m     885 keV     0 eV    3.3 mm    3.3 mm    TrackerTransportation
-    2  -70.8 cm   -2.4 m    64.3 cm    885 keV     0 eV   3.94 m    3.94 m     WorldPVTransportation
-    3  -85.8 cm  -2.91 m    1.29 m     885 keV     0 eV   83.8 cm   4.78 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 424,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    191 mum -1.47 mm   -2.4 m    9.95 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -268 mum -4.33 mm   -2.4 m    9.95 MeV     0 eV   3.95 mm   3.95 mm    TrackerTransportation
-    2  -38.5 cm   -2.4 m   -13.7 cm   9.95 MeV     0 eV   3.32 m    3.32 m     WorldPVTransportation
-    3  -46.7 cm  -2.91 m    34.5 cm   9.95 MeV     0 eV   70.6 cm   4.03 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 423,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    195 mum -1.44 mm   -2.4 m    2.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -256 mum -4.37 mm   -2.4 m    2.04 MeV     0 eV   4.02 mm   4.02 mm    TrackerTransportation
-    2    -37 cm   -2.4 m   -16.4 cm   2.04 MeV     0 eV    3.3 m     3.3 m     WorldPVTransportation
-    3  -44.8 cm  -2.91 m    31.1 cm   2.04 MeV     0 eV   70.2 cm      4 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 422,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    528 mum -1.08 mm  -2.41 m    4.75 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    616 mum -2.44 mm   -2.4 m    4.75 MeV     0 eV   5.48 mm   5.48 mm    TrackerTransportation
-    2   1.39 cm  -20.8 cm   -1.6 m    4.75 MeV     0 eV   82.6 cm   83.1 cm    ChamberTransportation
-    3    1.6 cm    -24 cm  -1.47 m    4.75 MeV     0 eV     13 cm   96.2 cm    TrackerTransportation
-    4   2.72 cm  -41.3 cm    -80 cm   4.75 MeV     0 eV   69.6 cm   1.66 m     ChamberTransportation
-    5   3.05 cm  -46.4 cm    -60 cm   4.75 MeV     0 eV   20.6 cm   1.86 m     TrackerTransportation
-    6   4.05 cm  -61.8 cm      0 fm   4.75 MeV     0 eV   61.9 cm   2.48 m     ChamberTransportation
-    7   4.38 cm  -66.9 cm     20 cm   4.75 MeV     0 eV   20.6 cm   2.69 m     TrackerTransportation
-    8   5.37 cm  -82.3 cm     80 cm   4.75 MeV     0 eV   61.9 cm   3.31 m     ChamberTransportation
-    9   5.71 cm  -87.4 cm      1 m    4.75 MeV     0 eV   20.6 cm   3.52 m     TrackerTransportation
-   10    6.7 cm  -1.03 m     1.6 m    4.75 MeV     0 eV   61.9 cm   4.14 m     ChamberTransportation
-   11   7.03 cm  -1.08 m     1.8 m    4.75 MeV     0 eV   20.6 cm   4.34 m     TrackerTransportation
-   12   8.03 cm  -1.23 m     2.4 m    4.75 MeV     0 eV   61.9 cm   4.96 m     WorldPVTransportation
-   13   8.88 cm  -1.36 m    2.91 m    4.75 MeV     0 eV   52.7 cm   5.49 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 421,   Parent ID = 397
+* G4Track Information:   Particle = gamma,   Track ID = 22,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    218 mum  -118 mum -2.41 m    13.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    646 mum -1.64 mm   -2.4 m    13.4 MeV     0 eV   8.19 mm   8.19 mm    TrackerTransportation
-    2   4.33 cm  -15.3 cm   -1.6 m    13.4 MeV     0 eV   81.5 cm   82.4 cm    ChamberTransportation
-    3   5.39 cm  -19.1 cm   -1.4 m    13.4 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4   8.59 cm  -30.5 cm    -80 cm   13.4 MeV     0 eV   61.2 cm   1.64 m     ChamberTransportation
-    5   9.65 cm  -34.3 cm    -60 cm   13.4 MeV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6   12.8 cm  -45.6 cm      0 fm   13.4 MeV     0 eV   61.2 cm   2.45 m     ChamberTransportation
-    7   13.9 cm  -49.4 cm     20 cm   13.4 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   17.1 cm  -60.8 cm     80 cm   13.4 MeV     0 eV   61.2 cm   3.27 m     ChamberTransportation
-    9   18.2 cm  -64.6 cm      1 m    13.4 MeV     0 eV   20.4 cm   3.47 m     TrackerTransportation
-   10   21.4 cm  -75.9 cm    1.6 m    13.4 MeV     0 eV   61.2 cm   4.08 m     ChamberTransportation
-   11   22.4 cm  -79.7 cm    1.8 m    13.4 MeV     0 eV   20.4 cm   4.29 m     TrackerTransportation
-   12   25.6 cm  -91.1 cm    2.4 m    13.4 MeV     0 eV   61.2 cm    4.9 m     WorldPVTransportation
-   13   28.3 cm  -1.01 m    2.91 m    13.4 MeV     0 eV     52 cm   5.42 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.79 mm  -1.69 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.72 mm  -1.69 mm  -2.44 m     310 keV   201 keV   115 mum   115 mum  TargetPV       compt
+    2  -2.58 mm   -355 mum -2.44 m     197 keV   113 keV  1.39 mm    1.5 mm   TargetPV       compt
+    3  -3.14 mm   -490 mum -2.44 m       0 eV    197 keV  1.11 mm   2.61 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 420,   Parent ID = 397
+* G4Track Information:   Particle = gamma,   Track ID = 21,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    183 mum   144 mum -2.41 m    2.34 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   73.8 mum  -1.6 mm   -2.4 m    2.34 MeV     0 eV   9.23 mm   9.23 mm    TrackerTransportation
-    2  -9.58 mm  -15.5 cm   -1.6 m    2.34 MeV     0 eV   81.5 cm   82.4 cm    ChamberTransportation
-    3   -1.2 cm  -19.4 cm   -1.4 m    2.34 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4  -1.92 cm  -30.9 cm    -80 cm   2.34 MeV     0 eV   61.1 cm   1.64 m     ChamberTransportation
-    5  -2.16 cm  -34.8 cm    -60 cm   2.34 MeV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6  -2.89 cm  -46.3 cm  0.114 fm   2.34 MeV     0 eV   61.1 cm   2.45 m     ChamberTransportation
-    7  -2.99 cm  -47.8 cm   8.12 cm    1.6 MeV     0 eV   8.27 cm   2.54 m     Chamber     compt
-    8   2.35 cm  -48.5 cm     20 cm    1.6 MeV     0 eV     13 cm   2.67 m     TrackerTransportation
-    9   29.3 cm    -52 cm     80 cm    1.6 MeV     0 eV   65.9 cm   3.33 m     ChamberTransportation
-   10   38.3 cm  -53.1 cm      1 m     1.6 MeV     0 eV     22 cm   3.54 m     TrackerTransportation
-   11   65.2 cm  -56.6 cm    1.6 m     1.6 MeV     0 eV   65.9 cm    4.2 m     ChamberTransportation
-   12   74.2 cm  -57.8 cm    1.8 m     1.6 MeV     0 eV     22 cm   4.42 m     TrackerTransportation
-   13   1.01 m   -61.2 cm    2.4 m     1.6 MeV     0 eV   65.9 cm   5.08 m     WorldPVTransportation
-   14   1.24 m   -64.2 cm   2.91 m     1.6 MeV     0 eV     56 cm   5.64 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 437,   Parent ID = 420
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.99 cm  -47.8 cm   8.12 cm    737 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -12.6 cm    -51 cm     14 cm    632 keV   106 keV  21.7 cm   21.7 cm    Chamber     eIoni
-    2  -8.78 cm  -50.2 cm     20 cm    581 keV  50.9 keV  11.5 cm   33.2 cm    TrackerTransportation
-    3   12.3 cm  -19.2 cm   38.9 cm    498 keV  82.9 keV    46 cm   79.2 cm    Tracker     eIoni
-    4   10.6 cm  -10.1 cm   56.3 cm    434 keV  33.2 keV  20.2 cm   99.4 cm    Tracker     eIoni
-    5   10.8 cm  -4.87 cm   60.8 cm    374 keV  10.3 keV  6.94 cm   1.06 m     Tracker     eIoni
-    6   21.4 cm    5.4 cm   77.2 cm    326 keV  47.3 keV  24.3 cm   1.31 m     Tracker     eIoni
-    7   24.6 cm   6.77 cm     80 cm    319 keV  7.85 keV  4.56 cm   1.35 m     ChamberTransportation
-    8   27.5 cm   5.96 cm   82.3 cm    297 keV  21.6 keV  6.62 cm   1.42 m     Chamber     eIoni
-    9   26.4 cm   5.68 cm   81.2 cm    248 keV   7.2 keV  1.66 cm   1.44 m     Chamber     eIoni
-   10   25.1 cm   5.24 cm     80 cm    181 keV  66.6 keV  3.06 cm   1.47 m     TrackerTransportation
-   11   18.3 cm   3.08 cm   79.8 cm    160 keV  21.2 keV  7.72 cm   1.54 m     Tracker     eIoni
-   12   17.4 cm   2.82 cm   79.3 cm    141 keV  1.63 keV  1.05 cm   1.55 m     Tracker     eIoni
-   13   12.6 cm   3.47 cm   78.8 cm    130 keV  11.3 keV  5.06 cm    1.6 m     Tracker     eIoni
-   14   8.85 cm   2.12 cm   79.6 cm    115 keV  14.6 keV  4.38 cm   1.65 m     Tracker     eIoni
-   15   8.03 cm   2.45 cm     80 cm    111 keV  3.71 keV  1.01 cm   1.66 m     ChamberTransportation
-   16   7.44 cm   2.76 cm     80 cm    101 keV    10 keV  1.26 cm   1.67 m     Chamber     eIoni
-   17   7.28 cm   2.21 cm     80 cm   93.4 keV  7.91 keV  1.08 cm   1.68 m     Chamber     eIoni
-   18   7.25 cm   1.73 cm     80 cm   80.6 keV  12.7 keV  9.49 mm   1.69 m     Chamber     eIoni
-   19   7.53 cm   1.75 cm   80.2 cm   66.8 keV  3.38 keV  5.11 mm    1.7 m     Chamber     eBrem
-   20   7.64 cm   1.72 cm     80 cm   59.7 keV  7.11 keV  3.12 mm    1.7 m     TrackerTransportation
-   21   7.99 cm   1.23 cm   79.1 cm   52.4 keV  7.29 keV  1.15 cm   1.71 m     Tracker     eIoni
-   22   7.94 cm   1.08 cm   78.3 cm   45.8 keV  6.63 keV   9.1 mm   1.72 m     Tracker     eIoni
-   23   7.59 cm   6.18 mm   77.9 cm     41 keV  4.76 keV  7.23 mm   1.73 m     Tracker     eIoni
-   24   7.25 cm   2.32 mm   77.6 cm   34.9 keV  6.11 keV     6 mm   1.73 m     Tracker     eIoni
-   25   7.14 cm   -1.9 mm   77.6 cm   32.2 keV  2.71 keV  4.55 mm   1.74 m     Tracker     eIoni
-   26   7.36 cm  -4.51 mm   77.8 cm   29.5 keV   2.7 keV  3.99 mm   1.74 m     Tracker     eIoni
-   27   7.56 cm  -2.96 mm     78 cm   26.2 keV  3.29 keV  3.44 mm   1.75 m     Tracker     eIoni
-   28   7.62 cm   -294 mum    78 cm   23.4 keV  2.77 keV  2.85 mm   1.75 m     Tracker     eIoni
-   29   7.65 cm  -2.45 mm   78.1 cm   21.8 keV  1.67 keV  2.39 mm   1.75 m     Tracker     eIoni
-   30    7.5 cm  -2.93 mm   77.9 cm   19.1 keV  2.62 keV  2.13 mm   1.75 m     Tracker     eIoni
-   31   7.34 cm  -3.22 mm   77.9 cm   15.3 keV  3.85 keV  1.76 mm   1.75 m     Tracker     eIoni
-   32   7.27 cm  -3.05 mm   77.8 cm   14.4 keV   924 eV   1.28 mm   1.76 m     Tracker     eIoni
-   33   7.21 cm  -3.53 mm   77.7 cm   13.5 keV   843 eV   1.18 mm   1.76 m     Tracker     eIoni
-   34   7.15 cm  -3.79 mm   77.6 cm   11.9 keV  1.62 keV  1.09 mm   1.76 m     Tracker     eIoni
-   35   7.12 cm  -4.32 mm   77.5 cm   7.68 keV  4.21 keV   933 mum  1.76 m     Tracker     eIoni
-   36   7.11 cm  -4.45 mm   77.5 cm   5.26 keV  2.42 keV   592 mum  1.76 m     Tracker     eIoni
-   37   7.09 cm  -4.56 mm   77.4 cm   3.32 keV  1.94 keV   433 mum  1.76 m     Tracker     eIoni
-   38   7.08 cm  -4.61 mm   77.4 cm   1.24 keV  2.08 keV   303 mum  1.76 m     Tracker     eIoni
-   39   7.08 cm  -4.63 mm   77.4 cm      0 eV   1.24 keV  81.4 mum  1.76 m     Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 442,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.53 cm   1.75 cm   80.2 cm   10.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   7.41 cm   1.56 cm   80.3 cm      0 eV   10.5 keV  2.76 mm   2.76 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 441,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.4 cm   2.82 cm   79.3 cm   17.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   17.5 cm   2.71 cm   79.2 cm   16.2 keV  1.42 keV  1.56 mm   1.56 mm    Tracker     eIoni
-    2   17.5 cm   2.58 cm   79.2 cm   15.3 keV   984 eV   1.39 mm   2.96 mm    Tracker     eIoni
-    3   17.4 cm   2.46 cm   79.2 cm   13.8 keV   1.5 keV  1.28 mm   4.24 mm    Tracker     eIoni
-    4   17.4 cm   2.37 cm   79.2 cm   12.6 keV  1.14 keV  1.12 mm   5.36 mm    Tracker     eIoni
-    5   17.4 cm   2.29 cm   79.2 cm   10.5 keV  2.11 keV     1 mm   6.36 mm    Tracker     eIoni
-    6   17.4 cm   2.23 cm   79.1 cm   6.92 keV  3.59 keV   812 mum  7.18 mm    Tracker     eIoni
-    7   17.4 cm   2.22 cm   79.1 cm   5.36 keV  1.56 keV   539 mum  7.71 mm    Tracker     eIoni
-    8   17.4 cm    2.2 cm     79 cm   3.05 keV  2.31 keV   439 mum  8.15 mm    Tracker     eIoni
-    9   17.4 cm   2.19 cm     79 cm   1.42 keV  1.63 keV   282 mum  8.44 mm    Tracker     eIoni
-   10   17.4 cm   2.18 cm     79 cm      0 eV   1.42 keV  98.7 mum  8.53 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 440,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   26.4 cm   5.68 cm   81.2 cm   41.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   26.5 cm   5.49 cm   81.2 cm   38.3 keV  3.65 keV  2.75 mm   2.75 mm    Chamber     eIoni
-    2   26.6 cm   5.46 cm   81.2 cm   32.3 keV  5.94 keV  2.41 mm   5.16 mm    Chamber     eIoni
-    3   26.7 cm   5.49 cm   81.1 cm   29.9 keV  2.41 keV   1.9 mm   7.06 mm    Chamber     eIoni
-    4   26.8 cm   5.37 cm   81.1 cm   24.4 keV   5.5 keV   1.7 mm   8.77 mm    Chamber     eIoni
-    5   26.8 cm   5.31 cm   81.1 cm   20.1 keV  4.36 keV  1.31 mm   1.01 cm    Chamber     eIoni
-    6   26.8 cm   5.32 cm   81.1 cm   14.3 keV   5.8 keV  1.03 mm   1.11 cm    Chamber     eIoni
-    7   26.8 cm   5.34 cm   81.1 cm   10.4 keV  3.82 keV   720 mum  1.18 cm    Chamber     eIoni
-    8   26.8 cm   5.37 cm   81.1 cm   7.69 keV  2.75 keV   550 mum  1.24 cm    Chamber     eIoni
-    9   26.9 cm   5.36 cm   81.1 cm   4.99 keV   2.7 keV   439 mum  1.28 cm    Chamber     eIoni
-   10   26.9 cm   5.35 cm   81.1 cm   1.45 keV  3.54 keV   328 mum  1.31 cm    Chamber     eIoni
-   11   26.9 cm   5.35 cm   81.1 cm      0 eV   1.45 keV  75.8 mum  1.32 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 439,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   10.8 cm  -4.87 cm   60.8 cm   50.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   10.1 cm  -4.52 cm   60.8 cm   46.8 keV  3.42 keV  8.49 mm   8.49 mm    Tracker     eIoni
-    2   10.1 cm  -3.85 cm   61.1 cm     43 keV  3.83 keV  7.53 mm    1.6 cm    Tracker     eIoni
-    3   9.98 cm  -3.84 cm   61.7 cm   37.8 keV  5.21 keV  6.48 mm   2.25 cm    Tracker     eIoni
-    4   9.79 cm  -3.59 cm   62.1 cm   33.5 keV  4.28 keV  5.21 mm   2.77 cm    Tracker     eIoni
-    5   9.44 cm  -3.46 cm   62.3 cm   30.3 keV  3.24 keV  4.26 mm    3.2 cm    Tracker     eIoni
-    6   9.41 cm  -3.15 cm   62.1 cm   27.2 keV  3.09 keV  3.58 mm   3.56 cm    Tracker     eIoni
-    7   9.32 cm  -2.88 cm   62.1 cm   23.8 keV  3.35 keV  3.02 mm   3.86 cm    Tracker     eIoni
-    8    9.1 cm   -2.8 cm   62.1 cm   19.1 keV  4.76 keV  2.45 mm    4.1 cm    Tracker     eIoni
-    9   8.94 cm  -2.77 cm   62.1 cm   15.4 keV  3.62 keV  1.75 mm   4.28 cm    Tracker     eIoni
-   10   8.89 cm  -2.82 cm     62 cm   9.76 keV  5.68 keV   1.3 mm   4.41 cm    Tracker     eIoni
-   11   8.81 cm  -2.82 cm     62 cm   7.49 keV  2.27 keV   748 mum  4.48 cm    Tracker     eIoni
-   12   8.77 cm  -2.84 cm     62 cm   6.11 keV  1.37 keV   579 mum  4.54 cm    Tracker     eIoni
-   13   8.73 cm  -2.86 cm     62 cm   5.06 keV  1.05 keV   487 mum  4.59 cm    Tracker     eIoni
-   14   8.74 cm  -2.83 cm     62 cm   3.74 keV  1.32 keV   421 mum  4.63 cm    Tracker     eIoni
-   15   8.73 cm   -2.8 cm     62 cm   2.22 keV  1.52 keV   335 mum  4.66 cm    Tracker     eIoni
-   16   8.73 cm  -2.81 cm     62 cm      0 eV   2.22 keV   191 mum  4.68 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 438,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   10.6 cm  -10.1 cm   56.3 cm   30.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   10.4 cm  -10.2 cm   56.7 cm   27.7 keV  2.53 keV  3.59 mm   3.59 mm    Tracker     eIoni
-    2   10.5 cm  -10.2 cm     57 cm   23.8 keV  3.95 keV  3.13 mm   6.71 mm    Tracker     eIoni
-    3   10.5 cm  -10.3 cm   57.2 cm   21.7 keV  2.09 keV  2.45 mm   9.16 mm    Tracker     eIoni
-    4   10.4 cm  -10.4 cm   57.3 cm   20.3 keV  1.37 keV  2.12 mm   1.13 cm    Tracker     eIoni
-    5   10.2 cm  -10.4 cm   57.4 cm   16.6 keV   3.7 keV  1.92 mm   1.32 cm    Tracker     eIoni
-    6   10.2 cm  -10.3 cm   57.5 cm   15.1 keV  1.56 keV  1.44 mm   1.46 cm    Tracker     eIoni
-    7   10.1 cm  -10.4 cm   57.5 cm   13.3 keV  1.77 keV  1.26 mm   1.59 cm    Tracker     eIoni
-    8   10.1 cm  -10.5 cm   57.4 cm   11.5 keV  1.76 keV  1.07 mm    1.7 cm    Tracker     eIoni
-    9     10 cm  -10.6 cm   57.4 cm   10.1 keV  1.39 keV   903 mum  1.79 cm    Tracker     eIoni
-   10     10 cm  -10.6 cm   57.3 cm   7.67 keV  2.48 keV   780 mum  1.87 cm    Tracker     eIoni
-   11     10 cm  -10.6 cm   57.3 cm   5.92 keV  1.75 keV   591 mum  1.92 cm    Tracker     eIoni
-   12   9.97 cm  -10.7 cm   57.3 cm   4.57 keV  1.35 keV   474 mum  1.97 cm    Tracker     eIoni
-   13   9.96 cm  -10.6 cm   57.3 cm   3.17 keV   1.4 keV   389 mum  2.01 cm    Tracker     eIoni
-   14   9.94 cm  -10.6 cm   57.3 cm    710 eV   2.46 keV   291 mum  2.04 cm    Tracker     eIoni
-   15   9.94 cm  -10.6 cm   57.3 cm      0 eV    710 eV   40.4 mum  2.04 cm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.79 mm  -1.69 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.36 mm  -1.77 mm  -2.44 m       0 eV    511 keV   963 mum   963 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 419,   Parent ID = 397
+* G4Track Information:   Particle = gamma,   Track ID = 20,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    183 mum   152 mum -2.41 m    2.97 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    284 mum -1.68 mm   -2.4 m    2.97 MeV     0 eV   9.29 mm   9.29 mm    TrackerTransportation
-    2   9.18 mm  -16.2 cm   -1.6 m    2.97 MeV     0 eV   81.6 cm   82.5 cm    ChamberTransportation
-    3   1.14 cm  -20.3 cm   -1.4 m    2.97 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4   1.81 cm  -32.3 cm    -80 cm   2.97 MeV     0 eV   61.2 cm   1.64 m     ChamberTransportation
-    5   2.03 cm  -36.3 cm    -60 cm   2.97 MeV     0 eV   20.4 cm   1.85 m     TrackerTransportation
-    6    2.7 cm  -48.4 cm -0.114 fm   2.97 MeV     0 eV   61.2 cm   2.46 m     ChamberTransportation
-    7   2.92 cm  -52.4 cm     20 cm   2.97 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   3.59 cm  -64.5 cm     80 cm   2.97 MeV     0 eV   61.2 cm   3.27 m     ChamberTransportation
-    9   3.81 cm  -68.5 cm      1 m    2.97 MeV     0 eV   20.4 cm   3.48 m     TrackerTransportation
-   10   4.47 cm  -80.6 cm    1.6 m    2.97 MeV     0 eV   61.2 cm   4.09 m     ChamberTransportation
-   11    4.7 cm  -84.6 cm    1.8 m    2.97 MeV     0 eV   20.4 cm   4.29 m     TrackerTransportation
-   12   5.36 cm  -96.6 cm    2.4 m    2.97 MeV     0 eV   61.2 cm   4.91 m     WorldPVTransportation
-   13   5.68 cm  -1.02 m    2.69 m     743 keV     0 eV   29.5 cm    5.2 m     WorldPV     compt
-   14   48.4 cm   -1.1 m    2.91 m     743 keV     0 eV   48.6 cm   5.69 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.9 mm  -1.08 mm  -2.44 m    2.46 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.93 mm   -315 mum -2.44 m     834 keV  1.62 MeV  5.77 mm   5.77 mm   TargetPV       compt
+    2  -2.33 cm   -6.4 mm  -2.44 m     685 keV   149 keV  1.83 cm    2.4 cm   TargetPV       compt
+    3   -2.5 cm  -8.29 mm  -2.44 m     685 keV     0 eV   3.13 mm   2.72 cm   TargetPV  Transportation
+    4  -47.2 cm  -49.7 cm  -2.91 m     685 keV     0 eV     81 cm   83.7 cm OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 443,   Parent ID = 419
+* G4Track Information:   Particle = gamma,   Track ID = 19,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.68 cm  -1.02 m    2.69 m    2.22 MeV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   3.52 mm  -1.07 m    2.91 m    2.18 MeV  42.6 keV  23.3 cm   23.3 cm OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.79 mm   -949 mum -2.44 m      12 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.3 cm  -3.14 mm  -2.42 m       0 eV     11 MeV  2.16 cm   2.16 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 418,   Parent ID = 397
+* G4Track Information:   Particle = e+,   Track ID = 23,   Parent ID = 19
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    184 mum   164 mum -2.41 m    3.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    189 mum -1.72 mm   -2.4 m    3.09 MeV     0 eV   9.35 mm   9.35 mm    TrackerTransportation
-    2    609 mum -16.6 cm   -1.6 m    3.09 MeV     0 eV   81.7 cm   82.6 cm    ChamberTransportation
-    3    714 mum -20.7 cm   -1.4 m    3.09 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4   1.03 mm    -33 cm    -80 cm   3.09 MeV     0 eV   61.2 cm   1.64 m     ChamberTransportation
-    5   1.13 mm  -37.1 cm    -60 cm   3.09 MeV     0 eV   20.4 cm   1.85 m     TrackerTransportation
-    6   1.45 mm  -49.4 cm      0 fm   3.09 MeV     0 eV   61.2 cm   2.46 m     ChamberTransportation
-    7   1.55 mm  -53.5 cm     20 cm   3.09 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   1.87 mm  -65.8 cm     80 cm   3.09 MeV     0 eV   61.2 cm   3.28 m     ChamberTransportation
-    9   1.97 mm  -69.9 cm      1 m    3.09 MeV     0 eV   20.4 cm   3.48 m     TrackerTransportation
-   10   2.29 mm  -82.2 cm    1.6 m    3.09 MeV     0 eV   61.2 cm   4.09 m     ChamberTransportation
-   11   2.39 mm  -86.3 cm    1.8 m    3.09 MeV     0 eV   20.4 cm    4.3 m     TrackerTransportation
-   12   2.71 mm  -98.6 cm    2.4 m    3.09 MeV     0 eV   61.2 cm   4.91 m     WorldPVTransportation
-   13   2.98 mm  -1.09 m    2.91 m    3.09 MeV     0 eV   52.1 cm   5.43 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 cm  -3.14 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.3 cm  -3.14 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 417,   Parent ID = 397
+* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 23
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    164 mum   199 mum -2.41 m     390 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    380 mum  -825 mum  -2.4 m       0 eV    390 keV  6.12 mm   6.12 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 cm  -3.14 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.7 cm  -1.67 cm  -2.44 m     496 keV  14.8 keV  2.22 cm   2.22 cm   TargetPV       compt
+    2  -1.81 cm   -1.8 cm  -2.44 m       0 eV    496 keV  2.78 mm    2.5 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 416,   Parent ID = 397
+* G4Track Information:   Particle = gamma,   Track ID = 24,   Parent ID = 23
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    160 mum   212 mum -2.41 m     334 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    386 mum  -454 mum  -2.4 m       0 eV    334 keV  5.59 mm   5.59 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 cm  -3.14 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.28 cm  -2.54 mm  -2.42 m       0 eV    511 keV   987 mum   987 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 415,   Parent ID = 397
+* G4Track Information:   Particle = gamma,   Track ID = 18,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    159 mum   215 mum -2.41 m    13.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    608 mum -1.09 mm   -2.4 m    13.9 MeV     0 eV   9.63 mm   9.63 mm    TrackerTransportation
-    2   3.83 cm  -11.1 cm   -1.6 m    13.9 MeV     0 eV   80.8 cm   81.8 cm    ChamberTransportation
-    3   4.78 cm  -13.9 cm   -1.4 m    13.9 MeV     0 eV   20.2 cm   1.02 m     TrackerTransportation
-    4   7.61 cm  -22.1 cm    -80 cm   13.9 MeV     0 eV   60.6 cm   1.63 m     ChamberTransportation
-    5   8.55 cm  -24.8 cm    -60 cm   13.9 MeV     0 eV   20.2 cm   1.83 m     TrackerTransportation
-    6   11.4 cm  -33.1 cm      0 fm   13.9 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   12.3 cm  -35.8 cm     20 cm   13.9 MeV     0 eV   20.2 cm   2.64 m     TrackerTransportation
-    8   15.2 cm  -44.1 cm     80 cm   13.9 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   16.1 cm  -46.8 cm      1 m    13.9 MeV     0 eV   20.2 cm   3.45 m     TrackerTransportation
-   10   18.9 cm  -55.1 cm    1.6 m    13.9 MeV     0 eV   60.6 cm   4.05 m     ChamberTransportation
-   11   19.9 cm  -57.8 cm    1.8 m    13.9 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   22.7 cm  -66.1 cm    2.4 m    13.9 MeV     0 eV   60.6 cm   4.86 m     WorldPVTransportation
-   13   25.1 cm  -73.1 cm   2.91 m    13.9 MeV     0 eV   51.5 cm   5.38 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.65 mm   -871 mum -2.44 m    8.11 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.35 cm  -1.23 cm  -2.42 m       0 eV   7.09 MeV  2.76 cm   2.76 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 414,   Parent ID = 397
+* G4Track Information:   Particle = e+,   Track ID = 26,   Parent ID = 18
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    140 mum   240 mum -2.41 m    9.65 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    142 mum   232 mum -2.41 m       0 eV   8.63 MeV   155 mum   155 mum  TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.35 cm  -1.23 cm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.35 cm  -1.23 cm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 444,   Parent ID = 414
+* G4Track Information:   Particle = gamma,   Track ID = 28,   Parent ID = 26
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    142 mum   232 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1    142 mum   232 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.35 cm  -1.23 cm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.18 cm   -1.4 cm  -2.42 m       0 eV    511 keV  2.93 mm   2.93 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 446,   Parent ID = 444
+* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 26
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    142 mum   232 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -586 mum -6.22 mm  -2.42 m       0 eV    511 keV  1.42 cm   1.42 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.35 cm  -1.23 cm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.86 cm  -7.16 mm  -2.42 m       0 eV    511 keV   8.9 mm    8.9 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 445,   Parent ID = 444
+* G4Track Information:   Particle = gamma,   Track ID = 17,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    142 mum   232 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    706 mum  5.23 mm   -2.4 m     511 keV     0 eV    1.1 cm    1.1 cm    TrackerTransportation
-    2   27.1 cm    2.4 m    2.29 m     511 keV     0 eV   5.28 m    5.29 m     WorldPVTransportation
-    3   30.6 cm   2.71 m    2.91 m     511 keV     0 eV   69.3 cm   5.98 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.12 mm   -567 mum -2.44 m    4.79 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.11 mm   -916 mum -2.43 m    1.47 MeV     0 eV   7.39 mm   7.39 mm   TargetPV       compt
+    2   -1.3 cm  -3.13 mm  -2.42 m     377 keV  1.09 MeV  1.47 cm   2.21 cm   TargetPV       compt
+    3  -1.24 cm  -4.62 mm  -2.42 m       0 eV     88 keV  1.62 mm   2.38 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 413,   Parent ID = 397
+* G4Track Information:   Particle = e-,   Track ID = 30,   Parent ID = 17
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.04 mum   269 mum -2.41 m     319 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    193 mum   201 mum -2.41 m       0 eV    319 keV  3.59 mm   3.59 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.24 cm  -4.62 mm  -2.42 m     289 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.24 cm  -4.63 mm  -2.42 m       0 eV    289 keV   141 mum   141 mum  TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 412,   Parent ID = 397
+* G4Track Information:   Particle = e-,   Track ID = 29,   Parent ID = 17
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.9 mum   248 mum -2.41 m    2.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    391 mum -93.8 mum  -2.4 m    2.08 MeV     0 eV   1.23 cm   1.23 cm    TrackerTransportation
-    2   2.84 cm  -2.24 cm   -1.6 m    2.08 MeV     0 eV   80.1 cm   81.3 cm    ChamberTransportation
-    3   3.54 cm   -2.8 cm   -1.4 m    2.08 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   5.65 cm  -4.47 cm    -80 cm   2.08 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   6.35 cm  -5.03 cm    -60 cm   2.08 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   8.45 cm   -6.7 cm      0 fm   2.08 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   9.15 cm  -7.26 cm     20 cm   2.08 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   11.3 cm  -8.93 cm     80 cm   2.08 MeV     0 eV   60.1 cm   3.22 m     ChamberTransportation
-    9     12 cm  -9.49 cm      1 m    2.08 MeV     0 eV     20 cm   3.42 m     TrackerTransportation
-   10   14.1 cm  -11.2 cm    1.6 m    2.08 MeV     0 eV   60.1 cm   4.02 m     ChamberTransportation
-   11   14.8 cm  -11.7 cm    1.8 m    2.08 MeV     0 eV     20 cm   4.22 m     TrackerTransportation
-   12   16.9 cm  -13.4 cm    2.4 m    2.08 MeV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13   18.6 cm  -14.8 cm   2.91 m    2.08 MeV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.11 mm   -916 mum -2.43 m    3.33 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.92 mm  -1.01 mm  -2.43 m     949 keV   357 keV   382 mum   382 mum  TargetPV       eBrem
+    2   -1.9 mm   -987 mum -2.43 m     503 keV   446 keV   408 mum   790 mum  TargetPV       eIoni
+    3  -1.85 mm   -981 mum -2.43 m     191 keV   312 keV   275 mum  1.06 mm   TargetPV       eIoni
+    4  -1.85 mm   -984 mum -2.43 m       0 eV    191 keV    76 mum  1.14 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 411,   Parent ID = 397
+* G4Track Information:   Particle = gamma,   Track ID = 31,   Parent ID = 29
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -48 mum   242 mum -2.41 m     431 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   31.6 mum   309 mum -2.41 m     421 keV  9.96 keV  2.74 mm   2.74 mm   TargetPV     compt
-    2   64.8 mum   288 mum -2.41 m       0 eV    421 keV   161 mum   2.9 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.92 mm  -1.01 mm  -2.43 m    2.02 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    234 mum -2.61 mm  -2.44 m     264 keV  1.76 MeV  3.97 mm   3.97 mm   TargetPV       compt
+    2  -16.8 mum    -3 mm  -2.43 m       0 eV    264 keV  1.42 mm   5.39 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 386,   Parent ID = 3
+* G4Track Information:   Particle = gamma,   Track ID = 16,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -7.71 mum  19.8 mum -2.42 m    15.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -74.2 mum   645 mum  -2.4 m       0 eV    4.5 MeV  1.45 cm   1.45 cm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.12 mm   -567 mum -2.44 m    8.34 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1     -6 mm  -1.92 mm   -2.4 m       0 eV   2.52 MeV  3.78 cm   3.78 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 447,   Parent ID = 386
+* G4Track Information:   Particle = e+,   Track ID = 32,   Parent ID = 16
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -74.2 mum   645 mum  -2.4 m    10.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -298 mum  1.59 mm   -2.4 m    7.62 MeV  2.53 MeV  1.82 mm   1.82 mm   TargetPV     eIoni
-    2    291 mum  2.05 mm   -2.4 m    6.08 MeV   1.1 MeV   807 mum  2.62 mm   TargetPV     eBrem
-    3    330 mum  1.95 mm   -2.4 m    3.29 MeV  1.41 MeV  1.04 mm   3.66 mm   TargetPV     eBrem
-    4    383 mum  1.47 mm   -2.4 m    2.32 MeV   969 keV   825 mum  4.49 mm   TargetPV     eIoni
-    5    284 mum  1.39 mm   -2.4 m    1.75 MeV   173 keV   151 mum  4.64 mm   TargetPV     eBrem
-    6   38.8 mum   1.5 mm   -2.4 m    1.06 MeV   684 keV   566 mum  5.21 mm   TargetPV     eIoni
-    7    238 mum  1.48 mm   -2.4 m     690 keV   373 keV   433 mum  5.64 mm   TargetPV     eIoni
-    8    230 mum  1.44 mm   -2.4 m       0 eV    690 keV   340 mum  5.98 mm   TargetPV     eIoni
-    9    230 mum  1.44 mm   -2.4 m       0 eV      0 eV      0 fm   5.98 mm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0     -6 mm  -1.92 mm   -2.4 m     4.8 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.96 mm  -1.74 mm   -2.4 m    3.68 MeV   478 keV   533 mum   533 mum  TargetPV       eBrem
+    2  -6.33 mm   -1.2 mm   -2.4 m    2.55 MeV  1.13 MeV   905 mum  1.44 mm   TargetPV       eIoni
+    3  -6.12 mm  -1.03 mm   -2.4 m       0 eV    274 keV   312 mum  1.75 mm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 452,   Parent ID = 447
+* G4Track Information:   Particle = gamma,   Track ID = 35,   Parent ID = 32
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    230 mum  1.44 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.29 mm   -565 mum  -2.4 m     435 keV  75.9 keV  3.66 mm   3.66 mm   TargetPV     compt
-    2   4.51 mm   -665 mum  -2.4 m     357 keV  78.5 keV  1.29 mm   4.95 mm   TargetPV     compt
-    3   5.08 mm   -369 mum  -2.4 m       0 eV    357 keV  1.02 mm   5.97 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.12 mm  -1.03 mm   -2.4 m    3.01 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.07 mm   -243 mum  -2.4 m       0 eV   1.99 MeV  1.28 mm   1.28 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 451,   Parent ID = 447
+* G4Track Information:   Particle = e+,   Track ID = 36,   Parent ID = 35
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    230 mum  1.44 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -1.8 cm   1.34 cm   -2.4 m       0 eV    511 keV  2.18 cm   2.18 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.07 mm   -243 mum  -2.4 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.07 mm   -243 mum  -2.4 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 450,   Parent ID = 447
+* G4Track Information:   Particle = gamma,   Track ID = 38,   Parent ID = 36
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    284 mum  1.39 mm   -2.4 m     400 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.61 mm    1.8 mm   -2.4 m       0 eV    400 keV  1.98 mm   1.98 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.07 mm   -243 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -9.07 mm  -2.72 mm   -2.4 m     511 keV     0 eV   4.22 mm   4.22 mm   TargetPV  Transportation
+    2   -2.4 m   -1.98 m   -1.07 m     511 keV     0 eV   3.37 m    3.38 m     Tracker  Transportation
+    3  -2.91 m    -2.4 m   -79.2 cm    511 keV     0 eV     72 cm    4.1 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 449,   Parent ID = 447
+* G4Track Information:   Particle = gamma,   Track ID = 37,   Parent ID = 36
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    330 mum  1.95 mm   -2.4 m    1.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    308 mum  1.98 mm   -2.4 m    1.38 MeV     0 eV   1.37 mm   1.37 mm    TrackerTransportation
-    2  -1.25 cm   2.16 cm   -1.6 m    1.38 MeV     0 eV     80 cm   80.2 cm    ChamberTransportation
-    3  -1.57 cm   2.65 cm   -1.4 m    1.38 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -2.54 cm   4.12 cm    -80 cm   1.38 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -2.86 cm   4.61 cm    -60 cm   1.38 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -3.82 cm   6.08 cm      0 fm   1.38 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -4.14 cm   6.57 cm     20 cm   1.38 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -5.11 cm   8.05 cm     80 cm   1.38 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -5.43 cm   8.54 cm      1 m    1.38 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10  -6.39 cm     10 cm    1.6 m    1.38 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11  -6.71 cm   10.5 cm    1.8 m    1.38 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12  -7.67 cm     12 cm    2.4 m    1.38 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13  -8.49 cm   13.2 cm   2.91 m    1.38 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.07 mm   -243 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.19 cm   1.46 cm  -2.41 m     308 keV   203 keV  2.53 cm   2.53 cm   TargetPV       compt
+    2   1.18 cm   1.46 cm  -2.41 m       0 eV    308 keV   995 mum  2.63 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 448,   Parent ID = 447
+* G4Track Information:   Particle = gamma,   Track ID = 34,   Parent ID = 32
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    291 mum  2.05 mm   -2.4 m     447 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.58 mm    795 mum  -2.4 m     447 keV     0 eV   2.93 mm   2.93 mm    TrackerTransportation
-    2    2.4 m   -2.34 m    1.89 m     447 keV     0 eV   5.44 m    5.45 m     WorldPVTransportation
-    3   2.91 m   -2.84 m     2.8 m     447 keV     0 eV   1.16 m     6.6 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.12 mm  -1.03 mm   -2.4 m     295 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.64 mm  -2.88 mm  -2.41 m       0 eV    295 keV  6.28 mm   6.28 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 385,   Parent ID = 3
+* G4Track Information:   Particle = gamma,   Track ID = 33,   Parent ID = 32
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.83 mum  13.8 mum -2.42 m     203 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -42.3 mum   502 mum -2.41 m       0 eV      0 eV   1.15 cm   1.15 cm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -5.96 mm  -1.74 mm   -2.4 m     635 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.71 mm   -165 mum  -2.4 m     635 keV     0 eV   3.42 mm   3.42 mm   TargetPV  Transportation
+    2  -60.7 cm   1.25 m   -4.89 cm    622 keV     0 eV   2.73 m    2.73 m     Tracker       compt
+    3  -1.67 m     2.4 m    2.16 m     622 keV     0 eV    2.7 m    5.44 m     Tracker  Transportation
+    4  -2.03 m    2.79 m    2.91 m     622 keV     0 eV   92.3 cm   6.36 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 454,   Parent ID = 385
+* G4Track Information:   Particle = e-,   Track ID = 39,   Parent ID = 33
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.3 mum   502 mum -2.41 m    52.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -64.3 mum   513 mum -2.41 m    28.8 MeV   405 keV   398 mum   398 mum  TargetPV     eBrem
-    2    198 mum   427 mum  -2.4 m    25.2 MeV  2.93 MeV   2.2 mm    2.6 mm   TargetPV     eBrem
-    3    161 mum   414 mum  -2.4 m    23.1 MeV  1.82 MeV   987 mum  3.59 mm   TargetPV     eBrem
-    4    164 mum   415 mum  -2.4 m    8.44 MeV  12.9 keV  15.3 mum   3.6 mm   TargetPV     eBrem
-    5    690 mum   864 mum  -2.4 m    5.49 MeV  1.37 MeV   1.2 mm    4.8 mm   TargetPV     eBrem
-    6    973 mum  1.17 mm   -2.4 m     612 keV  4.88 MeV  1.16 mm   5.96 mm   TargetPV     eIoni
-    7   1.01 mm   1.21 mm   -2.4 m     228 keV   384 keV   316 mum  6.28 mm   TargetPV     eIoni
-    8   1.03 mm   1.21 mm   -2.4 m       0 eV    228 keV  95.5 mum  6.37 mm   TargetPV     eIoni
-    9   1.03 mm   1.21 mm   -2.4 m       0 eV      0 eV      0 fm   6.37 mm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -60.7 cm   1.25 m   -4.89 cm   12.8 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -60.6 cm   1.25 m    -4.9 cm     10 keV  2.77 keV  1.01 mm   1.01 mm    Tracker       eIoni
+    2  -60.6 cm   1.25 m   -4.96 cm   7.79 keV  2.25 keV   759 mum  1.76 mm    Tracker       eIoni
+    3  -60.5 cm   1.25 m   -4.99 cm   6.37 keV  1.42 keV   591 mum  2.36 mm    Tracker       eIoni
+    4  -60.5 cm   1.25 m   -5.03 cm    4.9 keV  1.47 keV   496 mum  2.85 mm    Tracker       eIoni
+    5  -60.5 cm   1.25 m      -5 cm   3.59 keV  1.31 keV   404 mum  3.26 mm    Tracker       eIoni
+    6  -60.6 cm   1.25 m      -5 cm    1.6 keV  1.99 keV   318 mum  3.57 mm    Tracker       eIoni
+    7  -60.5 cm   1.25 m      -5 cm      0 eV    1.6 keV   111 mum  3.69 mm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 461,   Parent ID = 454
+* G4Track Information:   Particle = gamma,   Track ID = 15,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.03 mm   1.21 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.59 mm   3.91 mm  -2.41 m     251 keV   260 keV  7.02 mm   7.02 mm   TargetPV     compt
-    2  -1.93 mm   4.01 mm  -2.41 m       0 eV    251 keV   410 mum  7.43 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.04 mm   -580 mum -2.44 m    1.57 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.57 mm   -210 mum -2.44 m     913 keV   660 keV  4.04 mm   4.04 mm   TargetPV       compt
+    2   -3.5 mm   1.55 mm  -2.44 m     606 keV   306 keV  3.44 mm   7.48 mm   TargetPV       compt
+    3  -4.01 mm   1.34 mm  -2.43 m       0 eV    606 keV   946 mum  8.43 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 460,   Parent ID = 454
+* G4Track Information:   Particle = gamma,   Track ID = 14,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.03 mm   1.21 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.68 mm    537 mum  -2.4 m     511 keV     0 eV   1.76 mm   1.76 mm    TrackerTransportation
-    2   1.06 m   -1.09 m       0 fm    511 keV     0 eV   2.84 m    2.84 m     ChamberTransportation
-    3   1.07 m    -1.1 m    2.39 cm    511 keV     0 eV   2.84 cm   2.87 m     TrackerTransportation
-    4   1.42 m   -1.46 m      80 cm    511 keV     0 eV   91.9 cm   3.79 m     ChamberTransportation
-    5   1.49 m   -1.54 m    97.2 cm    511 keV     0 eV   20.4 cm      4 m     TrackerTransportation
-    6   1.77 m   -1.82 m     1.6 m     511 keV     0 eV   74.4 cm   4.74 m     ChamberTransportation
-    7   1.86 m   -1.91 m     1.8 m     511 keV     0 eV   23.7 cm   4.98 m     TrackerTransportation
-    8   2.12 m   -2.19 m     2.4 m     511 keV     0 eV   71.1 cm   5.69 m     WorldPVTransportation
-    9   2.35 m   -2.42 m    2.91 m     511 keV     0 eV   60.4 cm   6.29 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -952 mum  -430 mum -2.44 m    20.9 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.3 mm   -674 mum -2.44 m       0 eV   3.82 MeV   1.9 mm    1.9 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 459,   Parent ID = 454
+* G4Track Information:   Particle = e+,   Track ID = 41,   Parent ID = 14
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    690 mum   864 mum  -2.4 m    1.57 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    952 mum  1.27 mm   -2.4 m       0 eV     88 keV  2.28 mm   2.28 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 mm   -674 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.3 mm   -674 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 462,   Parent ID = 459
+* G4Track Information:   Particle = gamma,   Track ID = 43,   Parent ID = 41
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    952 mum  1.27 mm   -2.4 m    1.48 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    960 mum  1.28 mm   -2.4 m    1.21 MeV   274 keV  98.9 mum  98.9 mum   TrackerTransportation
-    2   1.03 m    14.6 cm  -2.02 m    1.01 MeV   198 keV   1.2 m     1.2 m     Tracker     eIoni
-    3   1.78 m   -18.8 cm   -1.6 m     843 keV   164 keV  95.9 cm   2.16 m     Tracker     eIoni
-    4   2.37 m    8.63 cm  -1.37 m     698 keV   135 keV  75.4 cm   2.91 m     Tracker     eIoni
-    5    2.4 m    7.96 cm  -1.36 m     693 keV  5.12 keV  3.05 cm   2.94 m     WorldPVTransportation
-    6   2.72 m       3 cm  -1.28 m     533 keV  52.5 keV  33.6 cm   3.28 m     WorldPV     eIoni
-    7   2.85 m   -3.49 cm  -1.17 m     492 keV  31.2 keV  19.7 cm   3.47 m     WorldPV     eIoni
-    8   2.86 m   -3.79 cm  -1.16 m     477 keV  4.06 keV  1.32 cm   3.49 m     WorldPV     eIoni
-    9   2.91 m   -3.55 cm   -1.1 m     457 keV  19.3 keV  8.37 cm   3.57 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 mm   -674 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   3.21 mm    928 mum -2.44 m     202 keV   309 keV  5.69 mm   5.69 mm   TargetPV       compt
+    2   3.22 mm    898 mum -2.44 m       0 eV    202 keV   173 mum  5.87 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 466,   Parent ID = 462
+* G4Track Information:   Particle = gamma,   Track ID = 42,   Parent ID = 41
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.86 m   -3.79 cm  -1.16 m      11 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.86 m   -3.84 cm  -1.16 m    7.51 keV  3.45 keV   852 mum   852 mum   WorldPV     eIoni
-    2   2.86 m   -3.85 cm  -1.16 m    6.54 keV   971 eV    580 mum  1.43 mm    WorldPV     eIoni
-    3   2.86 m   -3.83 cm  -1.16 m    5.62 keV   919 eV    514 mum  1.95 mm    WorldPV     eIoni
-    4   2.86 m   -3.83 cm  -1.16 m       0 eV   5.62 keV   455 mum   2.4 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 mm   -674 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.92 mm  -1.61 mm  -2.44 m       0 eV    511 keV  3.31 mm   3.31 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 465,   Parent ID = 462
+* G4Track Information:   Particle = e-,   Track ID = 40,   Parent ID = 14
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.85 m   -3.49 cm  -1.17 m    10.1 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.85 m   -3.54 cm  -1.17 m    8.09 keV     2 keV   776 mum   776 mum   WorldPV     eIoni
-    2   2.85 m   -3.58 cm  -1.17 m    6.96 keV  1.13 keV   621 mum   1.4 mm    WorldPV     eIoni
-    3   2.85 m   -3.53 cm  -1.17 m    5.96 keV   999 eV    542 mum  1.94 mm    WorldPV     eIoni
-    4   2.85 m   -3.49 cm  -1.17 m    4.08 keV  1.89 keV   477 mum  2.42 mm    WorldPV     eIoni
-    5   2.85 m   -3.46 cm  -1.17 m    1.38 keV   2.7 keV   357 mum  2.77 mm    WorldPV     eIoni
-    6   2.85 m   -3.46 cm  -1.17 m       0 eV   1.38 keV  94.7 mum  2.87 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 mm   -674 mum -2.44 m    16.1 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -2.3 mm   -769 mum -2.44 m      13 MeV   2.8 MeV  1.91 mm   1.91 mm   TargetPV       eBrem
+    2  -2.45 mm   -949 mum -2.44 m    10.5 MeV  2.17 MeV  1.68 mm   3.59 mm   TargetPV       eBrem
+    3   -3.3 mm   -888 mum -2.44 m     6.2 MeV  2.82 MeV  1.85 mm   5.44 mm   TargetPV       eBrem
+    4  -3.53 mm   -733 mum -2.44 m    5.31 MeV   525 keV   300 mum  5.74 mm   TargetPV       eBrem
+    5  -3.62 mm   -596 mum -2.44 m    4.08 MeV   210 keV   200 mum  5.94 mm   TargetPV       eBrem
+    6  -3.96 mm   -702 mum -2.44 m       3 MeV  1.08 MeV   950 mum  6.89 mm   TargetPV       eIoni
+    7  -4.01 mm  -1.12 mm  -2.44 m    2.01 MeV   990 keV   779 mum  7.67 mm   TargetPV       eIoni
+    8  -4.29 mm   -989 mum -2.44 m    1.39 MeV   627 keV   613 mum  8.28 mm   TargetPV       eIoni
+    9  -4.26 mm   -840 mum -2.44 m     874 keV   512 keV   498 mum  8.78 mm   TargetPV       eIoni
+   10  -4.18 mm   -880 mum -2.44 m     426 keV   448 keV   390 mum  9.17 mm   TargetPV       eIoni
+   11  -4.18 mm   -872 mum -2.44 m    28.6 keV   397 keV   237 mum   9.4 mm   TargetPV       eIoni
+   12  -4.18 mm   -872 mum -2.44 m       0 eV   28.6 keV  3.59 mum  9.41 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 464,   Parent ID = 462
+* G4Track Information:   Particle = gamma,   Track ID = 48,   Parent ID = 40
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.72 m       3 cm  -1.28 m     107 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.72 m     2.8 cm  -1.29 m    94.4 keV  1.29 keV  4.88 mm   4.88 mm    WorldPV     eIoni
-    2   2.72 m     4.2 mm  -1.29 m    82.2 keV  12.1 keV  2.54 cm   3.03 cm    WorldPV     eIoni
-    3   2.72 m    -6.8 mm  -1.31 m    73.3 keV  8.94 keV     2 cm   5.04 cm    WorldPV     eIoni
-    4   2.72 m   -1.12 cm  -1.32 m    66.3 keV  6.96 keV  1.64 cm   6.67 cm    WorldPV     eIoni
-    5   2.72 m   -9.17 mm  -1.34 m    55.3 keV    11 keV  1.38 cm   8.05 cm    WorldPV     eIoni
-    6   2.71 m   -6.68 mm  -1.34 m    48.3 keV  7.01 keV     1 cm   9.06 cm    WorldPV     eIoni
-    7    2.7 m    -7.6 mm  -1.34 m      39 keV   9.3 keV  7.95 mm   9.85 cm    WorldPV     eIoni
-    8    2.7 m   -5.06 mm  -1.35 m    32.1 keV  6.92 keV  5.51 mm   10.4 cm    WorldPV     eIoni
-    9    2.7 m   -3.97 mm  -1.35 m    29.6 keV  2.47 keV  3.97 mm   10.8 cm    WorldPV     eIoni
-   10   2.69 m    -3.4 mm  -1.34 m    24.4 keV  5.25 keV  3.47 mm   11.1 cm    WorldPV     eIoni
-   11   2.69 m   -3.37 mm  -1.35 m    21.7 keV  2.69 keV  2.54 mm   11.4 cm    WorldPV     eIoni
-   12   2.69 m   -3.87 mm  -1.34 m    20.5 keV  1.14 keV  2.12 mm   11.6 cm    WorldPV     eIoni
-   13   2.69 m   -4.75 mm  -1.34 m    17.1 keV  3.42 keV  1.95 mm   11.8 cm    WorldPV     eIoni
-   14   2.69 m   -5.62 mm  -1.34 m    14.8 keV  2.36 keV   1.5 mm     12 cm    WorldPV     eIoni
-   15   2.69 m    -6.6 mm  -1.34 m    12.5 keV  2.28 keV  1.22 mm   12.1 cm    WorldPV     eIoni
-   16   2.69 m   -7.18 mm  -1.34 m    11.3 keV  1.23 keV   991 mum  12.2 cm    WorldPV     eIoni
-   17   2.69 m   -7.66 mm  -1.34 m    8.55 keV   2.7 keV   878 mum  12.3 cm    WorldPV     eIoni
-   18   2.69 m   -7.63 mm  -1.34 m    6.68 keV  1.87 keV   655 mum  12.3 cm    WorldPV     eIoni
-   19   2.69 m   -7.81 mm  -1.34 m    4.58 keV  2.11 keV   524 mum  12.4 cm    WorldPV     eIoni
-   20   2.69 m   -7.68 mm  -1.34 m       3 keV  1.57 keV   390 mum  12.4 cm    WorldPV     eIoni
-   21   2.69 m   -7.48 mm  -1.34 m     892 eV   2.11 keV   277 mum  12.4 cm    WorldPV     eIoni
-   22   2.69 m    -7.5 mm  -1.34 m       0 eV    892 eV   52.9 mum  12.5 cm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.62 mm   -596 mum -2.44 m    1.02 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.41 cm   1.39 cm  -2.45 m    1.02 MeV     0 eV   2.12 cm   2.12 cm   TargetPV  Transportation
+    2    -44 cm   59.9 cm  -2.91 m    1.02 MeV     0 eV   85.7 cm   87.9 cm OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 467,   Parent ID = 464
+* G4Track Information:   Particle = gamma,   Track ID = 47,   Parent ID = 40
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.72 m     2.8 cm  -1.29 m    11.5 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.72 m    2.81 cm  -1.29 m    10.1 keV  1.36 keV   897 mum   897 mum   WorldPV     eIoni
-    2   2.72 m    2.86 cm  -1.29 m    6.31 keV   3.8 keV   777 mum  1.67 mm    WorldPV     eIoni
-    3   2.72 m    2.84 cm  -1.29 m    4.01 keV  2.29 keV   500 mum  2.17 mm    WorldPV     eIoni
-    4   2.72 m    2.83 cm  -1.29 m       0 eV   4.01 keV   353 mum  2.53 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.53 mm   -733 mum -2.44 m     359 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.13 mm   -333 mum -2.44 m       0 eV    359 keV  1.18 mm   1.18 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 463,   Parent ID = 462
+* G4Track Information:   Particle = gamma,   Track ID = 46,   Parent ID = 40
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.37 m    8.63 cm  -1.37 m    9.81 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.37 m    8.65 cm  -1.37 m    6.58 keV  3.23 keV   753 mum   753 mum   Tracker     eIoni
-    2   2.37 m    8.67 cm  -1.37 m    6.01 keV   568 eV    517 mum  1.27 mm    Tracker     eIoni
-    3   2.37 m    8.66 cm  -1.37 m    4.87 keV  1.14 keV   480 mum  1.75 mm    Tracker     eIoni
-    4   2.37 m    8.69 cm  -1.37 m    3.23 keV  1.64 keV   408 mum  2.16 mm    Tracker     eIoni
-    5   2.37 m    8.68 cm  -1.37 m    2.28 keV   944 eV    296 mum  2.45 mm    Tracker     eIoni
-    6   2.37 m    8.68 cm  -1.37 m       0 eV   2.28 keV   199 mum  2.65 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -3.3 mm   -888 mum -2.44 m    1.45 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.68 mm   -899 mum -2.44 m     672 keV   782 keV   387 mum   387 mum  TargetPV       compt
+    2  -4.24 mm   -981 mum -2.44 m       0 eV    672 keV   779 mum  1.17 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 458,   Parent ID = 454
+* G4Track Information:   Particle = gamma,   Track ID = 45,   Parent ID = 40
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    164 mum   415 mum  -2.4 m    14.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    778 mum   676 mum  -2.4 m    14.6 MeV     0 eV   3.24 mm   3.24 mm    TrackerTransportation
-    2   15.6 cm   6.64 cm   -1.6 m    14.6 MeV     0 eV   81.7 cm   82.1 cm    ChamberTransportation
-    3   19.4 cm   8.29 cm   -1.4 m    14.6 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4     31 cm   13.2 cm    -80 cm   14.6 MeV     0 eV   61.3 cm   1.64 m     ChamberTransportation
-    5   34.9 cm   14.9 cm    -60 cm   14.6 MeV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6   46.5 cm   19.8 cm      0 fm   14.6 MeV     0 eV   61.3 cm   2.46 m     ChamberTransportation
-    7   50.4 cm   21.4 cm     20 cm   14.6 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8     62 cm   26.4 cm     80 cm   14.6 MeV     0 eV   61.3 cm   3.27 m     ChamberTransportation
-    9   65.9 cm     28 cm      1 m    14.6 MeV     0 eV   20.4 cm   3.48 m     TrackerTransportation
-   10   77.5 cm   32.9 cm    1.6 m    14.6 MeV     0 eV   61.3 cm   4.09 m     ChamberTransportation
-   11   81.3 cm   34.6 cm    1.8 m    14.6 MeV     0 eV   20.4 cm    4.3 m     TrackerTransportation
-   12   92.9 cm   39.5 cm    2.4 m    14.6 MeV     0 eV   61.3 cm   4.91 m     WorldPVTransportation
-   13   1.03 m    43.7 cm   2.91 m    14.6 MeV     0 eV   52.1 cm   5.43 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.45 mm   -949 mum -2.44 m     328 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.35 mm   -966 mum -2.44 m     188 keV   140 keV  2.14 mm   2.14 mm   TargetPV       compt
+    2  -3.72 mm   -582 mum -2.44 m       0 eV    188 keV   1.1 mm   3.24 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 457,   Parent ID = 454
+* G4Track Information:   Particle = gamma,   Track ID = 44,   Parent ID = 40
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    161 mum   414 mum  -2.4 m     303 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    831 mum   774 mum  -2.4 m     303 keV     0 eV   3.28 mm   3.28 mm    TrackerTransportation
-    2   16.9 cm    9.1 cm   -1.6 m     303 keV     0 eV   82.2 cm   82.6 cm    ChamberTransportation
-    3   21.1 cm   11.4 cm   -1.4 m     303 keV     0 eV   20.6 cm   1.03 m     TrackerTransportation
-    4   33.7 cm   18.1 cm    -80 cm    303 keV     0 eV   61.7 cm   1.65 m     ChamberTransportation
-    5     38 cm   20.4 cm    -60 cm    303 keV     0 eV   20.6 cm   1.85 m     TrackerTransportation
-    6   50.6 cm   27.2 cm      0 fm    303 keV     0 eV   61.7 cm   2.47 m     ChamberTransportation
-    7   54.8 cm   29.4 cm     20 cm    303 keV     0 eV   20.6 cm   2.68 m     TrackerTransportation
-    8   67.4 cm   36.2 cm     80 cm    303 keV     0 eV   61.7 cm   3.29 m     ChamberTransportation
-    9   71.6 cm   38.4 cm      1 m     303 keV     0 eV   20.6 cm    3.5 m     TrackerTransportation
-   10   84.2 cm   45.2 cm    1.6 m     303 keV     0 eV   61.7 cm   4.12 m     ChamberTransportation
-   11   88.4 cm   47.5 cm    1.8 m     303 keV     0 eV   20.6 cm   4.32 m     TrackerTransportation
-   12   1.01 m    54.2 cm    2.4 m     303 keV     0 eV   61.7 cm   4.94 m     WorldPVTransportation
-   13   1.12 m      60 cm   2.91 m     303 keV     0 eV   52.4 cm   5.46 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -2.3 mm   -769 mum -2.44 m     332 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.03 mm   -462 mum -2.43 m       0 eV    332 keV  6.54 mm   6.54 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 456,   Parent ID = 454
+* G4Track Information:   Particle = gamma,   Track ID = 13,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    198 mum   427 mum  -2.4 m     724 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    718 mum   175 mum  -2.4 m     724 keV     0 eV    4.2 mm    4.2 mm    TrackerTransportation
-    2   10.1 cm  -4.82 cm   -1.6 m     724 keV     0 eV   80.8 cm   81.2 cm    ChamberTransportation
-    3   12.6 cm  -6.04 cm   -1.4 m     724 keV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4     20 cm  -9.67 cm    -80 cm    724 keV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   22.5 cm  -10.9 cm    -60 cm    724 keV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6     30 cm  -14.5 cm      0 fm    724 keV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   32.5 cm  -15.7 cm     20 cm    724 keV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8     40 cm  -19.4 cm     80 cm    724 keV     0 eV   60.6 cm   3.23 m     ChamberTransportation
-    9   42.5 cm  -20.6 cm      1 m     724 keV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10     50 cm  -24.2 cm    1.6 m     724 keV     0 eV   60.6 cm   4.04 m     ChamberTransportation
-   11   52.5 cm  -25.4 cm    1.8 m     724 keV     0 eV   20.2 cm   4.24 m     TrackerTransportation
-   12     60 cm    -29 cm    2.4 m     724 keV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   66.3 cm  -32.1 cm   2.91 m     724 keV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -561 mum  -131 mum -2.44 m    40.4 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.05 mm   -940 mum -2.44 m       0 eV      0 eV   4.47 mm   4.47 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 455,   Parent ID = 454
+* G4Track Information:   Particle = e+,   Track ID = 50,   Parent ID = 13
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -64.3 mum   513 mum -2.41 m    23.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    269 mum   1.5 mm   -2.4 m       0 eV      0 eV   4.84 mm   4.84 mm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.05 mm   -940 mum -2.44 m      36 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.1 mm  -1.02 mm  -2.44 m    31.6 MeV   363 keV   351 mum   351 mum  TargetPV       eBrem
+    2   -884 mum  -870 mum -2.44 m    25.3 MeV  3.37 MeV   2.5 mm   2.85 mm   TargetPV       eBrem
+    3  -1.34 mm  -1.12 mm  -2.43 m    18.3 MeV  3.26 MeV  2.47 mm   5.32 mm   TargetPV       eBrem
+    4  -1.76 mm  -1.28 mm  -2.43 m    15.9 MeV   738 keV   641 mum  5.96 mm   TargetPV       eBrem
+    5  -2.08 mm  -1.56 mm  -2.43 m    12.6 MeV  1.17 MeV  1.08 mm   7.04 mm   TargetPV       eBrem
+    6  -2.97 mm   -1.6 mm  -2.43 m    8.52 MeV  2.83 MeV  1.88 mm   8.92 mm   TargetPV       eBrem
+    7     -3 mm  -2.29 mm  -2.43 m    7.05 MeV  1.16 MeV   721 mum  9.64 mm   TargetPV       eBrem
+    8  -3.02 mm  -2.59 mm  -2.43 m    5.11 MeV   350 keV   345 mum  9.98 mm   TargetPV       eBrem
+    9  -2.27 mm  -3.02 mm  -2.43 m    3.84 MeV  1.27 MeV  1.13 mm   1.11 cm   TargetPV       eIoni
+   10  -2.62 mm  -3.19 mm  -2.43 m     1.2 MeV  2.64 MeV   930 mum   1.2 cm   TargetPV       eIoni
+   11  -2.62 mm  -3.23 mm  -2.43 m     220 keV  67.6 keV  74.9 mum  1.21 cm   TargetPV       eBrem
+   12  -2.62 mm  -3.23 mm  -2.43 m       0 eV    220 keV  90.8 mum  1.22 cm   TargetPV       eIoni
+   13  -2.62 mm  -3.23 mm  -2.43 m       0 eV      0 eV      0 fm   1.22 cm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 469,   Parent ID = 455
+* G4Track Information:   Particle = gamma,   Track ID = 61,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    269 mum   1.5 mm   -2.4 m    9.77 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    514 mum   1.7 mm   -2.4 m    7.58 MeV   2.2 MeV  1.76 mm   1.76 mm   TargetPV     eIoni
-    2    557 mum  1.72 mm   -2.4 m    5.44 MeV  48.1 keV  48.5 mum  1.81 mm   TargetPV     eBrem
-    3    681 mum  1.78 mm   -2.4 m     4.8 MeV   195 keV   207 mum  2.02 mm   TargetPV     eBrem
-    4    741 mum  1.77 mm   -2.4 m    4.72 MeV  81.4 keV  73.7 mum  2.09 mm    TrackerTransportation
-    5   13.9 cm    878 mum -2.34 m    4.66 MeV  28.8 keV  15.1 cm   15.3 cm    Tracker     eIoni
-    6    1.9 m   -11.7 cm  -1.23 m    4.28 MeV   369 keV  2.11 m    2.26 m     Tracker     eIoni
-    7   2.15 m   -10.7 cm  -1.01 m    4.21 MeV  64.5 keV  33.2 cm   2.59 m     Tracker     eIoni
-    8    2.4 m   -9.05 cm  -80.9 cm   4.16 MeV  47.3 keV  32.1 cm   2.91 m     WorldPVTransportation
-    9   2.91 m   -6.52 cm  -27.5 cm   4.03 MeV   127 keV  74.4 cm   3.66 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.62 mm  -3.23 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -6.2 mm  -1.15 mm  -2.43 m     256 keV   255 keV  4.14 mm   4.14 mm   TargetPV       compt
+    2  -6.06 mm   -881 mum -2.43 m       0 eV    256 keV   473 mum  4.62 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 474,   Parent ID = 469
+* G4Track Information:   Particle = gamma,   Track ID = 60,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.15 m   -10.7 cm  -1.01 m    8.45 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.15 m   -10.6 cm  -1.01 m    7.15 keV   1.3 keV   647 mum   647 mum   Tracker     eIoni
-    2   2.15 m   -10.7 cm  -1.01 m    5.49 keV  1.66 keV   555 mum   1.2 mm    Tracker     eIoni
-    3   2.15 m   -10.7 cm  -1.01 m    4.42 keV  1.07 keV   447 mum  1.65 mm    Tracker     eIoni
-    4   2.15 m   -10.7 cm  -1.01 m    3.08 keV  1.34 keV   380 mum  2.03 mm    Tracker     eIoni
-    5   2.15 m   -10.6 cm  -1.01 m     834 eV   2.25 keV   284 mum  2.31 mm    Tracker     eIoni
-    6   2.15 m   -10.6 cm  -1.01 m       0 eV    834 eV   48.9 mum  2.36 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.62 mm  -3.23 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    1.9 cm  -1.58 cm  -2.43 m     280 keV   231 keV   2.5 cm    2.5 cm   TargetPV       compt
+    2   1.96 cm  -1.68 cm  -2.43 m       0 eV    280 keV  4.54 mm   2.96 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 473,   Parent ID = 469
+* G4Track Information:   Particle = gamma,   Track ID = 59,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.9 m   -11.7 cm  -1.23 m    11.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    1.9 m   -11.8 cm  -1.23 m    10.6 keV   1.1 keV   917 mum   917 mum   Tracker     eIoni
-    2    1.9 m   -11.9 cm  -1.23 m    9.26 keV  1.34 keV   821 mum  1.74 mm    Tracker     eIoni
-    3    1.9 m   -11.9 cm  -1.23 m    4.53 keV  4.73 keV   710 mum  2.45 mm    Tracker     eIoni
-    4    1.9 m   -11.9 cm  -1.23 m    1.85 keV  2.68 keV   387 mum  2.84 mm    Tracker     eIoni
-    5    1.9 m   -11.9 cm  -1.23 m       0 eV   1.85 keV   144 mum  2.98 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.62 mm  -3.23 mm  -2.43 m     913 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.58 mm  -3.31 mm  -2.43 m     436 keV   477 keV   338 mum   338 mum  TargetPV       compt
+    2  -1.47 mm  -5.72 mm  -2.43 m     363 keV  73.1 keV  2.68 mm   3.02 mm   TargetPV       compt
+    3    1.3 mm  -8.46 mm  -2.43 m       0 eV    363 keV  5.38 mm   8.39 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 472,   Parent ID = 469
+* G4Track Information:   Particle = gamma,   Track ID = 58,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   13.9 cm    878 mum -2.34 m    24.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1     14 cm    2.9 mm  -2.34 m    22.6 keV  2.33 keV  2.62 mm   2.62 mm    Tracker     eIoni
-    2     14 cm   5.07 mm  -2.34 m    20.8 keV  1.72 keV  2.26 mm   4.87 mm    Tracker     eIoni
-    3   14.1 cm   6.22 mm  -2.34 m    16.6 keV  4.29 keV  1.99 mm   6.86 mm    Tracker     eIoni
-    4   14.2 cm   7.58 mm  -2.34 m    12.7 keV  3.88 keV  1.43 mm   8.29 mm    Tracker     eIoni
-    5   14.1 cm   7.68 mm  -2.34 m    11.3 keV  1.36 keV  1.01 mm    9.3 mm    Tracker     eIoni
-    6   14.1 cm   8.38 mm  -2.34 m    10.3 keV  1.04 keV   884 mum  1.02 cm    Tracker     eIoni
-    7   14.1 cm   8.89 mm  -2.34 m    7.71 keV  2.57 keV   792 mum   1.1 cm    Tracker     eIoni
-    8   14.2 cm   8.69 mm  -2.34 m    6.54 keV  1.16 keV   594 mum  1.16 cm    Tracker     eIoni
-    9   14.2 cm   8.24 mm  -2.34 m     5.4 keV  1.15 keV   515 mum  1.21 cm    Tracker     eIoni
-   10   14.2 cm   7.91 mm  -2.34 m    3.95 keV  1.44 keV   442 mum  1.25 cm    Tracker     eIoni
-   11   14.2 cm   7.72 mm  -2.34 m    1.95 keV     2 keV   349 mum  1.29 cm    Tracker     eIoni
-   12   14.2 cm   7.69 mm  -2.34 m       0 eV   1.95 keV   157 mum   1.3 cm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.02 mm  -2.59 mm  -2.43 m    1.59 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.17 cm   -2.5 cm  -2.44 m    1.59 MeV     0 eV   2.72 cm   2.72 cm   TargetPV  Transportation
+    2   1.55 m   -2.37 m   -2.91 m    1.59 MeV     0 eV   2.85 m    2.87 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 471,   Parent ID = 469
+* G4Track Information:   Particle = gamma,   Track ID = 57,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    681 mum  1.78 mm   -2.4 m     449 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    764 mum  1.79 mm   -2.4 m     449 keV     0 eV   91.7 mum  91.7 mum   TrackerTransportation
-    2    2.4 m    23.8 cm   -1.3 m     449 keV     0 eV   2.65 m    2.65 m     WorldPVTransportation
-    3   2.91 m    28.8 cm  -1.07 m     449 keV     0 eV   56.3 cm   3.21 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0     -3 mm  -2.29 mm  -2.43 m     309 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.59 mm  -4.68 mm  -2.43 m       0 eV    309 keV  2.61 mm   2.61 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 470,   Parent ID = 469
+* G4Track Information:   Particle = gamma,   Track ID = 56,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    557 mum  1.72 mm   -2.4 m    2.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    824 mum   1.8 mm   -2.4 m    2.09 MeV     0 eV    336 mum   336 mum   TrackerTransportation
-    2    2.4 m    77.9 cm    -76 cm   2.09 MeV     0 eV   3.01 m    3.01 m     WorldPVTransportation
-    3   2.91 m    94.4 cm  -41.1 cm   2.09 MeV     0 eV     64 cm   3.65 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.97 mm   -1.6 mm  -2.43 m    1.25 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1     -4 mm  -4.17 mm  -2.43 m     221 keV  1.02 MeV  3.02 mm   3.02 mm   TargetPV       compt
+    2  -4.08 mm  -3.33 mm  -2.43 m     207 keV  14.4 keV   889 mum  3.91 mm   TargetPV       compt
+    3   -4.1 mm  -3.31 mm  -2.43 m       0 eV    207 keV  28.5 mum  3.94 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 468,   Parent ID = 455
+* G4Track Information:   Particle = gamma,   Track ID = 55,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    269 mum   1.5 mm   -2.4 m    12.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    330 mum  1.58 mm   -2.4 m    11.9 MeV   411 keV   261 mum   261 mum  TargetPV     eBrem
-    2    338 mum  1.39 mm   -2.4 m    9.19 MeV   640 keV   580 mum   840 mum  TargetPV     eBrem
-    3   7.39 mum   637 mum  -2.4 m    6.48 MeV  2.71 MeV  1.56 mm    2.4 mm    TrackerTransportation
-    4   66.6 cm  -43.7 cm  -2.19 m    6.33 MeV   141 keV  82.5 cm   82.7 cm    Tracker     eIoni
-    5   70.8 cm  -46.2 cm  -2.16 m     6.3 MeV  7.11 keV   6.2 cm   88.9 cm    Tracker     eIoni
-    6   1.28 m   -82.7 cm  -1.58 m    6.14 MeV   158 keV  89.4 cm   1.78 m     Tracker     eIoni
-    7   1.65 m   -1.03 m   -1.21 m    6.03 MeV  99.7 keV  55.8 cm   2.34 m     Tracker     eIoni
-    8   2.37 m   -1.45 m   -56.3 cm   5.82 MeV   187 keV  1.06 m     3.4 m     Tracker     eIoni
-    9    2.4 m   -1.47 m     -53 cm   5.81 MeV  7.33 keV  5.37 cm   3.45 m     WorldPVTransportation
-   10   2.91 m   -1.86 m   -1.33 cm   5.66 MeV   148 keV  82.4 cm   4.28 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.08 mm  -1.56 mm  -2.43 m    2.11 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -7.92 mm  -8.25 mm  -2.42 m    1.13 MeV   980 keV  1.38 cm   1.38 cm   TargetPV       compt
+    2  -1.25 cm  -6.59 mm  -2.41 m       0 eV   1.13 MeV  1.12 cm    2.5 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 481,   Parent ID = 468
+* G4Track Information:   Particle = gamma,   Track ID = 54,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.37 m   -1.45 m   -56.3 cm   23.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.36 m   -1.45 m   -56.2 cm   20.8 keV  2.65 keV  2.39 mm   2.39 mm    Tracker     eIoni
-    2   2.36 m   -1.45 m     -56 cm     19 keV   1.8 keV  1.98 mm   4.37 mm    Tracker     eIoni
-    3   2.36 m   -1.45 m   -55.9 cm     17 keV     2 keV  1.74 mm   6.11 mm    Tracker     eIoni
-    4   2.36 m   -1.45 m   -55.8 cm     15 keV  1.98 keV  1.48 mm   7.59 mm    Tracker     eIoni
-    5   2.36 m   -1.45 m   -55.7 cm     12 keV  2.99 keV  1.25 mm   8.84 mm    Tracker     eIoni
-    6   2.36 m   -1.45 m   -55.6 cm   9.38 keV  2.62 keV   943 mum  9.78 mm    Tracker     eIoni
-    7   2.36 m   -1.45 m   -55.6 cm   7.84 keV  1.54 keV   720 mum  1.05 cm    Tracker     eIoni
-    8   2.36 m   -1.45 m   -55.5 cm   7.17 keV   673 eV    604 mum  1.11 cm    Tracker     eIoni
-    9   2.36 m   -1.45 m   -55.5 cm    5.7 keV  1.47 keV   557 mum  1.17 cm    Tracker     eIoni
-   10   2.36 m   -1.45 m   -55.5 cm   4.92 keV   781 eV    460 mum  1.21 cm    Tracker     eIoni
-   11   2.36 m   -1.45 m   -55.5 cm   3.16 keV  1.76 keV   412 mum  1.25 cm    Tracker     eIoni
-   12   2.36 m   -1.45 m   -55.5 cm   2.08 keV  1.08 keV   291 mum  1.28 cm    Tracker     eIoni
-   13   2.36 m   -1.45 m   -55.5 cm      0 eV   2.08 keV   174 mum   1.3 cm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.76 mm  -1.28 mm  -2.43 m    1.66 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.21 cm  -5.76 mm  -2.42 m       0 eV   1.66 MeV  1.85 cm   1.85 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 480,   Parent ID = 468
+* G4Track Information:   Particle = gamma,   Track ID = 53,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.65 m   -1.03 m   -1.21 m    8.16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.65 m   -1.03 m   -1.21 m    5.94 keV  2.22 keV   625 mum   625 mum   Tracker     eIoni
-    2   1.65 m   -1.03 m   -1.21 m    4.43 keV  1.51 keV   475 mum   1.1 mm    Tracker     eIoni
-    3   1.65 m   -1.03 m   -1.21 m    2.64 keV  1.79 keV   381 mum  1.48 mm    Tracker     eIoni
-    4   1.65 m   -1.03 m   -1.21 m    1.28 keV  1.35 keV   242 mum  1.72 mm    Tracker     eIoni
-    5   1.65 m   -1.03 m   -1.21 m       0 eV   1.28 keV  85.4 mum  1.81 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.34 mm  -1.12 mm  -2.43 m    3.73 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.17 mm  -3.66 mm  -2.43 m    3.38 MeV   353 keV  9.49 mm   9.49 mm   TargetPV       compt
+    2  -2.21 cm  -6.68 mm   -2.4 m     949 keV  2.43 MeV  2.88 cm   3.82 cm   TargetPV       compt
+    3  -2.36 cm  -5.54 mm   -2.4 m     329 keV   620 keV  2.01 mm   4.03 cm   TargetPV       compt
+    4  -2.39 cm  -6.74 mm   -2.4 m       0 eV    329 keV  1.92 mm   4.22 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 479,   Parent ID = 468
+* G4Track Information:   Particle = gamma,   Track ID = 52,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.28 m   -82.7 cm  -1.58 m    8.67 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.28 m   -82.7 cm  -1.58 m    6.28 keV  2.38 keV   664 mum   664 mum   Tracker     eIoni
-    2   1.28 m   -82.6 cm  -1.58 m    4.49 keV  1.79 keV   498 mum  1.16 mm    Tracker     eIoni
-    3   1.28 m   -82.6 cm  -1.58 m    2.28 keV  2.21 keV   384 mum  1.55 mm    Tracker     eIoni
-    4   1.28 m   -82.6 cm  -1.58 m       0 eV   2.28 keV   198 mum  1.74 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -884 mum  -870 mum -2.44 m    2.91 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.94 cm   -1.1 mm   -2.4 m    2.91 MeV     0 eV   4.13 cm   4.13 cm   TargetPV  Transportation
+    2   -2.4 m   -3.03 cm   2.33 m    2.91 MeV     0 eV   5.29 m    5.34 m     Tracker  Transportation
+    3  -2.69 m   -3.38 cm   2.91 m    2.91 MeV     0 eV   65.1 cm   5.99 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 478,   Parent ID = 468
+* G4Track Information:   Particle = gamma,   Track ID = 51,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   70.8 cm  -46.2 cm  -2.16 m    15.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   70.9 cm  -46.2 cm  -2.16 m    14.2 keV  1.48 keV  1.33 mm   1.33 mm    Tracker     eIoni
-    2     71 cm  -46.2 cm  -2.16 m    12.9 keV   1.3 keV  1.17 mm    2.5 mm    Tracker     eIoni
-    3   71.1 cm  -46.2 cm  -2.16 m    10.3 keV  2.59 keV  1.04 mm   3.53 mm    Tracker     eIoni
-    4   71.1 cm  -46.2 cm  -2.16 m    8.41 keV  1.92 keV   797 mum  4.33 mm    Tracker     eIoni
-    5   71.2 cm  -46.2 cm  -2.16 m    6.78 keV  1.64 keV   644 mum  4.97 mm    Tracker     eIoni
-    6   71.2 cm  -46.2 cm  -2.16 m    5.93 keV   842 eV    530 mum   5.5 mm    Tracker     eIoni
-    7   71.2 cm  -46.1 cm  -2.16 m    4.62 keV  1.31 keV   475 mum  5.98 mm    Tracker     eIoni
-    8   71.2 cm  -46.1 cm  -2.16 m    3.14 keV  1.48 keV   393 mum  6.37 mm    Tracker     eIoni
-    9   71.2 cm  -46.1 cm  -2.16 m    2.27 keV   870 eV    289 mum  6.66 mm    Tracker     eIoni
-   10   71.2 cm  -46.1 cm  -2.16 m       0 eV   2.27 keV   197 mum  6.86 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.1 mm  -1.02 mm  -2.44 m    4.12 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.11 mm  -1.79 mm  -2.41 m    3.79 MeV   331 keV  2.65 cm   2.65 cm   TargetPV       compt
+    2  -7.56 mm  -2.37 mm   -2.4 m    3.79 MeV     0 eV   1.34 cm   3.99 cm   TargetPV  Transportation
+    3  -22.1 cm  -3.85 cm   -1.6 m    3.79 MeV     0 eV   82.9 cm   86.9 cm    Tracker  Transportation
+    4    -24 cm  -4.18 cm  -1.53 m    3.79 MeV     0 eV   7.54 cm   94.4 cm    Chamber  Transportation
+    5  -43.4 cm  -7.46 cm    -80 cm   3.79 MeV     0 eV   75.3 cm    1.7 m     Tracker  Transportation
+    6  -47.8 cm  -8.21 cm  -63.4 cm      0 eV      0 eV   17.2 cm   1.87 m     Chamber        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 477,   Parent ID = 468
+* G4Track Information:   Particle = e+,   Track ID = 63,   Parent ID = 51
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   66.6 cm  -43.7 cm  -2.19 m    8.75 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   66.6 cm  -43.7 cm  -2.19 m    6.29 keV  2.45 keV   670 mum   670 mum   Tracker     eIoni
-    2   66.6 cm  -43.6 cm  -2.19 m       5 keV  1.29 keV   499 mum  1.17 mm    Tracker     eIoni
-    3   66.6 cm  -43.6 cm  -2.19 m    3.68 keV  1.33 keV   417 mum  1.59 mm    Tracker     eIoni
-    4   66.6 cm  -43.6 cm  -2.19 m    1.92 keV  1.75 keV   330 mum  1.92 mm    Tracker     eIoni
-    5   66.6 cm  -43.6 cm  -2.19 m       0 eV   1.92 keV   153 mum  2.07 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -47.8 cm  -8.21 cm  -63.4 cm   1.14 MeV     0 eV      0 fm      0 fm    Chamber    initStep
+    1  -49.4 cm  -8.53 cm    -60 cm   1.12 MeV  18.9 keV  4.06 cm   4.06 cm    Chamber  Transportation
+    2  -86.5 cm   26.6 cm      0 fm    987 keV   133 keV  84.4 cm   88.5 cm    Tracker  Transportation
+    3  -1.03 m    31.7 cm   9.66 cm    830 keV   157 keV  30.7 cm   1.19 m     Chamber       eIoni
+    4  -98.2 cm     17 cm   8.37 cm    734 keV  95.5 keV  24.6 cm   1.44 m     Chamber       eIoni
+    5    -98 cm   24.3 cm      0 fm    652 keV    72 keV  18.6 cm   1.62 m     Chamber  Transportation
+    6  -1.03 m    9.11 cm  -8.87 cm    520 keV  39.9 keV  18.6 cm   1.81 m     Tracker       eIoni
+    7  -96.6 cm  -27.7 cm  -11.1 cm    455 keV  65.5 keV  38.8 cm    2.2 m     Tracker       eIoni
+    8  -97.9 cm    -58 cm  -16.7 cm    384 keV  70.6 keV    32 cm   2.52 m     Tracker       eIoni
+    9     -1 m   -78.2 cm  -29.5 cm    333 keV  50.8 keV  24.9 cm   2.77 m     Tracker       eIoni
+   10  -1.06 m   -77.1 cm  -46.7 cm    294 keV  39.1 keV    20 cm   2.97 m     Tracker       eIoni
+   11  -99.6 cm  -82.5 cm  -60.3 cm    248 keV  45.7 keV  16.5 cm   3.13 m     Tracker       eIoni
+   12     -1 m   -78.4 cm    -71 cm    218 keV    30 keV  12.6 cm   3.26 m     Tracker       eIoni
+   13  -95.1 cm  -75.5 cm    -79 cm    185 keV  33.6 keV  10.3 cm   3.36 m     Tracker       eIoni
+   14  -98.1 cm  -70.3 cm  -83.6 cm    164 keV    21 keV  7.79 cm   3.44 m     Tracker       eIoni
+   15  -96.8 cm  -65.1 cm  -86.4 cm    146 keV  18.1 keV  6.37 cm    3.5 m     Tracker       eIoni
+   16  -99.6 cm  -69.1 cm  -87.8 cm    125 keV  20.6 keV  5.23 cm   3.55 m     Tracker       eIoni
+   17  -1.01 m   -72.6 cm    -88 cm    113 keV  12.3 keV  4.03 cm   3.59 m     Tracker       eIoni
+   18  -1.01 m   -75.8 cm  -87.7 cm   94.8 keV    18 keV  3.37 cm   3.63 m     Tracker       eIoni
+   19  -1.01 m   -77.8 cm  -86.4 cm   75.8 keV    19 keV  2.49 cm   3.65 m     Tracker       eIoni
+   20  -1.01 m   -78.9 cm  -85.2 cm   65.7 keV  10.1 keV  1.67 cm   3.67 m     Tracker       eIoni
+   21  -1.02 m   -79.4 cm  -84.2 cm   59.9 keV  5.77 keV  1.31 cm   3.68 m     Tracker       eIoni
+   22  -1.01 m   -79.6 cm  -83.5 cm   55.4 keV  4.56 keV  1.11 cm   3.69 m     Tracker       eIoni
+   23  -1.01 m   -80.1 cm  -82.9 cm   50.1 keV  5.24 keV  9.68 mm    3.7 m     Tracker       eIoni
+   24     -1 m   -80.8 cm  -82.9 cm   45.4 keV  4.73 keV  8.12 mm   3.71 m     Tracker       eIoni
+   25     -1 m   -81.5 cm  -82.8 cm   39.5 keV  5.96 keV  6.83 mm   3.72 m     Tracker       eIoni
+   26  -99.9 cm  -81.9 cm  -82.9 cm   36.3 keV  3.12 keV  5.36 mm   3.72 m     Tracker       eIoni
+   27  -99.6 cm  -82.1 cm  -83.1 cm   33.5 keV  2.82 keV  4.62 mm   3.73 m     Tracker       eIoni
+   28  -99.4 cm  -82.4 cm  -83.3 cm   30.3 keV  3.16 keV  4.05 mm   3.73 m     Tracker       eIoni
+   29  -99.4 cm  -82.4 cm  -83.3 cm   18.7 keV  2.15 keV   535 mum  3.73 m     Tracker       eIoni
+   30  -99.4 cm  -82.4 cm  -83.4 cm     17 keV  1.73 keV  1.58 mm   3.73 m     Tracker       eIoni
+   31  -99.4 cm  -82.3 cm  -83.6 cm   12.2 keV  4.78 keV  1.37 mm   3.74 m     Tracker       eIoni
+   32  -99.4 cm  -82.3 cm  -83.5 cm   9.74 keV  2.44 keV   883 mum  3.74 m     Tracker       eIoni
+   33  -99.5 cm  -82.2 cm  -83.5 cm    8.1 keV  1.64 keV   687 mum  3.74 m     Tracker       eIoni
+   34  -99.4 cm  -82.2 cm  -83.5 cm   5.65 keV  2.45 keV   574 mum  3.74 m     Tracker       eIoni
+   35  -99.4 cm  -82.2 cm  -83.5 cm   3.66 keV  1.99 keV   424 mum  3.74 m     Tracker       eIoni
+   36  -99.5 cm  -82.2 cm  -83.5 cm   1.36 keV   2.3 keV   299 mum  3.74 m     Tracker       eIoni
+   37  -99.4 cm  -82.1 cm  -83.5 cm      0 eV   1.36 keV  72.7 mum  3.74 m     Tracker       eIoni
+   38  -99.4 cm  -82.1 cm  -83.5 cm      0 eV      0 eV      0 fm   3.74 m     Tracker     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 63
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -99.4 cm  -82.1 cm  -83.5 cm    511 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -2.27 m   -10.3 cm   -2.4 m     511 keV     0 eV   2.14 m    2.14 m     Tracker  Transportation
+    2  -2.69 m    13.2 cm  -2.91 m     511 keV     0 eV   69.9 cm   2.84 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 63
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -99.4 cm  -82.1 cm  -83.5 cm    511 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   99.1 cm  -1.94 m     1.6 m     511 keV     0 eV   3.34 m    3.34 m     Tracker  Transportation
+    2   1.04 m   -1.97 m    1.66 m     511 keV     0 eV   8.21 cm   3.42 m     Chamber  Transportation
+    3   1.64 m   -2.31 m     2.4 m     511 keV     0 eV   1.01 m    4.43 m     Tracker  Transportation
+    4   2.06 m   -2.54 m    2.91 m     511 keV     0 eV   69.9 cm   5.13 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 66,   Parent ID = 63
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -99.4 cm  -82.4 cm  -83.3 cm   9.52 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -99.3 cm  -82.4 cm  -83.3 cm   8.58 keV   940 eV    719 mum   719 mum   Tracker       eIoni
+    2  -99.3 cm  -82.5 cm  -83.3 cm      7 keV  1.58 keV   647 mum  1.37 mm    Tracker       eIoni
+    3  -99.3 cm  -82.5 cm  -83.2 cm   5.75 keV  1.25 keV   537 mum   1.9 mm    Tracker       eIoni
+    4  -99.3 cm  -82.5 cm  -83.2 cm   4.14 keV  1.61 keV   456 mum  2.36 mm    Tracker       eIoni
+    5  -99.2 cm  -82.6 cm  -83.2 cm   1.03 keV   3.1 keV   356 mum  2.71 mm    Tracker       eIoni
+    6  -99.2 cm  -82.6 cm  -83.2 cm      0 eV   1.03 keV  60.8 mum  2.78 mm    Tracker       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 63
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.03 m    9.11 cm  -8.87 cm   92.3 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -1.03 m    8.53 cm  -11.1 cm   81.1 keV  11.2 keV   2.4 cm    2.4 cm    Tracker       eIoni
+    2  -1.04 m     8.3 cm  -12.8 cm   72.9 keV  8.23 keV  1.92 cm   4.32 cm    Tracker       eIoni
+    3  -1.04 m    7.68 cm  -14.2 cm   63.4 keV  9.53 keV  1.59 cm   5.91 cm    Tracker       eIoni
+    4  -1.03 m    7.52 cm  -15.3 cm     56 keV  7.42 keV  1.24 cm   7.16 cm    Tracker       eIoni
+    5  -1.03 m    7.96 cm  -16.1 cm   46.5 keV  9.43 keV  1.01 cm   8.16 cm    Tracker       eIoni
+    6  -1.03 m    7.86 cm  -16.7 cm   41.1 keV   5.4 keV  7.31 mm   8.89 cm    Tracker       eIoni
+    7  -1.02 m     7.6 cm  -17.1 cm   36.7 keV  4.41 keV  5.91 mm   9.49 cm    Tracker       eIoni
+    8  -1.02 m    7.61 cm  -17.5 cm   32.1 keV  4.64 keV  4.86 mm   9.97 cm    Tracker       eIoni
+    9  -1.02 m    7.86 cm  -17.8 cm   29.2 keV   2.9 keV  3.89 mm   10.4 cm    Tracker       eIoni
+   10  -1.03 m    8.04 cm  -17.7 cm   26.5 keV  2.65 keV  3.32 mm   10.7 cm    Tracker       eIoni
+   11  -1.02 m    8.16 cm  -17.9 cm   19.1 keV  7.43 keV  2.85 mm     11 cm    Tracker       eIoni
+   12  -1.02 m    8.13 cm  -17.8 cm     17 keV  2.06 keV  1.72 mm   11.2 cm    Tracker       eIoni
+   13  -1.02 m    8.15 cm  -17.7 cm   14.3 keV  2.76 keV  1.46 mm   11.3 cm    Tracker       eIoni
+   14  -1.02 m    8.21 cm  -17.6 cm   12.7 keV  1.58 keV  1.15 mm   11.4 cm    Tracker       eIoni
+   15  -1.02 m    8.24 cm  -17.5 cm   10.5 keV  2.21 keV   995 mum  11.5 cm    Tracker       eIoni
+   16  -1.02 m    8.29 cm  -17.5 cm   8.48 keV     2 keV   797 mum  11.6 cm    Tracker       eIoni
+   17  -1.02 m    8.34 cm  -17.5 cm   7.58 keV   897 eV    639 mum  11.7 cm    Tracker       eIoni
+   18  -1.02 m    8.37 cm  -17.5 cm    509 eV   7.07 keV   577 mum  11.7 cm    Tracker       eIoni
+   19  -1.02 m    8.38 cm  -17.5 cm      0 eV    509 eV   26.9 mum  11.7 cm    Tracker       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 64,   Parent ID = 63
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    -98 cm   23.4 cm   1.07 cm    9.9 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1    -98 cm   23.4 cm   1.06 cm   7.13 keV  2.77 keV   506 mum   506 mum   Chamber       eIoni
+    2    -98 cm   23.4 cm   1.06 cm    2.9 keV  4.23 keV   400 mum   907 mum   Chamber       eIoni
+    3    -98 cm   23.4 cm   1.07 cm      0 eV    2.9 keV   173 mum  1.08 mm    Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 62,   Parent ID = 51
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -47.8 cm  -8.21 cm  -63.4 cm   1.63 MeV     0 eV      0 fm      0 fm    Chamber    initStep
+    1    -48 cm  -8.22 cm    -60 cm   1.62 MeV    11 keV  3.58 cm   3.58 cm    Chamber  Transportation
+    2  -47.9 cm  -8.34 cm  -59.4 cm   1.51 MeV   551 eV   6.17 mm    4.2 cm    Tracker       eIoni
+    3  -41.4 cm  -9.24 cm -0.000852 fm   1.41 MeV   104 keV  61.8 cm     66 cm    Tracker  Transportation
+    4  -38.8 cm  -10.8 cm   15.5 cm    921 keV  93.6 keV  19.2 cm   85.1 cm    Chamber       eBrem
+    5  -37.3 cm  -10.8 cm     20 cm    900 keV  20.7 keV   5.5 cm   90.7 cm    Chamber  Transportation
+    6  -35.6 cm  -13.9 cm   30.6 cm    700 keV  27.6 keV  11.2 cm   1.02 m     Tracker       eIoni
+    7  -13.2 cm  -14.5 cm   78.7 cm    602 keV  98.4 keV  58.7 cm   1.61 m     Tracker       eIoni
+    8  -12.9 cm  -14.1 cm     80 cm    600 keV   1.6 keV  1.42 cm   1.62 m     Tracker  Transportation
+    9  -4.75 cm  -14.7 cm   86.2 cm    521 keV  78.7 keV  15.9 cm   1.78 m     Chamber       eIoni
+   10  -5.34 cm  -14.3 cm   87.2 cm    437 keV  15.3 keV  1.24 cm   1.79 m     Chamber       eIoni
+   11  -6.36 cm   -9.4 cm   89.1 cm    378 keV  58.9 keV  10.2 cm   1.89 m     Chamber       eIoni
+   12     -6 cm  -12.3 cm     94 cm    308 keV  70.6 keV  8.27 cm   1.98 m     Chamber       eIoni
+   13  -8.24 cm  -11.4 cm   97.5 cm    262 keV  45.6 keV  6.08 cm   2.04 m     Chamber       eIoni
+   14  -8.46 cm  -12.8 cm   95.7 cm    235 keV  27.4 keV  4.75 cm   2.08 m     Chamber       eIoni
+   15  -9.63 cm  -13.5 cm   93.3 cm    209 keV  26.2 keV     4 cm   2.12 m     Chamber       eIoni
+   16  -9.88 cm  -11.6 cm   94.5 cm    189 keV  19.8 keV  3.33 cm   2.16 m     Chamber       eIoni
+   17   -8.6 cm    -12 cm     96 cm    170 keV  18.6 keV  2.83 cm   2.19 m     Chamber       eIoni
+   18  -6.95 cm  -11.7 cm   96.1 cm    154 keV  15.7 keV  2.41 cm   2.21 m     Chamber       eIoni
+   19  -5.66 cm  -11.2 cm   95.6 cm    143 keV  11.9 keV  2.06 cm   2.23 m     Chamber       eIoni
+   20  -5.15 cm  -10.9 cm   96.7 cm    105 keV  37.4 keV  1.81 cm   2.25 m     Chamber       eIoni
+   21  -5.88 cm  -10.8 cm   96.9 cm   98.6 keV  6.52 keV  1.11 cm   2.26 m     Chamber       eIoni
+   22  -6.27 cm  -11.3 cm   96.6 cm   91.8 keV  6.82 keV  9.98 mm   2.27 m     Chamber       eIoni
+   23  -5.66 cm  -11.3 cm   96.5 cm   81.3 keV  10.5 keV  8.86 mm   2.28 m     Chamber       eIoni
+   24  -5.38 cm  -11.2 cm   96.9 cm   68.7 keV  12.6 keV  7.32 mm   2.29 m     Chamber       eIoni
+   25  -5.53 cm  -11.4 cm   96.7 cm   61.9 keV   6.8 keV  5.61 mm   2.29 m     Chamber       eIoni
+   26  -5.47 cm  -11.6 cm     97 cm     54 keV  7.85 keV  4.75 mm    2.3 m     Chamber       eIoni
+   27  -5.52 cm  -11.8 cm   97.1 cm     52 keV  2.05 keV  3.86 mm    2.3 m     Chamber       eIoni
+   28  -5.28 cm  -11.7 cm   97.2 cm   44.4 keV  7.55 keV  3.63 mm    2.3 m     Chamber       eIoni
+   29  -5.35 cm  -11.9 cm   97.3 cm   37.3 keV  7.15 keV  2.86 mm   2.31 m     Chamber       eIoni
+   30  -5.22 cm    -12 cm   97.3 cm   32.8 keV  4.42 keV  2.21 mm   2.31 m     Chamber       eIoni
+   31   -5.3 cm  -11.9 cm   97.4 cm   28.5 keV  4.36 keV  1.86 mm   2.31 m     Chamber       eIoni
+   32  -5.35 cm  -11.9 cm   97.4 cm   9.34 keV  19.1 keV  1.53 mm   2.31 m     Chamber       eIoni
+   33  -5.35 cm  -11.9 cm   97.3 cm   4.57 keV  4.77 keV   485 mum  2.31 m     Chamber       eIoni
+   34  -5.35 cm  -11.9 cm   97.3 cm      0 eV   4.57 keV   290 mum  2.31 m     Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 72,   Parent ID = 62
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -5.34 cm  -14.3 cm   87.2 cm     69 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1  -5.45 cm  -14.3 cm   87.5 cm   63.9 keV  5.15 keV  5.66 mm   5.66 mm    Chamber       eIoni
+    2  -5.52 cm  -14.2 cm   87.4 cm      0 eV   63.9 keV  4.99 mm   1.06 cm    Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 71,   Parent ID = 62
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -35.6 cm  -13.9 cm   30.6 cm    172 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -38.5 cm  -16.2 cm   36.2 cm    144 keV  28.7 keV  6.99 cm   6.99 cm    Tracker       eIoni
+    2    -36 cm  -20.1 cm     38 cm    123 keV  20.9 keV  5.15 cm   12.1 cm    Tracker       eIoni
+    3  -34.1 cm  -23.4 cm   37.9 cm    105 keV  17.9 keV  3.94 cm   16.1 cm    Tracker       eIoni
+    4  -33.3 cm  -26.1 cm   37.8 cm     95 keV  9.95 keV     3 cm   19.1 cm    Tracker       eIoni
+    5    -35 cm  -26.8 cm   39.4 cm   84.9 keV  10.1 keV  2.53 cm   21.6 cm    Tracker       eIoni
+    6  -36.3 cm  -27.8 cm   40.6 cm   74.9 keV    10 keV  2.08 cm   23.7 cm    Tracker       eIoni
+    7    -37 cm  -27.4 cm     42 cm   64.9 keV  9.94 keV  1.67 cm   25.4 cm    Tracker       eIoni
+    8  -37.6 cm  -27.2 cm   43.1 cm   55.8 keV  9.12 keV   1.3 cm   26.7 cm    Tracker       eIoni
+    9  -38.1 cm    -27 cm   43.8 cm   51.1 keV  4.71 keV     1 cm   27.7 cm    Tracker       eIoni
+   10  -38.8 cm  -27.3 cm   44.2 cm     47 keV  4.13 keV  8.57 mm   28.5 cm    Tracker       eIoni
+   11  -38.4 cm  -27.8 cm   44.3 cm   43.3 keV  3.68 keV  7.43 mm   29.3 cm    Tracker       eIoni
+   12  -38.8 cm  -28.1 cm   44.8 cm   39.8 keV  3.49 keV  6.43 mm   29.9 cm    Tracker       eIoni
+   13  -38.9 cm  -28.4 cm   45.2 cm   37.6 keV   2.2 keV   5.6 mm   30.5 cm    Tracker       eIoni
+   14  -38.9 cm  -28.3 cm   45.7 cm   34.4 keV  3.17 keV  5.07 mm     31 cm    Tracker       eIoni
+   15  -39.1 cm  -28.4 cm     46 cm   29.8 keV  4.63 keV  4.38 mm   31.4 cm    Tracker       eIoni
+   16    -39 cm  -28.7 cm   46.2 cm   25.9 keV  3.86 keV  3.43 mm   31.8 cm    Tracker       eIoni
+   17  -38.9 cm    -29 cm   46.2 cm   22.4 keV  3.55 keV  2.75 mm     32 cm    Tracker       eIoni
+   18  -39.1 cm  -29.1 cm   46.3 cm     15 keV  7.36 keV  2.19 mm   32.2 cm    Tracker       eIoni
+   19  -39.1 cm  -29.1 cm   46.4 cm   13.7 keV  1.29 keV  1.23 mm   32.4 cm    Tracker       eIoni
+   20  -39.1 cm  -29.2 cm   46.5 cm   12.3 keV  1.44 keV   1.1 mm   32.5 cm    Tracker       eIoni
+   21  -39.1 cm  -29.2 cm   46.6 cm   10.6 keV  1.67 keV   957 mum  32.6 cm    Tracker       eIoni
+   22    -39 cm  -29.3 cm   46.6 cm   2.22 keV  8.41 keV   810 mum  32.7 cm    Tracker       eIoni
+   23    -39 cm  -29.3 cm   46.6 cm      0 eV   2.22 keV   184 mum  32.7 cm    Tracker       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 62
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -38.8 cm  -10.8 cm   15.5 cm    394 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1    -38 cm  -11.3 cm     20 cm    394 keV     0 eV   4.58 cm   4.58 cm    Chamber  Transportation
+    2  -27.3 cm  -17.6 cm     80 cm    394 keV     0 eV   61.3 cm   65.9 cm    Tracker  Transportation
+    3  -23.7 cm  -19.7 cm      1 m     394 keV     0 eV   20.4 cm   86.3 cm    Chamber  Transportation
+    4    -13 cm  -26.1 cm    1.6 m     394 keV     0 eV   61.3 cm   1.48 m     Tracker  Transportation
+    5  -9.48 cm  -28.2 cm    1.8 m     394 keV     0 eV   20.4 cm   1.68 m     Chamber  Transportation
+    6   1.21 cm  -34.5 cm    2.4 m     394 keV     0 eV   61.3 cm   2.29 m     Tracker  Transportation
+    7   10.3 cm  -39.9 cm   2.91 m     394 keV     0 eV   52.1 cm   2.81 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 69,   Parent ID = 62
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -47.9 cm  -8.34 cm  -59.4 cm    109 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1    -47 cm  -11.2 cm  -59.9 cm   95.8 keV  13.6 keV  3.21 cm   3.21 cm    Tracker       eIoni
+    2  -46.1 cm    -12 cm  -57.7 cm   84.8 keV    11 keV  2.57 cm   5.78 cm    Tracker       eIoni
+    3  -46.4 cm  -13.9 cm  -57.6 cm   71.1 keV  13.7 keV  2.08 cm   7.85 cm    Tracker       eIoni
+    4  -46.4 cm  -14.4 cm  -56.3 cm   64.3 keV  6.81 keV  1.53 cm   9.38 cm    Tracker       eIoni
+    5  -46.1 cm  -14.8 cm  -55.2 cm   58.3 keV  6.03 keV  1.28 cm   10.7 cm    Tracker       eIoni
+    6    -46 cm  -14.7 cm  -54.1 cm   50.3 keV  8.04 keV  1.08 cm   11.7 cm    Tracker       eIoni
+    7  -45.7 cm  -15.1 cm  -53.5 cm   45.9 keV   4.4 keV  8.34 mm   12.6 cm    Tracker       eIoni
+    8  -45.2 cm  -15.6 cm  -53.6 cm   39.7 keV  6.14 keV  7.13 mm   13.3 cm    Tracker       eIoni
+    9  -44.6 cm  -15.6 cm  -53.5 cm   35.6 keV  4.07 keV  5.58 mm   13.8 cm    Tracker       eIoni
+   10  -44.3 cm  -15.8 cm  -53.7 cm   30.8 keV  4.84 keV  4.63 mm   14.3 cm    Tracker       eIoni
+   11    -44 cm    -16 cm  -53.8 cm   27.8 keV  3.04 keV  3.63 mm   14.7 cm    Tracker       eIoni
+   12    -44 cm  -16.2 cm  -53.9 cm   13.7 keV  2.39 keV  2.46 mm   14.9 cm    Tracker       eIoni
+   13    -44 cm  -16.2 cm    -54 cm   8.51 keV  5.19 keV  1.09 mm     15 cm    Tracker       eIoni
+   14    -44 cm  -16.3 cm    -54 cm    6.6 keV  1.92 keV   642 mum  15.1 cm    Tracker       eIoni
+   15  -44.1 cm  -16.3 cm    -54 cm   4.41 keV  2.19 keV   511 mum  15.1 cm    Tracker       eIoni
+   16  -44.1 cm  -16.3 cm    -54 cm   3.09 keV  1.32 keV   374 mum  15.2 cm    Tracker       eIoni
+   17  -44.1 cm  -16.3 cm    -54 cm    209 eV   2.88 keV   279 mum  15.2 cm    Tracker       eIoni
+   18  -44.1 cm  -16.3 cm    -54 cm      0 eV    209 eV   13.9 mum  15.2 cm    Tracker       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 73,   Parent ID = 69
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    -44 cm  -16.2 cm  -53.9 cm   11.7 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -43.9 cm  -16.1 cm  -53.9 cm   9.04 keV  2.64 keV   899 mum   899 mum   Tracker       eIoni
+    2  -43.9 cm  -16.1 cm  -53.9 cm   6.97 keV  2.06 keV   682 mum  1.58 mm    Tracker       eIoni
+    3  -43.9 cm  -16.1 cm  -53.8 cm      0 eV   6.97 keV   535 mum  2.12 mm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 476,   Parent ID = 468
+* G4Track Information:   Particle = e-,   Track ID = 49,   Parent ID = 13
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    338 mum  1.39 mm   -2.4 m    2.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   22.2 mum   634 mum  -2.4 m    2.04 MeV     0 eV   1.16 mm   1.16 mm    TrackerTransportation
-    2  -99.9 cm   -2.4 m    21.2 cm   2.04 MeV     0 eV   3.69 m    3.69 m     WorldPVTransportation
-    3  -1.21 m   -2.91 m    76.7 cm   2.04 MeV     0 eV   78.3 cm   4.47 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.05 mm   -940 mum -2.44 m    3.33 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.2 mm  -1.28 mm  -2.44 m    2.29 MeV   484 keV   585 mum   585 mum  TargetPV       eBrem
+    2   -997 mum -1.05 mm  -2.44 m    1.55 MeV   742 keV   661 mum  1.25 mm   TargetPV       eIoni
+    3   -986 mum -1.03 mm  -2.44 m    1.21 MeV  31.6 keV  24.5 mum  1.27 mm   TargetPV       eBrem
+    4  -1.04 mm   -973 mum -2.44 m     744 keV   465 keV   464 mum  1.73 mm   TargetPV       eIoni
+    5  -1.06 mm   -922 mum -2.44 m     266 keV   478 keV   357 mum  2.09 mm   TargetPV       eIoni
+    6  -1.06 mm   -914 mum -2.44 m       0 eV    266 keV   125 mum  2.22 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 475,   Parent ID = 468
+* G4Track Information:   Particle = gamma,   Track ID = 75,   Parent ID = 49
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    330 mum  1.58 mm   -2.4 m     396 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    579 mum  1.45 mm   -2.4 m     396 keV     0 eV   1.39 mm   1.39 mm    TrackerTransportation
-    2   14.7 cm  -7.76 cm   -1.6 m     396 keV     0 eV   81.7 cm   81.9 cm    ChamberTransportation
-    3   18.4 cm  -9.73 cm   -1.4 m     396 keV     0 eV   20.4 cm   1.02 m     TrackerTransportation
-    4   29.4 cm  -15.7 cm    -80 cm    396 keV     0 eV   61.3 cm   1.64 m     ChamberTransportation
-    5   33.1 cm  -17.6 cm    -60 cm    396 keV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6   44.1 cm  -23.6 cm      0 fm    396 keV     0 eV   61.3 cm   2.45 m     ChamberTransportation
-    7   47.8 cm  -25.5 cm     20 cm    396 keV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   58.8 cm  -31.5 cm     80 cm    396 keV     0 eV   61.3 cm   3.27 m     ChamberTransportation
-    9   62.5 cm  -33.4 cm      1 m     396 keV     0 eV   20.4 cm   3.47 m     TrackerTransportation
-   10   73.5 cm  -39.4 cm    1.6 m     396 keV     0 eV   61.3 cm   4.09 m     ChamberTransportation
-   11   77.1 cm  -41.3 cm    1.8 m     396 keV     0 eV   20.4 cm   4.29 m     TrackerTransportation
-   12   88.1 cm  -47.3 cm    2.4 m     396 keV     0 eV   61.3 cm    4.9 m     WorldPVTransportation
-   13   97.5 cm  -52.3 cm   2.91 m     396 keV     0 eV   52.1 cm   5.43 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 453,   Parent ID = 385
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.3 mum   502 mum -2.41 m     149 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -42.3 mum   503 mum -2.41 m     147 MeV  31.8 keV  27.9 mum  27.9 mum  TargetPV     eBrem
-    2  -73.2 mum   565 mum -2.41 m     130 MeV    16 MeV   887 mum   915 mum  TargetPV     eBrem
-    3   -107 mum   543 mum  -2.4 m     119 MeV  1.06 MeV   829 mum  1.74 mm   TargetPV     eBrem
-    4    -95 mum   534 mum  -2.4 m    78.3 MeV  1.84 MeV  1.12 mm   2.86 mm   TargetPV     eBrem
-    5  -94.6 mum   535 mum  -2.4 m    76.3 MeV  6.29 keV   4.9 mum  2.86 mm   TargetPV     eBrem
-    6  -5.08 mum   604 mum  -2.4 m    67.5 MeV  1.22 MeV   721 mum  3.59 mm   TargetPV     eBrem
-    7  -26.8 mum   566 mum  -2.4 m    61.8 MeV  2.12 MeV  1.43 mm   5.01 mm   TargetPV     eBrem
-    8    -86 mum   585 mum  -2.4 m    49.9 MeV  6.74 MeV   1.3 mm   6.31 mm   TargetPV     eBrem
-    9  -30.4 mum   724 mum  -2.4 m    49.3 MeV   572 keV   457 mum  6.77 mm    TrackerTransportation
-   10   15.4 cm   36.5 cm  -1.46 m    49.1 MeV   226 keV  1.02 m    1.02 m     Tracker     eIoni
-   11   15.5 cm   36.7 cm  -1.46 m    49.1 MeV   601 eV   5.57 mm   1.03 m     Tracker     eIoni
-   12   25.4 cm     58 cm    -90 cm   48.9 MeV   130 keV  60.6 cm   1.63 m     Tracker     eIoni
-   13   26.3 cm     60 cm  -84.6 cm   48.9 MeV  10.6 keV  5.85 cm   1.69 m     Tracker     eIoni
-   14     27 cm   61.7 cm    -80 cm   48.9 MeV  13.9 keV  4.94 cm   1.74 m     ChamberTransportation
-   15   29.4 cm   67.2 cm  -65.1 cm   48.8 MeV   119 keV  16.1 cm    1.9 m     TrackerTransportation
-   16   37.7 cm   86.8 cm      0 fm   48.6 MeV   146 keV  68.5 cm   2.59 m     ChamberTransportation
-   17   40.2 cm   92.9 cm     20 cm   48.4 MeV   146 keV  21.1 cm    2.8 m     TrackerTransportation
-   18   42.1 cm   98.1 cm   35.9 cm   48.4 MeV  39.5 keV  16.8 cm   2.97 m     Tracker     eIoni
-   19   47.4 cm   1.13 m      80 cm   48.3 MeV  99.7 keV  46.9 cm   3.44 m     ChamberTransportation
-   20     50 cm    1.2 m       1 m    48.1 MeV   143 keV  21.4 cm   3.65 m     TrackerTransportation
-   21   56.9 cm   1.41 m     1.6 m      48 MeV   140 keV    64 cm   4.29 m     ChamberTransportation
-   22     59 cm   1.48 m     1.8 m    47.8 MeV   130 keV  21.2 cm    4.5 m     TrackerTransportation
-   23   61.1 cm   1.72 m     2.4 m    47.7 MeV   141 keV  64.7 cm   5.15 m     WorldPVTransportation
-   24   61.9 cm   1.82 m    2.65 m    47.6 MeV    57 keV  27.2 cm   5.42 m     WorldPV     eIoni
-   25   62.9 cm   1.93 m    2.91 m    47.5 MeV  68.3 keV  27.9 cm    5.7 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -986 mum -1.03 mm  -2.44 m     311 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -378 mum  -312 mum -2.44 m       0 eV    311 keV  1.08 mm   1.08 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 499,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   61.9 cm   1.82 m    2.65 m    25.6 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   62.1 cm   1.82 m    2.65 m    22.4 keV  3.18 keV  2.74 mm   2.74 mm    WorldPV     eIoni
-    2   62.3 cm   1.82 m    2.65 m    20.1 keV  2.29 keV  2.23 mm   4.97 mm    WorldPV     eIoni
-    3   62.5 cm   1.82 m    2.66 m    18.8 keV  1.35 keV  1.89 mm   6.86 mm    WorldPV     eIoni
-    4   62.6 cm   1.82 m    2.65 m    17.5 keV  1.24 keV  1.71 mm   8.57 mm    WorldPV     eIoni
-    5   62.8 cm   1.82 m    2.66 m    16.1 keV  1.45 keV  1.55 mm   1.01 cm    WorldPV     eIoni
-    6   62.8 cm   1.82 m    2.66 m    14.4 keV  1.68 keV  1.38 mm   1.15 cm    WorldPV     eIoni
-    7   62.8 cm   1.82 m    2.66 m    11.8 keV  2.55 keV  1.18 mm   1.27 cm    WorldPV     eIoni
-    8   62.7 cm   1.82 m    2.65 m    8.98 keV  2.87 keV   929 mum  1.36 cm    WorldPV     eIoni
-    9   62.7 cm   1.82 m    2.65 m    7.59 keV  1.38 keV   688 mum  1.43 cm    WorldPV     eIoni
-   10   62.7 cm   1.82 m    2.65 m    5.48 keV  2.11 keV   586 mum  1.49 cm    WorldPV     eIoni
-   11   62.7 cm   1.82 m    2.65 m    1.72 keV  3.76 keV   447 mum  1.53 cm    WorldPV     eIoni
-   12   62.7 cm   1.82 m    2.65 m       0 eV   1.72 keV   130 mum  1.55 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 498,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 74,   Parent ID = 49
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   58.7 cm   1.47 m    1.77 m    22.2 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   58.7 cm   1.47 m    1.77 m    17.6 keV  4.56 keV  1.17 mm   1.17 mm    Chamber     eIoni
-    2   58.6 cm   1.47 m    1.77 m    13.8 keV  3.89 keV   894 mum  2.06 mm    Chamber     eIoni
-    3   58.6 cm   1.47 m    1.77 m      12 keV  1.79 keV   697 mum  2.76 mm    Chamber     eIoni
-    4   58.6 cm   1.47 m    1.77 m    8.58 keV  3.39 keV   614 mum  3.37 mm    Chamber     eIoni
-    5   58.6 cm   1.47 m    1.77 m    6.22 keV  2.37 keV   474 mum  3.85 mm    Chamber     eIoni
-    6   58.6 cm   1.47 m    1.77 m    4.98 keV  1.24 keV   381 mum  4.23 mm    Chamber     eIoni
-    7   58.6 cm   1.47 m    1.77 m    2.09 keV  2.89 keV   327 mum  4.55 mm    Chamber     eIoni
-    8   58.6 cm   1.47 m    1.77 m       0 eV   2.09 keV   125 mum  4.68 mm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.2 mm  -1.28 mm  -2.44 m     554 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    263 mum -1.41 mm  -2.43 m     369 keV   185 keV  5.42 mm   5.42 mm   TargetPV       compt
+    2   -498 mum -2.77 mm  -2.43 m     178 keV   191 keV  2.05 mm   7.47 mm   TargetPV       compt
+    3   -302 mum -2.39 mm  -2.43 m     149 keV  28.6 keV   457 mum  7.93 mm   TargetPV       compt
+    4   -201 mum -2.41 mm  -2.43 m       0 eV    149 keV   158 mum  8.08 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 497,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 12,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   47.5 cm   1.13 m    81.4 cm   14.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   47.5 cm   1.13 m    81.4 cm   12.6 keV  1.71 keV   723 mum   723 mum   Chamber     eIoni
-    2   47.5 cm   1.13 m    81.4 cm   10.1 keV  2.56 keV   644 mum  1.37 mm    Chamber     eIoni
-    3   47.5 cm   1.13 m    81.4 cm   6.93 keV  3.13 keV   533 mum   1.9 mm    Chamber     eIoni
-    4   47.5 cm   1.13 m    81.4 cm   4.43 keV   2.5 keV   409 mum  2.31 mm    Chamber     eIoni
-    5   47.5 cm   1.13 m    81.4 cm   1.87 keV  2.56 keV   301 mum  2.61 mm    Chamber     eIoni
-    6   47.5 cm   1.13 m    81.4 cm      0 eV   1.87 keV   107 mum  2.72 mm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -482 mum -48.6 mum -2.44 m    1.46 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.93 mm  -1.55 mm  -2.42 m     712 keV   751 keV  2.31 cm   2.31 cm   TargetPV       compt
+    2  -4.58 mm  -2.91 mm  -2.42 m     541 keV   171 keV  2.52 mm   2.57 cm   TargetPV       compt
+    3  -9.45 mm  -8.25 mm  -2.42 m     540 keV   999 eV   7.27 mm   3.29 cm   TargetPV       compt
+    4  -1.17 cm  -1.07 cm  -2.42 m       0 eV    540 keV   3.3 mm   3.62 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 496,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 11,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   42.1 cm   98.1 cm   35.9 cm   12.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   42.2 cm     98 cm   35.9 cm   9.86 keV  2.32 keV   961 mum   961 mum   Tracker     eIoni
-    2   42.2 cm     98 cm   35.9 cm   8.38 keV  1.48 keV   757 mum  1.72 mm    Tracker     eIoni
-    3   42.3 cm     98 cm     36 cm   6.44 keV  1.94 keV   641 mum  2.36 mm    Tracker     eIoni
-    4   42.3 cm   98.1 cm     36 cm   4.87 keV  1.57 keV   508 mum  2.87 mm    Tracker     eIoni
-    5   42.3 cm   98.1 cm     36 cm   3.81 keV  1.06 keV   408 mum  3.28 mm    Tracker     eIoni
-    6   42.3 cm   98.1 cm     36 cm   2.12 keV  1.69 keV   339 mum  3.61 mm    Tracker     eIoni
-    7   42.3 cm   98.1 cm     36 cm      0 eV   2.12 keV   178 mum  3.79 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -481 mum -47.8 mum -2.44 m    40.2 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -656 mum  -164 mum -2.44 m       0 eV   1.48 MeV  1.73 mm   1.73 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 495,   Parent ID = 453
+* G4Track Information:   Particle = e+,   Track ID = 77,   Parent ID = 11
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   39.8 cm   91.9 cm   16.7 cm   37.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   39.9 cm   91.8 cm   16.7 cm   28.7 keV  8.88 keV  2.35 mm   2.35 mm    Chamber     eIoni
-    2   39.9 cm   91.8 cm   16.8 cm   23.8 keV  4.96 keV  1.62 mm   3.97 mm    Chamber     eIoni
-    3   39.8 cm   91.8 cm   16.7 cm   19.1 keV  4.74 keV  1.27 mm   5.24 mm    Chamber     eIoni
-    4   39.8 cm   91.8 cm   16.8 cm   14.2 keV  4.83 keV   975 mum  6.21 mm    Chamber     eIoni
-    5   39.8 cm   91.7 cm   16.8 cm   9.85 keV  4.37 keV   718 mum  6.93 mm    Chamber     eIoni
-    6   39.8 cm   91.7 cm   16.8 cm   8.75 keV  1.09 keV   525 mum  7.45 mm    Chamber     eIoni
-    7   39.8 cm   91.7 cm   16.7 cm   7.62 keV  1.14 keV   481 mum  7.94 mm    Chamber     eIoni
-    8   39.8 cm   91.7 cm   16.8 cm   5.66 keV  1.95 keV   436 mum  8.37 mm    Chamber     eIoni
-    9   39.8 cm   91.7 cm   16.8 cm   2.73 keV  2.93 keV   357 mum  8.73 mm    Chamber     eIoni
-   10   39.8 cm   91.7 cm   16.8 cm      0 eV   2.73 keV   180 mum  8.91 mm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -656 mum  -164 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -656 mum  -164 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 494,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 79,   Parent ID = 77
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.2 cm   66.8 cm  -66.2 cm   11.1 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   29.2 cm   66.8 cm  -66.1 cm   8.07 keV  3.01 keV   577 mum   577 mum   Chamber     eIoni
-    2   29.2 cm   66.8 cm  -66.1 cm   5.45 keV  2.62 keV   454 mum  1.03 mm    Chamber     eIoni
-    3   29.2 cm   66.8 cm  -66.2 cm   3.19 keV  2.26 keV   349 mum  1.38 mm    Chamber     eIoni
-    4   29.2 cm   66.8 cm  -66.2 cm      0 eV   3.19 keV   222 mum   1.6 mm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -656 mum  -164 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -715 mum  -200 mum -2.44 m     189 keV   322 keV  78.9 mum  78.9 mum  TargetPV       compt
+    2   -324 mum  -360 mum -2.44 m       0 eV    189 keV   513 mum   592 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 493,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 78,   Parent ID = 77
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   26.3 cm     60 cm  -84.6 cm   29.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   26.4 cm   60.3 cm  -84.7 cm   27.5 keV  2.38 keV  3.51 mm   3.51 mm    Tracker     eIoni
-    2   26.7 cm   60.4 cm  -84.8 cm   23.9 keV  3.54 keV  3.08 mm   6.58 mm    Tracker     eIoni
-    3   26.9 cm   60.5 cm  -84.8 cm   21.8 keV  2.08 keV  2.47 mm   9.05 mm    Tracker     eIoni
-    4     27 cm   60.7 cm  -84.9 cm   19.2 keV  2.66 keV  2.14 mm   1.12 cm    Tracker     eIoni
-    5   27.1 cm   60.8 cm  -84.9 cm   17.9 keV  1.27 keV  1.77 mm    1.3 cm    Tracker     eIoni
-    6   27.1 cm   60.9 cm    -85 cm   12.9 keV  5.02 keV   1.6 mm   1.46 cm    Tracker     eIoni
-    7   27.1 cm   60.9 cm  -85.1 cm    9.9 keV     3 keV  1.03 mm   1.56 cm    Tracker     eIoni
-    8     27 cm   60.9 cm  -85.1 cm   7.15 keV  2.74 keV   759 mum  1.63 cm    Tracker     eIoni
-    9     27 cm   60.9 cm  -85.2 cm   6.04 keV  1.11 keV   555 mum  1.69 cm    Tracker     eIoni
-   10     27 cm   60.9 cm  -85.2 cm   4.14 keV   1.9 keV   482 mum  1.74 cm    Tracker     eIoni
-   11     27 cm   60.9 cm  -85.2 cm   1.32 keV  2.83 keV   362 mum  1.77 cm    Tracker     eIoni
-   12     27 cm   60.9 cm  -85.2 cm      0 eV   1.32 keV  88.3 mum  1.78 cm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -656 mum  -164 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    116 mum   308 mum -2.44 m       0 eV    511 keV  1.03 mm   1.03 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 492,   Parent ID = 453
+* G4Track Information:   Particle = e-,   Track ID = 76,   Parent ID = 11
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   25.4 cm     58 cm    -90 cm    9.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   25.4 cm     58 cm    -90 cm    6.8 keV   2.6 keV   721 mum   721 mum   Tracker     eIoni
-    2   25.4 cm   57.9 cm  -89.9 cm   4.86 keV  1.94 keV   531 mum  1.25 mm    Tracker     eIoni
-    3   25.4 cm     58 cm    -90 cm   3.92 keV   949 eV    408 mum  1.66 mm    Tracker     eIoni
-    4   25.4 cm     58 cm    -90 cm    2.2 keV  1.71 keV   346 mum  2.01 mm    Tracker     eIoni
-    5   25.4 cm     58 cm    -90 cm      0 eV    2.2 keV   188 mum  2.19 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -656 mum  -164 mum -2.44 m    37.7 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -763 mum   144 mum -2.44 m    26.9 MeV  3.53 MeV  2.11 mm   2.11 mm   TargetPV       eBrem
+    2   -680 mum  -6.5 mum -2.44 m      25 MeV  1.61 MeV  1.08 mm   3.18 mm   TargetPV       eBrem
+    3    675 mum   170 mum -2.44 m    20.4 MeV  4.59 MeV  3.82 mm      7 mm   TargetPV       eIoni
+    4   -716 mum -1.41 mm  -2.43 m    15.9 MeV  3.93 MeV   2.8 mm    9.8 mm   TargetPV       eBrem
+    5   -721 mum -1.65 mm  -2.43 m    11.3 MeV   547 keV   416 mum  1.02 cm   TargetPV       eBrem
+    6   -578 mum  -2.4 mm  -2.43 m    9.99 MeV   888 keV   845 mum  1.11 cm   TargetPV       eBrem
+    7  -1.16 mm  -2.45 mm  -2.43 m    7.12 MeV  1.21 MeV     1 mm   1.21 cm   TargetPV       eBrem
+    8  -1.39 mm  -3.02 mm  -2.43 m    2.37 MeV   692 keV   672 mum  1.27 cm   TargetPV       eBrem
+    9  -1.33 mm  -3.38 mm  -2.43 m    1.71 MeV   663 keV   674 mum  1.34 cm   TargetPV       eIoni
+   10   -1.2 mm  -3.46 mm  -2.43 m     498 keV  1.21 MeV   558 mum   1.4 cm   TargetPV       eIoni
+   11  -1.19 mm  -3.41 mm  -2.43 m     201 keV   298 keV   273 mum  1.42 cm   TargetPV       eIoni
+   12   -1.2 mm  -3.41 mm  -2.43 m       0 eV    201 keV  81.8 mum  1.43 cm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 491,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 86,   Parent ID = 76
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   15.5 cm   36.7 cm  -1.46 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   15.4 cm   36.8 cm  -1.46 m    6.57 keV  3.52 keV   775 mum   775 mum   Tracker     eIoni
-    2   15.4 cm   36.8 cm  -1.46 m    1.69 keV  4.88 keV   517 mum  1.29 mm    Tracker     eIoni
-    3   15.4 cm   36.8 cm  -1.46 m       0 eV   1.69 keV   127 mum  1.42 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.39 mm  -3.02 mm  -2.43 m    4.06 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.49 mm  -6.71 mm  -2.43 m       0 eV   3.04 MeV   6.3 mm    6.3 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 490,   Parent ID = 453
+* G4Track Information:   Particle = e+,   Track ID = 87,   Parent ID = 86
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   15.4 cm   36.5 cm  -1.46 m    12.6 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   15.4 cm   36.4 cm  -1.46 m    10.9 keV  1.64 keV   999 mum   999 mum   Tracker     eIoni
-    2   15.4 cm   36.4 cm  -1.46 m     8.9 keV  2.02 keV   848 mum  1.85 mm    Tracker     eIoni
-    3   15.4 cm   36.4 cm  -1.46 m    7.85 keV  1.05 keV   682 mum  2.53 mm    Tracker     eIoni
-    4   15.3 cm   36.4 cm  -1.46 m    5.79 keV  2.06 keV   604 mum  3.13 mm    Tracker     eIoni
-    5   15.3 cm   36.3 cm  -1.46 m    4.04 keV  1.75 keV   466 mum   3.6 mm    Tracker     eIoni
-    6   15.3 cm   36.4 cm  -1.46 m    1.48 keV  2.56 keV   355 mum  3.95 mm    Tracker     eIoni
-    7   15.3 cm   36.3 cm  -1.46 m       0 eV   1.48 keV   105 mum  4.06 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.49 mm  -6.71 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.49 mm  -6.71 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 489,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 89,   Parent ID = 87
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -86 mum   585 mum  -2.4 m    5.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -78.5 mum   601 mum  -2.4 m       0 eV      0 eV   54.3 mum  54.3 mum  TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.49 mm  -6.71 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -5.4 mm   -7.2 mm  -2.43 m       0 eV    511 keV  5.42 mm   5.42 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 501,   Parent ID = 489
+* G4Track Information:   Particle = gamma,   Track ID = 88,   Parent ID = 87
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.5 mum   601 mum  -2.4 m    1.24 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.73 mum   652 mum  -2.4 m       0 eV   1.24 MeV   470 mum   470 mum  TargetPV     eIoni
-    2   3.73 mum   652 mum  -2.4 m       0 eV      0 eV      0 fm    470 mum  TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.49 mm  -6.71 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1      5 mm  -5.88 mm  -2.42 m     182 keV   329 keV  9.01 mm   9.01 mm   TargetPV       compt
+    2   4.14 mm  -5.59 mm  -2.42 m       0 eV    182 keV   939 mum  9.95 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 503,   Parent ID = 501
+* G4Track Information:   Particle = gamma,   Track ID = 85,   Parent ID = 76
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.73 mum   652 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.69 mm   -119 mum -2.41 m     510 keV  1.19 keV  5.72 mm   5.72 mm   TargetPV     compt
-    2   3.01 mm   -204 mum -2.41 m     403 keV   107 keV   606 mum  6.33 mm   TargetPV     compt
-    3   2.99 mm   -158 mum -2.41 m       0 eV    403 keV   200 mum  6.53 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.16 mm  -2.45 mm  -2.43 m    1.66 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.96 mm  -6.49 mm  -2.43 m    1.43 MeV   226 keV  5.57 mm   5.57 mm   TargetPV       compt
+    2  -5.11 mm  -6.59 mm  -2.43 m    1.13 MeV   297 keV   181 mum  5.75 mm   TargetPV       compt
+    3  -1.03 cm  -7.74 mm  -2.43 m       0 eV   1.13 MeV  5.67 mm   1.14 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 502,   Parent ID = 501
+* G4Track Information:   Particle = gamma,   Track ID = 84,   Parent ID = 76
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.73 mum   652 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -145 mum   695 mum  -2.4 m     511 keV     0 eV    318 mum   318 mum   TrackerTransportation
-    2   -2.4 m      69 cm   2.06 m     511 keV     0 eV   5.11 m    5.11 m     WorldPVTransportation
-    3  -2.86 m    82.1 cm   2.91 m     511 keV     0 eV   97.2 cm   6.09 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -578 mum  -2.4 mm  -2.43 m     454 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.64 mm  -4.86 mm  -2.43 m     267 keV   187 keV  4.83 mm   4.83 mm   TargetPV       compt
+    2  -2.19 mm  -4.98 mm  -2.43 m       0 eV    267 keV   571 mum   5.4 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 500,   Parent ID = 489
+* G4Track Information:   Particle = gamma,   Track ID = 83,   Parent ID = 76
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.5 mum   601 mum  -2.4 m    2.87 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -142 mum   555 mum  -2.4 m     888 keV   770 keV   574 mum   574 mum  TargetPV     eBrem
-    2   -116 mum   585 mum  -2.4 m     474 keV   415 keV   388 mum   962 mum  TargetPV     eIoni
-    3   -117 mum   599 mum  -2.4 m       0 eV    474 keV   257 mum  1.22 mm   TargetPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -721 mum -1.65 mm  -2.43 m       4 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -904 mum -5.22 mm  -2.43 m       0 eV   2.98 MeV  4.52 mm   4.52 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 504,   Parent ID = 500
+* G4Track Information:   Particle = e+,   Track ID = 90,   Parent ID = 83
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -142 mum   555 mum  -2.4 m    1.22 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -586 mum  1.59 mm   -2.4 m     237 keV   979 keV   2.6 mm    2.6 mm   TargetPV     compt
-    2   -757 mum  1.36 mm   -2.4 m     127 keV   110 keV   372 mum  2.97 mm   TargetPV     compt
-    3   -697 mum  1.38 mm   -2.4 m       0 eV    127 keV  70.7 mum  3.04 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -904 mum -5.22 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -904 mum -5.22 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 488,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 92,   Parent ID = 90
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -26.8 mum   566 mum  -2.4 m    3.55 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   10.8 mum   721 mum  -2.4 m    3.55 MeV     0 eV   1.73 mm   1.73 mm    TrackerTransportation
-    2   1.74 cm   7.25 cm   -1.6 m    3.55 MeV     0 eV   80.3 cm   80.5 cm    ChamberTransportation
-    3   2.18 cm   9.05 cm   -1.4 m    3.55 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   3.49 cm   14.4 cm    -80 cm   3.55 MeV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   3.92 cm   16.2 cm    -60 cm   3.55 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   5.23 cm   21.6 cm      0 fm   3.55 MeV     0 eV   60.3 cm   2.41 m     ChamberTransportation
-    7   5.67 cm   23.4 cm     20 cm   3.55 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   6.97 cm   28.8 cm     80 cm   3.55 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   7.41 cm   30.6 cm      1 m    3.55 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   8.72 cm     36 cm    1.6 m    3.55 MeV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   9.15 cm   37.8 cm    1.8 m    3.55 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   10.5 cm   43.2 cm    2.4 m    3.55 MeV     0 eV   60.3 cm   4.82 m     WorldPVTransportation
-   13   11.6 cm   47.7 cm   2.91 m    3.55 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -904 mum -5.22 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.85 mm  -6.62 mm  -2.43 m       0 eV    511 keV  1.75 mm   1.75 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 487,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 91,   Parent ID = 90
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.08 mum   604 mum  -2.4 m    7.65 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   64.2 mum   797 mum  -2.4 m    7.65 MeV     0 eV   3.15 mm   3.15 mm    TrackerTransportation
-    2   1.77 cm   4.99 cm   -1.6 m    7.65 MeV     0 eV   80.2 cm   80.5 cm    ChamberTransportation
-    3   2.21 cm   6.21 cm   -1.4 m    7.65 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   3.53 cm   9.89 cm    -80 cm   7.65 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   3.97 cm   11.1 cm    -60 cm   7.65 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   5.29 cm   14.8 cm      0 fm   7.65 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   5.74 cm     16 cm     20 cm   7.65 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   7.06 cm   19.7 cm     80 cm   7.65 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9    7.5 cm   20.9 cm      1 m    7.65 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   8.82 cm   24.6 cm    1.6 m    7.65 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   9.26 cm   25.8 cm    1.8 m    7.65 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   10.6 cm   29.5 cm    2.4 m    7.65 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13   11.7 cm   32.7 cm   2.91 m    7.65 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -904 mum -5.22 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   9.57 mm   1.03 cm  -2.44 m       0 eV    511 keV  1.94 cm   1.94 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 486,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 82,   Parent ID = 76
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.6 mum   535 mum  -2.4 m    1.93 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    173 mum   694 mum  -2.4 m    1.93 MeV     0 eV   3.87 mm   3.87 mm    TrackerTransportation
-    2   5.56 cm   3.37 cm   -1.6 m    1.93 MeV     0 eV   80.3 cm   80.6 cm    ChamberTransportation
-    3   6.95 cm   4.19 cm   -1.4 m    1.93 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   11.1 cm   6.66 cm    -80 cm   1.93 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   12.5 cm   7.49 cm    -60 cm   1.93 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   16.6 cm   9.96 cm  0.114 fm   1.93 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7     18 cm   10.8 cm     20 cm   1.93 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   22.2 cm   13.3 cm     80 cm   1.93 MeV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9   23.6 cm   14.1 cm      1 m    1.93 MeV     0 eV   20.1 cm   3.41 m     TrackerTransportation
-   10   27.7 cm   16.6 cm    1.6 m    1.93 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   29.1 cm   17.4 cm    1.8 m    1.93 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   33.3 cm   19.9 cm    2.4 m    1.93 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13   36.8 cm     22 cm   2.91 m    1.93 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -716 mum -1.41 mm  -2.43 m     596 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -467 mum -7.04 mm  -2.43 m     188 keV   408 keV  7.88 mm   7.88 mm   TargetPV       compt
+    2   -972 mum -6.58 mm  -2.43 m       0 eV    188 keV  1.05 mm   8.93 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 485,   Parent ID = 453
+* G4Track Information:   Particle = gamma,   Track ID = 81,   Parent ID = 76
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -95 mum   534 mum  -2.4 m    39.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    122 mum   707 mum  -2.4 m       0 eV      0 eV   2.76 mm   2.76 mm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -680 mum  -6.5 mum -2.44 m     342 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -742 mum  -327 mum -2.44 m     283 keV  58.4 keV  2.89 mm   2.89 mm   TargetPV       compt
+    2   -339 mum  -628 mum -2.44 m       0 eV    283 keV   669 mum  3.56 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 506,   Parent ID = 485
+* G4Track Information:   Particle = gamma,   Track ID = 80,   Parent ID = 76
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    122 mum   707 mum  -2.4 m    20.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    206 mum   775 mum  -2.4 m    18.7 MeV  2.25 MeV  1.16 mm   1.16 mm    TrackerTransportation
-    2  -3.59 mm   -204 mum -2.28 m    18.6 MeV    21 keV    12 cm   12.1 cm    Tracker     eIoni
-    3  -2.44 cm  -7.99 mm   -1.6 m    18.5 MeV   131 keV  68.1 cm   80.2 cm    ChamberTransportation
-    4  -2.23 cm  -1.38 cm   -1.4 m    18.3 MeV   166 keV  20.1 cm      1 m     TrackerTransportation
-    5   4.06 cm  -4.64 cm    -80 cm   18.2 MeV   120 keV  60.4 cm   1.61 m     ChamberTransportation
-    6   6.35 cm  -5.47 cm    -60 cm   18.1 MeV    95 keV  20.2 cm   1.81 m     TrackerTransportation
-    7   8.79 cm  -2.63 cm      0 fm   17.9 MeV   123 keV  60.1 cm   2.41 m     ChamberTransportation
-    8   9.41 cm   -1.8 cm     20 cm   17.8 MeV   130 keV  20.1 cm   2.61 m     TrackerTransportation
-    9   11.2 cm  -1.53 cm   44.6 cm   17.7 MeV  52.6 keV  24.7 cm   2.86 m     Tracker     eIoni
-   10   13.9 cm  -2.64 cm     80 cm   17.6 MeV  60.3 keV  35.5 cm   3.21 m     ChamberTransportation
-   11   14.3 cm  -2.74 cm   91.1 cm   17.5 MeV  83.2 keV  11.2 cm   3.33 m     Chamber     eIoni
-   12   15.1 cm   -2.9 cm   97.2 cm   17.3 MeV  39.5 keV  6.14 cm   3.39 m     Chamber     eIoni
-   13   15.5 cm  -2.89 cm      1 m    17.3 MeV  10.3 keV   2.8 cm   3.41 m     TrackerTransportation
-   14   22.1 cm  -1.49 cm    1.6 m    17.2 MeV   118 keV  60.4 cm   4.02 m     ChamberTransportation
-   15   24.3 cm  -7.13 mm    1.8 m    17.1 MeV  88.5 keV  20.2 cm   4.22 m     TrackerTransportation
-   16   25.4 cm  -6.41 mm   1.95 m      17 MeV  27.1 keV  15.2 cm   4.37 m     Tracker     eIoni
-   17     28 cm    4.1 mm    2.4 m    16.9 MeV  88.3 keV  44.9 cm   4.82 m     WorldPVTransportation
-   18   30.9 cm   2.32 cm   2.91 m    16.8 MeV  99.9 keV  51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 515,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   25.4 cm  -6.41 mm   1.95 m    22.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   25.3 cm  -7.44 mm   1.95 m    17.8 keV  4.42 keV   2.2 mm    2.2 mm    Tracker     eIoni
-    2   25.1 cm  -7.58 mm   1.95 m    15.7 keV  2.08 keV  1.58 mm   3.79 mm    Tracker     eIoni
-    3   25.1 cm  -8.79 mm   1.95 m    10.6 keV  5.13 keV  1.34 mm   5.12 mm    Tracker     eIoni
-    4   25.1 cm  -9.61 mm   1.95 m    5.11 keV  5.49 keV   820 mum  5.94 mm    Tracker     eIoni
-    5   25.1 cm  -9.53 mm   1.95 m     841 eV   4.27 keV   424 mum  6.37 mm    Tracker     eIoni
-    6   25.1 cm  -9.53 mm   1.95 m       0 eV    841 eV   49.3 mum  6.41 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 514,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   23.3 cm  -1.08 cm    1.7 m    14.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   23.3 cm  -1.11 cm   1.71 m    5.34 keV  5.78 keV   708 mum   708 mum   Chamber     eBrem
-    2   23.3 cm  -1.12 cm    1.7 m    3.27 keV  2.07 keV   344 mum  1.05 mm    Chamber     eIoni
-    3   23.3 cm  -1.12 cm    1.7 m     190 eV   3.08 keV   228 mum  1.28 mm    Chamber     eIoni
-    4   23.3 cm  -1.12 cm    1.7 m       0 eV    190 eV   10.6 mum  1.29 mm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -763 mum   144 mum -2.44 m    7.18 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    306 mum  1.36 mm  -2.42 m     420 keV  6.76 MeV  2.05 cm   2.05 cm   TargetPV       compt
+    2    3.2 mm   5.36 mm  -2.42 m       0 eV    420 keV  5.06 mm   2.55 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 516,   Parent ID = 514
+* G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   23.3 cm  -1.11 cm   1.71 m    3.56 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   23.3 cm  -8.02 mm    1.7 m       0 eV   3.56 keV  3.72 mm   3.72 mm    Chamber      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -461 mum -38.1 mum -2.45 m     845 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -818 mum  -237 mum -2.44 m     771 keV    74 keV  4.64 mm   4.64 mm   TargetPV       compt
+    2  -3.06 mm  -1.32 mm  -2.44 m     594 keV   177 keV  5.97 mm   1.06 cm   TargetPV       compt
+    3  -4.11 mm    650 mum -2.43 m     593 keV   955 eV   4.62 mm   1.52 cm   TargetPV       compt
+    4  -4.35 mm   1.04 mm  -2.43 m     508 keV  85.2 keV   884 mum  1.61 cm   TargetPV       compt
+    5  -6.24 mm   8.75 mm  -2.43 m       0 eV    508 keV  9.21 mm   2.53 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 513,   Parent ID = 506
+* G4Track Information:   Particle = gamma,   Track ID = 9,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   15.1 cm   -2.9 cm   97.2 cm    109 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   15.4 cm   -3.7 cm   97.4 cm   99.8 keV  9.71 keV  1.22 cm   1.22 cm    Chamber     eIoni
-    2     16 cm  -3.33 cm     97 cm   84.4 keV  15.3 keV  1.06 cm   2.28 cm    Chamber     eIoni
-    3     16 cm  -3.84 cm   96.7 cm   75.1 keV  9.35 keV   8.1 mm   3.09 cm    Chamber     eIoni
-    4     16 cm  -4.28 cm   96.9 cm   66.4 keV  8.65 keV   6.7 mm   3.76 cm    Chamber     eIoni
-    5     16 cm  -4.65 cm   96.7 cm   59.1 keV  7.35 keV  5.55 mm   4.32 cm    Chamber     eIoni
-    6   16.1 cm   -4.9 cm   96.5 cm     55 keV   4.1 keV  4.63 mm   4.78 cm    Chamber     eIoni
-    7   16.2 cm  -5.15 cm   96.6 cm   48.9 keV  6.05 keV  4.14 mm   5.19 cm    Chamber     eIoni
-    8   16.3 cm  -5.08 cm   96.8 cm   41.7 keV  7.17 keV  3.47 mm   5.54 cm    Chamber     eIoni
-    9   16.4 cm     -5 cm   96.7 cm     37 keV  4.77 keV  2.73 mm   5.81 cm    Chamber     eIoni
-   10   16.5 cm  -4.85 cm   96.6 cm     34 keV  2.96 keV  2.29 mm   6.04 cm    Chamber     eIoni
-   11   16.4 cm  -4.97 cm   96.5 cm   29.6 keV  4.37 keV  2.04 mm   6.25 cm    Chamber     eIoni
-   12   16.5 cm  -5.07 cm   96.5 cm   26.5 keV  3.12 keV  1.68 mm   6.41 cm    Chamber     eIoni
-   13   16.5 cm  -5.14 cm   96.5 cm   23.2 keV  3.29 keV  1.46 mm   6.56 cm    Chamber     eIoni
-   14   16.5 cm  -5.14 cm   96.6 cm   16.7 keV  6.51 keV  1.23 mm   6.68 cm    Chamber     eIoni
-   15   16.5 cm   -5.1 cm   96.5 cm   13.3 keV  3.38 keV   846 mum  6.77 cm    Chamber     eIoni
-   16   16.5 cm  -5.09 cm   96.5 cm   9.56 keV  3.78 keV   678 mum  6.83 cm    Chamber     eIoni
-   17   16.5 cm  -5.06 cm   96.5 cm   7.72 keV  1.84 keV   513 mum  6.89 cm    Chamber     eIoni
-   18   16.5 cm  -5.06 cm   96.5 cm   4.12 keV  3.61 keV   441 mum  6.93 cm    Chamber     eIoni
-   19   16.5 cm  -5.06 cm   96.5 cm    256 eV   3.86 keV   284 mum  6.96 cm    Chamber     eIoni
-   20   16.5 cm  -5.06 cm   96.5 cm      0 eV    256 eV   12.5 mum  6.96 cm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -389 mum  17.6 mum -2.45 m     563 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.53 mm  -1.07 mm  -2.43 m       0 eV    563 keV  1.97 cm   1.97 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 512,   Parent ID = 506
+* G4Track Information:   Particle = gamma,   Track ID = 8,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.3 cm  -2.74 cm   91.1 cm   95.8 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   13.9 cm  -3.16 cm   91.5 cm   63.4 keV  32.4 keV  9.91 mm   9.91 mm    Chamber     eIoni
-    2   13.9 cm  -2.97 cm   91.9 cm   55.3 keV   8.1 keV  5.15 mm   1.51 cm    Chamber     eIoni
-    3   13.9 cm   -2.7 cm   91.7 cm     50 keV  5.35 keV  4.18 mm   1.92 cm    Chamber     eIoni
-    4   13.9 cm  -2.56 cm   91.5 cm   35.3 keV  14.6 keV  3.58 mm   2.28 cm    Chamber     eIoni
-    5   13.9 cm  -2.43 cm   91.6 cm   30.1 keV  5.24 keV  2.15 mm    2.5 cm    Chamber     eIoni
-    6   13.9 cm  -2.51 cm   91.5 cm   9.74 keV  20.3 keV  1.72 mm   2.67 cm    Chamber     eIoni
-    7   13.9 cm  -2.49 cm   91.6 cm   8.33 keV  1.42 keV   521 mum  2.72 cm    Chamber     eIoni
-    8   13.9 cm  -2.46 cm   91.6 cm   6.91 keV  1.42 keV   463 mum  2.77 cm    Chamber     eIoni
-    9   13.9 cm  -2.45 cm   91.6 cm   5.46 keV  1.44 keV   408 mum  2.81 cm    Chamber     eIoni
-   10   13.9 cm  -2.45 cm   91.6 cm    832 eV   4.63 keV   349 mum  2.84 cm    Chamber     eIoni
-   11   13.9 cm  -2.45 cm   91.6 cm      0 eV    832 eV   37.1 mum  2.85 cm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -356 mum  35.1 mum -2.45 m     2.7 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.99 mm  -1.71 mm  -2.42 m     339 keV  2.36 MeV  3.12 cm   3.12 cm   TargetPV       compt
+    2  -3.73 mm    509 mum -2.42 m     173 keV   166 keV  2.31 mm   3.35 cm   TargetPV       compt
+    3  -4.44 mm    173 mum -2.42 m     172 keV   672 eV    809 mum  3.43 cm   TargetPV       compt
+    4  -5.34 mm   -228 mum -2.42 m       0 eV    172 keV  1.05 mm   3.54 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 511,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   11.2 cm  -1.53 cm   44.6 cm   51.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   11.8 cm  -9.11 mm   44.6 cm   40.5 keV  10.8 keV  8.79 mm   8.79 mm    Tracker     eIoni
-    2   12.2 cm  -7.62 mm   45.1 cm   37.4 keV  3.19 keV  5.88 mm   1.47 cm    Tracker     eIoni
-    3   12.3 cm  -3.35 mm   45.2 cm   33.1 keV  4.21 keV  5.11 mm   1.98 cm    Tracker     eIoni
-    4   12.4 cm  -1.17 mm   45.6 cm   30.9 keV  2.26 keV  4.19 mm    2.4 cm    Tracker     eIoni
-    5   12.3 cm   1.83 mm   45.7 cm   27.9 keV  3.03 keV  3.71 mm   2.77 cm    Tracker     eIoni
-    6   12.2 cm   4.41 mm   45.8 cm   24.7 keV  3.16 keV  3.15 mm   3.08 cm    Tracker     eIoni
-    7   12.2 cm   6.72 mm   45.9 cm   22.2 keV  2.47 keV  2.59 mm   3.34 cm    Tracker     eIoni
-    8   12.2 cm   8.26 mm     46 cm   18.7 keV  3.49 keV   2.2 mm   3.56 cm    Tracker     eIoni
-    9   12.1 cm   9.41 mm     46 cm   12.8 keV  5.99 keV  1.71 mm   3.73 cm    Tracker     eIoni
-   10   12.1 cm   1.01 cm   45.9 cm   11.4 keV  1.32 keV  1.02 mm   3.83 cm    Tracker     eIoni
-   11     12 cm    9.7 mm   45.9 cm   8.85 keV  2.58 keV   893 mum  3.92 cm    Tracker     eIoni
-   12     12 cm   1.03 cm     46 cm   6.66 keV  2.19 keV   678 mum  3.99 cm    Tracker     eIoni
-   13   12.1 cm   1.07 cm     46 cm   4.26 keV   2.4 keV   522 mum  4.04 cm    Tracker     eIoni
-   14     12 cm   1.07 cm   45.9 cm   2.08 keV  2.18 keV   370 mum  4.08 cm    Tracker     eIoni
-   15     12 cm   1.08 cm   45.9 cm      0 eV   2.08 keV   173 mum   4.1 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 510,   Parent ID = 506
+* G4Track Information:   Particle = gamma,   Track ID = 7,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   8.84 cm  -2.57 cm   1.42 cm   12.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1    8.8 cm  -2.58 cm    1.4 cm   9.92 keV  2.33 keV   627 mum   627 mum   Chamber     eIoni
-    2    8.8 cm   -2.6 cm    1.4 cm      0 eV   9.92 keV   528 mum  1.15 mm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -244 mum   115 mum -2.45 m    7.62 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -682 mum  76.4 mum -2.44 m    2.48 MeV  5.14 MeV  5.42 mm   5.42 mm   TargetPV       compt
+    2  -1.37 cm   1.13 mm  -2.42 m       0 eV   1.46 MeV  2.27 cm   2.81 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 509,   Parent ID = 506
+* G4Track Information:   Particle = e+,   Track ID = 93,   Parent ID = 7
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.12 cm  -5.39 cm  -61.9 cm     18 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   6.08 cm  -5.43 cm  -61.9 cm   17.3 keV   648 eV    913 mum   913 mum   Chamber     eIoni
-    2   6.05 cm  -5.44 cm    -62 cm   16.4 keV   953 eV    876 mum  1.79 mm    Chamber     eIoni
-    3   6.04 cm  -5.42 cm    -62 cm   12.7 keV  3.63 keV   827 mum  2.62 mm    Chamber     eIoni
-    4   6.03 cm  -5.41 cm  -62.1 cm     11 keV  1.73 keV   650 mum  3.27 mm    Chamber     eIoni
-    5   6.04 cm  -5.42 cm    -62 cm   7.98 keV  3.02 keV   574 mum  3.84 mm    Chamber     eIoni
-    6   6.06 cm  -5.43 cm    -62 cm   3.56 keV  4.43 keV   451 mum  4.29 mm    Chamber     eIoni
-    7   6.06 cm  -5.42 cm    -62 cm    786 eV   2.77 keV   249 mum  4.54 mm    Chamber     eIoni
-    8   6.06 cm  -5.42 cm    -62 cm      0 eV    786 eV   34.7 mum  4.57 mm    Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.37 cm   1.13 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.37 cm   1.13 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 508,   Parent ID = 506
+* G4Track Information:   Particle = gamma,   Track ID = 95,   Parent ID = 93
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.27 cm  -1.26 cm  -1.44 m    9.83 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -2.27 cm  -1.28 cm  -1.44 m       0 eV   9.83 keV   524 mum   524 mum   Chamber     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.37 cm   1.13 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -6.3 mm    6.5 mm  -2.43 m       0 eV    511 keV  1.08 cm   1.08 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 507,   Parent ID = 506
+* G4Track Information:   Particle = gamma,   Track ID = 94,   Parent ID = 93
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.59 mm   -204 mum -2.28 m    22.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   -5.2 mm   1.18 mm  -2.28 m    17.3 keV  5.01 keV  2.22 mm   2.22 mm    Tracker     eIoni
-    2  -5.61 mm   2.54 mm  -2.28 m    14.3 keV  3.04 keV  1.52 mm   3.74 mm    Tracker     eIoni
-    3  -6.53 mm   2.63 mm  -2.28 m    12.3 keV  1.93 keV  1.17 mm   4.91 mm    Tracker     eIoni
-    4   -7.2 mm   2.37 mm  -2.28 m    10.8 keV  1.56 keV   977 mum  5.88 mm    Tracker     eIoni
-    5  -7.91 mm    2.4 mm  -2.28 m    9.77 keV  1.01 keV   836 mum  6.72 mm    Tracker     eIoni
-    6  -8.28 mm   1.81 mm  -2.28 m    7.43 keV  2.34 keV   749 mum  7.47 mm    Tracker     eIoni
-    7  -8.53 mm   1.43 mm  -2.28 m    4.57 keV  2.86 keV   575 mum  8.04 mm    Tracker     eIoni
-    8  -8.38 mm   1.48 mm  -2.28 m    2.84 keV  1.73 keV   389 mum  8.43 mm    Tracker     eIoni
-    9  -8.33 mm   1.67 mm  -2.28 m     902 eV   1.94 keV   262 mum   8.7 mm    Tracker     eIoni
-   10  -8.34 mm   1.68 mm  -2.28 m       0 eV    902 eV   53.6 mum  8.75 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.37 cm   1.13 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.87 cm  -2.53 mm  -2.42 m       0 eV    511 keV  7.34 mm   7.34 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 505,   Parent ID = 485
+* G4Track Information:   Particle = gamma,   Track ID = 6,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    122 mum   707 mum  -2.4 m    17.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    115 mum   657 mum  -2.4 m    10.9 MeV   563 keV   505 mum   505 mum  TargetPV     eBrem
-    2    114 mum   657 mum  -2.4 m    9.83 MeV   151 eV   4.49 mum   509 mum  TargetPV     eBrem
-    3    220 mum   663 mum  -2.4 m    8.84 MeV   629 keV   550 mum  1.06 mm   TargetPV     eBrem
-    4    250 mum   721 mum  -2.4 m    8.69 MeV   146 keV   133 mum  1.19 mm    TrackerTransportation
-    5   9.67 mm   5.96 cm  -2.29 m    8.65 MeV  24.4 keV  12.3 cm   12.5 cm    Tracker     eIoni
-    6    7.2 cm   48.5 cm  -1.34 m    8.44 MeV   200 keV  1.05 m    1.17 m     Tracker     eIoni
-    7   20.7 cm     84 cm  -57.7 cm   8.27 MeV   159 keV    85 cm   2.02 m     Tracker     eIoni
-    8   24.7 cm   93.3 cm  -40.3 cm   8.21 MeV  45.9 keV  20.2 cm   2.23 m     Tracker     eIoni
-    9   26.2 cm   96.5 cm  -34.5 cm   8.19 MeV  10.9 keV   6.8 cm   2.29 m     Tracker     eIoni
-   10   48.2 cm   1.39 m    44.2 cm   7.99 MeV   165 keV  92.3 cm   3.22 m     Tracker     eIoni
-   11   59.5 cm   1.56 m    74.2 cm   7.91 MeV  76.9 keV  36.2 cm   3.58 m     Tracker     eIoni
-   12   70.7 cm   1.79 m    1.09 m    7.82 MeV  76.5 keV  43.1 cm   4.01 m     Tracker     eIoni
-   13     97 cm    2.4 m     1.9 m    7.63 MeV   188 keV  1.06 m    5.07 m     WorldPVTransportation
-   14   1.21 m     2.8 m    2.73 m    7.44 MeV   174 keV  94.9 cm   6.01 m     WorldPV     eIoni
-   15   1.27 m    2.88 m    2.88 m     7.4 MeV  28.4 keV  17.6 cm   6.19 m     WorldPV     eIoni
-   16   1.28 m    2.89 m    2.91 m    7.39 MeV  7.77 keV  3.96 cm   6.23 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -238 mum   116 mum -2.45 m    10.1 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -3.7 mm   -283 mum  -2.4 m       0 eV      0 eV   4.63 cm   4.63 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 529,   Parent ID = 505
+* G4Track Information:   Particle = e+,   Track ID = 97,   Parent ID = 6
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.27 m    2.88 m    2.88 m    8.38 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   1.27 m    2.88 m    2.88 m     6.9 keV  1.48 keV   641 mum   641 mum   WorldPV     eIoni
-    2   1.27 m    2.88 m    2.88 m    5.16 keV  1.74 keV   537 mum  1.18 mm    WorldPV     eIoni
-    3   1.27 m    2.88 m    2.88 m    2.97 keV  2.19 keV   427 mum  1.61 mm    WorldPV     eIoni
-    4   1.27 m    2.88 m    2.88 m     357 eV   2.61 keV   274 mum  1.88 mm    WorldPV     eIoni
-    5   1.27 m    2.88 m    2.88 m       0 eV    357 eV   20.6 mum   1.9 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -3.7 mm   -283 mum  -2.4 m    4.11 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.89 mm    209 mum  -2.4 m    3.24 MeV   877 keV   974 mum   974 mum  TargetPV       eIoni
+    2   -3.9 mm  -13.9 mum  -2.4 m    2.32 MeV   913 keV   831 mum   1.8 mm   TargetPV       eIoni
+    3  -3.97 mm    421 mum  -2.4 m    1.62 MeV   699 keV   676 mum  2.48 mm   TargetPV       eIoni
+    4  -4.07 mm    176 mum  -2.4 m    1.03 MeV   596 keV   550 mum  3.03 mm   TargetPV       eIoni
+    5  -4.18 mm    299 mum  -2.4 m     521 keV   508 keV   429 mum  3.46 mm   TargetPV       eIoni
+    6  -4.19 mm    266 mum  -2.4 m       0 eV    521 keV   283 mum  3.74 mm   TargetPV       eIoni
+    7  -4.19 mm    266 mum  -2.4 m       0 eV      0 eV      0 fm   3.74 mm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 528,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 99,   Parent ID = 97
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.21 m     2.8 m    2.73 m      24 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   1.21 m    2.81 m    2.72 m    21.5 keV  2.49 keV  2.48 mm   2.48 mm    WorldPV     eIoni
-    2   1.21 m    2.81 m    2.72 m    17.6 keV   3.9 keV   2.1 mm   4.58 mm    WorldPV     eIoni
-    3   1.21 m    2.81 m    2.72 m    13.8 keV  3.81 keV  1.56 mm   6.14 mm    WorldPV     eIoni
-    4   1.21 m    2.81 m    2.72 m    12.2 keV  1.66 keV  1.13 mm   7.26 mm    WorldPV     eIoni
-    5   1.21 m    2.81 m    2.72 m    7.83 keV  4.33 keV   960 mum  8.22 mm    WorldPV     eIoni
-    6   1.21 m    2.81 m    2.72 m       0 eV   7.83 keV   603 mum  8.83 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -4.19 mm    266 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.29 mm    266 mum  -2.4 m     216 keV   295 keV   114 mum   114 mum  TargetPV       compt
+    2   -4.3 mm    257 mum  -2.4 m     201 keV  14.7 keV   125 mum   239 mum  TargetPV       compt
+    3  -4.25 mm    238 mum  -2.4 m       0 eV    201 keV   103 mum   342 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 527,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 98,   Parent ID = 97
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   70.7 cm   1.79 m    1.09 m    10.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   70.8 cm   1.79 m    1.09 m    7.09 keV  3.07 keV   781 mum   781 mum   Tracker     eIoni
-    2   70.8 cm   1.79 m    1.09 m     5.1 keV  1.99 keV   551 mum  1.33 mm    Tracker     eIoni
-    3   70.8 cm   1.79 m    1.09 m    4.01 keV  1.09 keV   423 mum  1.75 mm    Tracker     eIoni
-    4   70.8 cm   1.79 m    1.09 m    1.82 keV  2.19 keV   353 mum  2.11 mm    Tracker     eIoni
-    5   70.8 cm   1.79 m    1.09 m       0 eV   1.82 keV   141 mum  2.25 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -4.19 mm    266 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.41 mm    259 mum  -2.4 m     511 keV     0 eV   1.97 mm   1.97 mm   TargetPV  Transportation
+    2    2.4 m   -9.13 mm  -1.25 m     511 keV     0 eV   2.66 m    2.67 m     Tracker  Transportation
+    3   2.91 m   -1.11 cm     -1 m     511 keV     0 eV   56.6 cm   3.23 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 526,   Parent ID = 505
+* G4Track Information:   Particle = e-,   Track ID = 96,   Parent ID = 6
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   59.5 cm   1.56 m    74.2 cm   8.29 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   59.5 cm   1.56 m    74.2 cm   6.09 keV   2.2 keV   635 mum   635 mum   Tracker     eIoni
-    2   59.5 cm   1.56 m    74.2 cm   3.84 keV  2.25 keV   486 mum  1.12 mm    Tracker     eIoni
-    3   59.5 cm   1.56 m    74.3 cm   1.22 keV  2.62 keV   341 mum  1.46 mm    Tracker     eIoni
-    4   59.5 cm   1.56 m    74.3 cm      0 eV   1.22 keV  79.6 mum  1.54 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -3.7 mm   -283 mum  -2.4 m    4.96 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.69 mm   -323 mum  -2.4 m    3.59 MeV  1.06 MeV   127 mum   127 mum  TargetPV       eBrem
+    2  -3.25 mm   -224 mum  -2.4 m    2.01 MeV  1.08 MeV   857 mum   984 mum  TargetPV       eBrem
+    3  -3.41 mm   -153 mum  -2.4 m    1.31 MeV   703 keV   613 mum   1.6 mm   TargetPV       eIoni
+    4   -3.3 mm   -155 mum  -2.4 m     804 keV   506 keV   484 mum  2.08 mm   TargetPV       eIoni
+    5  -3.19 mm   -176 mum  -2.4 m     458 keV   346 keV   373 mum  2.45 mm   TargetPV       eIoni
+    6  -3.22 mm   -165 mum  -2.4 m     100 keV   358 keV   254 mum  2.71 mm   TargetPV       eIoni
+    7  -3.22 mm   -165 mum  -2.4 m       0 eV    100 keV  27.7 mum  2.73 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 525,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 101,   Parent ID = 96
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   48.2 cm   1.39 m    44.2 cm   26.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   48.3 cm   1.39 m    44.3 cm   22.8 keV  4.04 keV  2.96 mm   2.96 mm    Tracker     eIoni
-    2   48.4 cm   1.39 m    44.4 cm   19.5 keV  3.31 keV  2.29 mm   5.25 mm    Tracker     eIoni
-    3   48.5 cm   1.38 m    44.4 cm   16.9 keV  2.54 keV   1.8 mm   7.05 mm    Tracker     eIoni
-    4   48.4 cm   1.38 m    44.3 cm   11.3 keV  5.62 keV  1.47 mm   8.52 mm    Tracker     eIoni
-    5   48.5 cm   1.38 m    44.3 cm   9.68 keV  1.63 keV   882 mum   9.4 mm    Tracker     eIoni
-    6   48.5 cm   1.38 m    44.3 cm   6.87 keV  2.81 keV   742 mum  1.01 cm    Tracker     eIoni
-    7   48.4 cm   1.38 m    44.4 cm   3.91 keV  2.96 keV   535 mum  1.07 cm    Tracker     eIoni
-    8   48.4 cm   1.38 m    44.4 cm   2.12 keV  1.79 keV   346 mum   1.1 cm    Tracker     eIoni
-    9   48.4 cm   1.38 m    44.4 cm      0 eV   2.12 keV   178 mum  1.12 cm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.25 mm   -224 mum  -2.4 m     493 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.41 mm   -259 mum  -2.4 m     205 keV   288 keV   183 mum   183 mum  TargetPV       compt
+    2  -3.18 mm   17.8 mum  -2.4 m       0 eV    205 keV   399 mum   582 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 524,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 100,   Parent ID = 96
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   26.2 cm   96.5 cm  -34.5 cm     13 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   26.2 cm   96.4 cm  -34.4 cm   9.85 keV  3.18 keV  1.05 mm   1.05 mm    Tracker     eIoni
-    2   26.2 cm   96.4 cm  -34.4 cm   7.83 keV  2.03 keV   756 mum   1.8 mm    Tracker     eIoni
-    3   26.1 cm   96.3 cm  -34.4 cm   5.81 keV  2.01 keV   603 mum  2.41 mm    Tracker     eIoni
-    4   26.1 cm   96.3 cm  -34.3 cm   4.53 keV  1.29 keV   467 mum  2.87 mm    Tracker     eIoni
-    5   26.1 cm   96.3 cm  -34.3 cm   3.12 keV  1.41 keV   387 mum  3.26 mm    Tracker     eIoni
-    6   26.1 cm   96.3 cm  -34.3 cm   1.53 keV  1.59 keV   287 mum  3.55 mm    Tracker     eIoni
-    7   26.1 cm   96.3 cm  -34.3 cm      0 eV   1.53 keV   109 mum  3.66 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.69 mm   -323 mum  -2.4 m     308 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -3.6 mm   -269 mum  -2.4 m       0 eV    308 keV   498 mum   498 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 523,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 5,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 cm   93.3 cm  -40.3 cm   16.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   24.8 cm   93.2 cm  -40.3 cm   15.6 keV   968 eV   1.43 mm   1.43 mm    Tracker     eIoni
-    2   24.9 cm   93.1 cm  -40.2 cm   12.1 keV   3.5 keV  1.32 mm   2.74 mm    Tracker     eIoni
-    3   24.9 cm   93.1 cm  -40.2 cm   10.4 keV  1.68 keV   949 mum  3.69 mm    Tracker     eIoni
-    4   24.9 cm     93 cm  -40.2 cm   7.48 keV   2.9 keV   801 mum   4.5 mm    Tracker     eIoni
-    5   24.9 cm   92.9 cm  -40.1 cm   6.28 keV   1.2 keV   578 mum  5.07 mm    Tracker     eIoni
-    6   24.9 cm   92.9 cm  -40.1 cm   4.96 keV  1.32 keV   498 mum  5.57 mm    Tracker     eIoni
-    7   24.9 cm   92.9 cm  -40.2 cm      0 eV   4.96 keV   414 mum  5.99 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -204 mum   116 mum -2.45 m    9.16 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.53 mm  -99.7 mum -2.41 m       0 eV   8.14 MeV  4.17 cm   4.17 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 522,   Parent ID = 505
+* G4Track Information:   Particle = e+,   Track ID = 102,   Parent ID = 5
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   20.7 cm     84 cm  -57.7 cm   8.93 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   20.7 cm   84.1 cm  -57.7 cm   6.84 keV  2.09 keV   684 mum   684 mum   Tracker     eIoni
-    2   20.7 cm   84.1 cm  -57.7 cm   5.84 keV   996 eV    533 mum  1.22 mm    Tracker     eIoni
-    3   20.6 cm   84.1 cm  -57.7 cm   4.65 keV  1.19 keV   469 mum  1.69 mm    Tracker     eIoni
-    4   20.6 cm   84.1 cm  -57.8 cm   3.46 keV  1.19 keV   394 mum  2.08 mm    Tracker     eIoni
-    5   20.6 cm   84.1 cm  -57.8 cm   2.42 keV  1.05 keV   314 mum   2.4 mm    Tracker     eIoni
-    6   20.6 cm   84.1 cm  -57.8 cm      0 eV   2.42 keV   217 mum  2.61 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.53 mm  -99.7 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.53 mm  -99.7 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 521,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 104,   Parent ID = 102
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    7.2 cm   48.5 cm  -1.34 m    8.37 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   7.25 cm   48.5 cm  -1.34 m    6.11 keV  2.26 keV   641 mum   641 mum   Tracker     eIoni
-    2   7.26 cm   48.5 cm  -1.34 m    4.11 keV     2 keV   487 mum  1.13 mm    Tracker     eIoni
-    3   7.23 cm   48.5 cm  -1.34 m     168 eV   3.94 keV   360 mum  1.49 mm    Tracker     eIoni
-    4   7.23 cm   48.5 cm  -1.34 m       0 eV    168 eV     13 mum   1.5 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.53 mm  -99.7 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.59 mm   -195 mum -2.41 m       0 eV    511 keV   117 mum   117 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 520,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 103,   Parent ID = 102
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.67 mm   5.96 cm  -2.29 m    20.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.09 cm   5.85 cm  -2.29 m    18.1 keV  2.59 keV  1.97 mm   1.97 mm    Tracker     eIoni
-    2   1.18 cm   5.79 cm  -2.29 m    15.6 keV  2.53 keV  1.62 mm   3.59 mm    Tracker     eIoni
-    3   1.29 cm   5.84 cm  -2.29 m    14.1 keV  1.51 keV  1.32 mm   4.91 mm    Tracker     eIoni
-    4   1.33 cm   5.86 cm  -2.29 m    11.5 keV  2.53 keV  1.15 mm   6.06 mm    Tracker     eIoni
-    5   1.38 cm   5.83 cm  -2.29 m    9.45 keV  2.08 keV   902 mum  6.96 mm    Tracker     eIoni
-    6   1.43 cm   5.87 cm  -2.29 m    6.28 keV  3.17 keV   725 mum  7.68 mm    Tracker     eIoni
-    7   1.47 cm   5.87 cm  -2.29 m    1.73 keV  4.55 keV   498 mum  8.18 mm    Tracker     eIoni
-    8   1.47 cm   5.87 cm  -2.29 m       0 eV   1.73 keV   131 mum  8.31 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.53 mm  -99.7 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.95 mm    876 mum -2.41 m     432 keV  79.5 keV   1.2 mm    1.2 mm   TargetPV       compt
+    2   4.34 mm   5.76 mm  -2.42 m       0 eV    432 keV  1.28 cm    1.4 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 519,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 4,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    220 mum   663 mum  -2.4 m     362 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    257 mum   725 mum  -2.4 m     362 keV     0 eV    133 mum   133 mum   TrackerTransportation
-    2   1.42 m     2.4 m    1.93 m     362 keV     0 eV   5.15 m    5.15 m     WorldPVTransportation
-    3   1.73 m    2.91 m    2.85 m     362 keV     0 eV    1.1 m    6.25 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -178 mum   107 mum -2.45 m     633 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -267 mum   136 mum -2.45 m     571 keV  62.5 keV  1.54 mm   1.54 mm   TargetPV       compt
+    2   2.78 mm   3.64 mm  -2.44 m     552 keV    19 keV   1.2 cm   1.36 cm   TargetPV       compt
+    3   5.78 mm   1.18 cm  -2.42 m     295 keV   256 keV  1.58 cm   2.94 cm   TargetPV       compt
+    4   5.27 mm   1.25 cm  -2.42 m     181 keV   114 keV   903 mum  3.03 cm   TargetPV       compt
+    5   5.38 mm   1.26 cm  -2.42 m       0 eV    181 keV   697 mum   3.1 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 518,   Parent ID = 505
+* G4Track Information:   Particle = gamma,   Track ID = 3,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    114 mum   657 mum  -2.4 m    1.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    104 mum   656 mum  -2.4 m    1.09 MeV     0 eV    614 mum   614 mum   TrackerTransportation
-    2  -1.38 cm  -1.12 mm   -1.6 m    1.09 MeV     0 eV     80 cm   80.1 cm    ChamberTransportation
-    3  -1.72 cm  -1.56 mm   -1.4 m    1.09 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -2.76 cm   -2.9 mm    -80 cm   1.09 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -3.11 cm  -3.34 mm    -60 cm   1.09 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -4.15 cm  -4.67 mm  0.114 fm   1.09 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7   -4.5 cm  -5.11 mm     20 cm   1.09 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -5.54 cm  -6.45 mm     80 cm   1.09 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -5.89 cm  -6.89 mm      1 m    1.09 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10  -6.93 cm  -8.22 mm    1.6 m    1.09 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11  -7.27 cm  -8.66 mm    1.8 m    1.09 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12  -8.32 cm    -10 mm    2.4 m    1.09 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13   -9.2 cm  -1.11 cm   2.91 m    1.09 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -173 mum   108 mum -2.45 m    3.03 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -294 mum  98.1 mum -2.45 m     473 keV  2.56 MeV  4.27 mm   4.27 mm   TargetPV       compt
+    2   3.73 mm  -4.62 mm  -2.44 m       0 eV    473 keV  6.24 mm   1.05 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 517,   Parent ID = 505
+* G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    115 mum   657 mum  -2.4 m    5.86 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    120 mum   648 mum  -2.4 m    5.86 MeV     0 eV    618 mum   618 mum   TrackerTransportation
-    2   7.46 mm  -1.14 cm   -1.6 m    5.86 MeV     0 eV     80 cm   80.1 cm    ChamberTransportation
-    3    9.3 mm  -1.45 cm   -1.4 m    5.86 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4   1.48 cm  -2.35 cm    -80 cm   5.86 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5   1.66 cm  -2.66 cm    -60 cm   5.86 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6   2.21 cm  -3.56 cm      0 fm   5.86 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7    2.4 cm  -3.87 cm     20 cm   5.86 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8   2.95 cm  -4.77 cm     80 cm   5.86 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9   3.13 cm  -5.08 cm      1 m    5.86 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10   3.68 cm  -5.98 cm    1.6 m    5.86 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11   3.87 cm  -6.28 cm    1.8 m    5.86 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12   4.42 cm  -7.19 cm    2.4 m    5.86 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13   4.88 cm  -7.96 cm   2.91 m    5.86 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -32.2 mum -1.27 mum -2.86 m    10.5 keV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1   -543 mum  -512 mum -2.86 m    8.63 keV  1.87 keV   798 mum   798 mum   WorldPV       eIoni
+    2   -505 mum -1.11 mm  -2.86 m    6.62 keV  2.01 keV   651 mum  1.45 mm    WorldPV       eIoni
+    3   -339 mum  -1.5 mm  -2.86 m    5.32 keV   1.3 keV   512 mum  1.96 mm    WorldPV       eIoni
+    4   -692 mum -1.66 mm  -2.86 m    3.12 keV   2.2 keV   431 mum  2.39 mm    WorldPV       eIoni
+    5   -663 mum  -1.6 mm  -2.86 m       0 eV   3.12 keV   281 mum  2.67 mm    WorldPV       eIoni
+>>> Event 0
+    0 trajectories stored in this event.
+### Run 1 start.
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 484,   Parent ID = 453
+* G4Track Information:   Particle = mu+,   Track ID = 1,   Parent ID = 0
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -107 mum   543 mum  -2.4 m    9.78 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -120 mum   607 mum  -2.4 m    3.68 MeV     0 eV   1.14 mm   1.14 mm   TargetPV     compt
-    2    408 mum  2.48 mm   -2.4 m    3.68 MeV     0 eV    4.3 mm   5.44 mm    TrackerTransportation
-    3   55.1 cm   1.95 m     1.6 m    3.68 MeV     0 eV   4.48 m    4.49 m     ChamberTransportation
-    4   55.5 cm   1.97 m    1.63 m    3.68 MeV     0 eV   3.42 cm   4.52 m     TrackerTransportation
-    5   66.1 cm   2.34 m     2.4 m    3.68 MeV     0 eV   86.3 cm   5.39 m     WorldPVTransportation
-    6   73.1 cm   2.59 m    2.91 m    3.68 MeV     0 eV   57.2 cm   5.96 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0      0 fm      0 fm  -2.91 m       1 TeV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1   6.92 nm   10.1 nm  -2.84 m   1e+03 GeV  16.3 keV  7.02 cm   7.02 cm    WorldPV      MuIoni
+    2  -29.7 nm   5.53 nm  -2.45 m   1e+03 GeV  88.2 keV    39 cm     46 cm    WorldPV  Transportation
+    3  -15.9 nm     16 nm   -2.4 m   1e+03 GeV  81.5 MeV     5 cm     51 cm   TargetPV  Transportation
+    4    3.7 mum  4.75 mum -2.04 m   1e+03 GeV  93.3 keV  36.2 cm   87.2 cm    Tracker      MuIoni
+    5   8.21 mum  10.8 mum  -1.6 m   1e+03 GeV   114 keV  43.8 cm   1.31 m     Tracker  Transportation
+    6   9.61 mum  12.9 mum -1.44 m   1e+03 GeV  94.8 keV    16 cm   1.47 m     Chamber      MuIoni
+    7   10.1 mum  13.5 mum  -1.4 m   1e+03 GeV  41.5 keV  4.01 cm   1.51 m     Chamber  Transportation
+    8   16.6 mum    22 mum   -80 cm  1e+03 GeV   165 keV    60 cm   2.11 m     Tracker  Transportation
+    9   18.8 mum  24.7 mum   -60 cm  1e+03 GeV   219 keV    20 cm   2.31 m     Chamber  Transportation
+   10   23.9 mum  31.8 mum -4.26 cm  1e+03 GeV   135 keV  55.7 cm   2.87 m     Tracker      MuIoni
+   11   24.3 mum  32.4 mum     0 fm  1e+03 GeV  9.88 keV  4.26 cm   2.91 m     Tracker  Transportation
+   12   25.6 mum    35 mum  17.7 cm  1e+03 GeV   183 keV  17.7 cm   3.09 m     Chamber      MuIoni
+   13   25.9 mum  35.3 mum    20 cm  1e+03 GeV  15.6 keV  2.34 cm   3.11 m     Chamber  Transportation
+   14   26.8 mum  36.8 mum  29.8 cm  1e+03 GeV    23 keV  9.81 cm   3.21 m     Tracker      MuIoni
+   15   26.8 mum  36.8 mum  29.8 cm  1e+03 GeV  13.2 eV    338 mum  3.21 m     Tracker      MuIoni
+   16   26.8 mum  36.8 mum  29.9 cm  1e+03 GeV  49.6 eV    710 mum  3.21 m     Tracker      MuIoni
+   17   31.8 mum  44.2 mum    80 cm  1e+03 GeV   136 keV  50.1 cm   3.71 m     Tracker  Transportation
+   18   33.7 mum  47.2 mum     1 m   1e+03 GeV   152 keV    20 cm   3.91 m     Chamber  Transportation
+   19   34.4 mum  48.4 mum  1.08 m   1e+03 GeV  27.5 keV  8.45 cm   3.99 m     Tracker      MuIoni
+   20   38.5 mum  55.6 mum   1.6 m   1e+03 GeV   130 keV  51.6 cm   4.51 m     Tracker  Transportation
+   21   40.1 mum  58.5 mum   1.8 m   1e+03 GeV   186 keV    20 cm   4.71 m     Chamber  Transportation
+   22   45.2 mum  67.5 mum   2.4 m   1e+03 GeV   140 keV    60 cm   5.31 m     Tracker  Transportation
+   23   46.8 mum  70.1 mum  2.58 m   1e+03 GeV  41.9 keV  17.6 cm   5.49 m     WorldPV      MuIoni
+   24   49.6 mum    75 mum  2.91 m   1e+03 GeV    72 keV  33.4 cm   5.82 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 530,   Parent ID = 484
+* G4Track Information:   Particle = e-,   Track ID = 11,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -120 mum   607 mum  -2.4 m    6.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -503 mum -61.8 mum  -2.4 m    4.73 MeV  1.36 MeV  1.22 mm   1.22 mm   TargetPV     eIoni
-    2   -207 mum   623 mum  -2.4 m    3.01 MeV  1.06 MeV   949 mum  2.17 mm   TargetPV     eBrem
-    3   -153 mum   312 mum  -2.4 m    1.56 MeV   414 keV   388 mum  2.56 mm   TargetPV     eBrem
-    4  -22.9 mum   324 mum  -2.4 m     330 keV   145 keV   178 mum  2.73 mm   TargetPV     eBrem
-    5  -16.6 mum   328 mum  -2.4 m       0 eV    330 keV   166 mum   2.9 mm   TargetPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   46.8 mum  70.1 mum  2.58 m    15.2 keV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1   -194 mum   1.2 mm   2.58 m    11.8 keV  3.39 keV  1.25 mm   1.25 mm    WorldPV       eIoni
+    2    211 mum  2.01 mm   2.58 m    6.02 keV  5.74 keV   907 mum  2.15 mm    WorldPV       eIoni
+    3    281 mum   2.3 mm   2.58 m    3.36 keV  2.65 keV   474 mum  2.63 mm    WorldPV       eIoni
+    4    485 mum  2.34 mm   2.57 m    1.86 keV   1.5 keV   301 mum  2.93 mm    WorldPV       eIoni
+    5    477 mum   2.3 mm   2.57 m       0 eV   1.86 keV   140 mum  3.07 mm    WorldPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 533,   Parent ID = 530
+* G4Track Information:   Particle = e-,   Track ID = 10,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -22.9 mum   324 mum  -2.4 m    1.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.61 mm   1.41 mm   -2.4 m       0 eV     88 keV  3.48 mm   3.48 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   34.4 mum  48.4 mum  1.08 m    11.7 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   -482 mum   604 mum  1.08 m    9.96 keV  1.72 keV   899 mum   899 mum   Tracker       eIoni
+    2    201 mum   435 mum  1.08 m     7.7 keV  2.26 keV   752 mum  1.65 mm    Tracker       eIoni
+    3    374 mum -33.8 mum  1.08 m    5.96 keV  1.73 keV   585 mum  2.24 mm    Tracker       eIoni
+    4    719 mum  85.7 mum  1.09 m    4.05 keV  1.92 keV   471 mum  2.71 mm    Tracker       eIoni
+    5    960 mum  31.5 mum  1.09 m     882 eV   3.17 keV   350 mum  3.06 mm    Tracker       eIoni
+    6    963 mum    13 mum  1.09 m       0 eV    882 eV   49.7 mum  3.11 mm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 534,   Parent ID = 533
+* G4Track Information:   Particle = e-,   Track ID = 9,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.61 mm   1.41 mm   -2.4 m     995 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.74 mm   1.46 mm   -2.4 m     538 keV   457 keV   412 mum   412 mum  TargetPV     eIoni
-    2  -1.75 mm   1.48 mm   -2.4 m       0 eV    538 keV   285 mum   697 mum  TargetPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   26.8 mum  36.8 mum  29.9 cm   18.5 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -1.52 mm   -359 mum  29.9 cm   13.6 keV  4.96 keV  1.65 mm   1.65 mm    Tracker       eIoni
+    2   -1.8 mm  -1.35 mm   29.9 cm   11.5 keV  2.06 keV  1.08 mm   2.73 mm    Tracker       eIoni
+    3  -1.64 mm  -1.96 mm   29.9 cm    8.9 keV  2.62 keV   886 mum  3.62 mm    Tracker       eIoni
+    4  -1.32 mm  -2.48 mm   29.9 cm   6.57 keV  2.33 keV   672 mum  4.29 mm    Tracker       eIoni
+    5  -1.56 mm  -2.55 mm   29.9 cm   3.43 keV  3.13 keV   509 mum   4.8 mm    Tracker       eIoni
+    6  -1.56 mm  -2.37 mm   29.9 cm   89.7 eV   3.35 keV   307 mum   5.1 mm    Tracker       eIoni
+    7  -1.56 mm  -2.37 mm   29.9 cm      0 eV   89.7 eV   9.07 mum  5.11 mm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 532,   Parent ID = 530
+* G4Track Information:   Particle = e-,   Track ID = 8,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -153 mum   312 mum  -2.4 m    1.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   8.42 mm   1.11 cm   -2.4 m     889 keV   150 keV  1.39 cm   1.39 cm   TargetPV     compt
-    2   9.73 mm   1.45 cm   -2.4 m     889 keV     0 eV   3.99 mm   1.79 cm    TrackerTransportation
-    3     92 cm    2.4 m   -1.31 m     889 keV     0 eV   2.78 m     2.8 m     WorldPVTransportation
-    4   1.11 m    2.91 m   -1.07 m     889 keV     0 eV   59.4 cm   3.39 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   26.8 mum  36.8 mum  29.8 cm    8.4 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   -255 mum   506 mum  29.8 cm   5.49 keV  2.92 keV   633 mum   633 mum   Tracker       eIoni
+    2   -408 mum   808 mum  29.8 cm   3.78 keV  1.71 keV   441 mum  1.07 mm    Tracker       eIoni
+    3   -647 mum   701 mum  29.8 cm   1.46 keV  2.31 keV   332 mum  1.41 mm    Tracker       eIoni
+    4   -657 mum   664 mum  29.8 cm      0 eV   1.46 keV  98.3 mum   1.5 mm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 531,   Parent ID = 530
+* G4Track Information:   Particle = e-,   Track ID = 7,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -207 mum   623 mum  -2.4 m     660 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.52 mm  -3.26 mm   -2.4 m     660 keV     0 eV   5.33 mm   5.33 mm    TrackerTransportation
-    2   1.07 m    -2.4 m     -41 cm    660 keV     0 eV   3.29 m     3.3 m     WorldPVTransportation
-    3   1.29 m   -2.91 m     1.3 cm    660 keV     0 eV   70.1 cm      4 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   26.8 mum  36.8 mum  29.8 cm   87.3 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1  -1.65 cm   9.49 mm   30.7 cm   78.8 keV  8.45 keV  2.18 cm   2.18 cm    Tracker       eIoni
+    2  -3.14 cm   1.41 cm   31.5 cm   68.8 keV  10.1 keV  1.83 cm   4.01 cm    Tracker       eIoni
+    3  -4.38 cm   1.35 cm   32.1 cm   59.9 keV  8.87 keV  1.44 cm   5.45 cm    Tracker       eIoni
+    4  -4.75 cm   2.04 cm   32.9 cm   53.6 keV  6.28 keV  1.13 cm   6.58 cm    Tracker       eIoni
+    5  -4.61 cm   2.11 cm   33.7 cm   46.3 keV  7.35 keV  9.32 mm   7.51 cm    Tracker       eIoni
+    6  -3.94 cm   1.96 cm   33.9 cm   40.2 keV  6.01 keV  7.24 mm   8.24 cm    Tracker       eIoni
+    7  -3.43 cm   2.03 cm   34.1 cm     37 keV  3.24 keV   5.7 mm   8.81 cm    Tracker       eIoni
+    8   -3.1 cm   2.36 cm     34 cm   33.4 keV   3.6 keV  4.93 mm    9.3 cm    Tracker       eIoni
+    9  -2.87 cm   2.61 cm   34.2 cm   29.7 keV  3.68 keV  4.17 mm   9.72 cm    Tracker       eIoni
+   10  -2.66 cm    2.6 cm   34.4 cm   27.3 keV  2.48 keV  3.42 mm   10.1 cm    Tracker       eIoni
+   11  -2.55 cm   2.54 cm   34.7 cm   23.7 keV  3.56 keV  2.98 mm   10.4 cm    Tracker       eIoni
+   12  -2.48 cm   2.54 cm   34.9 cm   20.9 keV  2.77 keV  2.39 mm   10.6 cm    Tracker       eIoni
+   13  -2.42 cm   2.46 cm   35.1 cm   19.3 keV  1.65 keV  1.96 mm   10.8 cm    Tracker       eIoni
+   14  -2.52 cm   2.44 cm   34.9 cm   16.9 keV  2.37 keV  1.75 mm     11 cm    Tracker       eIoni
+   15  -2.58 cm   2.48 cm   34.8 cm   15.1 keV  1.77 keV  1.45 mm   11.1 cm    Tracker       eIoni
+   16  -2.58 cm   2.55 cm   34.7 cm   13.6 keV  1.52 keV  1.25 mm   11.2 cm    Tracker       eIoni
+   17  -2.65 cm   2.52 cm   34.6 cm   12.1 keV   1.5 keV  1.09 mm   11.3 cm    Tracker       eIoni
+   18  -2.68 cm   2.61 cm   34.7 cm   10.5 keV  1.62 keV   940 mum  11.4 cm    Tracker       eIoni
+   19  -2.71 cm   2.67 cm   34.6 cm    9.4 keV  1.12 keV   799 mum  11.5 cm    Tracker       eIoni
+   20  -2.76 cm   2.71 cm   34.6 cm   8.29 keV  1.11 keV   709 mum  11.6 cm    Tracker       eIoni
+   21  -2.78 cm   2.75 cm   34.6 cm   6.89 keV   1.4 keV   625 mum  11.7 cm    Tracker       eIoni
+   22  -2.81 cm   2.78 cm   34.6 cm   5.86 keV  1.04 keV   529 mum  11.7 cm    Tracker       eIoni
+   23  -2.84 cm   2.75 cm   34.6 cm   4.63 keV  1.22 keV   463 mum  11.8 cm    Tracker       eIoni
+   24  -2.84 cm   2.72 cm   34.6 cm   3.45 keV  1.18 keV   388 mum  11.8 cm    Tracker       eIoni
+   25  -2.84 cm   2.74 cm   34.6 cm   1.25 keV   2.2 keV   308 mum  11.8 cm    Tracker       eIoni
+   26  -2.84 cm   2.74 cm   34.6 cm      0 eV   1.25 keV  79.1 mum  11.8 cm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 483,   Parent ID = 453
+* G4Track Information:   Particle = e-,   Track ID = 6,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -73.2 mum   565 mum -2.41 m     845 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -228 mum   614 mum  -2.4 m     268 keV   577 keV  4.87 mm   4.87 mm   TargetPV     compt
-    2   -653 mum   751 mum  -2.4 m       0 eV    268 keV   474 mum  5.34 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   25.6 mum    35 mum  17.7 cm    150 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1   1.31 cm   3.47 mm   17.4 cm    138 keV  11.7 keV  1.96 cm   1.96 cm    Chamber       eIoni
+    2    2.4 cm   -910 mum  17.2 cm    118 keV  19.7 keV  1.72 cm   3.68 cm    Chamber       eIoni
+    3   2.59 cm  -5.36 mm   16.4 cm   89.8 keV  28.6 keV  1.34 cm   5.02 cm    Chamber       eIoni
+    4   2.56 cm    584 mum  16.4 cm   77.7 keV  12.1 keV  8.56 mm   5.88 cm    Chamber       eIoni
+    5   2.43 cm    465 mum  16.9 cm   62.9 keV  14.7 keV   6.8 mm   6.56 cm    Chamber       eIoni
+    6   2.12 cm   1.35 mm   16.8 cm   58.7 keV  4.26 keV  4.88 mm   7.04 cm    Chamber       eIoni
+    7   1.88 cm    774 mum  16.6 cm   51.7 keV  6.93 keV  4.39 mm   7.48 cm    Chamber       eIoni
+    8   1.98 cm    775 mum  16.4 cm   43.1 keV  8.65 keV  3.61 mm   7.84 cm    Chamber       eIoni
+    9   2.12 cm   1.13 mm   16.5 cm   39.1 keV  4.02 keV  2.74 mm   8.12 cm    Chamber       eIoni
+   10    2.2 cm   2.41 mm   16.4 cm   34.8 keV  4.29 keV  2.38 mm   8.35 cm    Chamber       eIoni
+   11   2.07 cm   2.22 mm   16.4 cm   29.7 keV  5.04 keV  2.01 mm   8.56 cm    Chamber       eIoni
+   12   2.11 cm   2.16 mm   16.5 cm   20.4 keV  9.34 keV  1.62 mm   8.72 cm    Chamber       eIoni
+   13   2.11 cm   2.81 mm   16.5 cm   18.3 keV  2.11 keV  1.01 mm   8.82 cm    Chamber       eIoni
+   14   2.09 cm    2.7 mm   16.6 cm   15.1 keV  3.17 keV   891 mum  8.91 cm    Chamber       eIoni
+   15   2.08 cm   2.98 mm   16.6 cm   12.7 keV  2.38 keV   731 mum  8.98 cm    Chamber       eIoni
+   16   2.05 cm   2.96 mm   16.6 cm   9.16 keV  3.57 keV   623 mum  9.04 cm    Chamber       eIoni
+   17   2.04 cm   3.16 mm   16.6 cm   6.91 keV  2.25 keV   478 mum  9.09 cm    Chamber       eIoni
+   18   2.05 cm   3.15 mm   16.6 cm    578 eV   6.33 keV   391 mum  9.13 cm    Chamber       eIoni
+   19   2.05 cm   3.15 mm   16.6 cm      0 eV    578 eV   21.5 mum  9.13 cm    Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 5,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   23.9 mum  31.8 mum -4.26 cm   49.5 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   2.99 mm   7.25 mm  -4.29 cm   44.1 keV  5.37 keV  8.13 mm   8.13 mm    Tracker       eIoni
+    2   7.72 mm   1.08 cm  -4.06 cm     40 keV   4.1 keV  6.64 mm   1.48 cm    Tracker       eIoni
+    3   8.08 mm   1.51 cm  -3.73 cm     36 keV  3.96 keV  5.64 mm   2.04 cm    Tracker       eIoni
+    4   6.14 mm    1.9 cm  -3.86 cm   32.7 keV  3.36 keV  4.71 mm   2.51 cm    Tracker       eIoni
+    5   5.79 mm   2.26 cm  -3.98 cm   29.1 keV  3.56 keV  4.02 mm   2.91 cm    Tracker       eIoni
+    6   4.87 mm   2.56 cm  -4.05 cm   25.9 keV  3.21 keV  3.31 mm   3.24 cm    Tracker       eIoni
+    7   4.46 mm   2.79 cm  -4.16 cm   23.5 keV   2.4 keV  2.74 mm   3.52 cm    Tracker       eIoni
+    8   4.39 mm   2.99 cm  -4.26 cm   21.5 keV  2.03 keV  2.36 mm   3.75 cm    Tracker       eIoni
+    9   2.67 mm   3.02 cm  -4.17 cm   20.1 keV  1.37 keV  2.05 mm   3.96 cm    Tracker       eIoni
+   10   1.67 mm   2.91 cm  -4.07 cm   15.2 keV   4.9 keV  1.86 mm   4.15 cm    Tracker       eIoni
+   11   2.19 mm    2.8 cm  -4.08 cm     13 keV   2.2 keV  1.25 mm   4.27 cm    Tracker       eIoni
+   12   1.72 mm   2.73 cm  -4.04 cm   10.3 keV   2.7 keV  1.03 mm   4.37 cm    Tracker       eIoni
+   13   1.05 mm    2.7 cm  -4.02 cm   8.22 keV   2.1 keV   783 mum  4.45 cm    Tracker       eIoni
+   14    626 mum  2.69 cm  -4.06 cm   6.44 keV  1.78 keV   620 mum  4.51 cm    Tracker       eIoni
+   15    227 mum  2.68 cm  -4.08 cm   5.56 keV   876 eV    501 mum  4.56 cm    Tracker       eIoni
+   16  -52.2 mum  2.65 cm  -4.09 cm   3.08 keV  2.48 keV   446 mum  4.61 cm    Tracker       eIoni
+   17  -14.7 mum  2.63 cm  -4.09 cm      0 eV   3.08 keV   278 mum  4.64 cm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 482,   Parent ID = 453
+* G4Track Information:   Particle = e-,   Track ID = 4,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.3 mum   503 mum -2.41 m    1.93 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -139 mum   818 mum  -2.4 m    1.93 MeV     0 eV    6.7 mm    6.7 mm    TrackerTransportation
-    2  -1.17 cm   3.86 cm   -1.6 m    1.93 MeV     0 eV   80.1 cm   80.8 cm    ChamberTransportation
-    3  -1.46 cm    4.8 cm   -1.4 m    1.93 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.33 cm   7.63 cm    -80 cm   1.93 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -2.62 cm   8.58 cm    -60 cm   1.93 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -3.49 cm   11.4 cm      0 fm   1.93 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -3.78 cm   12.4 cm     20 cm   1.93 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -4.65 cm   15.2 cm     80 cm   1.93 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -4.94 cm   16.1 cm      1 m    1.93 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -5.81 cm     19 cm    1.6 m    1.93 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   -6.1 cm   19.9 cm    1.8 m    1.93 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -6.97 cm   22.7 cm    2.4 m    1.93 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -7.71 cm   25.1 cm   2.91 m    1.93 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   9.61 mum  12.9 mum -1.44 m    57.7 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1  -1.47 mm    606 mum -1.44 m    52.6 keV  5.09 keV  4.27 mm   4.27 mm    Chamber       eIoni
+    2  -1.19 mm   1.48 mm  -1.44 m    39.1 keV  13.4 keV  3.69 mm   7.96 mm    Chamber       eIoni
+    3    154 mum   832 mum -1.44 m    37.2 keV  1.88 keV  2.38 mm   1.03 cm    Chamber       eIoni
+    4    592 mum  2.15 mm  -1.44 m    31.4 keV  5.87 keV  2.21 mm   1.26 cm    Chamber       eIoni
+    5    724 mum   2.8 mm  -1.44 m    28.2 keV  3.15 keV  1.74 mm   1.43 cm    Chamber       eIoni
+    6   1.49 mm   2.74 mm  -1.44 m    25.6 keV  2.66 keV  1.51 mm   1.58 cm    Chamber       eIoni
+    7   1.93 mm   3.37 mm  -1.44 m    24.1 keV  1.49 keV  1.33 mm   1.71 cm    Chamber       eIoni
+    8   2.51 mm   3.81 mm  -1.44 m    20.8 keV  3.27 keV  1.23 mm   1.84 cm    Chamber       eIoni
+    9   2.55 mm   4.44 mm  -1.44 m    18.4 keV  2.44 keV  1.03 mm   1.94 cm    Chamber       eIoni
+   10   2.23 mm   3.99 mm  -1.44 m    14.2 keV  4.15 keV   896 mum  2.03 cm    Chamber       eIoni
+   11   2.18 mm   3.85 mm  -1.44 m    7.44 keV  6.76 keV   688 mum   2.1 cm    Chamber       eIoni
+   12   2.06 mm   3.98 mm  -1.44 m    6.32 keV  1.12 keV   413 mum  2.14 cm    Chamber       eIoni
+   13   2.01 mm   3.99 mm  -1.44 m    2.58 keV  3.74 keV   369 mum  2.18 cm    Chamber       eIoni
+   14   2.01 mm   3.99 mm  -1.44 m       0 eV   2.58 keV   147 mum  2.19 cm    Chamber       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 384,   Parent ID = 3
+* G4Track Information:   Particle = e-,   Track ID = 3,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -4.04 mum  8.08 mum -2.42 m    1.37 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -50.1 mum   147 mum -2.42 m    1.31 MeV    57 keV  3.04 mm   3.04 mm   TargetPV     compt
-    2   2.16 mm   1.53 mm   -2.4 m     214 keV   1.1 MeV  1.41 cm   1.71 cm   TargetPV     compt
-    3   2.13 mm   1.49 mm   -2.4 m       0 eV    214 keV   364 mum  1.75 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    3.7 mum  4.75 mum -2.04 m    12.4 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1    584 mum   718 mum -2.04 m      10 keV  2.41 keV   968 mum   968 mum   Tracker       eIoni
+    2   1.24 mm    609 mum -2.04 m    8.96 keV  1.05 keV   756 mum  1.72 mm    Tracker       eIoni
+    3   1.71 mm    295 mum -2.04 m    7.73 keV  1.23 keV   676 mum   2.4 mm    Tracker       eIoni
+    4   1.78 mm    200 mum -2.04 m    3.75 keV  3.98 keV   587 mum  2.99 mm    Tracker       eIoni
+    5   1.68 mm  -3.98 mum -2.04 m    1.77 keV  1.98 keV   330 mum  3.32 mm    Tracker       eIoni
+    6   1.74 mm  -2.18 mum -2.04 m       0 eV   1.77 keV   130 mum  3.45 mm    Tracker       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.88 Ang -8.52 Ang  -2.9 m    9.39 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    148 mum  -670 mum  -2.9 m    7.47 keV  1.93 keV   720 mum   720 mum   WorldPV     eIoni
-    2    637 mum  -680 mum  -2.9 m    6.39 keV  1.07 keV   577 mum   1.3 mm    WorldPV     eIoni
-    3    861 mum  -614 mum  -2.9 m    5.08 keV  1.32 keV   505 mum   1.8 mm    WorldPV     eIoni
-    4    658 mum  -355 mum  -2.9 m    3.21 keV  1.87 keV   422 mum  2.22 mm    WorldPV     eIoni
-    5    624 mum  -181 mum  -2.9 m     299 eV   2.91 keV   294 mum  2.52 mm    WorldPV     eIoni
-    6    620 mum  -186 mum  -2.9 m       0 eV    299 eV     18 mum  2.54 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   6.92 nm   10.1 nm  -2.84 m    11.7 keV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1    314 mum   713 mum -2.84 m    9.68 keV  2.05 keV   904 mum   904 mum   WorldPV       eIoni
+    2    423 mum   484 mum -2.84 m    6.58 keV  3.11 keV   731 mum  1.64 mm    WorldPV       eIoni
+    3    797 mum   538 mum -2.84 m    3.98 keV  2.59 keV   510 mum  2.14 mm    WorldPV       eIoni
+    4    798 mum   326 mum -2.84 m    2.77 keV  1.21 keV   345 mum  2.49 mm    WorldPV       eIoni
+    5    896 mum   298 mum -2.84 m     622 eV   2.15 keV   248 mum  2.74 mm    WorldPV       eIoni
+    6    891 mum   304 mum -2.84 m       0 eV    622 eV   33.1 mum  2.77 mm    WorldPV       eIoni
 >>> Event 0
     0 trajectories stored in this event.
 ### Run 2 start.
diff --git a/examples/novice/N02/exampleN02.out b/examples/novice/N02/exampleN02.out
index ec8546c5df403ace88f5ff416ce6d8d904ca01ea..d25b900c8989e69dfc44120c21836b18af6f630f 100644
--- a/examples/novice/N02/exampleN02.out
+++ b/examples/novice/N02/exampleN02.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -24,7 +24,7 @@ The materials defined are :
 
 
 Target is 5 cm of Pb
-There are 6 chambers in the tracker region. The chambers are 2e+02 mm of XenonGas
+There are 5 chambers in the tracker region. The chambers are 2e+02 mm of XenonGas
  The distance between chamber is 80 cm
 
 conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
@@ -52,10 +52,10 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-                 Air         6.1428
-                  Al         572.84
-                  Pb           1370
-            XenonGas         8.9393
+                 Air         6.2457
+                  Al         572.17
+                  Pb         1332.1
+            XenonGas         9.4278
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -71,10 +71,10 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 
            material        min.delta energy(keV) 
 
-                 Air         6.1428
-                  Al         572.84
-                  Pb           1370
-            XenonGas         8.9393
+                 Air         6.2457
+                  Al         572.17
+                  Pb         1332.1
+            XenonGas         9.4278
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -118,866 +118,752 @@ Cut in energy
 * G4Track Information:   Particle = e+,   Track ID = 1,   Parent ID = 0
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0      0 fm      0 fm  -2.91 m     200 MeV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -31.4 mum  1.22 mum -2.86 m     200 MeV  7.66 keV  4.79 cm   4.79 cm    WorldPV     eIoni
-    2   -278 mum  -212 mum -2.45 m     200 MeV  93.3 keV  41.2 cm     46 cm   TargetPVTransportation
-    3   -285 mum  -201 mum -2.45 m     128 MeV   930 keV   682 mum  46.1 cm   TargetPV     eBrem
-    4   -289 mum  -209 mum -2.45 m     121 MeV  2.05 MeV   876 mum  46.2 cm   TargetPV     eBrem
-    5   -270 mum  -197 mum -2.45 m     117 MeV   706 keV   506 mum  46.2 cm   TargetPV     eBrem
-    6   -282 mum  -181 mum -2.45 m     115 MeV  1.45 MeV   985 mum  46.3 cm   TargetPV     eBrem
-    7   -281 mum  -182 mum -2.45 m     110 MeV  31.1 keV  24.6 mum  46.3 cm   TargetPV     eBrem
-    8   -301 mum  -345 mum -2.45 m     105 MeV  1.99 MeV  1.58 mm   46.5 cm   TargetPV     eBrem
-    9   -324 mum  -362 mum -2.44 m     102 MeV  3.24 MeV  2.23 mm   46.7 cm   TargetPV     eBrem
-   10   -318 mum  -364 mum -2.44 m      30 MeV   148 keV   129 mum  46.7 cm   TargetPV     eBrem
-   11   -300 mum  -371 mum -2.44 m    23.7 MeV   222 keV   183 mum  46.7 cm   TargetPV     eBrem
-   12   -265 mum  -378 mum -2.44 m    23.2 MeV   243 keV   207 mum  46.7 cm   TargetPV     eBrem
-   13   -199 mum  -282 mum -2.44 m    21.6 MeV   710 keV   537 mum  46.8 cm   TargetPV     eBrem
-   14     22 mum  -186 mum -2.44 m    18.6 MeV  1.63 MeV  1.37 mm   46.9 cm   TargetPV     eBrem
-   15   -452 mum   786 mum -2.44 m    12.7 MeV  4.79 MeV   2.9 mm   47.2 cm   TargetPV     eBrem
-   16   -394 mum   139 mum -2.44 m    8.42 MeV   790 keV   781 mum  47.3 cm   TargetPV     eBrem
-   17   -393 mum   136 mum -2.44 m     6.4 MeV  3.84 keV  4.48 mum  47.3 cm   TargetPV     eBrem
-   18    220 mum  -777 mum -2.44 m    5.04 MeV  1.36 MeV  1.29 mm   47.4 cm   TargetPV     eIoni
-   19   -449 mum  -1.1 mm  -2.44 m     3.9 MeV  1.14 MeV  1.09 mm   47.5 cm   TargetPV     eIoni
-   20   -132 mum -1.17 mm  -2.44 m    2.92 MeV   984 keV   921 mum  47.6 cm   TargetPV     eIoni
-   21   -498 mum  -771 mum -2.44 m    1.89 MeV  1.03 MeV   765 mum  47.7 cm   TargetPV     eIoni
-   22   -772 mum  -702 mum -2.44 m     820 keV  1.07 MeV   590 mum  47.8 cm   TargetPV     eIoni
-   23   -855 mum  -784 mum -2.44 m     296 keV   524 keV   376 mum  47.8 cm   TargetPV     eIoni
-   24   -872 mum  -791 mum -2.44 m       0 eV    296 keV   142 mum  47.8 cm   TargetPV     eIoni
-   25   -872 mum  -791 mum -2.44 m       0 eV      0 eV      0 fm   47.8 cm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0      0 fm      0 fm  -2.91 m     200 MeV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1  -32.2 mum -1.27 mum -2.86 m     200 MeV  7.66 keV  4.79 cm   4.79 cm    WorldPV       eIoni
+    2   -185 mum   115 mum -2.45 m     200 MeV  94.2 keV  41.2 cm     46 cm    WorldPV  Transportation
+    3   -182 mum   100 mum -2.45 m     147 MeV  3.66 MeV   682 mum  46.1 cm   TargetPV       eBrem
+    4   -180 mum    99 mum -2.45 m     143 MeV   418 keV   204 mum  46.1 cm   TargetPV       eBrem
+    5   -178 mum   101 mum -2.45 m     143 MeV   116 keV    95 mum  46.1 cm   TargetPV       eBrem
+    6   -168 mum   119 mum -2.45 m    78.4 MeV   877 keV   570 mum  46.2 cm   TargetPV       eBrem
+    7  -67.8 mum   165 mum -2.45 m    76.1 MeV  1.33 MeV  1.06 mm   46.3 cm   TargetPV       eBrem
+    8  -92.5 mum   137 mum -2.45 m    75.1 MeV   225 keV   225 mum  46.3 cm   TargetPV       eBrem
+    9   -121 mum    68 mum -2.45 m      74 MeV   847 keV   698 mum  46.4 cm   TargetPV       eBrem
+   10   -547 mum  -369 mum -2.44 m      66 MeV  4.28 MeV  3.46 mm   46.7 cm   TargetPV       eBrem
+   11   -829 mum -1.83 mm  -2.44 m    60.8 MeV  4.87 MeV  3.08 mm     47 cm   TargetPV       eBrem
+   12   -807 mum -1.99 mm  -2.44 m    35.9 MeV   555 keV   409 mum    47 cm   TargetPV       eBrem
+   13   -884 mum -3.14 mm  -2.44 m    20.9 MeV  3.08 MeV   2.3 mm   47.3 cm   TargetPV       eBrem
+   14   -707 mum -3.53 mm  -2.44 m    18.1 MeV  1.62 MeV  1.09 mm   47.4 cm   TargetPV       eBrem
+   15   -943 mum -3.64 mm  -2.44 m      13 MeV   646 keV   660 mum  47.5 cm   TargetPV       eBrem
+   16   -944 mum -3.64 mm  -2.44 m    10.3 MeV   617 eV   3.71 mum  47.5 cm   TargetPV       eBrem
+   17  -1.41 mm  -4.95 mm  -2.44 m    7.97 MeV  2.31 MeV   1.9 mm   47.6 cm   TargetPV       eIoni
+   18  -1.65 mm  -5.73 mm  -2.44 m    3.43 MeV   949 keV   914 mum  47.7 cm   TargetPV       eBrem
+   19  -1.66 mm  -6.36 mm  -2.44 m    2.31 MeV  1.13 MeV   864 mum  47.8 cm   TargetPV       eIoni
+   20  -1.62 mm  -6.64 mm  -2.43 m    1.08 MeV  1.23 MeV   673 mum  47.9 cm   TargetPV       eIoni
+   21  -1.49 mm  -6.56 mm  -2.43 m     488 keV   591 keV   440 mum  47.9 cm   TargetPV       eIoni
+   22  -1.45 mm   -6.6 mm  -2.43 m     155 keV   333 keV   269 mum    48 cm   TargetPV       eIoni
+   23  -1.44 mm   -6.6 mm  -2.43 m       0 eV    155 keV  51.9 mum    48 cm   TargetPV       eIoni
+   24  -1.44 mm   -6.6 mm  -2.43 m       0 eV      0 eV      0 fm     48 cm   TargetPV     annihil
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 19,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -872 mum  -791 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   5.23 mm   -1.2 cm  -2.44 m       0 eV    511 keV  1.28 cm   1.28 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.44 mm   -6.6 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.13 mm  -2.45 cm  -2.44 m       0 eV    511 keV  1.88 cm   1.88 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 18,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -872 mum  -791 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -2.5 mm   2.21 mm  -2.44 m     205 keV   306 keV  3.41 mm   3.41 mm   TargetPV     compt
-    2  -2.52 mm   1.73 mm  -2.44 m       0 eV    205 keV   816 mum  4.23 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.44 mm   -6.6 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.16 mm   1.93 cm  -2.43 m       0 eV    511 keV  2.72 cm   2.72 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 17,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -393 mum   136 mum -2.44 m    2.02 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    1.1 cm  -1.42 cm  -2.42 m     586 keV  1.43 MeV  2.82 cm   2.82 cm   TargetPV     compt
-    2    1.1 cm  -1.43 cm  -2.42 m     423 keV   163 keV  25.4 mum  2.83 cm   TargetPV     compt
-    3   1.13 cm  -1.52 cm  -2.42 m       0 eV    423 keV   994 mum  2.93 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.65 mm  -5.73 mm  -2.44 m    3.59 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.47 mm  -7.07 mm  -2.44 m     324 keV  3.26 MeV  1.56 mm   1.56 mm   TargetPV       compt
+    2    107 mum -6.81 mm  -2.43 m       0 eV    324 keV  2.89 mm   4.45 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 16,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -394 mum   139 mum -2.44 m    3.51 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.91 mm  -1.56 cm  -2.42 m    3.22 MeV   287 keV  2.36 cm   2.36 cm   TargetPV     compt
-    2   7.52 mm   -2.5 cm  -2.41 m    3.22 MeV     0 eV    1.2 cm   3.56 cm    WorldPVTransportation
-    3   1.27 cm  -4.34 cm   -2.4 m    3.22 MeV     0 eV   2.37 cm   5.93 cm    TrackerTransportation
-    4     67 cm   -2.4 m   -61.3 cm   3.22 MeV     0 eV   3.03 m    3.09 m     WorldPVTransportation
-    5   81.2 cm  -2.91 m   -22.6 cm   3.22 MeV     0 eV   65.6 cm   3.74 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -944 mum -3.64 mm  -2.44 m    2.68 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.99 mm  -8.53 mm  -2.42 m    2.46 MeV   218 keV  1.72 cm   1.72 cm   TargetPV       compt
+    2  -6.35 mm  -1.87 cm   -2.4 m    2.46 MeV     0 eV   2.28 cm      4 cm   TargetPV  Transportation
+    3    -56 cm   -2.4 m    2.37 m    2.46 MeV     0 eV   5.36 m     5.4 m     Tracker  Transportation
+    4  -62.3 cm  -2.67 m    2.91 m    2.46 MeV     0 eV   60.5 cm   6.01 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 15,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -452 mum   786 mum -2.44 m    1.05 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -891 mum  -921 mum -2.44 m     383 keV   669 keV  2.13 mm   2.13 mm   TargetPV     compt
-    2  -2.73 mm   2.29 mm  -2.43 m       0 eV    383 keV  6.83 mm   8.96 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -943 mum -3.64 mm  -2.44 m    4.54 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.49 mm  -4.38 mm  -2.43 m    1.17 MeV  3.37 MeV  2.95 mm   2.95 mm   TargetPV       compt
+    2  -1.61 mm  -3.86 mm  -2.43 m     858 keV   313 keV   952 mum   3.9 mm   TargetPV       compt
+    3  -4.06 mm   8.46 mm  -2.43 m     438 keV   419 keV  1.37 cm   1.76 cm   TargetPV       compt
+    4  -5.55 mm   8.78 mm  -2.43 m     248 keV   190 keV  1.55 mm   1.91 cm   TargetPV       compt
+    5  -7.95 mm   6.01 mm  -2.43 m     158 keV  89.9 keV  6.53 mm   2.57 cm   TargetPV       compt
+    6   -8.2 mm   5.49 mm  -2.43 m       0 eV    158 keV   798 mum  2.65 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 14,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0     22 mum  -186 mum -2.44 m    1.44 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    560 mum   463 mum -2.44 m     831 keV   611 keV  3.57 mm   3.57 mm   TargetPV     compt
-    2   1.06 mm    757 mum -2.44 m       0 eV    831 keV   707 mum  4.28 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -707 mum -3.53 mm  -2.44 m    1.18 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -817 mum -3.52 mm  -2.44 m     996 keV   183 keV   312 mum   312 mum  TargetPV       compt
+    2  -3.54 mm   -507 mum -2.43 m     805 keV   191 keV  7.29 mm    7.6 mm   TargetPV       compt
+    3  -4.26 mm    381 mum -2.43 m       0 eV    805 keV  1.29 mm   8.89 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 13,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -199 mum  -282 mum -2.44 m     866 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.84 mm   2.09 mm  -2.43 m       0 eV    866 keV  8.27 mm   8.27 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -884 mum -3.14 mm  -2.44 m    11.9 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -900 mum -3.28 mm  -2.44 m     730 keV  11.1 MeV   323 mum   323 mum  TargetPV       compt
+    2  -1.13 cm  -1.39 cm  -2.44 m     632 keV  98.1 keV  1.48 cm   1.51 cm   TargetPV       compt
+    3  -1.85 cm  -1.69 cm  -2.44 m       0 eV    632 keV  8.07 mm   2.32 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 12,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -265 mum  -378 mum -2.44 m     286 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -207 mum  -336 mum -2.44 m     188 keV  98.2 keV   545 mum   545 mum  TargetPV     compt
-    2  -74.3 mum -79.7 mum -2.44 m       0 eV    188 keV   289 mum   834 mum  TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -807 mum -1.99 mm  -2.44 m    24.4 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -469 mum -2.98 mm  -2.44 m    10.6 MeV     0 eV   2.48 mm   2.48 mm   TargetPV       compt
+    2   1.67 mm  -6.27 mm  -2.43 m    7.75 MeV     0 eV   6.64 mm   9.12 mm   TargetPV       compt
+    3   1.51 cm  -2.07 cm  -2.41 m       0 eV    620 keV  2.78 cm    3.7 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 11,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -300 mum  -371 mum -2.44 m    6.01 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.39 mm  -1.09 mm  -2.42 m       0 eV   4.99 MeV  1.91 cm   1.91 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 20,   Parent ID = 11
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.39 mm  -1.09 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.39 mm  -1.09 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 22,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.39 mm  -1.09 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.05 mm  -2.57 mm  -2.42 m       0 eV    511 keV  2.72 mm   2.72 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 21,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.39 mm  -1.09 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    125 mum   1.7 mm  -2.43 m     416 keV  94.7 keV  5.15 mm   5.15 mm   TargetPV     compt
-    2    457 mum  2.97 mm  -2.43 m     243 keV   174 keV  1.47 mm   6.62 mm   TargetPV     compt
-    3   1.83 mm   2.05 mm  -2.43 m       0 eV    243 keV   2.4 mm   9.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -318 mum  -364 mum -2.44 m    71.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -59.9 mum  -353 mum -2.44 m       0 eV   1.03 MeV  4.54 mm   4.54 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 24,   Parent ID = 10
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -59.9 mum  -353 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 26,   Parent ID = 24
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.78 mm  -3.87 mm  -2.43 m       0 eV    511 keV  7.17 mm   7.17 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 24
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.68 mm   5.37 mm  -2.45 m     176 keV   335 keV  1.17 cm   1.17 cm   TargetPV     compt
-    2  -3.99 mm    420 mum -2.44 m       0 eV    176 keV  6.25 mm   1.79 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 23,   Parent ID = 10
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.9 mum  -353 mum -2.44 m    69.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -30.3 mum  -362 mum -2.44 m    67.4 MeV   476 keV   354 mum   354 mum  TargetPV     eBrem
-    2  -11.7 mum  -359 mum -2.44 m    65.6 MeV  1.14 MeV   485 mum   839 mum  TargetPV     eBrem
-    3   17.2 mum  -567 mum -2.44 m      62 MeV  3.15 MeV  2.51 mm   3.35 mm   TargetPV     eBrem
-    4    269 mum  -604 mum -2.43 m    35.7 MeV  1.38 MeV   917 mum  4.27 mm   TargetPV     eBrem
-    5    316 mum  -558 mum -2.43 m    32.8 MeV   397 keV   313 mum  4.58 mm   TargetPV     eBrem
-    6    783 mum  -546 mum -2.43 m    28.8 MeV  1.42 MeV  1.08 mm   5.66 mm   TargetPV     eBrem
-    7    977 mum  -849 mum -2.43 m    27.3 MeV   644 keV   515 mum  6.17 mm   TargetPV     eBrem
-    8   1.47 mm  -1.19 mm  -2.43 m    14.4 MeV  1.06 MeV   653 mum  6.83 mm   TargetPV     eBrem
-    9   1.76 mm  -1.36 mm  -2.43 m      13 MeV   511 keV   418 mum  7.24 mm   TargetPV     eBrem
-   10   1.86 mm  -1.39 mm  -2.43 m    9.67 MeV   113 keV   113 mum  7.36 mm   TargetPV     eBrem
-   11   1.88 mm  -1.39 mm  -2.43 m    8.29 MeV  15.7 keV  17.2 mum  7.37 mm   TargetPV     eBrem
-   12   2.33 mm  -2.09 mm  -2.43 m    6.27 MeV  2.02 MeV  1.52 mm   8.89 mm   TargetPV     eIoni
-   13   2.37 mm  -2.07 mm  -2.43 m    5.92 MeV  37.3 keV  45.6 mum  8.94 mm   TargetPV     eBrem
-   14   2.64 mm  -1.77 mm  -2.43 m    3.27 MeV   617 keV   523 mum  9.46 mm   TargetPV     eBrem
-   15   2.53 mm  -1.24 mm  -2.43 m    2.32 MeV   949 keV   805 mum  1.03 cm   TargetPV     eIoni
-   16   2.19 mm  -1.18 mm  -2.43 m    1.37 MeV   950 keV   654 mum  1.09 cm   TargetPV     eIoni
-   17    2.1 mm   -988 mum -2.43 m     908 keV   464 keV   488 mum  1.14 cm   TargetPV     eIoni
-   18   2.15 mm   -975 mum -2.43 m     231 keV   677 keV   393 mum  1.18 cm   TargetPV     eIoni
-   19   2.15 mm   -978 mum -2.43 m       0 eV    231 keV  99.2 mum  1.19 cm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 39,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.64 mm  -1.77 mm  -2.43 m    2.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.53 mm   -940 mum -2.43 m       0 eV   1.01 MeV  1.26 mm   1.26 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 40,   Parent ID = 39
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.53 mm   -940 mum -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.53 mm   -940 mum -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 42,   Parent ID = 40
+* G4Track Information:   Particle = e+,   Track ID = 22,   Parent ID = 12
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.53 mm   -940 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.91 mm   -426 mum -2.43 m       0 eV    511 keV   863 mum   863 mum  TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.51 cm  -2.07 cm  -2.41 m    6.11 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.61 cm  -2.09 cm  -2.41 m    4.45 MeV  1.66 MeV  1.28 mm   1.28 mm   TargetPV       eIoni
+    2   1.54 cm  -2.11 cm  -2.41 m    2.88 MeV  1.57 MeV  1.03 mm   2.31 mm   TargetPV       eIoni
+    3   1.52 cm  -2.13 cm  -2.41 m    1.99 MeV   889 keV   771 mum  3.08 mm   TargetPV       eIoni
+    4   1.49 cm  -2.15 cm  -2.41 m    1.41 MeV   580 keV   617 mum   3.7 mm   TargetPV       eIoni
+    5   1.49 cm  -2.16 cm  -2.41 m     295 keV  95.2 keV  79.3 mum  3.78 mm   TargetPV       eBrem
+    6   1.49 cm  -2.16 cm  -2.41 m       0 eV    295 keV   142 mum  3.92 mm   TargetPV       eIoni
+    7   1.49 cm  -2.16 cm  -2.41 m       0 eV      0 eV      0 fm   3.92 mm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 41,   Parent ID = 40
+* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 22
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.53 mm   -940 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.55 mm  -3.68 mm  -2.43 m     455 keV  55.5 keV   4.6 mm    4.6 mm   TargetPV     compt
-    2   -446 mum -5.97 mm  -2.43 m       0 eV    455 keV  3.13 mm   7.73 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.49 cm  -2.16 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.52 cm  -2.17 cm  -2.41 m     239 keV   272 keV   331 mum   331 mum  TargetPV       compt
+    2   1.54 cm  -2.06 cm  -2.41 m     126 keV   113 keV   1.1 mm   1.43 mm   TargetPV       compt
+    3   1.54 cm  -2.06 cm  -2.41 m       0 eV    126 keV  43.8 mum  1.48 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 38,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 24,   Parent ID = 22
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.37 mm  -2.07 mm  -2.43 m     312 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.43 mm  -2.03 mm  -2.43 m       0 eV    312 keV  72.7 mum  72.7 mum  TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.49 cm  -2.16 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   7.01 mm  -1.88 cm  -2.42 m     249 keV   262 keV  8.76 mm   8.76 mm   TargetPV       compt
+    2   6.79 mm  -1.93 cm  -2.42 m       0 eV    249 keV   592 mum  9.35 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 37,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 23,   Parent ID = 22
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.88 mm  -1.39 mm  -2.43 m    1.36 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.08 cm  -1.05 cm  -2.42 m     449 keV   914 keV  2.33 cm   2.33 cm   TargetPV     compt
-    2   1.98 cm  -1.15 cm  -2.42 m       0 eV    449 keV  2.68 mm    2.6 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.49 cm  -2.16 cm  -2.41 m    1.02 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.41 cm   -2.5 cm  -2.41 m    1.02 MeV     0 eV   3.76 mm   3.76 mm   TargetPV  Transportation
+    2    -31 cm   -1.4 m   -2.91 m    1.02 MeV     0 eV   1.49 m     1.5 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 36,   Parent ID = 23
+* G4Track Information:   Particle = e-,   Track ID = 21,   Parent ID = 12
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.86 mm  -1.39 mm  -2.43 m    3.24 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    2.5 cm  -1.09 cm  -2.42 m    3.24 MeV     0 eV   2.72 cm   2.72 cm    WorldPVTransportation
-    2   7.07 cm  -2.96 cm   -2.4 m    3.24 MeV     0 eV   5.38 cm    8.1 cm    TrackerTransportation
-    3    2.4 m   -98.6 cm  -1.31 m    3.24 MeV     0 eV   2.74 m    2.82 m     WorldPVTransportation
-    4   2.91 m    -1.2 m   -1.07 m    3.24 MeV     0 eV   60.1 cm   3.42 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.67 mm  -6.27 mm  -2.43 m    2.84 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.34 mm  -6.25 mm  -2.43 m    1.81 MeV  1.03 MeV   753 mum   753 mum  TargetPV       eIoni
+    2   1.22 mm  -6.47 mm  -2.43 m     1.3 MeV   513 keV   577 mum  1.33 mm   TargetPV       eIoni
+    3   1.07 mm  -6.54 mm  -2.43 m     666 keV   632 keV   481 mum  1.81 mm   TargetPV       eIoni
+    4   1.04 mm  -6.51 mm  -2.43 m       0 eV    666 keV   334 mum  2.15 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 35,   Parent ID = 23
+* G4Track Information:   Particle = e-,   Track ID = 20,   Parent ID = 12
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.76 mm  -1.36 mm  -2.43 m     849 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.28 cm   -6.1 mm  -2.43 m       0 eV    849 keV  1.27 cm   1.27 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -469 mum -2.98 mm  -2.44 m    13.8 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    402 mum  -3.4 mm  -2.44 m      11 MeV  2.28 MeV  1.99 mm   1.99 mm   TargetPV       eBrem
+    2    966 mum  -2.6 mm  -2.44 m    6.81 MeV  1.51 MeV  1.37 mm   3.36 mm   TargetPV       eBrem
+    3    963 mum  -2.6 mm  -2.44 m    5.63 MeV  15.1 keV  18.4 mum  3.38 mm   TargetPV       eBrem
+    4   1.41 mm  -2.79 mm  -2.43 m    4.15 MeV  1.48 MeV  1.18 mm   4.56 mm   TargetPV       eIoni
+    5    997 mum -2.85 mm  -2.43 m     3.1 MeV   431 keV   514 mum  5.08 mm   TargetPV       eBrem
+    6    579 mum -2.71 mm  -2.43 m    1.72 MeV   633 keV   636 mum  5.71 mm   TargetPV       eBrem
+    7    563 mum -2.54 mm  -2.43 m     369 keV  1.35 MeV   560 mum  6.27 mm   TargetPV       eIoni
+    8    554 mum -2.55 mm  -2.43 m       0 eV    369 keV   199 mum  6.47 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 34,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 30,   Parent ID = 20
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.47 mm  -1.19 mm  -2.43 m    11.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.46 mm  -1.78 mm  -2.43 m       0 eV   10.8 MeV  1.26 mm   1.26 mm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    579 mum -2.71 mm  -2.43 m     749 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -9.05 mm    2.4 mm  -2.44 m       0 eV    749 keV  1.09 cm   1.09 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 43,   Parent ID = 34
+* G4Track Information:   Particle = gamma,   Track ID = 29,   Parent ID = 20
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.46 mm  -1.78 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.46 mm  -1.78 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    997 mum -2.85 mm  -2.43 m     623 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.83 mm  -1.29 mm  -2.43 m       0 eV    623 keV  4.13 mm   4.13 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 45,   Parent ID = 43
+* G4Track Information:   Particle = gamma,   Track ID = 28,   Parent ID = 20
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.46 mm  -1.78 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.27 mm  -5.18 mm  -2.43 m     293 keV   218 keV  6.02 mm   6.02 mm   TargetPV     compt
-    2  -1.32 mm  -5.32 mm  -2.43 m     153 keV   140 keV   190 mum  6.21 mm   TargetPV     compt
-    3  -1.59 mm   -5.1 mm  -2.43 m       0 eV    153 keV   458 mum  6.67 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    963 mum  -2.6 mm  -2.44 m    1.17 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   54.2 mum  2.72 mm  -2.41 m       0 eV   1.17 MeV  2.37 cm   2.37 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 44,   Parent ID = 43
+* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 20
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.46 mm  -1.78 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.96 mm   -411 mum -2.43 m       0 eV    511 keV  2.42 mm   2.42 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    966 mum  -2.6 mm  -2.44 m    2.66 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.88 mm   6.75 mm   -2.4 m    2.66 MeV     0 eV    3.7 cm    3.7 cm   TargetPV  Transportation
+    2  -11.3 cm   21.8 cm   -1.6 m    2.66 MeV     0 eV   83.5 cm   87.2 cm    Tracker  Transportation
+    3  -12.5 cm     24 cm  -1.52 m    2.66 MeV     0 eV   8.64 cm   95.8 cm    Chamber  Transportation
+    4  -22.3 cm   42.9 cm    -80 cm   2.66 MeV     0 eV   74.8 cm   1.71 m     Tracker  Transportation
+    5    -25 cm   48.2 cm    -60 cm   2.66 MeV     0 eV   20.9 cm   1.91 m     Chamber  Transportation
+    6  -33.2 cm   64.1 cm -0.114 fm   2.66 MeV     0 eV   62.6 cm   2.54 m     Tracker  Transportation
+    7    -36 cm   69.4 cm     20 cm   2.66 MeV     0 eV   20.9 cm   2.75 m     Chamber  Transportation
+    8  -44.2 cm   85.2 cm     80 cm   2.66 MeV     0 eV   62.6 cm   3.38 m     Tracker  Transportation
+    9  -46.9 cm   90.5 cm      1 m    2.66 MeV     0 eV   20.9 cm   3.58 m     Chamber  Transportation
+   10  -55.1 cm   1.06 m     1.6 m    2.66 MeV     0 eV   62.6 cm   4.21 m     Tracker  Transportation
+   11  -57.9 cm   1.12 m     1.8 m    2.66 MeV     0 eV   20.9 cm   4.42 m     Chamber  Transportation
+   12  -66.1 cm   1.27 m     2.4 m    2.66 MeV     0 eV   62.6 cm   5.04 m     Tracker  Transportation
+   13  -73.1 cm   1.41 m    2.91 m    2.66 MeV     0 eV   53.2 cm   5.58 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 33,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 26,   Parent ID = 20
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    977 mum  -849 mum -2.43 m     838 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.34 cm  -1.58 cm  -2.42 m       0 eV    838 keV  3.15 cm   3.15 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    402 mum  -3.4 mm  -2.44 m     551 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    701 mum -3.29 mm  -2.44 m     544 keV  7.42 keV   404 mum   404 mum  TargetPV       compt
+    2   1.53 mm  -3.17 mm  -2.44 m     178 keV   366 keV   1.1 mm    1.5 mm   TargetPV       compt
+    3   1.49 mm  -3.16 mm  -2.44 m       0 eV    178 keV  61.3 mum  1.57 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 32,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 11,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    783 mum  -546 mum -2.43 m    2.57 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   6.04 mm  -6.41 mm  -2.43 m     948 keV  1.62 MeV   1.1 cm    1.1 cm   TargetPV     compt
-    2   6.29 mm  -6.13 mm  -2.42 m     472 keV   476 keV  1.65 mm   1.26 cm   TargetPV     compt
-    3   4.48 mm  -6.87 mm  -2.42 m       0 eV    472 keV  2.54 mm   1.52 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -829 mum -1.83 mm  -2.44 m     287 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -820 mum -1.91 mm  -2.44 m       0 eV    287 keV   231 mum   231 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 31,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    316 mum  -558 mum -2.43 m    2.55 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.69 mm    335 mum -2.42 m       0 eV   1.53 MeV  1.09 cm   1.09 cm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -547 mum  -369 mum -2.44 m    3.69 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.11 mm  -1.04 cm  -2.42 m     340 keV  3.35 MeV  2.76 cm   2.76 cm   TargetPV       compt
+    2  -4.94 mm  -1.05 cm  -2.42 m       0 eV    340 keV   980 mum  2.86 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 46,   Parent ID = 31
+* G4Track Information:   Particle = gamma,   Track ID = 9,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.69 mm    335 mum -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.69 mm    335 mum -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -121 mum    68 mum -2.45 m     312 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -158 mum  38.1 mum -2.45 m       0 eV    312 keV   261 mum   261 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 48,   Parent ID = 46
+* G4Track Information:   Particle = gamma,   Track ID = 8,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.69 mm    335 mum -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.91 mm   3.12 mm  -2.42 m       0 eV    511 keV  3.09 mm   3.09 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -92.5 mum   137 mum -2.45 m     778 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -516 mum  -569 mum -2.44 m     577 keV   200 keV  5.47 mm   5.47 mm   TargetPV       compt
+    2    204 mum  -790 mum -2.44 m     525 keV  52.5 keV  1.26 mm   6.73 mm   TargetPV       compt
+    3   5.31 mm  -1.47 mm  -2.44 m       0 eV    525 keV  5.96 mm   1.27 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 47,   Parent ID = 46
+* G4Track Information:   Particle = gamma,   Track ID = 7,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.69 mm    335 mum -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.72 mm  -1.88 mm  -2.42 m       0 eV    511 keV  2.46 mm   2.46 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -67.8 mum   165 mum -2.45 m     945 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.3 mm  -1.62 mm  -2.43 m     322 keV   623 keV   1.4 cm    1.4 cm   TargetPV       compt
+    2  -1.46 mm  -1.64 mm  -2.43 m       0 eV    322 keV   160 mum  1.42 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 30,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 6,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    269 mum  -604 mum -2.43 m    24.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    429 mum  -521 mum -2.43 m       0 eV   9.25 MeV   755 mum   755 mum  TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -168 mum   119 mum -2.45 m    63.3 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -7.54 mum   155 mum -2.44 m       0 eV      0 eV   3.67 mm   3.67 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 49,   Parent ID = 30
+* G4Track Information:   Particle = e+,   Track ID = 32,   Parent ID = 6
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    429 mum  -521 mum -2.43 m    14.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    404 mum  -354 mum -2.43 m    11.5 MeV   788 keV   609 mum   609 mum  TargetPV     eBrem
-    2    252 mum  -380 mum -2.43 m    8.28 MeV   1.6 MeV  1.12 mm   1.72 mm   TargetPV     eBrem
-    3  -34.1 mum  -166 mum -2.43 m    6.68 MeV   1.3 MeV   918 mum  2.64 mm   TargetPV     eBrem
-    4   -972 mum  -773 mum -2.43 m    5.26 MeV  1.42 MeV  1.33 mm   3.97 mm   TargetPV     eIoni
-    5  -1.17 mm   -830 mum -2.43 m    4.46 MeV   215 keV   214 mum  4.19 mm   TargetPV     eBrem
-    6  -1.57 mm   -859 mum -2.43 m    3.31 MeV  1.16 MeV  1.01 mm    5.2 mm   TargetPV     eIoni
-    7  -1.56 mm   -854 mum -2.43 m     895 keV  4.42 keV  5.93 mum   5.2 mm   TargetPV     eBrem
-    8   -1.5 mm   -749 mum -2.43 m     406 keV   489 keV   395 mum   5.6 mm   TargetPV     eIoni
-    9  -1.49 mm   -711 mum -2.43 m    86.2 keV   320 keV   222 mum  5.82 mm   TargetPV     eIoni
-   10  -1.49 mm   -708 mum -2.43 m       0 eV   86.2 keV  19.9 mum  5.84 mm   TargetPV     eIoni
-   11  -1.49 mm   -708 mum -2.43 m       0 eV      0 eV      0 fm   5.84 mm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -7.54 mum   155 mum -2.44 m    25.5 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.11 mm   -289 mum -2.44 m    6.39 MeV  4.19 MeV  3.35 mm   3.35 mm   TargetPV       eBrem
+    2    1.4 mm   -359 mum -2.44 m    4.67 MeV  1.22 MeV   928 mum  4.28 mm   TargetPV       eBrem
+    3   1.41 mm   -348 mum -2.44 m       0 eV   32.5 keV  28.7 mum  4.31 mm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 56,   Parent ID = 49
+* G4Track Information:   Particle = gamma,   Track ID = 36,   Parent ID = 32
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 mm   -708 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    924 mum  1.58 mm  -2.42 m       0 eV    511 keV  6.07 mm   6.07 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.41 mm   -348 mum -2.44 m    1.22 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1      2 mm  -1.13 mm  -2.44 m     234 keV   990 keV  1.44 mm   1.44 mm   TargetPV       compt
+    2   1.38 mm   -1.2 mm  -2.44 m       0 eV    234 keV   892 mum  2.33 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 55,   Parent ID = 49
+* G4Track Information:   Particle = gamma,   Track ID = 35,   Parent ID = 32
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 mm   -708 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -5.42 mm  -4.43 mm  -2.44 m     329 keV   182 keV   9.9 mm    9.9 mm   TargetPV     compt
-    2  -5.17 mm  -5.19 mm  -2.44 m     317 keV  12.3 keV   831 mum  1.07 cm   TargetPV     compt
-    3  -3.45 mm  -1.12 cm  -2.44 m       0 eV    317 keV  7.65 mm   1.84 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.41 mm   -348 mum -2.44 m    4.43 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   3.83 mm   2.99 mm  -2.44 m       0 eV   3.41 MeV   6.9 mm    6.9 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 54,   Parent ID = 49
+* G4Track Information:   Particle = e+,   Track ID = 37,   Parent ID = 35
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.56 mm   -854 mum -2.43 m    2.41 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.17 cm    2.5 cm  -2.42 m    2.41 MeV     0 eV   3.03 cm   3.03 cm    WorldPVTransportation
-    2   4.44 cm   8.87 cm   -2.4 m    2.41 MeV     0 eV   7.47 cm   10.5 cm    TrackerTransportation
-    3   1.23 m     2.4 m   -1.63 m    2.41 MeV     0 eV   2.71 m    2.82 m     WorldPVTransportation
-    4   1.49 m    2.91 m   -1.46 m    2.41 MeV     0 eV   59.8 cm   3.41 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   3.83 mm   2.99 mm  -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1   3.83 mm   2.99 mm  -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 53,   Parent ID = 49
+* G4Track Information:   Particle = gamma,   Track ID = 39,   Parent ID = 37
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.17 mm   -830 mum -2.43 m     580 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.91 mm   -746 mum -2.43 m       0 eV    580 keV   905 mum   905 mum  TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   3.83 mm   2.99 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.43 cm  -6.87 mm  -2.45 m     367 keV   144 keV     2 cm      2 cm   TargetPV       compt
+    2   1.75 cm  -7.93 mm  -2.45 m     255 keV   111 keV  3.31 mm   2.33 cm   TargetPV       compt
+    3   1.76 cm  -7.93 mm  -2.45 m       0 eV    255 keV   421 mum  2.37 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 52,   Parent ID = 49
+* G4Track Information:   Particle = gamma,   Track ID = 38,   Parent ID = 37
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -34.1 mum  -166 mum -2.43 m     302 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -109 mum  -263 mum -2.43 m     235 keV  66.8 keV   188 mum   188 mum  TargetPV     compt
-    2   1.83 mm   -937 mum -2.43 m     205 keV    30 keV  3.75 mm   3.93 mm   TargetPV     compt
-    3   1.55 mm   -930 mum -2.43 m       0 eV    205 keV  1.14 mm   5.08 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   3.83 mm   2.99 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   2.52 mm   4.22 mm  -2.43 m     346 keV   165 keV  2.48 mm   2.48 mm   TargetPV       compt
+    2   4.42 mm   5.69 mm  -2.43 m     154 keV   192 keV  4.49 mm   6.97 mm   TargetPV       compt
+    3   4.27 mm   5.75 mm  -2.43 m       0 eV    154 keV   278 mum  7.25 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 51,   Parent ID = 49
+* G4Track Information:   Particle = gamma,   Track ID = 34,   Parent ID = 32
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    252 mum  -380 mum -2.43 m     1.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    674 mum -1.47 mm  -2.41 m       0 eV    1.6 MeV  2.46 cm   2.46 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    1.4 mm   -359 mum -2.44 m     500 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.48 mm   -279 mum -2.44 m       0 eV    500 keV   306 mum   306 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 50,   Parent ID = 49
+* G4Track Information:   Particle = gamma,   Track ID = 33,   Parent ID = 32
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    404 mum  -354 mum -2.43 m    2.37 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.82 cm  -1.12 mm   -2.4 m    2.37 MeV     0 eV   3.79 cm   3.79 cm    TrackerTransportation
-    2   -2.4 m   -9.89 cm   1.82 m    2.37 MeV     0 eV   4.84 m    4.88 m     WorldPVTransportation
-    3  -2.91 m     -12 cm   2.72 m    2.37 MeV     0 eV   1.04 m    5.92 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.11 mm   -289 mum -2.44 m    14.9 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    790 mum  1.08 cm  -2.41 m       0 eV   13.9 MeV  3.31 cm   3.31 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 29,   Parent ID = 23
+* G4Track Information:   Particle = e+,   Track ID = 40,   Parent ID = 33
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.2 mum  -567 mum -2.44 m     411 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    793 mum  -658 mum -2.43 m     376 keV  34.9 keV  3.82 mm   3.82 mm   TargetPV     compt
-    2    763 mum  -272 mum -2.43 m     202 keV   174 keV   988 mum  4.81 mm   TargetPV     compt
-    3    345 mum   248 mum -2.43 m       0 eV    202 keV   765 mum  5.57 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    790 mum  1.08 cm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1    790 mum  1.08 cm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 28,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 42,   Parent ID = 40
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -11.7 mum  -359 mum -2.44 m     737 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    839 mum  69.3 mum -2.43 m       0 eV    737 keV  1.09 cm   1.09 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    790 mum  1.08 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    867 mum   1.1 cm  -2.41 m       0 eV    511 keV   237 mum   237 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 23
+* G4Track Information:   Particle = gamma,   Track ID = 41,   Parent ID = 40
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -30.3 mum  -362 mum -2.44 m    1.54 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    161 mum  -246 mum -2.44 m       0 eV   1.54 MeV  3.09 mm   3.09 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    790 mum  1.08 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.12 mm   5.55 mm  -2.41 m     368 keV   143 keV  5.87 mm   5.87 mm   TargetPV       compt
+    2  -2.68 mm   4.39 mm  -2.41 m       0 eV    368 keV  2.11 mm   7.98 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 9,   Parent ID = 1
+* G4Track Information:   Particle = e-,   Track ID = 31,   Parent ID = 6
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -324 mum  -362 mum -2.44 m     480 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -11.1 mum  -429 mum -2.44 m     444 keV  36.1 keV   6.8 mm    6.8 mm   TargetPV     compt
-    2   4.58 mm   5.61 mm  -2.42 m     332 keV   112 keV  1.79 cm   2.47 cm   TargetPV     compt
-    3   4.21 mm   6.79 mm  -2.42 m       0 eV    332 keV  1.37 mm   2.61 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -7.54 mum   155 mum -2.44 m    36.8 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    420 mum   791 mum -2.44 m    14.1 MeV   4.5 MeV  3.13 mm   3.13 mm   TargetPV       eBrem
+    2    778 mum   985 mum -2.44 m    12.3 MeV   774 keV   728 mum  3.86 mm   TargetPV       eBrem
+    3    912 mum   975 mum -2.44 m    10.1 MeV   483 keV   288 mum  4.14 mm   TargetPV       eBrem
+    4    1.6 mm   1.19 mm  -2.44 m    5.93 MeV  1.35 MeV  1.26 mm    5.4 mm   TargetPV       eBrem
+    5   1.67 mm   1.29 mm  -2.44 m    4.83 MeV   669 keV   590 mum  5.99 mm   TargetPV       eBrem
+    6   1.85 mm   1.45 mm  -2.44 m    3.85 MeV   543 keV   290 mum  6.28 mm   TargetPV       eBrem
+    7   2.14 mm    1.5 mm  -2.44 m     2.7 MeV  1.15 MeV   913 mum  7.19 mm   TargetPV       eIoni
+    8    1.9 mm   1.28 mm  -2.44 m    1.97 MeV   724 keV   728 mum  7.92 mm   TargetPV       eIoni
+    9   1.71 mm   1.09 mm  -2.44 m    1.23 MeV   736 keV   605 mum  8.53 mm   TargetPV       eIoni
+   10   1.56 mm   1.14 mm  -2.44 m     803 keV   431 keV   469 mum     9 mm   TargetPV       eIoni
+   11    1.6 mm   1.15 mm  -2.44 m       0 eV    803 keV   373 mum  9.37 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 8,   Parent ID = 1
+* G4Track Information:   Particle = gamma,   Track ID = 48,   Parent ID = 31
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -301 mum  -345 mum -2.45 m    2.62 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -724 mum  -900 mum -2.44 m     759 keV  1.86 MeV  8.92 mm   8.92 mm   TargetPV     compt
-    2   -358 mum  4.42 mm  -2.43 m       0 eV    759 keV  6.54 mm   1.55 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.85 mm   1.45 mm  -2.44 m     434 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.04 cm   2.88 mm  -2.44 m     314 keV   120 keV  8.99 mm   8.99 mm   TargetPV       compt
+    2   1.09 cm   4.04 mm  -2.44 m     284 keV  29.8 keV  1.55 mm   1.05 cm   TargetPV       compt
+    3   1.29 cm   5.45 mm  -2.44 m       0 eV    284 keV  2.68 mm   1.32 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 7,   Parent ID = 1
+* G4Track Information:   Particle = gamma,   Track ID = 47,   Parent ID = 31
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -281 mum  -182 mum -2.45 m    4.58 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.21 mm  -2.52 mm   -2.4 m    4.58 MeV     0 eV    4.7 cm    4.7 cm    TrackerTransportation
-    2  -1.71 cm  -4.24 cm   -1.6 m    4.58 MeV     0 eV   80.1 cm   84.8 cm    ChamberTransportation
-    3  -2.11 cm  -5.24 cm   -1.4 m    4.58 MeV     0 eV     20 cm   1.05 m     TrackerTransportation
-    4   -3.3 cm  -8.23 cm    -80 cm   4.58 MeV     0 eV   60.1 cm   1.65 m     ChamberTransportation
-    5   -3.7 cm  -9.23 cm    -60 cm   4.58 MeV     0 eV     20 cm   1.85 m     TrackerTransportation
-    6  -4.89 cm  -12.2 cm      0 fm   4.58 MeV     0 eV   60.1 cm   2.45 m     ChamberTransportation
-    7  -5.29 cm  -13.2 cm     20 cm   4.58 MeV     0 eV     20 cm   2.65 m     TrackerTransportation
-    8  -6.48 cm  -16.2 cm     80 cm   4.58 MeV     0 eV   60.1 cm   3.25 m     ChamberTransportation
-    9  -6.88 cm  -17.2 cm      1 m    4.58 MeV     0 eV     20 cm   3.45 m     TrackerTransportation
-   10  -8.07 cm  -20.2 cm    1.6 m    4.58 MeV     0 eV   60.1 cm   4.05 m     ChamberTransportation
-   11  -8.47 cm  -21.2 cm    1.8 m    4.58 MeV     0 eV     20 cm   4.25 m     TrackerTransportation
-   12  -9.66 cm  -24.2 cm    2.4 m    4.58 MeV     0 eV   60.1 cm   4.85 m     WorldPVTransportation
-   13  -10.7 cm  -26.7 cm   2.91 m    4.58 MeV     0 eV   51.1 cm   5.36 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.67 mm   1.29 mm  -2.44 m     435 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   4.52 mm   3.03 mm  -2.44 m       0 eV    435 keV  3.35 mm   3.35 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 6,   Parent ID = 1
+* G4Track Information:   Particle = gamma,   Track ID = 46,   Parent ID = 31
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -282 mum  -181 mum -2.45 m     608 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -278 mum  -191 mum -2.45 m       0 eV    608 keV   183 mum   183 mum  TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    1.6 mm   1.19 mm  -2.44 m    2.83 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    3.9 mm   2.18 mm  -2.44 m     629 keV   2.2 MeV  3.49 mm   3.49 mm   TargetPV       compt
+    2   3.61 mm   1.91 mm  -2.44 m       0 eV    629 keV     1 mm   4.49 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 5,   Parent ID = 1
+* G4Track Information:   Particle = gamma,   Track ID = 45,   Parent ID = 31
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -270 mum  -197 mum -2.45 m    3.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.62 mm    446 mum -2.42 m     323 keV  2.91 MeV  2.65 cm   2.65 cm   TargetPV     compt
-    2  -1.46 mm    445 mum -2.42 m     160 keV   162 keV   168 mum  2.66 cm   TargetPV     compt
-    3  -1.76 mm    350 mum -2.42 m       0 eV    160 keV   355 mum   2.7 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    912 mum   975 mum -2.44 m    1.74 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   2.66 mm   2.14 mm  -2.43 m     716 keV  1.02 MeV  9.21 mm   9.21 mm   TargetPV       compt
+    2   -897 mum  7.85 mm  -2.43 m     303 keV   413 keV  8.33 mm   1.75 cm   TargetPV       compt
+    3   -993 mum  2.26 mm  -2.42 m     214 keV  89.2 keV  8.83 mm   2.64 cm   TargetPV       compt
+    4   -973 mum   2.3 mm  -2.42 m       0 eV    214 keV  77.6 mum  2.64 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 4,   Parent ID = 1
+* G4Track Information:   Particle = gamma,   Track ID = 44,   Parent ID = 31
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -289 mum  -209 mum -2.45 m    5.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -240 mum  -107 mum -2.44 m     677 keV  4.61 MeV  4.75 mm   4.75 mm   TargetPV     compt
-    2  -7.37 mm  -7.12 mm  -2.44 m     294 keV   383 keV  1.07 cm   1.55 cm   TargetPV     compt
-    3  -4.19 mm  -8.02 mm  -2.44 m       0 eV    294 keV  5.53 mm    2.1 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    778 mum   985 mum -2.44 m     949 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   2.21 mm    395 mum -2.44 m       0 eV    949 keV  3.82 mm   3.82 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 3,   Parent ID = 1
+* G4Track Information:   Particle = gamma,   Track ID = 43,   Parent ID = 31
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -285 mum  -201 mum -2.45 m    71.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -375 mum  -103 mum -2.45 m       0 eV      0 eV   4.26 mm   4.26 mm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    420 mum   791 mum -2.44 m    18.2 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   4.64 mm    565 mum -2.44 m       0 eV      0 eV   7.85 mm   7.85 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 58,   Parent ID = 3
+* G4Track Information:   Particle = e+,   Track ID = 50,   Parent ID = 43
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -375 mum  -103 mum -2.45 m      19 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -371 mum  -110 mum -2.44 m    12.2 MeV   660 keV   149 mum   149 mum  TargetPV     eBrem
-    2   -766 mum  -171 mum -2.44 m    8.42 MeV   1.4 MeV   1.1 mm   1.25 mm   TargetPV     eBrem
-    3    125 mum   222 mum -2.44 m     6.6 MeV  1.52 MeV  1.35 mm    2.6 mm   TargetPV     eBrem
-    4    912 mum   575 mum -2.44 m    5.12 MeV  1.48 MeV  1.32 mm   3.93 mm   TargetPV     eIoni
-    5    294 mum  1.15 mm  -2.44 m       4 MeV  1.13 MeV  1.11 mm   5.03 mm   TargetPV     eIoni
-    6  -63.7 mum  1.49 mm  -2.44 m    3.14 MeV   562 keV   563 mum   5.6 mm   TargetPV     eBrem
-    7    340 mum  1.15 mm  -2.44 m    2.33 MeV   809 keV   800 mum   6.4 mm   TargetPV     eIoni
-    8   1.66 mum  1.38 mm  -2.44 m     1.6 MeV   728 keV   667 mum  7.06 mm   TargetPV     eIoni
-    9  -38.8 mum  1.58 mm  -2.44 m    1.13 MeV   469 keV   538 mum   7.6 mm   TargetPV     eIoni
-   10   -176 mum  1.58 mm  -2.44 m     499 keV   630 keV   447 mum  8.05 mm   TargetPV     eIoni
-   11   -206 mum  1.59 mm  -2.44 m     207 keV   292 keV   272 mum  8.32 mm   TargetPV     eIoni
-   12   -205 mum  1.59 mm  -2.44 m       0 eV    207 keV  82.8 mum   8.4 mm   TargetPV     eIoni
-   13   -205 mum  1.59 mm  -2.44 m       0 eV      0 eV      0 fm    8.4 mm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   4.64 mm    565 mum -2.44 m    9.54 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    5.6 mm    491 mum -2.43 m    7.54 MeV  1.31 MeV  1.14 mm   1.14 mm   TargetPV       eBrem
+    2   6.02 mm    544 mum -2.43 m    6.28 MeV   479 keV   474 mum  1.62 mm   TargetPV       eBrem
+    3   7.11 mm    236 mum -2.43 m    4.36 MeV  1.92 MeV  1.31 mm   2.93 mm   TargetPV       eIoni
+    4   7.48 mm    549 mum -2.43 m     3.3 MeV   562 keV   544 mum  3.47 mm   TargetPV       eBrem
+    5    6.9 mm    401 mum -2.43 m    1.94 MeV  1.35 MeV   841 mum  4.31 mm   TargetPV       eIoni
+    6   6.79 mm    190 mum -2.43 m    1.22 MeV   334 keV   404 mum  4.72 mm   TargetPV       eBrem
+    7   6.69 mm   30.9 mum -2.43 m     696 keV   528 keV   471 mum  5.19 mm   TargetPV       eIoni
+    8   6.75 mm    100 mum -2.43 m     368 keV   328 keV   345 mum  5.53 mm   TargetPV       eIoni
+    9   6.75 mm    114 mum -2.43 m       0 eV    368 keV   196 mum  5.73 mm   TargetPV       eIoni
+   10   6.75 mm    114 mum -2.43 m       0 eV      0 eV      0 fm   5.73 mm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 64,   Parent ID = 58
+* G4Track Information:   Particle = gamma,   Track ID = 56,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -205 mum  1.59 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -683 mum   3.9 mm  -2.45 m     440 keV  71.5 keV  2.69 mm   2.69 mm   TargetPV     compt
-    2   -652 mum  3.98 mm  -2.45 m     167 keV   273 keV    89 mum  2.78 mm   TargetPV     compt
-    3   -650 mum  3.83 mm  -2.45 m       0 eV    167 keV   174 mum  2.96 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   6.75 mm    114 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   7.03 mm  -87.6 mum -2.44 m     186 keV   325 keV  1.02 mm   1.02 mm   TargetPV       compt
+    2   6.99 mm   -243 mum -2.44 m       0 eV    186 keV   321 mum  1.34 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 63,   Parent ID = 58
+* G4Track Information:   Particle = gamma,   Track ID = 55,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -205 mum  1.59 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -188 mum  1.52 mm  -2.44 m     257 keV   254 keV  92.1 mum  92.1 mum  TargetPV     compt
-    2  -2.89 mm   2.24 mm  -2.44 m       0 eV    257 keV  3.68 mm   3.77 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   6.75 mm    114 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   5.24 mm   1.18 mm  -2.43 m       0 eV    511 keV   5.4 mm    5.4 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 62,   Parent ID = 58
+* G4Track Information:   Particle = gamma,   Track ID = 54,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -63.7 mum  1.49 mm  -2.44 m     299 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    2.5 mm   1.19 mm  -2.44 m     192 keV   107 keV  4.63 mm   4.63 mm   TargetPV     compt
-    2    768 mum   441 mum -2.44 m       0 eV    192 keV  2.25 mm   6.88 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   6.79 mm    190 mum -2.43 m     383 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   8.19 mm  -1.43 mm  -2.44 m       0 eV    383 keV  2.42 mm   2.42 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 61,   Parent ID = 58
+* G4Track Information:   Particle = gamma,   Track ID = 53,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    125 mum   222 mum -2.44 m     297 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    807 mum -92.7 mum -2.44 m       0 eV    297 keV   1.8 mm    1.8 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   7.48 mm    549 mum -2.43 m     502 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   2.15 mm   2.45 mm  -2.44 m       0 eV    502 keV  6.05 mm   6.05 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 60,   Parent ID = 58
+* G4Track Information:   Particle = gamma,   Track ID = 52,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -766 mum  -171 mum -2.44 m    2.39 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   8.46 mm   -1.9 mm  -2.43 m    2.09 MeV   306 keV  1.88 cm   1.88 cm   TargetPV     compt
-    2   8.99 mm  -1.72 mm  -2.43 m    2.06 MeV  26.5 keV  1.41 mm   2.02 cm   TargetPV     compt
-    3   2.22 cm    3.2 mm   -2.4 m    2.06 MeV     0 eV   2.98 cm   5.01 cm    TrackerTransportation
-    4    2.4 m    89.2 cm   2.35 m    2.06 MeV     0 eV   5.38 m    5.43 m     WorldPVTransportation
-    5   2.68 m    99.8 cm   2.91 m    2.06 MeV     0 eV     64 cm   6.07 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   6.02 mm    544 mum -2.43 m     783 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    1.5 cm    671 mum -2.43 m     722 keV  61.5 keV  9.29 mm   9.29 mm   TargetPV       compt
+    2    1.6 cm    579 mum -2.43 m     662 keV  59.4 keV  1.27 mm   1.06 cm   TargetPV       compt
+    3   1.86 cm   34.6 mum -2.43 m     592 keV  70.7 keV  2.73 mm   1.33 cm   TargetPV       compt
+    4    2.5 cm    684 mum -2.43 m     592 keV     0 eV   6.44 mm   1.97 cm   TargetPV  Transportation
+    5   2.91 m    29.4 cm  -2.58 m     592 keV     0 eV    2.9 m    2.92 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 59,   Parent ID = 58
+* G4Track Information:   Particle = gamma,   Track ID = 51,   Parent ID = 50
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -371 mum  -110 mum -2.44 m    6.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -450 mum  -274 nm  -2.44 m    3.53 MeV  2.65 MeV  2.05 mm   2.05 mm   TargetPV     compt
-    2   -2.7 mm   1.77 mm  -2.44 m    1.43 MeV     0 eV   7.08 mm   9.13 mm   TargetPV     compt
-    3  -8.17 mm   -2.3 mm  -2.43 m     423 keV  1.01 MeV  1.11 cm   2.03 cm   TargetPV     compt
-    4  -6.55 mm   1.79 mm  -2.42 m       0 eV    423 keV  5.97 mm   2.62 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    5.6 mm    491 mum -2.43 m     697 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   6.15 mm    938 mum -2.43 m       0 eV    697 keV   900 mum   900 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 59
+* G4Track Information:   Particle = e-,   Track ID = 49,   Parent ID = 43
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.7 mm   1.77 mm  -2.44 m     2.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.86 mm   2.07 mm  -2.44 m    1.47 MeV   633 keV   618 mum   618 mum  TargetPV     eIoni
-    2  -2.78 mm   2.28 mm  -2.44 m     911 keV   559 keV   507 mum  1.12 mm   TargetPV     eIoni
-    3  -2.66 mm   2.24 mm  -2.44 m     535 keV   377 keV   393 mum  1.52 mm   TargetPV     eIoni
-    4  -2.63 mm   2.28 mm  -2.44 m     190 keV   344 keV   284 mum   1.8 mm   TargetPV     eIoni
-    5  -2.63 mm   2.29 mm  -2.44 m       0 eV    190 keV  74.6 mum  1.88 mm   TargetPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   4.64 mm    565 mum -2.44 m    7.64 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1    4.9 mm   1.26 mm  -2.43 m       5 MeV  2.64 MeV  1.48 mm   1.48 mm   TargetPV       eIoni
+    2   4.65 mm    870 mum -2.43 m    3.64 MeV   996 keV   989 mum  2.47 mm   TargetPV       eBrem
+    3   4.93 mm    569 mum -2.43 m    2.36 MeV  1.28 MeV   881 mum  3.35 mm   TargetPV       eIoni
+    4    4.8 mm    813 mum -2.43 m    1.75 MeV   619 keV   673 mum  4.02 mm   TargetPV       eIoni
+    5      5 mm    788 mum -2.43 m    1.04 MeV   704 keV   565 mum  4.59 mm   TargetPV       eIoni
+    6   4.98 mm    719 mum -2.43 m     528 keV   514 keV   428 mum  5.02 mm   TargetPV       eIoni
+    7   4.94 mm    697 mum -2.43 m     201 keV   327 keV   286 mum   5.3 mm   TargetPV       eIoni
+    8   4.95 mm    694 mum -2.43 m       0 eV    201 keV  81.8 mum  5.38 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 57,   Parent ID = 3
+* G4Track Information:   Particle = gamma,   Track ID = 57,   Parent ID = 49
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -375 mum  -103 mum -2.45 m      51 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -722 mum -47.6 mum -2.44 m    40.5 MeV   3.3 MeV  2.07 mm   2.07 mm   TargetPV     eBrem
-    2   -611 mum  -391 mum -2.44 m    28.5 MeV   1.1 MeV   934 mum     3 mm   TargetPV     eBrem
-    3   -614 mum  -427 mum -2.44 m    10.6 MeV  96.8 keV  83.8 mum  3.08 mm   TargetPV     eBrem
-    4   -610 mum  -631 mum -2.44 m    6.62 MeV   404 keV   331 mum  3.41 mm   TargetPV     eBrem
-    5  -82.2 mum -1.24 mm  -2.44 m    3.93 MeV   2.7 MeV  1.29 mm   4.71 mm   TargetPV     eIoni
-    6   -672 mum -1.33 mm  -2.44 m    2.89 MeV  1.04 MeV   905 mum  5.61 mm   TargetPV     eIoni
-    7   -399 mum -1.62 mm  -2.44 m    2.03 MeV   858 keV   746 mum  6.36 mm   TargetPV     eIoni
-    8   -268 mum -1.38 mm  -2.44 m    1.21 MeV   492 keV   512 mum  6.87 mm   TargetPV     eBrem
-    9   -353 mum  -1.3 mm  -2.44 m     546 keV   668 keV   458 mum  7.33 mm   TargetPV     eIoni
-   10   -375 mum -1.32 mm  -2.44 m       0 eV    546 keV   288 mum  7.61 mm   TargetPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   4.65 mm    870 mum -2.43 m     369 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   4.19 mm    585 mum -2.44 m       0 eV    369 keV  6.46 mm   6.46 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 57
+* G4Track Information:   Particle = gamma,   Track ID = 5,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -268 mum -1.38 mm  -2.44 m     327 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.12 mm    272 mum -2.44 m     152 keV   175 keV  1.86 mm   1.86 mm   TargetPV     compt
-    2  -1.15 mm   55.4 mum -2.44 m       0 eV    152 keV   222 mum  2.08 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -178 mum   101 mum -2.45 m     744 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -16.4 mum   133 mum -2.44 m       0 eV    744 keV  5.06 mm   5.06 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 69,   Parent ID = 57
+* G4Track Information:   Particle = gamma,   Track ID = 4,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -610 mum  -631 mum -2.44 m    3.56 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.33 mm   -1.4 mm  -2.43 m    3.33 MeV   234 keV   9.4 mm    9.4 mm   TargetPV     compt
-    2   3.29 mm  -2.72 mm  -2.43 m       0 eV   2.31 MeV  6.82 mm   1.62 cm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -180 mum    99 mum -2.45 m    2.82 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -113 mum   127 mum -2.45 m     831 keV  1.99 MeV  2.58 mm   2.58 mm   TargetPV       compt
+    2  -5.03 mm  -2.78 mm  -2.44 m     829 keV  1.67 keV  7.07 mm   9.64 mm   TargetPV       compt
+    3  -5.41 mm  -3.03 mm  -2.44 m       0 eV    829 keV   549 mum  1.02 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 71,   Parent ID = 69
+* G4Track Information:   Particle = gamma,   Track ID = 3,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.29 mm  -2.72 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.29 mm  -2.72 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -182 mum   100 mum -2.45 m    49.6 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -188 mum  96.6 mum -2.45 m       0 eV      0 eV   2.76 mm   2.76 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 73,   Parent ID = 71
+* G4Track Information:   Particle = e+,   Track ID = 59,   Parent ID = 3
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.29 mm  -2.72 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.72 mm  -4.84 mm  -2.43 m     375 keV   136 keV  6.23 mm   6.23 mm   TargetPV     compt
-    2   4.72 mm  -7.97 mm  -2.43 m     314 keV    61 keV  4.16 mm   1.04 cm   TargetPV     compt
-    3   4.71 mm   -8.5 mm  -2.44 m       0 eV    314 keV  1.21 mm   1.16 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -188 mum  96.6 mum -2.45 m    25.4 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -932 mum   289 mum -2.44 m    3.09 MeV   3.5 MeV  2.64 mm   2.64 mm   TargetPV       eBrem
+    2 -1e+03 mum  -144 mum -2.44 m    1.65 MeV  1.45 MeV   807 mum  3.45 mm   TargetPV       eIoni
+    3  -1.01 mm  -4.03 mum -2.44 m     245 keV   1.4 MeV   554 mum     4 mm   TargetPV       eIoni
+    4  -1.01 mm  -11.9 mum -2.44 m  1.11e-10 eV    245 keV   107 mum  4.11 mm   TargetPV       eIoni
+    5  -1.01 mm  -11.9 mum -2.44 m  1.11e-10 eV      0 eV      0 fm   4.11 mm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 72,   Parent ID = 71
+* G4Track Information:   Particle = gamma,   Track ID = 62,   Parent ID = 59
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.29 mm  -2.72 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.31 mm  -2.65 mm  -2.43 m       0 eV    511 keV   203 mum   203 mum  TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.01 mm  -11.9 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.56 mm   1.23 mm  -2.45 m       0 eV    511 keV  2.76 mm   2.76 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 57
+* G4Track Information:   Particle = gamma,   Track ID = 61,   Parent ID = 59
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -614 mum  -427 mum -2.44 m    17.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -861 mum -3.61 mm  -2.44 m       0 eV      0 eV   7.43 mm   7.43 mm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.01 mm  -11.9 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -224 mum  -650 mum -2.44 m     244 keV   267 keV  1.42 mm   1.42 mm   TargetPV       compt
+    2   -559 mum  -140 mum -2.44 m       0 eV    244 keV   782 mum   2.2 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 75,   Parent ID = 68
+* G4Track Information:   Particle = gamma,   Track ID = 60,   Parent ID = 59
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -861 mum -3.61 mm  -2.44 m    14.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.37 mm  -5.13 mm  -2.43 m    10.5 MeV  2.96 MeV  2.22 mm   2.22 mm   TargetPV     eBrem
-    2  -1.59 mm   -5.4 mm  -2.43 m    2.83 MeV   1.3 MeV   949 mum  3.17 mm   TargetPV     eBrem
-    3  -2.08 mm  -5.14 mm  -2.43 m    2.07 MeV   760 keV   751 mum  3.92 mm   TargetPV     eIoni
-    4  -2.03 mm  -4.76 mm  -2.43 m    1.43 MeV   641 keV   623 mum  4.54 mm   TargetPV     eIoni
-    5  -1.87 mm  -4.82 mm  -2.43 m     701 keV   729 keV   507 mum  5.05 mm   TargetPV     eIoni
-    6  -1.79 mm  -4.84 mm  -2.43 m     132 keV   569 keV   344 mum  5.39 mm   TargetPV     eIoni
-    7   -1.8 mm  -4.84 mm  -2.43 m       0 eV    132 keV  40.1 mum  5.43 mm   TargetPV     eIoni
-    8   -1.8 mm  -4.84 mm  -2.43 m       0 eV      0 eV      0 fm   5.43 mm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -932 mum   289 mum -2.44 m    18.8 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.98 mm  -1.97 mm  -2.43 m       0 eV   17.7 MeV  1.49 cm   1.49 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 79,   Parent ID = 75
+* G4Track Information:   Particle = e+,   Track ID = 63,   Parent ID = 60
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -1.8 mm  -4.84 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.78 mm   -4.2 mm  -2.43 m     423 keV  87.6 keV  1.61 mm   1.61 mm   TargetPV     compt
-    2  -6.27 mm  -3.64 mm  -2.43 m     415 keV  8.08 keV  3.62 mm   5.23 mm   TargetPV     compt
-    3  -8.93 mm   -3.5 mm  -2.43 m       0 eV    415 keV  2.66 mm   7.89 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -5.98 mm  -1.97 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.98 mm  -1.97 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 78,   Parent ID = 75
+* G4Track Information:   Particle = gamma,   Track ID = 65,   Parent ID = 63
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -1.8 mm  -4.84 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    6.3 mm  -1.01 cm  -2.42 m       0 eV    511 keV  1.33 cm   1.33 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -5.98 mm  -1.97 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.51 mm   -2.7 mm  -2.43 m       0 eV    511 keV  1.37 mm   1.37 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 77,   Parent ID = 75
+* G4Track Information:   Particle = gamma,   Track ID = 64,   Parent ID = 63
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 mm   -5.4 mm  -2.43 m     6.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -4.4 mm  -3.55 mm  -2.43 m     558 keV  5.84 MeV  3.94 mm   3.94 mm   TargetPV     compt
-    2  -6.02 mm   -4.4 mm  -2.43 m     221 keV   337 keV  2.01 mm   5.94 mm   TargetPV     compt
-    3  -5.53 mm  -4.86 mm  -2.43 m       0 eV    221 keV   695 mum  6.64 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -5.98 mm  -1.97 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -6.2 mm  -1.62 mm  -2.43 m       0 eV    511 keV   652 mum   652 mum  TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 76,   Parent ID = 75
+* G4Track Information:   Particle = e-,   Track ID = 58,   Parent ID = 3
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.37 mm  -5.13 mm  -2.43 m    1.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -690 mum -7.17 mm  -2.43 m     862 keV   321 keV  9.03 mm   9.03 mm   TargetPV     compt
-    2  -4.78 mm  -5.99 mm  -2.42 m     750 keV   112 keV  1.08 cm   1.99 cm   TargetPV     compt
-    3  -1.08 cm   -9.1 mm  -2.41 m       0 eV    750 keV  1.15 cm   3.13 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -188 mum  96.6 mum -2.45 m    23.2 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -183 mum -83.3 mum -2.45 m    17.3 MeV  1.06 MeV   858 mum   858 mum  TargetPV       eBrem
+    2    243 mum  -881 mum -2.44 m    7.31 MeV  2.99 MeV  1.93 mm   2.79 mm   TargetPV       eBrem
+    3    464 mum  -892 mum -2.44 m    5.46 MeV   300 keV   229 mum  3.02 mm   TargetPV       eBrem
+    4    857 mum  -956 mum -2.44 m    2.44 MeV   703 keV   450 mum  3.47 mm   TargetPV       eBrem
+    5    486 mum -1.05 mm  -2.44 m    1.84 MeV   605 keV   687 mum  4.16 mm   TargetPV       eIoni
+    6    687 mum -1.23 mm  -2.44 m    1.26 MeV   577 keV   582 mum  4.74 mm   TargetPV       eIoni
+    7    572 mum -1.34 mm  -2.44 m     614 keV   649 keV   474 mum  5.21 mm   TargetPV       eIoni
+    8    601 mum -1.32 mm  -2.44 m     195 keV  61.7 keV  70.7 mum  5.28 mm   TargetPV       eBrem
+    9    601 mum -1.31 mm  -2.44 m  8.33e-11 eV    195 keV  78.5 mum  5.36 mm   TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 74,   Parent ID = 68
+* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 58
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -861 mum -3.61 mm  -2.44 m    2.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -808 mum  -3.6 mm  -2.44 m     876 keV   191 keV   194 mum   194 mum  TargetPV     eBrem
-    2   -805 mum -3.72 mm  -2.44 m     517 keV   359 keV   385 mum   579 mum  TargetPV     eIoni
-    3   -827 mum -3.71 mm  -2.44 m       0 eV    517 keV   276 mum   856 mum  TargetPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    601 mum -1.32 mm  -2.44 m     357 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   34.4 mum -1.16 mm  -2.45 m       0 eV    357 keV  1.39 mm   1.39 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 80,   Parent ID = 74
+* G4Track Information:   Particle = gamma,   Track ID = 69,   Parent ID = 58
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -808 mum  -3.6 mm  -2.44 m    1.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.72 mm  -1.41 cm  -2.44 m     280 keV   798 keV  1.23 cm   1.23 cm   TargetPV     compt
-    2   5.33 mm  -1.29 cm  -2.44 m       0 eV    280 keV  1.51 mm   1.38 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    857 mum  -956 mum -2.44 m    2.32 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -2.5 cm  -1.03 cm  -2.42 m    2.32 MeV     0 eV   3.62 cm   3.62 cm   TargetPV  Transportation
+    2  -4.77 cm  -1.84 cm   -2.4 m    2.32 MeV     0 eV   3.17 cm   6.79 cm    WorldPV  Transportation
+    3   -2.4 m   -86.5 cm  -25.8 cm   2.32 MeV     0 eV   3.29 m    3.36 m     Tracker  Transportation
+    4  -2.91 m   -1.05 m    20.7 cm   2.32 MeV     0 eV   71.4 cm   4.07 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 57
+* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 58
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -611 mum  -391 mum -2.44 m    10.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -2.3 mm  -1.09 cm  -2.42 m       0 eV   9.86 MeV  2.58 cm   2.58 cm   TargetPV      conv
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    464 mum  -892 mum -2.44 m    1.54 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.65 cm   4.13 mm  -2.45 m     591 keV   953 keV  1.69 cm   1.69 cm   TargetPV       compt
+    2   1.83 cm   3.63 mm  -2.45 m       0 eV     88 keV  4.31 mm   2.12 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 81,   Parent ID = 67
+* G4Track Information:   Particle = e-,   Track ID = 71,   Parent ID = 68
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.3 mm  -1.09 cm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -2.3 mm  -1.09 cm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   1.83 cm   3.63 mm  -2.45 m     503 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.83 cm   3.66 mm  -2.45 m     228 keV   274 keV   275 mum   275 mum  TargetPV       eIoni
+    2   1.83 cm   3.66 mm  -2.45 m       0 eV    228 keV  99.3 mum   374 mum  TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 83,   Parent ID = 81
+* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 58
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.3 mm  -1.09 cm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.53 mm  -9.22 mm  -2.42 m     300 keV   211 keV  2.98 mm   2.98 mm   TargetPV     compt
-    2  -1.12 mm  -9.95 mm  -2.42 m       0 eV    300 keV  1.18 mm   4.17 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    243 mum  -881 mum -2.44 m    7.02 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   2.02 mm   -421 mum -2.44 m       0 eV      6 MeV  1.84 mm   1.84 mm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 82,   Parent ID = 81
+* G4Track Information:   Particle = e+,   Track ID = 72,   Parent ID = 67
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.3 mm  -1.09 cm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.81 mm   -1.2 cm  -2.42 m     344 keV   167 keV  1.96 mm   1.96 mm   TargetPV     compt
-    2  -4.49 mm  -1.05 cm  -2.42 m       0 eV    344 keV  3.92 mm   5.88 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   2.02 mm   -421 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1   2.02 mm   -421 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 66,   Parent ID = 57
+* G4Track Information:   Particle = gamma,   Track ID = 74,   Parent ID = 72
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -722 mum -47.6 mum -2.44 m    7.19 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -306 mum  -912 mum -2.44 m    1.19 MeV     0 eV    3.5 mm    3.5 mm   TargetPV     compt
-    2  -4.96 mm  -2.19 mm  -2.43 m     842 keV   344 keV  6.77 mm   1.03 cm   TargetPV     compt
-    3  -1.97 cm   7.55 mm  -2.42 m     711 keV   131 keV  2.44 cm   3.47 cm   TargetPV     compt
-    4  -2.01 cm   8.83 mm  -2.42 m       0 eV    711 keV  1.88 mm   3.66 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   2.02 mm   -421 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.23 mm  -1.95 mm  -2.45 m     511 keV     0 eV   8.12 mm   8.12 mm   TargetPV  Transportation
+    2  -40.7 cm  -11.9 cm  -2.91 m     511 keV     0 eV   62.3 cm   63.1 cm OutOfWorld  Transportation
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 84,   Parent ID = 66
+* G4Track Information:   Particle = gamma,   Track ID = 73,   Parent ID = 72
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -306 mum  -912 mum -2.44 m       6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -499 mum -1.06 mm  -2.44 m    3.98 MeV  1.47 MeV   678 mum   678 mum  TargetPV     eBrem
-    2   -156 mum -1.62 mm  -2.44 m    3.04 MeV   943 keV   913 mum  1.59 mm   TargetPV     eIoni
-    3  -96.4 mum -1.74 mm  -2.44 m    2.44 MeV   222 keV   211 mum   1.8 mm   TargetPV     eBrem
-    4   -249 mum -1.94 mm  -2.44 m    1.42 MeV  1.02 MeV   674 mum  2.48 mm   TargetPV     eIoni
-    5   -305 mum -2.11 mm  -2.44 m     852 keV   571 keV   498 mum  2.97 mm   TargetPV     eIoni
-    6   -247 mum -2.17 mm  -2.44 m     348 keV   504 keV   379 mum  3.35 mm   TargetPV     eIoni
-    7   -236 mum -2.17 mm  -2.44 m       0 eV    348 keV   178 mum  3.53 mm   TargetPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   2.02 mm   -421 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   5.72 mm    656 mum -2.44 m     464 keV  47.3 keV  5.72 mm   5.72 mm   TargetPV       compt
+    2   5.91 mm    687 mum -2.44 m       0 eV     88 keV   205 mum  5.92 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 86,   Parent ID = 84
+* G4Track Information:   Particle = e-,   Track ID = 75,   Parent ID = 73
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -96.4 mum -1.74 mm  -2.44 m     373 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    378 mum -2.55 mm  -2.44 m       0 eV    373 keV  1.51 mm   1.51 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   5.91 mm    687 mum -2.44 m     376 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   5.93 mm    684 mum -2.44 m    70.1 keV   306 keV   204 mum   204 mum  TargetPV       eIoni
+    2   5.93 mm    683 mum -2.44 m  4.16e-11 eV   70.1 keV  15.5 mum   219 mum  TargetPV       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 85,   Parent ID = 84
+* G4Track Information:   Particle = gamma,   Track ID = 66,   Parent ID = 58
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -499 mum -1.06 mm  -2.44 m     551 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -436 mum -2.36 mm  -2.44 m       0 eV    551 keV  1.52 mm   1.52 mm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -183 mum -83.3 mum -2.45 m    4.84 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.66 mm  -3.69 mm  -2.43 m    2.17 MeV  2.68 MeV     2 cm      2 cm   TargetPV       compt
+    2  -3.18 mm   3.87 mm   -2.4 m    1.09 MeV  1.08 MeV   2.3 cm    4.3 cm   TargetPV       compt
+    3  -7.78 mm   8.23 mm   -2.4 m    1.09 MeV     0 eV   7.74 mm   5.07 cm   TargetPV  Transportation
+    4   -2.4 m    2.28 m   -8.99 cm   1.09 MeV     0 eV   4.03 m    4.08 m     Tracker  Transportation
+    5  -2.91 m    2.76 m    40.3 cm   1.09 MeV     0 eV   85.8 cm   4.93 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -31.4 mum  1.22 mum -2.86 m    16.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -275 mum   1.3 mm  -2.86 m    13.8 keV   2.5 keV  1.41 mm   1.41 mm    WorldPV     eIoni
-    2    355 mum   1.4 mm  -2.86 m    11.8 keV  2.06 keV  1.13 mm   2.53 mm    WorldPV     eIoni
-    3    834 mum     2 mm  -2.86 m    10.4 keV  1.35 keV   925 mum  3.46 mm    WorldPV     eIoni
-    4    621 mum  1.71 mm  -2.86 m    8.72 keV  1.73 keV   806 mum  4.27 mm    WorldPV     eIoni
-    5    454 mum  1.37 mm  -2.86 m    7.47 keV  1.24 keV   668 mum  4.93 mm    WorldPV     eIoni
-    6    460 mum   954 mum -2.86 m    1.27 keV   6.2 keV   578 mum  5.51 mm    WorldPV     eIoni
-    7    438 mum   957 mum -2.86 m       0 eV   1.27 keV  84.4 mum  5.59 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -32.2 mum -1.27 mum -2.86 m    10.5 keV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1   -698 mum  -105 mum -2.86 m    6.11 keV  4.39 keV   798 mum   798 mum   WorldPV       eIoni
+    2   -284 mum -93.4 mum -2.86 m    4.72 keV  1.39 keV   480 mum  1.28 mm    WorldPV       eIoni
+    3   24.5 mum  -192 mum -2.86 m    2.24 keV  2.47 keV   393 mum  1.67 mm    WorldPV       eIoni
+    4  -2.23 mum  -293 mum -2.86 m       0 eV   2.24 keV   186 mum  1.86 mm    WorldPV       eIoni
 >>> Event 0
     0 trajectories stored in this event.
 ### Run 1 start.
@@ -986,7864 +872,249 @@ Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  Ne
 * G4Track Information:   Particle = mu+,   Track ID = 1,   Parent ID = 0
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0      0 fm      0 fm  -2.91 m       1 TeV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -3.88 Ang -8.52 Ang  -2.9 m   1e+03 GeV  3.03 keV  1.28 cm   1.28 cm    WorldPV    MuIoni
-    2  -27.8 nm   39.9 nm  -2.45 m   1e+03 GeV   105 keV  44.7 cm     46 cm   TargetPVTransportation
-    3  -94.3 nm   -850 nm  -2.42 m   1e+03 GeV  56.6 MeV  3.14 cm   49.1 cm   TargetPV    MuIoni
-    4    111 nm   -877 nm  -2.41 m     998 GeV  5.55 MeV  4.08 mm   49.5 cm   TargetPVMuPairProd
-    5    202 nm   -895 nm  -2.41 m     998 GeV  2.43 MeV  1.89 mm   49.7 cm   TargetPV    MuIoni
-    6    787 nm  -1.05 mum  -2.4 m     998 GeV  17.5 MeV  1.26 cm     51 cm    TrackerTransportation
-    7     60 mum -8.13 mum  -1.6 m     998 GeV   193 keV    80 cm   1.31 m     ChamberTransportation
-    8   74.9 mum -9.75 mum  -1.4 m     998 GeV   154 keV    20 cm   1.51 m     TrackerTransportation
-    9    118 mum -15.1 mum   -80 cm    998 GeV   138 keV    60 cm   2.11 m     ChamberTransportation
-   10    132 mum -16.8 mum   -60 cm    998 GeV   201 keV    20 cm   2.31 m     TrackerTransportation
-   11    176 mum -21.8 mum 0.114 fm    998 GeV   145 keV    60 cm   2.91 m     ChamberTransportation
-   12    190 mum -23.6 mum    20 cm    998 GeV   201 keV    20 cm   3.11 m     TrackerTransportation
-   13    233 mum -29.2 mum    80 cm    998 GeV   145 keV    60 cm   3.71 m     ChamberTransportation
-   14    247 mum -31.1 mum     1 m     998 GeV   159 keV    20 cm   3.91 m     TrackerTransportation
-   15    289 mum -37.4 mum   1.6 m     998 GeV   139 keV    60 cm   4.51 m     ChamberTransportation
-   16    303 mum -39.5 mum   1.8 m     998 GeV   144 keV    20 cm   4.71 m     TrackerTransportation
-   17    326 mum -42.8 mum  2.12 m     998 GeV  88.1 keV    32 cm   5.03 m     Tracker    MuIoni
-   18    345 mum -45.6 mum   2.4 m     998 GeV  58.2 keV    28 cm   5.31 m     WorldPVTransportation
-   19    381 mum -50.7 mum  2.91 m     998 GeV   133 keV    51 cm   5.82 m  OutOfWorldTransportation
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0      0 fm      0 fm  -2.91 m       1 TeV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1      0 fm      0 fm  -2.45 m   1e+03 GeV   100 keV    46 cm     46 cm    WorldPV  Transportation
+    2   28.2 nm  -9.83 Ang  -2.4 m   1e+03 GeV  89.5 MeV     5 cm     51 cm   TargetPV  Transportation
+    3  -2.24 mum  1.03 mum  -1.6 m   1e+03 GeV   195 keV    80 cm   1.31 m     Tracker  Transportation
+    4  -2.79 mum  1.42 mum  -1.4 m   1e+03 GeV   165 keV    20 cm   1.51 m     Chamber  Transportation
+    5  -3.05 mum  1.74 mum -1.27 m   1e+03 GeV  30.9 keV  13.5 cm   1.64 m     Tracker      MuIoni
+    6  -3.26 mum  1.98 mum -1.16 m   1e+03 GeV  27.3 keV  10.9 cm   1.75 m     Tracker      MuIoni
+    7  -3.53 mum  2.38 mum -1.01 m   1e+03 GeV  29.2 keV  14.2 cm    1.9 m     Tracker      MuIoni
+    8  -4.02 mum  2.97 mum   -80 cm  1e+03 GeV  46.3 keV  21.4 cm   2.11 m     Tracker  Transportation
+    9  -4.46 mum  3.49 mum   -60 cm  1e+03 GeV   158 keV    20 cm   2.31 m     Chamber  Transportation
+   10  -4.51 mum  4.73 mum -30.2 cm  1e+03 GeV  67.4 keV  29.8 cm   2.61 m     Tracker      MuIoni
+   11  -4.71 mum  5.96 mum0.0568 fm  1e+03 GeV  73.9 keV  30.2 cm   2.91 m     Tracker  Transportation
+   12  -4.65 mum  6.82 mum  19.8 cm  1e+03 GeV   227 keV  19.8 cm   3.11 m     Chamber      MuIoni
+   13  -4.65 mum  6.83 mum    20 cm  1e+03 GeV   565 eV   1.64 mm   3.11 m     Chamber  Transportation
+   14  -5.58 mum  9.02 mum    80 cm  1e+03 GeV   147 keV    60 cm   3.71 m     Tracker  Transportation
+   15  -5.91 mum   9.9 mum     1 m   1e+03 GeV   183 keV    20 cm   3.91 m     Chamber  Transportation
+   16  -6.09 mum  10.6 mum  1.08 m   1e+03 GeV  22.8 keV  7.96 cm   3.99 m     Tracker      MuIoni
+   17  -7.24 mum  14.9 mum   1.6 m   1e+03 GeV   125 keV    52 cm   4.51 m     Tracker  Transportation
+   18  -7.73 mum  16.7 mum   1.8 m   1e+03 GeV   214 keV    20 cm   4.71 m     Chamber  Transportation
+   19  -10.2 mum  21.2 mum  2.27 m   1e+03 GeV   118 keV  47.1 cm   5.18 m     Tracker      MuIoni
+   20    -11 mum  22.6 mum   2.4 m   1e+03 GeV  28.2 keV  12.9 cm   5.31 m     Tracker  Transportation
+   21  -13.9 mum    28 mum  2.91 m   1e+03 GeV   118 keV    51 cm   5.82 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 8,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -10.2 mum  21.2 mum  2.27 m    8.95 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1    564 mum   144 mum  2.27 m    7.91 keV  1.04 keV   676 mum   676 mum   Tracker       eIoni
+    2     66 mum   147 mum  2.27 m    6.34 keV  1.57 keV   599 mum  1.27 mm    Tracker       eIoni
+    3   -393 mum   168 mum  2.27 m     3.6 keV  2.73 keV   495 mum  1.77 mm    Tracker       eIoni
+    4   -601 mum   217 mum  2.27 m     633 eV   2.97 keV   320 mum  2.09 mm    Tracker       eIoni
+    5   -605 mum   224 mum  2.27 m  1.08e-13 eV    633 eV   33.7 mum  2.12 mm    Tracker       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 7,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    326 mum -42.8 mum  2.12 m    16.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.25 mm  -1.16 mm   2.12 m    4.55 keV  11.9 keV  1.42 mm   1.42 mm    Tracker     eIoni
-    2    979 mum -1.39 mm   2.12 m    2.99 keV  1.57 keV   389 mum  1.81 mm    Tracker     eIoni
-    3    901 mum -1.55 mm   2.12 m       0 eV   2.99 keV   276 mum  2.09 mm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.09 mum  10.6 mum  1.08 m    8.79 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1    484 mum   359 mum  1.08 m    6.48 keV  2.31 keV   663 mum   663 mum   Tracker       eIoni
+    2    745 mum   268 mum  1.08 m       0 eV   6.48 keV   504 mum  1.17 mm    Tracker       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 6,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    202 nm   -895 nm  -2.41 m    15.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    811 mum  -249 mum -2.41 m    12.3 MeV  3.52 MeV  2.51 mm   2.51 mm   TargetPV     eIoni
-    2    750 mum  -209 mum -2.41 m    11.2 MeV    99 keV  77.5 mum  2.59 mm   TargetPV     eBrem
-    3    629 mum  -117 mum -2.41 m      10 MeV   246 keV   216 mum   2.8 mm   TargetPV     eBrem
-    4   -622 mum   514 mum -2.41 m    1.39 MeV  8.11 MeV  1.69 mm   4.49 mm   TargetPV     eBrem
-    5   -640 mum   541 mum -2.41 m    1.01 MeV   383 keV   492 mum  4.98 mm   TargetPV     eIoni
-    6   -772 mum   610 mum -2.41 m     622 keV   384 keV   415 mum   5.4 mm   TargetPV     eIoni
-    7   -727 mum   670 mum -2.41 m     279 keV   344 keV   316 mum  5.71 mm   TargetPV     eIoni
-    8   -735 mum   676 mum -2.41 m       0 eV    279 keV   131 mum  5.84 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -622 mum   514 mum -2.41 m     548 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.95 mm  -1.01 mm  -2.41 m       0 eV    548 keV  3.57 mm   3.57 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 9,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    629 mum  -117 mum -2.41 m     880 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.68 mm    5.6 mm  -2.42 m     388 keV     0 eV   8.97 mm   8.97 mm   TargetPV     compt
-    2   -5.2 mm   6.32 mm  -2.41 m       0 eV    388 keV  1.26 mm   1.02 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 11,   Parent ID = 9
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -4.68 mm    5.6 mm  -2.42 m     492 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.72 mm   5.63 mm  -2.42 m     183 keV   309 keV   265 mum   265 mum  TargetPV     eIoni
-    2  -4.71 mm   5.63 mm  -2.42 m       0 eV    183 keV  70.2 mum   336 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 8,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    750 mum  -209 mum -2.41 m    1.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.58 cm   9.42 mm  -2.43 m     566 keV   474 keV  2.46 cm   2.46 cm   TargetPV     compt
-    2  -1.54 cm   2.13 cm  -2.43 m       0 eV    566 keV  1.29 cm   3.75 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 5,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    111 nm   -877 nm  -2.41 m     272 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   5.08 mum  4.59 mum -2.41 m     271 MeV   709 keV   556 mum   556 mum  TargetPV     eBrem
-    2  -6.06 mum  2.52 mum -2.41 m     269 MeV  1.34 MeV   670 mum  1.23 mm   TargetPV     eBrem
-    3   4.02 mum  1.98 mum -2.41 m     267 MeV   642 keV   438 mum  1.66 mm   TargetPV     eBrem
-    4   29.5 mum  7.96 mum -2.41 m     252 MeV  1.57 MeV   853 mum  2.52 mm   TargetPV     eBrem
-    5   32.7 mum  21.1 mum -2.41 m     250 MeV   569 keV   525 mum  3.04 mm   TargetPV     eBrem
-    6   33.9 mum  24.4 mum -2.41 m    50.3 MeV   190 keV   167 mum  3.21 mm   TargetPV     eBrem
-    7   29.6 mum  29.9 mum -2.41 m    49.4 MeV   230 keV   202 mum  3.41 mm   TargetPV     eBrem
-    8   30.2 mum  29.9 mum -2.41 m    27.7 MeV  13.7 keV  18.7 mum  3.43 mm   TargetPV     eBrem
-    9    113 mum  -143 mum -2.41 m    20.8 MeV  1.15 MeV  1.07 mm    4.5 mm   TargetPV     eBrem
-   10    308 mum  -165 mum -2.41 m    17.3 MeV  1.23 MeV  1.01 mm   5.51 mm   TargetPV     eBrem
-   11   -167 mum  1.72 mm  -2.41 m    12.9 MeV  2.58 MeV  2.23 mm   7.73 mm   TargetPV     eBrem
-   12   -182 mum  1.74 mm  -2.41 m    9.03 MeV  39.9 keV  30.6 mum  7.76 mm   TargetPV     eBrem
-   13  -1.37 mm    2.7 mm  -2.41 m    6.94 MeV  2.08 MeV  1.66 mm   9.42 mm   TargetPV     eIoni
-   14  -1.49 mm    3.2 mm  -2.41 m    5.59 MeV  1.36 MeV  1.37 mm   1.08 cm   TargetPV     eIoni
-   15  -1.11 mm   3.05 mm  -2.41 m    4.53 MeV   627 keV   603 mum  1.14 cm   TargetPV     eBrem
-   16   -609 mum  2.83 mm  -2.41 m    2.78 MeV   897 keV   674 mum  1.21 cm   TargetPV     eBrem
-   17   -585 mum  3.22 mm  -2.41 m    1.79 MeV   993 keV   743 mum  1.28 cm   TargetPV     eIoni
-   18   -333 mum   3.1 mm  -2.41 m     1.2 MeV   593 keV   573 mum  1.34 cm   TargetPV     eIoni
-   19   -530 mum  3.16 mm  -2.41 m     777 keV   420 keV   461 mum  1.38 cm   TargetPV     eIoni
-   20   -459 mum  3.23 mm  -2.41 m     197 keV   580 keV   365 mum  1.42 cm   TargetPV     eIoni
-   21   -469 mum  3.23 mm  -2.41 m       0 eV    197 keV  76.4 mum  1.43 cm   TargetPV     eIoni
-   22   -469 mum  3.23 mm  -2.41 m       0 eV      0 eV      0 fm   1.43 cm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -469 mum  3.23 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.13 mm   2.66 mm  -2.41 m     185 keV   326 keV  3.65 mm   3.65 mm   TargetPV     compt
-    2   2.82 mm   2.55 mm  -2.41 m       0 eV    185 keV   378 mum  4.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 26,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -469 mum  3.23 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -8.24 mm   4.46 mm  -2.41 m     441 keV  70.2 keV  7.86 mm   7.86 mm   TargetPV     compt
-    2  -1.29 cm   5.51 mm  -2.41 m     284 keV   157 keV  5.67 mm   1.35 cm   TargetPV     compt
-    3  -1.29 cm    5.6 mm  -2.41 m       0 eV    284 keV   131 mum  1.37 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -609 mum  2.83 mm  -2.41 m     850 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.01 cm   7.08 mm   -2.4 m     585 keV   264 keV  1.33 cm   1.33 cm   TargetPV     compt
-    2  -1.03 cm   7.02 mm   -2.4 m       0 eV    585 keV   208 mum  1.35 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 24,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.11 mm   3.05 mm  -2.41 m     430 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   7.74 mm   -161 mum -2.41 m       0 eV    430 keV  9.56 mm   9.56 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 23,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -182 mum  1.74 mm  -2.41 m    3.81 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -502 mum  2.16 mm  -2.41 m     459 keV     0 eV    653 mum   653 mum  TargetPV     compt
-    2   4.48 mm   5.09 mm  -2.41 m       0 eV    459 keV   5.9 mm   6.55 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 28,   Parent ID = 23
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -502 mum  2.16 mm  -2.41 m    3.35 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.06 mm   2.23 mm  -2.41 m    2.53 MeV   816 keV   817 mum   817 mum  TargetPV     eIoni
-    2  -1.11 mm   1.85 mm  -2.41 m    1.56 MeV   969 keV   689 mum  1.51 mm   TargetPV     eIoni
-    3   -951 mum  1.78 mm  -2.41 m    1.04 MeV   529 keV   524 mum  2.03 mm   TargetPV     eIoni
-    4   -829 mum  1.71 mm  -2.41 m     588 keV   448 keV   421 mum  2.45 mm   TargetPV     eIoni
-    5   -865 mum   1.7 mm  -2.41 m     132 keV   456 keV   304 mum  2.75 mm   TargetPV     eIoni
-    6   -862 mum   1.7 mm  -2.41 m       0 eV    132 keV  42.5 mum   2.8 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 22,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -167 mum  1.72 mm  -2.41 m    1.83 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -6.28 mm   9.44 mm   -2.4 m    1.83 MeV     0 eV   1.28 cm   1.28 cm    TrackerTransportation
-    2   -1.9 m     2.4 m    12.5 cm   1.83 MeV     0 eV   3.96 m    3.97 m     WorldPVTransportation
-    3   -2.3 m    2.91 m    66.3 cm   1.83 MeV     0 eV   84.5 cm   4.82 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 21,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    308 mum  -165 mum -2.41 m    2.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.38 mm   8.05 mm   -2.4 m    2.28 MeV     0 eV   1.28 cm   1.28 cm    TrackerTransportation
-    2  -1.08 m     2.4 m    24.5 cm   2.28 MeV     0 eV   3.72 m    3.74 m     WorldPVTransportation
-    3  -1.31 m    2.91 m    80.9 cm   2.28 MeV     0 eV   79.4 cm   4.53 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 20,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    113 mum  -143 mum -2.41 m    5.76 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.16 mm   -953 mum -2.41 m     587 keV  5.17 MeV  3.94 mm   3.94 mm   TargetPV     compt
-    2   87.3 mum -2.39 mm  -2.41 m     408 keV   179 keV  1.84 mm   5.78 mm   TargetPV     compt
-    3    446 mum -5.59 mm   -2.4 m     311 keV  97.2 keV   5.2 mm    1.1 cm   TargetPV     compt
-    4    777 mum -5.11 mm   -2.4 m     311 keV     0 eV   1.95 mm   1.29 cm    TrackerTransportation
-    5   14.3 cm   20.2 cm   -1.6 m     311 keV     0 eV   83.8 cm   85.1 cm    ChamberTransportation
-    6     17 cm     24 cm  -1.45 m     311 keV     0 eV   15.6 cm   1.01 m     TrackerTransportation
-    7   28.6 cm   40.8 cm    -80 cm    311 keV     0 eV   68.3 cm   1.69 m     ChamberTransportation
-    8   32.1 cm     46 cm    -60 cm    311 keV     0 eV     21 cm    1.9 m     TrackerTransportation
-    9   42.8 cm   61.5 cm      0 fm    311 keV     0 eV   62.9 cm   2.53 m     ChamberTransportation
-   10   46.4 cm   66.7 cm     20 cm    311 keV     0 eV     21 cm   2.74 m     TrackerTransportation
-   11     57 cm   82.2 cm     80 cm    311 keV     0 eV   62.9 cm   3.37 m     ChamberTransportation
-   12   60.6 cm   87.3 cm      1 m     311 keV     0 eV     21 cm   3.58 m     TrackerTransportation
-   13   71.3 cm   1.03 m     1.6 m     311 keV     0 eV   62.9 cm   4.21 m     ChamberTransportation
-   14   74.8 cm   1.08 m     1.8 m     311 keV     0 eV     21 cm   4.41 m     TrackerTransportation
-   15   85.5 cm   1.24 m     2.4 m     311 keV     0 eV   62.9 cm   5.04 m     WorldPVTransportation
-   16   94.6 cm   1.37 m    2.91 m     311 keV     0 eV   53.5 cm   5.58 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 19,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   30.2 mum  29.9 mum -2.41 m    21.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    433 mum  -413 nm   -2.4 m       0 eV      0 eV    8.7 mm    8.7 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 30,   Parent ID = 19
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    433 mum  -413 nm   -2.4 m      14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   77.5 mum  -440 mum  -2.4 m    10.5 MeV  3.48 MeV  2.33 mm   2.33 mm   TargetPV     eIoni
-    2    673 mum  -407 mum  -2.4 m    9.62 MeV   892 keV   821 mum  3.15 mm    TrackerTransportation
-    3   20.8 cm  -16.9 cm  -2.13 m    9.53 MeV  72.9 keV  38.1 cm   38.5 cm    Tracker     eIoni
-    4   52.5 cm  -42.2 cm  -1.63 m     9.4 MeV   124 keV    64 cm   1.02 m     Tracker     eIoni
-    5   92.4 cm    -69 cm  -1.06 m    9.25 MeV   134 keV  74.7 cm   1.77 m     Tracker     eIoni
-    6   1.07 m   -76.1 cm  -86.5 cm   9.19 MeV  43.2 keV  25.6 cm   2.03 m     Tracker     eIoni
-    7   1.12 m   -78.4 cm  -79.9 cm   8.32 MeV  23.5 keV  8.44 cm   2.11 m     Tracker     eIoni
-    8   1.27 m   -88.7 cm  -56.3 cm   8.25 MeV  55.4 keV    30 cm   2.41 m     Tracker     eIoni
-    9   1.33 m   -93.4 cm    -46 cm   8.21 MeV  18.7 keV  12.8 cm   2.54 m     Tracker     eIoni
-   10    1.4 m   -99.4 cm    -35 cm   6.39 MeV  27.9 keV  14.1 cm   2.68 m     Tracker     eIoni
-   11   1.41 m   -1.02 m   -30.4 cm   6.37 MeV  8.08 keV  5.29 cm   2.73 m     Tracker     eIoni
-   12   1.61 m   -1.38 m    44.2 cm   6.18 MeV   150 keV  85.6 cm   3.59 m     Tracker     eIoni
-   13   1.62 m   -1.39 m    47.6 cm   6.17 MeV  6.52 keV  4.02 cm   3.63 m     Tracker     eIoni
-   14    2.2 m   -2.08 m    1.93 m    5.86 MeV   299 keV  1.72 m    5.35 m     Tracker     eIoni
-   15   2.26 m   -2.18 m    2.08 m    5.76 MeV  41.9 keV  19.3 cm   5.54 m     Tracker     eIoni
-   16   2.37 m   -2.35 m     2.4 m     5.7 MeV  60.2 keV  37.9 cm   5.92 m     WorldPVTransportation
-   17   2.42 m   -2.46 m    2.57 m    5.63 MeV  43.7 keV  21.1 cm   6.13 m     WorldPV     eIoni
-   18   2.51 m   -2.59 m     2.8 m    5.56 MeV  54.1 keV  27.8 cm   6.41 m     WorldPV     eIoni
-   19   2.54 m   -2.63 m    2.89 m    5.46 MeV  23.6 keV  10.4 cm   6.51 m     WorldPV     eIoni
-   20   2.55 m   -2.64 m    2.91 m    5.46 MeV  3.95 keV  2.45 cm   6.54 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 46,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.54 m   -2.63 m    2.89 m    78.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.55 m   -2.65 m    2.88 m    63.6 keV  14.6 keV  1.83 cm   1.83 cm    WorldPV     eIoni
-    2   2.55 m   -2.66 m    2.87 m    59.1 keV  4.51 keV  1.28 cm   3.11 cm    WorldPV     eIoni
-    3   2.55 m   -2.66 m    2.86 m    48.5 keV  10.5 keV  1.13 cm   4.23 cm    WorldPV     eIoni
-    4   2.56 m   -2.66 m    2.86 m    36.2 keV  12.3 keV  8.01 mm   5.03 cm    WorldPV     eIoni
-    5   2.56 m   -2.67 m    2.86 m    31.7 keV  4.49 keV  4.83 mm   5.52 cm    WorldPV     eIoni
-    6   2.56 m   -2.67 m    2.86 m    28.9 keV  2.78 keV  3.89 mm   5.91 cm    WorldPV     eIoni
-    7   2.56 m   -2.67 m    2.86 m    24.7 keV  4.21 keV  3.34 mm   6.24 cm    WorldPV     eIoni
-    8   2.56 m   -2.67 m    2.86 m    20.7 keV  3.97 keV  2.59 mm    6.5 cm    WorldPV     eIoni
-    9   2.56 m   -2.67 m    2.86 m      18 keV  2.77 keV  1.97 mm    6.7 cm    WorldPV     eIoni
-   10   2.56 m   -2.67 m    2.86 m    15.1 keV  2.88 keV   1.6 mm   6.86 cm    WorldPV     eIoni
-   11   2.56 m   -2.67 m    2.86 m    13.7 keV  1.41 keV  1.26 mm   6.98 cm    WorldPV     eIoni
-   12   2.56 m   -2.67 m    2.86 m    11.6 keV  2.07 keV  1.11 mm   7.09 cm    WorldPV     eIoni
-   13   2.56 m   -2.67 m    2.86 m    10.4 keV  1.17 keV   908 mum  7.18 cm    WorldPV     eIoni
-   14   2.56 m   -2.67 m    2.86 m    8.55 keV  1.88 keV   806 mum  7.27 cm    WorldPV     eIoni
-   15   2.56 m   -2.67 m    2.86 m    6.19 keV  2.36 keV   655 mum  7.33 cm    WorldPV     eIoni
-   16   2.56 m   -2.67 m    2.86 m    5.29 keV   901 eV    492 mum  7.38 cm    WorldPV     eIoni
-   17   2.56 m   -2.67 m    2.86 m    3.57 keV  1.72 keV   435 mum  7.42 cm    WorldPV     eIoni
-   18   2.56 m   -2.67 m    2.86 m     816 eV   2.76 keV   323 mum  7.46 cm    WorldPV     eIoni
-   19   2.56 m   -2.67 m    2.86 m       0 eV    816 eV   47.6 mum  7.46 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 45,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.51 m   -2.59 m     2.8 m      15 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.52 m   -2.59 m     2.8 m      14 keV     1 keV  1.25 mm   1.25 mm    WorldPV     eIoni
-    2   2.52 m   -2.59 m     2.8 m    12.9 keV   1.1 keV  1.14 mm   2.39 mm    WorldPV     eIoni
-    3   2.52 m   -2.59 m     2.8 m    10.1 keV  2.79 keV  1.03 mm   3.42 mm    WorldPV     eIoni
-    4   2.52 m   -2.59 m     2.8 m    8.22 keV  1.88 keV   776 mum   4.2 mm    WorldPV     eIoni
-    5   2.52 m   -2.59 m     2.8 m    7.49 keV   732 eV    630 mum  4.83 mm    WorldPV     eIoni
-    6   2.52 m   -2.59 m     2.8 m    5.62 keV  1.87 keV   579 mum  5.41 mm    WorldPV     eIoni
-    7   2.52 m   -2.59 m     2.8 m    4.81 keV   811 eV    455 mum  5.87 mm    WorldPV     eIoni
-    8   2.52 m   -2.59 m     2.8 m    1.95 keV  2.87 keV   404 mum  6.27 mm    WorldPV     eIoni
-    9   2.52 m   -2.59 m     2.8 m       0 eV   1.95 keV   156 mum  6.43 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 44,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.42 m   -2.46 m    2.57 m    22.9 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.42 m   -2.46 m    2.57 m    20.2 keV  2.75 keV  2.31 mm   2.31 mm    WorldPV     eIoni
-    2   2.42 m   -2.46 m    2.57 m    18.9 keV  1.24 keV   1.9 mm   4.21 mm    WorldPV     eIoni
-    3   2.42 m   -2.46 m    2.57 m    17.3 keV  1.63 keV  1.74 mm   5.95 mm    WorldPV     eIoni
-    4   2.42 m   -2.46 m    2.57 m    8.64 keV  8.68 keV  1.52 mm   7.47 mm    WorldPV     eIoni
-    5   2.42 m   -2.46 m    2.57 m    7.57 keV  1.08 keV   662 mum  8.13 mm    WorldPV     eIoni
-    6   2.42 m   -2.46 m    2.57 m    6.29 keV  1.28 keV   584 mum  8.71 mm    WorldPV     eIoni
-    7   2.42 m   -2.46 m    2.57 m    4.34 keV  1.95 keV   498 mum  9.21 mm    WorldPV     eIoni
-    8   2.42 m   -2.46 m    2.57 m    2.34 keV     2 keV   375 mum  9.59 mm    WorldPV     eIoni
-    9   2.42 m   -2.46 m    2.57 m       0 eV   2.34 keV   207 mum  9.79 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 43,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.26 m   -2.18 m    2.08 m    56.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.26 m   -2.17 m    2.09 m    44.2 keV  12.3 keV  1.04 cm   1.04 cm    Tracker     eIoni
-    2   2.26 m   -2.16 m    2.09 m    39.5 keV  4.73 keV  6.79 mm   1.72 cm    Tracker     eIoni
-    3   2.26 m   -2.16 m    2.09 m    35.7 keV  3.75 keV  5.62 mm   2.29 cm    Tracker     eIoni
-    4   2.26 m   -2.16 m     2.1 m    31.2 keV  4.49 keV  4.73 mm   2.76 cm    Tracker     eIoni
-    5   2.26 m   -2.15 m     2.1 m    27.8 keV  3.38 keV  3.79 mm   3.14 cm    Tracker     eIoni
-    6   2.26 m   -2.15 m     2.1 m    25.1 keV  2.75 keV  3.15 mm   3.45 cm    Tracker     eIoni
-    7   2.26 m   -2.15 m     2.1 m      23 keV  2.11 keV  2.65 mm   3.72 cm    Tracker     eIoni
-    8   2.26 m   -2.15 m     2.1 m    20.2 keV   2.8 keV  2.32 mm   3.95 cm    Tracker     eIoni
-    9   2.26 m   -2.15 m     2.1 m    18.3 keV  1.87 keV   1.9 mm   4.14 cm    Tracker     eIoni
-   10   2.26 m   -2.15 m     2.1 m    15.5 keV  2.84 keV  1.65 mm    4.3 cm    Tracker     eIoni
-   11   2.26 m   -2.14 m     2.1 m    12.1 keV  3.34 keV  1.31 mm   4.43 cm    Tracker     eIoni
-   12   2.26 m   -2.14 m     2.1 m    10.3 keV  1.81 keV   957 mum  4.53 cm    Tracker     eIoni
-   13   2.26 m   -2.14 m     2.1 m    9.19 keV  1.14 keV   797 mum  4.61 cm    Tracker     eIoni
-   14   2.26 m   -2.14 m     2.1 m    7.35 keV  1.84 keV   705 mum  4.68 cm    Tracker     eIoni
-   15   2.26 m   -2.14 m     2.1 m    5.71 keV  1.64 keV   569 mum  4.74 cm    Tracker     eIoni
-   16   2.26 m   -2.14 m     2.1 m    4.77 keV   944 eV    461 mum  4.78 cm    Tracker     eIoni
-   17   2.26 m   -2.14 m     2.1 m    2.96 keV  1.81 keV   401 mum  4.82 cm    Tracker     eIoni
-   18   2.26 m   -2.14 m     2.1 m       0 eV   2.96 keV   273 mum  4.85 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 42,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.2 m   -2.08 m    1.93 m    8.46 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    2.2 m   -2.08 m    1.93 m    5.86 keV   2.6 keV   647 mum   647 mum   Tracker     eIoni
-    2    2.2 m   -2.08 m    1.93 m    3.56 keV   2.3 keV   470 mum  1.12 mm    Tracker     eIoni
-    3    2.2 m   -2.08 m    1.93 m     833 eV   2.73 keV   322 mum  1.44 mm    Tracker     eIoni
-    4    2.2 m   -2.08 m    1.93 m       0 eV    833 eV   48.8 mum  1.49 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 41,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.62 m   -1.39 m    47.6 cm   8.13 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.62 m   -1.39 m    47.6 cm   6.82 keV  1.31 keV   624 mum   624 mum   Tracker     eIoni
-    2   1.63 m   -1.39 m    47.6 cm   3.37 keV  3.45 keV   533 mum  1.16 mm    Tracker     eIoni
-    3   1.63 m   -1.39 m    47.6 cm      0 eV   3.37 keV   307 mum  1.46 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 40,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.61 m   -1.38 m    44.2 cm   43.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.61 m   -1.38 m    44.5 cm   32.9 keV  10.4 keV  6.56 mm   6.56 mm    Tracker     eIoni
-    2    1.6 m   -1.38 m    44.8 cm     30 keV  2.84 keV  4.13 mm   1.07 cm    Tracker     eIoni
-    3    1.6 m   -1.38 m    44.8 cm   25.7 keV  4.36 keV  3.54 mm   1.42 cm    Tracker     eIoni
-    4    1.6 m   -1.39 m    44.8 cm   23.1 keV  2.62 keV  2.75 mm    1.7 cm    Tracker     eIoni
-    5    1.6 m   -1.39 m    44.8 cm   21.6 keV  1.47 keV  2.33 mm   1.93 cm    Tracker     eIoni
-    6    1.6 m   -1.39 m    44.8 cm   18.9 keV  2.68 keV   2.1 mm   2.14 cm    Tracker     eIoni
-    7    1.6 m   -1.39 m    44.8 cm   16.3 keV  2.62 keV  1.73 mm   2.32 cm    Tracker     eIoni
-    8    1.6 m   -1.39 m    44.7 cm   11.4 keV  4.86 keV   1.4 mm   2.46 cm    Tracker     eIoni
-    9    1.6 m   -1.39 m    44.7 cm   9.89 keV  1.54 keV   893 mum  2.55 cm    Tracker     eIoni
-   10    1.6 m   -1.39 m    44.7 cm   7.78 keV  2.11 keV   759 mum  2.62 cm    Tracker     eIoni
-   11    1.6 m   -1.39 m    44.7 cm   6.83 keV   945 eV    599 mum  2.68 cm    Tracker     eIoni
-   12    1.6 m   -1.39 m    44.7 cm   3.78 keV  3.05 keV   533 mum  2.73 cm    Tracker     eIoni
-   13    1.6 m   -1.39 m    44.7 cm      0 eV   3.78 keV   337 mum  2.77 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 39,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.41 m   -1.02 m   -30.4 cm      9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.41 m   -1.02 m   -30.5 cm   4.85 keV  4.14 keV   690 mum   690 mum   Tracker     eIoni
-    2   1.41 m   -1.02 m   -30.4 cm   2.76 keV  2.09 keV   407 mum   1.1 mm    Tracker     eIoni
-    3   1.41 m   -1.02 m   -30.4 cm      0 eV   2.76 keV   254 mum  1.35 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 38,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.4 m   -99.4 cm    -35 cm   1.79 MeV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    1.5 m   -1.02 m   -29.3 cm   1.76 MeV  16.5 keV  11.9 cm   11.9 cm    Tracker     eIoni
-    2   1.77 m   -1.09 m   -15.3 cm   1.71 MeV  45.1 keV  31.4 cm   43.2 cm    Tracker     eIoni
-    3   1.97 m   -1.09 m    4.55 cm   1.64 MeV  52.7 keV  28.7 cm   71.9 cm    Tracker     eIoni
-    4   2.14 m   -1.09 m    26.9 cm   1.47 MeV  49.4 keV    28 cm   99.9 cm    Tracker     eIoni
-    5    2.4 m    -1.2 m      63 cm    1.4 MeV  75.3 keV  47.2 cm   1.47 m     WorldPVTransportation
-    6   2.44 m   -1.23 m    65.5 cm   1.37 MeV  10.3 keV  5.27 cm   1.52 m     WorldPV     eIoni
-    7    2.5 m   -1.27 m    68.7 cm   1.35 MeV  13.6 keV  7.63 cm    1.6 m     WorldPV     eIoni
-    8   2.64 m   -1.36 m    75.3 cm   1.27 MeV  32.7 keV  18.9 cm   1.79 m     WorldPV     eIoni
-    9   2.74 m   -1.44 m    82.5 cm   1.24 MeV  22.2 keV  14.3 cm   1.93 m     WorldPV     eIoni
-   10   2.88 m   -1.52 m    92.8 cm   1.19 MeV  32.7 keV  19.1 cm   2.12 m     WorldPV     eIoni
-   11   2.91 m   -1.52 m    94.3 cm   1.19 MeV  5.27 keV   3.3 cm   2.16 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 55,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.88 m   -1.52 m    92.8 cm   10.5 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.88 m   -1.52 m    92.8 cm   9.27 keV  1.23 keV   811 mum   811 mum   WorldPV     eIoni
-    2   2.88 m   -1.52 m    92.8 cm   7.84 keV  1.43 keV   711 mum  1.52 mm    WorldPV     eIoni
-    3   2.88 m   -1.52 m    92.8 cm   5.97 keV  1.87 keV   603 mum  2.13 mm    WorldPV     eIoni
-    4   2.88 m   -1.52 m    92.8 cm   2.67 keV   3.3 keV   477 mum   2.6 mm    WorldPV     eIoni
-    5   2.88 m   -1.52 m    92.8 cm   1.41 keV  1.26 keV   245 mum  2.85 mm    WorldPV     eIoni
-    6   2.88 m   -1.52 m    92.8 cm      0 eV   1.41 keV  97.4 mum  2.94 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 54,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.74 m   -1.44 m    82.5 cm     11 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.74 m   -1.44 m    82.4 cm   9.21 keV  1.81 keV   857 mum   857 mum   WorldPV     eIoni
-    2   2.74 m   -1.44 m    82.4 cm   8.02 keV  1.19 keV   706 mum  1.56 mm    WorldPV     eIoni
-    3   2.74 m   -1.44 m    82.3 cm   6.24 keV  1.79 keV   616 mum  2.18 mm    WorldPV     eIoni
-    4   2.74 m   -1.44 m    82.3 cm   4.39 keV  1.85 keV   495 mum  2.67 mm    WorldPV     eIoni
-    5   2.74 m   -1.44 m    82.3 cm   3.35 keV  1.04 keV   378 mum  3.05 mm    WorldPV     eIoni
-    6   2.74 m   -1.44 m    82.3 cm      0 eV   3.35 keV   305 mum  3.36 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 53,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.64 m   -1.36 m    75.3 cm   45.4 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.65 m   -1.36 m    74.9 cm     39 keV   6.4 keV  7.12 mm   7.12 mm    WorldPV     eIoni
-    2   2.65 m   -1.36 m    74.9 cm     37 keV  1.98 keV   5.5 mm   1.26 cm    WorldPV     eIoni
-    3   2.66 m   -1.36 m    74.9 cm   33.8 keV   3.2 keV  5.02 mm   1.76 cm    WorldPV     eIoni
-    4   2.66 m   -1.36 m    74.8 cm   30.1 keV  3.65 keV  4.32 mm    2.2 cm    WorldPV     eIoni
-    5   2.66 m   -1.36 m    74.7 cm   26.1 keV  3.99 keV  3.56 mm   2.55 cm    WorldPV     eIoni
-    6   2.67 m   -1.36 m    74.7 cm   24.1 keV  2.07 keV  2.84 mm   2.83 cm    WorldPV     eIoni
-    7   2.67 m   -1.36 m    74.9 cm   20.8 keV  3.31 keV  2.49 mm   3.08 cm    WorldPV     eIoni
-    8   2.67 m   -1.36 m      75 cm   18.9 keV  1.89 keV  1.98 mm   3.28 cm    WorldPV     eIoni
-    9   2.67 m   -1.36 m      75 cm   16.9 keV     2 keV  1.72 mm   3.45 cm    WorldPV     eIoni
-   10   2.67 m   -1.36 m      75 cm     15 keV  1.87 keV  1.47 mm    3.6 cm    WorldPV     eIoni
-   11   2.67 m   -1.36 m    74.9 cm   13.2 keV  1.76 keV  1.25 mm   3.73 cm    WorldPV     eIoni
-   12   2.67 m   -1.36 m    74.9 cm   11.8 keV  1.47 keV  1.07 mm   3.83 cm    WorldPV     eIoni
-   13   2.67 m   -1.36 m    74.9 cm   10.6 keV  1.14 keV   922 mum  3.92 cm    WorldPV     eIoni
-   14   2.67 m   -1.36 m    74.9 cm   9.04 keV  1.58 keV   822 mum  4.01 cm    WorldPV     eIoni
-   15   2.67 m   -1.36 m    74.9 cm   7.55 keV  1.49 keV   693 mum  4.08 cm    WorldPV     eIoni
-   16   2.67 m   -1.36 m      75 cm   6.68 keV   870 eV    583 mum  4.13 cm    WorldPV     eIoni
-   17   2.67 m   -1.36 m      75 cm   5.57 keV   1.1 keV   523 mum  4.19 cm    WorldPV     eIoni
-   18   2.67 m   -1.36 m      75 cm   3.52 keV  2.05 keV   452 mum  4.23 cm    WorldPV     eIoni
-   19   2.67 m   -1.36 m      75 cm      0 eV   3.52 keV   319 mum  4.26 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 52,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.5 m   -1.27 m    68.7 cm   13.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.5 m   -1.27 m    68.7 cm   11.7 keV  1.66 keV  1.08 mm   1.08 mm    WorldPV     eIoni
-    2    2.5 m   -1.27 m    68.6 cm   10.5 keV  1.23 keV   915 mum  1.99 mm    WorldPV     eIoni
-    3    2.5 m   -1.27 m    68.5 cm   8.87 keV  1.58 keV   807 mum   2.8 mm    WorldPV     eIoni
-    4    2.5 m   -1.27 m    68.5 cm   6.32 keV  2.55 keV   680 mum  3.48 mm    WorldPV     eIoni
-    5    2.5 m   -1.27 m    68.5 cm   5.27 keV  1.05 keV   501 mum  3.98 mm    WorldPV     eIoni
-    6    2.5 m   -1.27 m    68.5 cm   2.87 keV   2.4 keV   434 mum  4.42 mm    WorldPV     eIoni
-    7    2.5 m   -1.27 m    68.5 cm   1.57 keV  1.31 keV   266 mum  4.68 mm    WorldPV     eIoni
-    8    2.5 m   -1.27 m    68.5 cm      0 eV   1.57 keV   113 mum  4.79 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 51,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.44 m   -1.23 m    65.5 cm   11.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.44 m   -1.23 m    65.5 cm   7.57 keV  3.77 keV   885 mum   885 mum   WorldPV     eIoni
-    2   2.44 m   -1.23 m    65.4 cm   6.29 keV  1.27 keV   584 mum  1.47 mm    WorldPV     eIoni
-    3   2.44 m   -1.23 m    65.4 cm    4.4 keV   1.9 keV   499 mum  1.97 mm    WorldPV     eIoni
-    4   2.44 m   -1.23 m    65.4 cm   2.82 keV  1.57 keV   379 mum  2.35 mm    WorldPV     eIoni
-    5   2.44 m   -1.23 m    65.4 cm      0 eV   2.82 keV   260 mum  2.61 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 50,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.14 m   -1.09 m    26.9 cm    118 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.17 m   -1.07 m    25.2 cm    105 keV  13.5 keV  3.75 cm   3.75 cm    Tracker     eIoni
-    2   2.17 m   -1.05 m      24 cm     92 keV  12.7 keV  3.04 cm    6.8 cm    Tracker     eIoni
-    3   2.16 m   -1.03 m    23.7 cm   82.1 keV  9.85 keV  2.43 cm   9.22 cm    Tracker     eIoni
-    4   2.14 m   -1.03 m    23.7 cm   71.8 keV  10.3 keV     2 cm   11.2 cm    Tracker     eIoni
-    5   2.13 m   -1.01 m    24.2 cm   61.9 keV  9.88 keV  1.58 cm   12.8 cm    Tracker     eIoni
-    6   2.13 m      -1 m    24.3 cm   53.6 keV   8.3 keV  1.22 cm     14 cm    Tracker     eIoni
-    7   2.12 m   -99.7 cm   23.9 cm   46.9 keV  6.76 keV   9.5 mm     15 cm    Tracker     eIoni
-    8   2.12 m   -99.2 cm   24.1 cm   40.2 keV  6.68 keV  7.55 mm   15.7 cm    Tracker     eIoni
-    9   2.11 m   -99.3 cm   24.5 cm   35.2 keV  4.96 keV   5.8 mm   16.3 cm    Tracker     eIoni
-   10   2.11 m   -99.1 cm   24.9 cm   30.9 keV  4.35 keV  4.63 mm   16.8 cm    Tracker     eIoni
-   11   2.11 m   -98.9 cm   25.1 cm   26.1 keV  4.79 keV  3.71 mm   17.1 cm    Tracker     eIoni
-   12   2.11 m   -98.9 cm   25.2 cm   23.4 keV  2.64 keV  2.83 mm   17.4 cm    Tracker     eIoni
-   13   2.11 m   -98.8 cm   25.1 cm   19.7 keV  3.72 keV  2.39 mm   17.7 cm    Tracker     eIoni
-   14   2.11 m   -98.7 cm   25.1 cm   17.4 keV  2.33 keV  1.84 mm   17.8 cm    Tracker     eIoni
-   15   2.11 m   -98.6 cm   25.1 cm   13.9 keV  3.48 keV  1.53 mm     18 cm    Tracker     eIoni
-   16   2.11 m   -98.7 cm     25 cm   11.7 keV  2.27 keV  1.14 mm   18.1 cm    Tracker     eIoni
-   17   2.11 m   -98.7 cm     25 cm   9.22 keV  2.44 keV   913 mum  18.2 cm    Tracker     eIoni
-   18   2.11 m   -98.7 cm     25 cm    6.7 keV  2.52 keV   707 mum  18.3 cm    Tracker     eIoni
-   19   2.11 m   -98.7 cm   24.9 cm   5.71 keV   994 eV    525 mum  18.3 cm    Tracker     eIoni
-   20   2.11 m   -98.8 cm   24.9 cm   3.97 keV  1.74 keV   460 mum  18.4 cm    Tracker     eIoni
-   21   2.11 m   -98.7 cm   24.9 cm    954 eV   3.02 keV   350 mum  18.4 cm    Tracker     eIoni
-   22   2.11 m   -98.7 cm   24.9 cm      0 eV    954 eV   57.7 mum  18.4 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 49,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.97 m   -1.09 m    4.55 cm   15.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.97 m   -1.09 m    4.53 cm   13.3 keV  2.48 keV  1.34 mm   1.34 mm    Tracker     eIoni
-    2   1.97 m   -1.09 m    4.59 cm   11.2 keV  2.15 keV  1.08 mm   2.42 mm    Tracker     eIoni
-    3   1.97 m   -1.09 m    4.64 cm   9.92 keV  1.27 keV   871 mum  3.29 mm    Tracker     eIoni
-    4   1.97 m   -1.09 m    4.68 cm   8.11 keV   1.8 keV   761 mum  4.05 mm    Tracker     eIoni
-    5   1.97 m   -1.09 m    4.66 cm   6.89 keV  1.23 keV   622 mum  4.67 mm    Tracker     eIoni
-    6   1.97 m   -1.09 m    4.67 cm   5.35 keV  1.54 keV   536 mum  5.21 mm    Tracker     eIoni
-    7   1.97 m   -1.09 m    4.66 cm   2.07 keV  3.28 keV   439 mum  5.65 mm    Tracker     eIoni
-    8   1.97 m   -1.09 m    4.67 cm      0 eV   2.07 keV   172 mum  5.82 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 48,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.77 m   -1.09 m   -15.3 cm   8.61 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.77 m   -1.09 m   -15.4 cm   5.47 keV  3.15 keV   660 mum   660 mum   Tracker     eIoni
-    2   1.77 m   -1.09 m   -15.4 cm   2.95 keV  2.52 keV   446 mum  1.11 mm    Tracker     eIoni
-    3   1.77 m   -1.09 m   -15.4 cm   1.08 keV  1.86 keV   272 mum  1.38 mm    Tracker     eIoni
-    4   1.77 m   -1.09 m   -15.4 cm      0 eV   1.08 keV  67.8 mum  1.45 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 47,   Parent ID = 38
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.5 m   -1.02 m   -29.3 cm   11.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    1.5 m   -1.02 m   -29.3 cm    9.6 keV  2.28 keV   932 mum   932 mum   Tracker     eIoni
-    2    1.5 m   -1.02 m   -29.2 cm   8.24 keV  1.36 keV   736 mum  1.67 mm    Tracker     eIoni
-    3    1.5 m   -1.02 m   -29.2 cm   7.34 keV   896 eV    631 mum   2.3 mm    Tracker     eIoni
-    4    1.5 m   -1.02 m   -29.1 cm   5.39 keV  1.96 keV   569 mum  2.87 mm    Tracker     eIoni
-    5    1.5 m   -1.02 m   -29.1 cm   3.79 keV   1.6 keV   441 mum  3.31 mm    Tracker     eIoni
-    6    1.5 m   -1.02 m   -29.1 cm   1.86 keV  1.92 keV   338 mum  3.65 mm    Tracker     eIoni
-    7    1.5 m   -1.02 m   -29.1 cm      0 eV   1.86 keV   146 mum  3.79 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 37,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.33 m   -93.4 cm    -46 cm   26.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.33 m   -93.7 cm  -45.9 cm   23.8 keV  3.01 keV  2.96 mm   2.96 mm    Tracker     eIoni
-    2   1.33 m   -93.9 cm  -46.1 cm     22 keV  1.82 keV  2.45 mm   5.41 mm    Tracker     eIoni
-    3   1.33 m   -93.8 cm  -46.3 cm   17.1 keV  4.84 keV  2.16 mm   7.57 mm    Tracker     eIoni
-    4   1.33 m   -93.7 cm  -46.4 cm   14.9 keV  2.23 keV   1.5 mm   9.07 mm    Tracker     eIoni
-    5   1.33 m   -93.6 cm  -46.5 cm   13.3 keV  1.59 keV  1.24 mm   1.03 cm    Tracker     eIoni
-    6   1.33 m   -93.6 cm  -46.5 cm     12 keV  1.32 keV  1.08 mm   1.14 cm    Tracker     eIoni
-    7   1.33 m   -93.5 cm  -46.6 cm   10.3 keV  1.71 keV   944 mum  1.23 cm    Tracker     eIoni
-    8   1.33 m   -93.4 cm  -46.6 cm   9.08 keV  1.22 keV   794 mum  1.31 cm    Tracker     eIoni
-    9   1.33 m   -93.4 cm  -46.5 cm    6.4 keV  2.68 keV   696 mum  1.38 cm    Tracker     eIoni
-   10   1.33 m   -93.3 cm  -46.5 cm   2.36 keV  4.04 keV   506 mum  1.43 cm    Tracker     eIoni
-   11   1.33 m   -93.3 cm  -46.5 cm      0 eV   2.36 keV   209 mum  1.45 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 36,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.27 m   -88.7 cm  -56.3 cm     16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.27 m   -88.6 cm  -56.2 cm   4.26 keV  11.7 keV  1.37 mm   1.37 mm    Tracker     eIoni
-    2   1.27 m   -88.6 cm  -56.2 cm   3.14 keV  1.11 keV   370 mum  1.74 mm    Tracker     eIoni
-    3   1.27 m   -88.6 cm  -56.2 cm   1.55 keV   1.6 keV   289 mum  2.03 mm    Tracker     eIoni
-    4   1.27 m   -88.6 cm  -56.2 cm      0 eV   1.55 keV   111 mum  2.14 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 35,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.12 m   -78.4 cm  -79.9 cm    847 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.63 m   -83.6 cm  -57.3 cm    728 keV  92.8 keV  57.5 cm   57.5 cm    Tracker     eIoni
-    2   1.79 m   -88.8 cm  -55.8 cm    615 keV  32.1 keV  17.2 cm   74.8 cm    Tracker     eIoni
-    3   2.11 m   -89.9 cm  -65.7 cm    548 keV  55.1 keV    35 cm    1.1 m     Tracker     eIoni
-    4    2.4 m   -93.9 cm  -81.5 cm    476 keV  71.7 keV  35.6 cm   1.45 m     WorldPVTransportation
-    5    2.4 m   -93.9 cm  -81.6 cm    467 keV   147 eV    537 mum  1.45 m     WorldPV     eIoni
-    6   2.66 m   -1.14 m   -82.2 cm    397 keV  70.5 keV  33.8 cm   1.79 m     WorldPV     eIoni
-    7   2.66 m   -1.14 m   -82.3 cm    382 keV  16.5 eV   1.17 mm   1.79 m     WorldPV     eIoni
-    8   2.75 m   -1.22 m   -1.02 m     324 keV  58.4 keV  25.1 cm   2.04 m     WorldPV     eIoni
-    9    2.8 m   -1.24 m   -1.07 m     300 keV    14 keV  7.46 cm   2.12 m     WorldPV     eIoni
-   10   2.91 m   -1.25 m   -1.18 m     258 keV  41.4 keV  17.3 cm   2.29 m     WorldPV     eIoni
-   11   2.91 m   -1.25 m   -1.18 m     258 keV   152 eV   1.31 mm   2.29 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 61,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.8 m   -1.24 m   -1.07 m    9.88 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.79 m   -1.24 m   -1.07 m     8.9 keV   978 eV    758 mum   758 mum   WorldPV     eIoni
-    2   2.79 m   -1.24 m   -1.07 m    7.91 keV   993 eV    682 mum  1.44 mm    WorldPV     eIoni
-    3   2.79 m   -1.24 m   -1.07 m    6.56 keV  1.35 keV   608 mum  2.05 mm    WorldPV     eIoni
-    4   2.79 m   -1.24 m   -1.07 m    3.89 keV  2.67 keV   516 mum  2.56 mm    WorldPV     eIoni
-    5   2.79 m   -1.24 m   -1.07 m    2.66 keV  1.23 keV   345 mum  2.91 mm    WorldPV     eIoni
-    6   2.79 m   -1.24 m   -1.07 m       0 eV   2.66 keV   244 mum  3.15 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 60,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.66 m   -1.14 m   -82.3 cm     15 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.66 m   -1.14 m   -82.2 cm   11.5 keV  3.47 keV  1.25 mm   1.25 mm    WorldPV     eIoni
-    2   2.66 m   -1.14 m   -82.1 cm   9.68 keV  1.86 keV   903 mum  2.16 mm    WorldPV     eIoni
-    3   2.66 m   -1.14 m   -82.1 cm   7.75 keV  1.93 keV   743 mum   2.9 mm    WorldPV     eIoni
-    4   2.66 m   -1.14 m   -82.1 cm   4.95 keV   2.8 keV   597 mum   3.5 mm    WorldPV     eIoni
-    5   2.66 m   -1.14 m   -82.1 cm      0 eV   4.95 keV   414 mum  3.91 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 59,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.4 m   -93.9 cm  -81.6 cm   8.78 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.4 m   -93.9 cm  -81.5 cm   6.72 keV  2.06 keV   673 mum   673 mum   WorldPV     eIoni
-    2    2.4 m   -93.9 cm  -81.5 cm      0 eV   6.72 keV   526 mum   1.2 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -4.65 mum  6.82 mum  19.8 cm    1.4 MeV     0 eV      0 fm      0 fm    Chamber    initStep
+    1    1.4 mm  -16.8 mum    20 cm    1.4 MeV   338 eV   2.17 mm   2.17 mm    Chamber  Transportation
+    2   18.6 cm  -4.98 cm   62.2 cm   1.28 MeV  68.7 keV  46.8 cm   47.1 cm    Tracker       eIoni
+    3   31.3 cm  -9.75 cm     80 cm   1.24 MeV  39.3 keV  22.7 cm   69.8 cm    Tracker  Transportation
+    4   39.4 cm  -10.8 cm   86.2 cm   1.06 MeV  51.9 keV  11.2 cm     81 cm    Chamber       eIoni
+    5   44.5 cm  -17.8 cm      1 m     890 keV   167 keV  30.3 cm   1.11 m     Chamber  Transportation
+    6   44.5 cm  -17.8 cm      1 m     890 keV     0 eV      0 fm   1.11 m     Tracker  Transportation
+    7     50 cm  -4.47 cm   95.4 cm    769 keV   122 keV  26.8 cm   1.38 m     Chamber       eIoni
+    8   49.9 cm   -4.3 cm   95.4 cm    745 keV   875 eV   2.23 mm   1.38 m     Chamber       eBrem
+    9   48.5 cm  -3.24 cm   95.6 cm    576 keV  9.77 keV  1.83 cm    1.4 m     Chamber       eIoni
+   10     50 cm  -2.22 mm      1 m     528 keV    48 keV  8.88 cm   1.49 m     Chamber  Transportation
+   11   26.6 cm  -5.03 cm    1.3 m     457 keV  70.8 keV  39.6 cm   1.89 m     Tracker       eIoni
+   12   52.5 cm   12.1 cm   1.29 m     384 keV  72.5 keV  32.2 cm   2.21 m     Tracker       eIoni
+   13   59.6 cm   34.6 cm   1.24 m     337 keV  47.6 keV  24.9 cm   2.46 m     Tracker       eIoni
+   14   56.5 cm   45.4 cm    1.1 m     301 keV    36 keV  20.4 cm   2.66 m     Tracker       eIoni
+   15     56 cm   52.4 cm      1 m     278 keV  22.5 keV    13 cm   2.79 m     Tracker  Transportation
+   16   55.4 cm   53.9 cm   97.7 cm    249 keV  29.1 keV   5.2 cm   2.84 m     Chamber       eIoni
+   17   55.6 cm     52 cm   98.4 cm    221 keV  27.8 keV   4.4 cm   2.89 m     Chamber       eIoni
+   18   54.2 cm   50.3 cm   98.4 cm    199 keV  22.5 keV  3.65 cm   2.93 m     Chamber       eIoni
+   19   53.3 cm   49.4 cm   97.9 cm    175 keV  23.6 keV  3.09 cm   2.96 m     Chamber       eIoni
+   20   52.1 cm   48.4 cm   98.1 cm    149 keV  26.5 keV  2.53 cm   2.98 m     Chamber       eIoni
+   21   51.2 cm   47.8 cm   98.8 cm    136 keV  13.1 keV  1.94 cm      3 m     Chamber       eIoni
+   22   51.9 cm   48.3 cm     99 cm    114 keV  22.2 keV  1.67 cm   3.02 m     Chamber       eIoni
+   23   52.3 cm   47.8 cm   98.7 cm   81.1 keV  32.5 keV  1.25 cm   3.03 m     Chamber       eIoni
+   24   52.3 cm   47.4 cm   98.5 cm   76.1 keV  4.99 keV  7.29 mm   3.04 m     Chamber       eIoni
+   25   52.3 cm   47.1 cm   98.8 cm   67.7 keV  8.34 keV  6.57 mm   3.04 m     Chamber       eIoni
+   26   52.5 cm   46.8 cm   98.6 cm   46.1 keV  21.6 keV  5.49 mm   3.05 m     Chamber       eIoni
+   27   52.5 cm   46.8 cm   98.8 cm   41.4 keV  4.74 keV  3.04 mm   3.05 m     Chamber       eIoni
+   28   52.6 cm   46.8 cm   98.7 cm   38.7 keV  2.71 keV  2.59 mm   3.06 m     Chamber       eIoni
+   29   52.7 cm   46.9 cm   98.7 cm   17.5 keV  21.2 keV  2.34 mm   3.06 m     Chamber       eIoni
+   30   52.7 cm   46.9 cm   98.8 cm   16.5 keV  1.01 keV   849 mum  3.06 m     Chamber       eIoni
+   31   52.7 cm   46.9 cm   98.8 cm   13.6 keV  2.91 keV   799 mum  3.06 m     Chamber       eIoni
+   32   52.7 cm   46.8 cm   98.9 cm   11.3 keV  2.27 keV   661 mum  3.06 m     Chamber       eIoni
+   33   52.7 cm   46.8 cm   98.9 cm   9.38 keV  1.93 keV   564 mum  3.06 m     Chamber       eIoni
+   34   52.7 cm   46.8 cm   98.9 cm   6.84 keV  2.54 keV   487 mum  3.06 m     Chamber       eIoni
+   35   52.7 cm   46.8 cm   98.9 cm   5.58 keV  1.26 keV   389 mum  3.06 m     Chamber       eIoni
+   36   52.8 cm   46.8 cm   98.9 cm   2.15 keV  3.43 keV   338 mum  3.06 m     Chamber       eIoni
+   37   52.8 cm   46.8 cm   98.9 cm      0 eV   2.15 keV   114 mum  3.06 m     Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 12,   Parent ID = 6
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   48.5 cm  -3.24 cm   95.6 cm    160 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1   49.8 cm  -2.66 cm     96 cm    138 keV  22.1 keV  2.17 cm   2.17 cm    Chamber       eIoni
+    2   49.1 cm  -2.43 cm   96.9 cm    115 keV  22.5 keV  1.71 cm   3.89 cm    Chamber       eIoni
+    3   48.7 cm  -1.65 cm   97.1 cm    103 keV  11.9 keV  1.28 cm   5.17 cm    Chamber       eIoni
+    4   48.8 cm  -9.08 mm     97 cm   91.7 keV  11.7 keV  1.08 cm   6.25 cm    Chamber       eIoni
+    5   48.4 cm  -1.41 cm   97.1 cm   88.6 keV  3.13 keV  8.85 mm   7.13 cm    Chamber       eIoni
+    6   48.5 cm   -8.5 mm   96.9 cm   78.7 keV  9.89 keV  8.39 mm   7.97 cm    Chamber       eIoni
+    7   48.1 cm  -9.63 mm   96.8 cm   72.3 keV  6.41 keV  6.95 mm   8.67 cm    Chamber       eIoni
+    8   48.5 cm  -9.95 mm   96.7 cm   64.2 keV  8.14 keV  6.08 mm   9.27 cm    Chamber       eIoni
+    9   48.4 cm  -6.63 mm   96.6 cm   57.6 keV  6.55 keV  5.03 mm   9.78 cm    Chamber       eIoni
+   10   48.5 cm  -4.15 mm   96.6 cm     52 keV  5.57 keV  4.27 mm   10.2 cm    Chamber       eIoni
+   11   48.5 cm  -2.59 mm   96.7 cm   48.3 keV  3.71 keV  3.64 mm   10.6 cm    Chamber       eIoni
+   12   48.6 cm  -4.71 mm   96.7 cm   40.3 keV  7.99 keV  3.26 mm   10.9 cm    Chamber       eIoni
+   13   48.8 cm   -4.3 mm   96.7 cm   36.9 keV  3.44 keV  2.49 mm   11.1 cm    Chamber       eIoni
+   14   48.9 cm  -5.06 mm   96.7 cm   33.9 keV  3.02 keV  2.18 mm   11.4 cm    Chamber       eIoni
+   15   48.9 cm  -4.11 mm   96.7 cm   14.3 keV  19.6 keV  1.94 mm   11.6 cm    Chamber       eIoni
+   16   48.9 cm  -3.78 mm   96.7 cm   10.8 keV   3.5 keV   693 mum  11.6 cm    Chamber       eIoni
+   17   48.9 cm  -3.64 mm   96.7 cm   9.01 keV  1.79 keV   543 mum  11.7 cm    Chamber       eIoni
+   18   48.9 cm  -3.62 mm   96.7 cm   1.42 keV  7.59 keV   473 mum  11.7 cm    Chamber       eIoni
+   19   48.9 cm  -3.62 mm   96.8 cm      0 eV   1.42 keV  64.7 mum  11.7 cm    Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 11,   Parent ID = 6
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   49.9 cm   -4.3 cm   95.4 cm   22.6 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1   48.7 cm  -3.84 cm     96 cm      0 eV   22.6 keV  1.42 cm   1.42 cm    Chamber        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 10,   Parent ID = 6
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   39.4 cm  -10.8 cm   86.2 cm    131 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1   39.9 cm  -9.98 cm   85.7 cm    120 keV  11.3 keV  1.57 cm   1.57 cm    Chamber       eIoni
+    2   39.6 cm  -9.24 cm   86.2 cm    103 keV  17.1 keV  1.36 cm   2.94 cm    Chamber       eIoni
+    3   39.6 cm  -9.44 cm   85.5 cm   88.7 keV  13.8 keV  1.06 cm      4 cm    Chamber       eIoni
+    4   39.2 cm  -9.19 cm   85.1 cm   79.8 keV   8.9 keV  8.41 mm   4.84 cm    Chamber       eIoni
+    5   39.4 cm  -8.75 cm   85.3 cm   72.5 keV  7.34 keV  7.11 mm   5.55 cm    Chamber       eIoni
+    6   39.1 cm  -8.46 cm   85.2 cm   67.1 keV  5.34 keV   6.1 mm   6.16 cm    Chamber       eIoni
+    7   38.8 cm  -8.19 cm   85.1 cm   61.1 keV  6.04 keV  5.41 mm    6.7 cm    Chamber       eIoni
+    8   38.6 cm  -8.05 cm   85.1 cm     54 keV  7.13 keV  4.67 mm   7.17 cm    Chamber       eIoni
+    9   38.4 cm  -8.22 cm     85 cm   48.9 keV  5.11 keV  3.85 mm   7.55 cm    Chamber       eIoni
+   10   38.2 cm  -8.36 cm   85.1 cm   42.4 keV  6.46 keV  3.31 mm   7.88 cm    Chamber       eIoni
+   11   38.3 cm  -8.43 cm   84.9 cm   28.1 keV  14.3 keV  2.68 mm   8.15 cm    Chamber       eIoni
+   12   38.4 cm  -8.45 cm   84.8 cm   25.1 keV     3 keV   1.5 mm    8.3 cm    Chamber       eIoni
+   13   38.4 cm  -8.43 cm   84.8 cm   21.4 keV  3.74 keV   1.3 mm   8.43 cm    Chamber       eIoni
+   14   38.5 cm  -8.43 cm   84.9 cm   18.4 keV  2.97 keV  1.06 mm   8.54 cm    Chamber       eIoni
+   15   38.5 cm  -8.42 cm     85 cm   15.5 keV  2.88 keV   899 mum  8.63 cm    Chamber       eIoni
+   16   38.5 cm  -8.41 cm     85 cm   10.8 keV  4.73 keV   752 mum   8.7 cm    Chamber       eIoni
+   17   38.5 cm  -8.41 cm     85 cm   7.03 keV  3.77 keV   543 mum  8.76 cm    Chamber       eIoni
+   18   38.6 cm  -8.41 cm     85 cm   5.59 keV  1.44 keV   396 mum   8.8 cm    Chamber       eIoni
+   19   38.6 cm   -8.4 cm     85 cm   3.16 keV  2.43 keV   338 mum  8.83 cm    Chamber       eIoni
+   20   38.6 cm   -8.4 cm     85 cm 2.17e-12 eV   3.16 keV   195 mum  8.85 cm    Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 9,   Parent ID = 6
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   18.6 cm  -4.98 cm   62.2 cm   47.8 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   18.6 cm  -4.31 cm   62.5 cm   41.5 keV   6.3 keV  7.67 mm   7.67 mm    Tracker       eIoni
+    2   18.5 cm  -3.87 cm   62.8 cm   38.2 keV  3.27 keV     6 mm   1.37 cm    Tracker       eIoni
+    3   18.7 cm  -3.45 cm   63.1 cm   33.7 keV   4.5 keV  5.22 mm   1.89 cm    Tracker       eIoni
+    4   18.8 cm  -3.67 cm   63.4 cm   31.5 keV  2.27 keV  4.23 mm   2.31 cm    Tracker       eIoni
+    5   18.8 cm  -3.74 cm   63.7 cm   28.8 keV  2.67 keV  3.76 mm   2.69 cm    Tracker       eIoni
+    6   18.9 cm   -3.9 cm     64 cm   25.6 keV  3.22 keV  3.25 mm   3.01 cm    Tracker       eIoni
+    7   18.9 cm  -3.64 cm     64 cm   20.2 keV  5.39 keV  2.68 mm   3.28 cm    Tracker       eIoni
+    8   18.8 cm  -3.58 cm   64.1 cm   16.2 keV  4.01 keV  1.87 mm   3.47 cm    Tracker       eIoni
+    9   18.8 cm  -3.52 cm   64.2 cm   14.6 keV  1.62 keV  1.36 mm   3.61 cm    Tracker       eIoni
+   10   18.8 cm  -3.42 cm   64.2 cm   11.8 keV  2.77 keV  1.18 mm   3.72 cm    Tracker       eIoni
+   11   18.9 cm  -3.35 cm   64.3 cm   10.1 keV  1.68 keV   909 mum  3.81 cm    Tracker       eIoni
+   12   18.9 cm  -3.34 cm   64.2 cm   7.72 keV  2.39 keV   765 mum  3.89 cm    Tracker       eIoni
+   13   18.9 cm  -3.39 cm   64.2 cm   5.73 keV  1.99 keV   586 mum  3.95 cm    Tracker       eIoni
+   14     19 cm  -3.41 cm   64.2 cm   3.64 keV  2.09 keV   455 mum  3.99 cm    Tracker       eIoni
+   15     19 cm  -3.44 cm   64.2 cm   2.05 keV  1.59 keV   322 mum  4.03 cm    Tracker       eIoni
+   16     19 cm  -3.43 cm   64.2 cm      0 eV   2.05 keV   162 mum  4.04 cm    Tracker       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 5,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -4.51 mum  4.73 mum -30.2 cm   14.3 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1    718 mum  -809 mum -30.2 cm   12.6 keV  1.67 keV  1.15 mm   1.15 mm    Tracker       eIoni
+    2   1.51 mm  -1.23 mm  -30.2 cm   10.4 keV  2.24 keV   986 mum  2.14 mm    Tracker       eIoni
+    3   1.75 mm  -1.87 mm  -30.2 cm   8.22 keV  2.15 keV   787 mum  2.92 mm    Tracker       eIoni
+    4   2.17 mm  -1.67 mm  -30.2 cm   7.17 keV  1.05 keV   620 mum  3.54 mm    Tracker       eIoni
+    5   2.69 mm   -1.7 mm  -30.2 cm   4.94 keV  2.23 keV   548 mum  4.09 mm    Tracker       eIoni
+    6   2.85 mm  -1.71 mm  -30.2 cm   3.58 keV  1.36 keV   407 mum   4.5 mm    Tracker       eIoni
+    7   2.78 mm  -1.88 mm  -30.2 cm    365 eV   3.22 keV   318 mum  4.81 mm    Tracker       eIoni
+    8   2.77 mm  -1.89 mm  -30.2 cm      0 eV    365 eV   19.9 mum  4.83 mm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 58,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.11 m   -89.9 cm  -65.7 cm   11.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.11 m   -89.8 cm  -65.7 cm   10.3 keV  1.25 keV   902 mum   902 mum   Tracker     eIoni
-    2   2.11 m   -89.7 cm  -65.7 cm   8.43 keV  1.85 keV   792 mum  1.69 mm    Tracker     eIoni
-    3   2.11 m   -89.7 cm  -65.7 cm   7.59 keV   844 eV    646 mum  2.34 mm    Tracker     eIoni
-    4   2.12 m   -89.6 cm  -65.7 cm   5.98 keV  1.61 keV   586 mum  2.93 mm    Tracker     eIoni
-    5   2.12 m   -89.6 cm  -65.6 cm   4.35 keV  1.62 keV   478 mum   3.4 mm    Tracker     eIoni
-    6   2.12 m   -89.6 cm  -65.6 cm      0 eV   4.35 keV   376 mum  3.78 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 57,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.79 m   -88.8 cm  -55.8 cm   81.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.79 m   -89.4 cm  -54.1 cm   66.6 keV  14.8 keV  1.97 cm   1.97 cm    Tracker     eIoni
-    2    1.8 m   -89.9 cm  -53.6 cm   60.1 keV  6.46 keV  1.39 cm   3.36 cm    Tracker     eIoni
-    3   1.81 m   -90.4 cm  -53.2 cm   53.4 keV  6.72 keV  1.16 cm   4.52 cm    Tracker     eIoni
-    4   1.82 m   -90.7 cm  -52.6 cm   42.1 keV  11.3 keV  9.42 mm   5.46 cm    Tracker     eIoni
-    5   1.82 m   -91.3 cm  -52.6 cm   36.9 keV  5.18 keV  6.27 mm   6.09 cm    Tracker     eIoni
-    6   1.83 m   -91.2 cm    -53 cm   33.1 keV   3.8 keV  5.01 mm   6.59 cm    Tracker     eIoni
-    7   1.82 m   -91.2 cm  -53.2 cm   23.4 keV  1.34 keV  2.15 mm    6.8 cm    Tracker     eIoni
-    8   1.83 m   -91.1 cm  -53.4 cm   20.3 keV   3.1 keV  2.38 mm   7.04 cm    Tracker     eIoni
-    9   1.83 m   -91.1 cm  -53.6 cm   11.9 keV  8.34 keV  1.91 mm   7.23 cm    Tracker     eIoni
-   10   1.83 m     -91 cm  -53.7 cm   10.6 keV  1.33 keV   937 mum  7.32 cm    Tracker     eIoni
-   11   1.83 m     -91 cm  -53.7 cm   8.47 keV  2.13 keV   821 mum  7.41 cm    Tracker     eIoni
-   12   1.83 m     -91 cm  -53.6 cm   6.88 keV   1.6 keV   649 mum  7.47 cm    Tracker     eIoni
-   13   1.83 m     -91 cm  -53.7 cm   4.32 keV  2.56 keV   536 mum  7.53 cm    Tracker     eIoni
-   14   1.83 m   -90.9 cm  -53.6 cm   1.62 keV   2.7 keV   374 mum  7.56 cm    Tracker     eIoni
-   15   1.83 m     -91 cm  -53.6 cm      0 eV   1.62 keV   119 mum  7.57 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 62,   Parent ID = 57
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.82 m   -91.2 cm  -53.2 cm   8.43 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.82 m   -91.1 cm  -53.2 cm   5.92 keV  2.51 keV   645 mum   645 mum   Tracker     eIoni
-    2   1.82 m   -91.1 cm  -53.2 cm   2.53 keV  3.38 keV   474 mum  1.12 mm    Tracker     eIoni
-    3   1.82 m   -91.2 cm  -53.2 cm      0 eV   2.53 keV   231 mum  1.35 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 56,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.63 m   -83.6 cm  -57.3 cm   25.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.63 m   -83.5 cm  -57.4 cm   24.3 keV  1.52 keV  2.77 mm   2.77 mm    Tracker     eIoni
-    2   1.63 m   -83.5 cm  -57.6 cm   22.3 keV  1.94 keV  2.52 mm   5.29 mm    Tracker     eIoni
-    3   1.63 m   -83.7 cm  -57.7 cm   21.1 keV  1.22 keV  2.22 mm    7.5 mm    Tracker     eIoni
-    4   1.63 m   -83.6 cm  -57.9 cm   18.3 keV  2.75 keV  2.03 mm   9.53 mm    Tracker     eIoni
-    5   1.63 m   -83.6 cm    -58 cm   15.8 keV  2.57 keV  1.65 mm   1.12 cm    Tracker     eIoni
-    6   1.63 m   -83.7 cm  -58.1 cm   14.3 keV  1.49 keV  1.34 mm   1.25 cm    Tracker     eIoni
-    7   1.63 m   -83.7 cm  -58.2 cm   12.6 keV  1.72 keV  1.17 mm   1.37 cm    Tracker     eIoni
-    8   1.63 m   -83.7 cm  -58.2 cm   11.5 keV  1.04 keV     1 mm   1.47 cm    Tracker     eIoni
-    9   1.63 m   -83.8 cm  -58.3 cm   10.1 keV  1.46 keV   903 mum  1.56 cm    Tracker     eIoni
-   10   1.63 m   -83.8 cm  -58.3 cm   8.47 keV  1.61 keV   774 mum  1.64 cm    Tracker     eIoni
-   11   1.63 m   -83.7 cm  -58.3 cm   7.33 keV  1.14 keV   649 mum   1.7 cm    Tracker     eIoni
-   12   1.63 m   -83.7 cm  -58.3 cm   5.06 keV  2.28 keV   568 mum  1.76 cm    Tracker     eIoni
-   13   1.63 m   -83.7 cm  -58.3 cm   2.93 keV  2.13 keV   420 mum   1.8 cm    Tracker     eIoni
-   14   1.63 m   -83.7 cm  -58.3 cm    798 eV   2.13 keV   270 mum  1.83 cm    Tracker     eIoni
-   15   1.63 m   -83.7 cm  -58.3 cm      0 eV    798 eV   46.3 mum  1.83 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 34,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.07 m   -76.1 cm  -86.5 cm   9.23 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.07 m     -76 cm  -86.4 cm   7.41 keV  1.82 keV   708 mum   708 mum   Tracker     eIoni
-    2   1.07 m     -76 cm  -86.4 cm    6.1 keV  1.31 keV   573 mum  1.28 mm    Tracker     eIoni
-    3   1.07 m   -75.9 cm  -86.4 cm   4.69 keV  1.41 keV   486 mum  1.77 mm    Tracker     eIoni
-    4   1.07 m     -76 cm  -86.4 cm   2.44 keV  2.25 keV   397 mum  2.16 mm    Tracker     eIoni
-    5   1.07 m     -76 cm  -86.4 cm   1.51 keV   932 eV    220 mum  2.38 mm    Tracker     eIoni
-    6   1.07 m     -76 cm  -86.4 cm      0 eV   1.51 keV   107 mum  2.49 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 33,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   92.4 cm    -69 cm  -1.06 m    18.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   92.5 cm  -68.9 cm  -1.06 m    13.9 keV  4.42 keV  1.65 mm   1.65 mm    Tracker     eIoni
-    2   92.6 cm    -69 cm  -1.06 m    11.4 keV  2.44 keV  1.13 mm   2.78 mm    Tracker     eIoni
-    3   92.6 cm    -69 cm  -1.06 m    4.38 keV  7.06 keV   894 mum  3.67 mm    Tracker     eIoni
-    4   92.6 cm    -69 cm  -1.07 m    2.34 keV  2.04 keV   378 mum  4.05 mm    Tracker     eIoni
-    5   92.6 cm    -69 cm  -1.07 m       0 eV   2.34 keV   207 mum  4.26 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 32,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   52.5 cm  -42.2 cm  -1.63 m    10.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   52.5 cm  -42.2 cm  -1.63 m    9.29 keV  1.12 keV   804 mum   804 mum   Tracker     eIoni
-    2   52.6 cm  -42.2 cm  -1.63 m    8.18 keV  1.11 keV   713 mum  1.52 mm    Tracker     eIoni
-    3   52.6 cm  -42.1 cm  -1.63 m    6.54 keV  1.64 keV   627 mum  2.14 mm    Tracker     eIoni
-    4   52.6 cm  -42.1 cm  -1.63 m       0 eV   6.54 keV   515 mum  2.66 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 31,   Parent ID = 30
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   20.8 cm  -16.9 cm  -2.13 m    10.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   20.9 cm  -16.9 cm  -2.13 m    9.56 keV  1.29 keV   842 mum   842 mum   Tracker     eIoni
-    2   20.9 cm  -16.9 cm  -2.13 m    7.44 keV  2.12 keV   733 mum  1.58 mm    Tracker     eIoni
-    3   20.8 cm    -17 cm  -2.13 m     5.7 keV  1.74 keV   575 mum  2.15 mm    Tracker     eIoni
-    4   20.8 cm    -17 cm  -2.13 m    4.59 keV  1.11 keV   460 mum  2.61 mm    Tracker     eIoni
-    5   20.8 cm    -17 cm  -2.13 m    2.05 keV  2.54 keV   391 mum     3 mm    Tracker     eIoni
-    6   20.8 cm    -17 cm  -2.13 m       0 eV   2.05 keV   170 mum  3.17 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 29,   Parent ID = 19
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    433 mum  -413 nm   -2.4 m    6.69 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.12 mm   -238 mum  -2.4 m    5.32 MeV  1.37 MeV   1.3 mm    1.3 mm   TargetPV     eIoni
-    2   1.54 mm    449 mum  -2.4 m    4.17 MeV  1.15 MeV  1.11 mm   2.41 mm   TargetPV     eIoni
-    3   1.55 mm    450 mum  -2.4 m    3.75 MeV  95.9 keV  23.4 mum  2.43 mm   TargetPV     eBrem
-    4   1.43 mm    884 mum  -2.4 m    2.43 MeV  1.32 MeV   879 mum  3.31 mm   TargetPV     eIoni
-    5   1.65 mm    623 mum  -2.4 m     1.8 MeV   626 keV   672 mum  3.99 mm   TargetPV     eIoni
-    6   1.54 mm    619 mum  -2.4 m     446 keV   386 keV   227 mum  4.21 mm   TargetPV     eBrem
-    7   1.53 mm    629 mum  -2.4 m    26.3 keV   420 keV   243 mum  4.46 mm   TargetPV     eIoni
-    8   1.53 mm    630 mum  -2.4 m       0 eV   26.3 keV  3.17 mum  4.46 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 64,   Parent ID = 29
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.54 mm    619 mum  -2.4 m     971 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -439 mum  3.33 mm   -2.4 m     696 keV   275 keV  3.76 mm   3.76 mm   TargetPV     compt
-    2  -1.62 mm   6.05 mm   -2.4 m     483 keV   213 keV     3 mm   6.76 mm   TargetPV     compt
-    3  -2.25 cm    1.3 cm  -2.41 m       0 eV    483 keV  2.25 cm   2.93 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 63,   Parent ID = 29
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.55 mm    450 mum  -2.4 m     321 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    2.1 mm    876 mum  -2.4 m     284 keV  36.4 keV   957 mum   957 mum  TargetPV     compt
-    2   5.66 mm   3.43 mm   -2.4 m       0 eV    284 keV   4.4 mm   5.36 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 18,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.6 mum  29.9 mum -2.41 m     654 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    439 mum  45.5 mum -2.41 m     292 keV   362 keV  3.76 mm   3.76 mm   TargetPV     compt
-    2   5.16 mm   3.82 mm  -2.41 m       0 eV    292 keV  6.05 mm   9.81 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 17,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   33.9 mum  24.4 mum -2.41 m     199 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    149 mum   189 mum  -2.4 m       0 eV      0 eV   6.53 mm   6.53 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 66,   Parent ID = 17
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    149 mum   189 mum  -2.4 m     100 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    225 mum   200 mum  -2.4 m    79.2 MeV  1.34 MeV  1.16 mm   1.16 mm   TargetPV     eBrem
-    2    227 mum   185 mum  -2.4 m    77.9 MeV   544 keV   532 mum  1.69 mm   TargetPV     eBrem
-    3    217 mum   189 mum  -2.4 m    75.7 MeV   258 keV   170 mum  1.86 mm   TargetPV     eBrem
-    4   66.9 mum   208 mum  -2.4 m    71.3 MeV  4.46 MeV  2.97 mm   4.83 mm    TrackerTransportation
-    5  -4.39 cm   9.09 cm   -1.6 m    71.1 MeV   170 keV  80.6 cm   81.1 cm    ChamberTransportation
-    6  -5.25 cm   10.4 cm  -1.47 m      71 MeV    79 keV  12.7 cm   93.8 cm    Chamber     eBrem
-    7  -5.63 cm   11.2 cm   -1.4 m    70.9 MeV  92.1 keV  7.49 cm   1.01 m     TrackerTransportation
-    8  -8.73 cm     18 cm    -80 cm   70.8 MeV   135 keV  60.5 cm   1.62 m     ChamberTransportation
-    9  -9.64 cm   20.2 cm    -60 cm   70.6 MeV   126 keV  20.1 cm   1.82 m     TrackerTransportation
-   10  -9.82 cm   20.7 cm  -54.4 cm   70.6 MeV  13.2 keV  5.65 cm   1.88 m     Tracker     eIoni
-   11  -9.89 cm   20.9 cm  -51.8 cm   70.5 MeV  5.57 keV  2.59 cm    1.9 m     Tracker     eIoni
-   12  -9.97 cm   21.2 cm  -48.5 cm   70.5 MeV  6.69 keV  3.35 cm   1.93 m     Tracker     eIoni
-   13  -10.5 cm     23 cm  -28.2 cm   70.5 MeV    38 keV  20.3 cm   2.14 m     Tracker     eIoni
-   14  -11.2 cm   25.5 cm      0 fm   70.4 MeV  53.8 keV  28.3 cm   2.42 m     ChamberTransportation
-   15  -11.3 cm   26.2 cm   7.25 cm   70.2 MeV  33.6 keV  7.28 cm   2.49 m     Chamber     eBrem
-   16  -11.7 cm   27.1 cm     20 cm   70.2 MeV  67.6 keV  12.8 cm   2.62 m     TrackerTransportation
-   17  -13.6 cm   32.2 cm     80 cm   70.1 MeV   130 keV  60.2 cm   3.22 m     ChamberTransportation
-   18  -14.2 cm   33.5 cm      1 m    69.9 MeV   114 keV  20.1 cm   3.43 m     TrackerTransportation
-   19  -15.1 cm   36.3 cm    1.4 m    69.8 MeV  85.4 keV  40.5 cm   3.83 m     Tracker     eIoni
-   20  -15.5 cm   37.8 cm    1.6 m    69.8 MeV  39.1 keV  19.6 cm   4.03 m     ChamberTransportation
-   21  -15.9 cm   39.2 cm    1.8 m    69.7 MeV   101 keV  20.1 cm   4.23 m     TrackerTransportation
-   22    -16 cm   40.3 cm      2 m    69.6 MeV  47.9 keV  20.1 cm   4.43 m     Tracker     eIoni
-   23  -16.2 cm   41.5 cm   2.25 m    69.5 MeV  53.4 keV  24.8 cm   4.68 m     Tracker     eIoni
-   24  -16.4 cm   42.2 cm    2.4 m    69.5 MeV  34.6 keV  15.2 cm   4.83 m     WorldPVTransportation
-   25  -16.5 cm   43.5 cm   2.71 m    69.3 MeV  57.2 keV  31.1 cm   5.14 m     WorldPV     eIoni
-   26  -16.7 cm   44.5 cm   2.91 m    69.3 MeV  38.5 keV    20 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 82,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -16.5 cm   43.5 cm   2.71 m    79.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -16.9 cm   41.9 cm   2.72 m    68.1 keV    11 keV  1.87 cm   1.87 cm    WorldPV     eIoni
-    2    -16 cm   42.6 cm   2.71 m    54.3 keV  13.8 keV  1.45 cm   3.32 cm    WorldPV     eIoni
-    3  -15.8 cm   43.5 cm   2.71 m    48.3 keV     6 keV  9.73 mm   4.29 cm    WorldPV     eIoni
-    4  -15.2 cm     44 cm   2.71 m      44 keV  4.38 keV  7.96 mm   5.09 cm    WorldPV     eIoni
-    5  -14.7 cm   44.2 cm   2.72 m    40.9 keV   3.1 keV  6.73 mm   5.76 cm    WorldPV     eIoni
-    6  -14.5 cm   44.2 cm   2.72 m    37.6 keV   3.3 keV  5.96 mm   6.36 cm    WorldPV     eIoni
-    7  -14.5 cm     44 cm   2.72 m    33.3 keV  4.26 keV  5.16 mm   6.87 cm    WorldPV     eIoni
-    8  -14.2 cm   43.9 cm   2.73 m    28.9 keV  4.39 keV  4.22 mm   7.29 cm    WorldPV     eIoni
-    9  -14.1 cm     44 cm   2.73 m    25.6 keV  3.31 keV  3.34 mm   7.63 cm    WorldPV     eIoni
-   10    -14 cm   44.2 cm   2.73 m    23.4 keV  2.18 keV  2.74 mm    7.9 cm    WorldPV     eIoni
-   11  -14.1 cm   44.4 cm   2.73 m      20 keV  3.44 keV  2.39 mm   8.14 cm    WorldPV     eIoni
-   12  -14.2 cm   44.5 cm   2.73 m    17.5 keV  2.46 keV  1.87 mm   8.33 cm    WorldPV     eIoni
-   13  -14.2 cm   44.6 cm   2.73 m    15.4 keV   2.1 keV  1.54 mm   8.48 cm    WorldPV     eIoni
-   14  -14.2 cm   44.6 cm   2.73 m    12.9 keV  2.55 keV   1.3 mm   8.61 cm    WorldPV     eIoni
-   15  -14.2 cm   44.7 cm   2.74 m    11.7 keV  1.13 keV  1.03 mm   8.72 cm    WorldPV     eIoni
-   16  -14.2 cm   44.7 cm   2.74 m    10.5 keV   1.2 keV   920 mum  8.81 cm    WorldPV     eIoni
-   17  -14.1 cm   44.7 cm   2.74 m    8.26 keV  2.27 keV   814 mum  8.89 cm    WorldPV     eIoni
-   18  -14.1 cm   44.8 cm   2.74 m    5.69 keV  2.57 keV   632 mum  8.95 cm    WorldPV     eIoni
-   19  -14.1 cm   44.8 cm   2.74 m     1.9 keV  3.79 keV   459 mum     9 cm    WorldPV     eIoni
-   20  -14.1 cm   44.8 cm   2.74 m       0 eV    1.9 keV   150 mum  9.01 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 81,   Parent ID = 66
+* G4Track Information:   Particle = e-,   Track ID = 4,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -16.2 cm   41.5 cm   2.25 m      12 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -16.1 cm   41.5 cm   2.25 m    10.5 keV  1.49 keV   947 mum   947 mum   Tracker     eIoni
-    2  -16.1 cm   41.6 cm   2.25 m    8.83 keV  1.71 keV   815 mum  1.76 mm    Tracker     eIoni
-    3    -16 cm   41.6 cm   2.25 m    6.71 keV  2.12 keV   677 mum  2.44 mm    Tracker     eIoni
-    4    -16 cm   41.6 cm   2.25 m    2.21 keV   4.5 keV   525 mum  2.96 mm    Tracker     eIoni
-    5    -16 cm   41.6 cm   2.25 m       0 eV   2.21 keV   189 mum  3.15 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 80,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -16 cm   40.3 cm      2 m    64.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -15.4 cm   39.4 cm   2.01 m    58.1 keV  6.37 keV  1.31 cm   1.31 cm    Tracker     eIoni
-    2  -14.8 cm   38.8 cm   2.01 m    52.7 keV  5.42 keV  1.09 cm    2.4 cm    Tracker     eIoni
-    3    -15 cm     38 cm   2.02 m      49 keV  3.67 keV  9.19 mm   3.32 cm    Tracker     eIoni
-    4    -15 cm     38 cm   2.02 m    43.4 keV   5.6 keV  8.14 mm   4.14 cm    Tracker     eIoni
-    5  -14.7 cm   37.5 cm   2.02 m    38.4 keV  4.98 keV  6.58 mm   4.79 cm    Tracker     eIoni
-    6  -14.4 cm   37.3 cm   2.03 m    35.1 keV  3.31 keV  5.36 mm   5.33 cm    Tracker     eIoni
-    7  -14.2 cm     37 cm   2.03 m    30.4 keV  4.66 keV   4.6 mm   5.79 cm    Tracker     eIoni
-    8  -14.1 cm   36.9 cm   2.03 m    16.4 keV  2.05 keV  2.05 mm   5.99 cm    Tracker     eIoni
-    9    -14 cm   36.9 cm   2.03 m    13.4 keV  2.98 keV  1.41 mm   6.13 cm    Tracker     eIoni
-   10  -13.9 cm   36.8 cm   2.03 m    10.9 keV  2.48 keV  1.08 mm   6.24 cm    Tracker     eIoni
-   11  -13.9 cm   36.7 cm   2.03 m    6.92 keV  4.01 keV   850 mum  6.33 cm    Tracker     eIoni
-   12  -13.9 cm   36.7 cm   2.03 m    5.19 keV  1.73 keV   539 mum  6.38 cm    Tracker     eIoni
-   13  -13.9 cm   36.7 cm   2.03 m    3.32 keV  1.88 keV   429 mum  6.43 cm    Tracker     eIoni
-   14  -13.9 cm   36.7 cm   2.03 m     156 eV   3.16 keV   303 mum  6.46 cm    Tracker     eIoni
-   15  -13.9 cm   36.7 cm   2.03 m       0 eV    156 eV   12.6 mum  6.46 cm    Tracker     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.53 mum  2.38 mum -1.01 m    12.1 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   -831 mum  -142 mum -1.01 m    9.94 keV  2.14 keV   935 mum   935 mum   Tracker       eIoni
+    2   -831 mum  -770 mum -1.01 m    9.04 keV   900 eV    751 mum  1.69 mm    Tracker       eIoni
+    3  -1.04 mm  -1.36 mm  -1.01 m     6.6 keV  2.44 keV   682 mum  2.37 mm    Tracker       eIoni
+    4  -1.49 mm   -1.3 mm  -1.01 m    3.72 keV  2.88 keV   511 mum  2.88 mm    Tracker       eIoni
+    5  -1.66 mm  -1.21 mm  -1.01 m    2.38 keV  1.34 keV   328 mum  3.21 mm    Tracker       eIoni
+    6  -1.62 mm   -1.2 mm  -1.01 m  8.67e-13 eV   2.38 keV   205 mum  3.41 mm    Tracker       eIoni
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 83,   Parent ID = 80
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.1 cm   36.9 cm   2.03 m      12 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -14.2 cm   36.8 cm   2.03 m    10.4 keV  1.61 keV   943 mum   943 mum   Tracker     eIoni
-    2  -14.2 cm   36.8 cm   2.03 m    8.66 keV  1.72 keV   801 mum  1.74 mm    Tracker     eIoni
-    3  -14.2 cm   36.8 cm   2.03 m    6.92 keV  1.74 keV   663 mum  2.41 mm    Tracker     eIoni
-    4  -14.3 cm   36.8 cm   2.03 m    5.33 keV  1.59 keV   539 mum  2.95 mm    Tracker     eIoni
-    5  -14.3 cm   36.8 cm   2.03 m    3.75 keV  1.59 keV   438 mum  3.38 mm    Tracker     eIoni
-    6  -14.2 cm   36.8 cm   2.03 m    2.06 keV  1.69 keV   335 mum  3.72 mm    Tracker     eIoni
-    7  -14.2 cm   36.8 cm   2.03 m       0 eV   2.06 keV   170 mum  3.89 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 79,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -15.5 cm   37.9 cm   1.61 m    9.26 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -15.5 cm   37.9 cm   1.61 m    7.93 keV  1.32 keV   501 mum   501 mum   Chamber     eIoni
-    2  -15.5 cm   37.9 cm   1.61 m    2.41 keV  5.52 keV   449 mum   950 mum   Chamber     eIoni
-    3  -15.5 cm   37.9 cm   1.61 m       0 eV   2.41 keV   153 mum   1.1 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 78,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -15.1 cm   36.3 cm    1.4 m    18.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -15.2 cm   36.5 cm    1.4 m    15.6 keV  2.93 keV  1.68 mm   1.68 mm    Tracker     eIoni
-    2  -15.2 cm   36.6 cm    1.4 m    14.5 keV  1.09 keV  1.32 mm      3 mm    Tracker     eIoni
-    3  -15.1 cm   36.7 cm    1.4 m    11.5 keV  3.04 keV   1.2 mm    4.2 mm    Tracker     eIoni
-    4  -15.1 cm   36.7 cm    1.4 m    9.31 keV  2.18 keV   898 mum   5.1 mm    Tracker     eIoni
-    5  -15.1 cm   36.6 cm    1.4 m    7.71 keV   1.6 keV   714 mum  5.81 mm    Tracker     eIoni
-    6  -15.2 cm   36.6 cm    1.4 m    6.67 keV  1.04 keV   594 mum  6.41 mm    Tracker     eIoni
-    7  -15.2 cm   36.6 cm    1.4 m    4.25 keV  2.41 keV   523 mum  6.93 mm    Tracker     eIoni
-    8  -15.2 cm   36.6 cm    1.4 m    1.89 keV  2.36 keV   369 mum   7.3 mm    Tracker     eIoni
-    9  -15.2 cm   36.6 cm    1.4 m       0 eV   1.89 keV   149 mum  7.45 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 77,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -14 cm     33 cm   92.9 cm   17.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -13.9 cm     33 cm     93 cm   14.3 keV  3.61 keV   908 mum   908 mum   Chamber     eIoni
-    2  -13.9 cm     33 cm   92.9 cm   9.83 keV  4.45 keV   721 mum  1.63 mm    Chamber     eIoni
-    3  -13.9 cm     33 cm   92.9 cm      0 eV   9.83 keV   524 mum  2.15 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 76,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -11.3 cm   26.2 cm   7.25 cm    131 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -11.6 cm     27 cm   17.4 cm   89.1 keV     0 eV   10.2 cm   10.2 cm    Chamber     compt
-    2  -4.63 cm   15.7 cm      0 fm   89.1 keV     0 eV   21.9 cm   32.1 cm    TrackerTransportation
-    3   19.2 cm  -23.1 cm    -60 cm   89.1 keV     0 eV   75.3 cm   1.07 m     ChamberTransportation
-    4   21.9 cm  -27.4 cm  -66.7 cm      0 eV   34.6 keV   8.4 cm   1.16 m     Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 85,   Parent ID = 76
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   21.9 cm  -27.4 cm  -66.7 cm   54.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   22.2 cm  -27.5 cm  -66.8 cm   50.6 keV  3.94 keV  4.09 mm   4.09 mm    Chamber     eIoni
-    2   22.3 cm  -27.5 cm  -66.6 cm   43.2 keV   7.4 keV  3.64 mm   7.73 mm    Chamber     eIoni
-    3   22.4 cm  -27.5 cm  -66.4 cm   34.8 keV  8.36 keV  2.87 mm   1.06 cm    Chamber     eIoni
-    4   22.4 cm  -27.6 cm  -66.4 cm   30.7 keV  4.15 keV   2.1 mm   1.27 cm    Chamber     eIoni
-    5   22.4 cm  -27.7 cm  -66.4 cm   28.4 keV  2.28 keV  1.76 mm   1.45 cm    Chamber     eIoni
-    6   22.4 cm  -27.8 cm  -66.3 cm   27.3 keV  1.07 keV  1.59 mm   1.61 cm    Chamber     eIoni
-    7   22.4 cm  -27.9 cm  -66.4 cm   22.2 keV  5.08 keV  1.51 mm   1.76 cm    Chamber     eIoni
-    8   22.4 cm  -27.9 cm  -66.4 cm   19.7 keV  2.55 keV  1.17 mm   1.87 cm    Chamber     eIoni
-    9   22.4 cm  -27.9 cm  -66.4 cm      0 eV   19.7 keV  1.01 mm   1.97 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 84,   Parent ID = 76
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -11.6 cm     27 cm   17.4 cm   42.2 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -11.7 cm   26.9 cm   17.6 cm   35.7 keV  6.52 keV  2.78 mm   2.78 mm    Chamber     eIoni
-    2  -11.7 cm     27 cm   17.7 cm   31.5 keV  4.16 keV  2.18 mm   4.95 mm    Chamber     eIoni
-    3  -11.6 cm   27.1 cm   17.7 cm     26 keV  5.51 keV  1.83 mm   6.79 mm    Chamber     eIoni
-    4  -11.7 cm   27.1 cm   17.7 cm   25.8 keV   218 eV   1.42 mm   8.21 mm    Chamber     eIoni
-    5  -11.8 cm   27.1 cm   17.7 cm   20.6 keV  5.22 keV   1.4 mm   9.61 mm    Chamber     eIoni
-    6  -11.8 cm   27.1 cm   17.7 cm   14.4 keV  6.22 keV  1.06 mm   1.07 cm    Chamber     eIoni
-    7  -11.8 cm     27 cm   17.7 cm   12.4 keV  1.97 keV   725 mum  1.14 cm    Chamber     eIoni
-    8  -11.8 cm     27 cm   17.8 cm   9.58 keV   2.8 keV   633 mum   1.2 cm    Chamber     eIoni
-    9  -11.8 cm   27.1 cm   17.8 cm   8.01 keV  1.57 keV   514 mum  1.25 cm    Chamber     eIoni
-   10  -11.8 cm     27 cm   17.8 cm    5.5 keV  2.51 keV   452 mum   1.3 cm    Chamber     eIoni
-   11  -11.8 cm     27 cm   17.8 cm   3.26 keV  2.23 keV   351 mum  1.33 cm    Chamber     eIoni
-   12  -11.8 cm     27 cm   17.8 cm   2.28 keV   984 eV    227 mum  1.36 cm    Chamber     eIoni
-   13  -11.8 cm     27 cm   17.8 cm      0 eV   2.28 keV   141 mum  1.37 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 75,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -10.5 cm     23 cm  -28.2 cm   28.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -10.8 cm   22.9 cm  -28.2 cm   26.3 keV  1.83 keV   3.2 mm    3.2 mm    Tracker     eIoni
-    2    -11 cm     23 cm  -28.2 cm   23.4 keV  2.91 keV  2.87 mm   6.06 mm    Tracker     eIoni
-    3  -11.1 cm   23.1 cm    -28 cm     22 keV  1.41 keV  2.38 mm   8.45 mm    Tracker     eIoni
-    4  -11.2 cm   23.1 cm  -27.8 cm   17.5 keV   4.5 keV  2.17 mm   1.06 cm    Tracker     eIoni
-    5  -11.3 cm   23.1 cm  -27.7 cm   14.8 keV  2.64 keV  1.54 mm   1.22 cm    Tracker     eIoni
-    6  -11.4 cm   23.1 cm  -27.6 cm     13 keV   1.8 keV  1.23 mm   1.34 cm    Tracker     eIoni
-    7  -11.4 cm     23 cm  -27.6 cm   11.7 keV  1.32 keV  1.05 mm   1.44 cm    Tracker     eIoni
-    8  -11.5 cm     23 cm  -27.5 cm   10.1 keV  1.64 keV   919 mum  1.54 cm    Tracker     eIoni
-    9  -11.5 cm     23 cm  -27.4 cm   7.69 keV   2.4 keV   775 mum  1.61 cm    Tracker     eIoni
-   10  -11.4 cm     23 cm  -27.4 cm   6.11 keV  1.58 keV   593 mum  1.67 cm    Tracker     eIoni
-   11  -11.5 cm     23 cm  -27.4 cm   3.87 keV  2.25 keV   487 mum  1.72 cm    Tracker     eIoni
-   12  -11.5 cm     23 cm  -27.4 cm   1.13 keV  2.73 keV   343 mum  1.76 cm    Tracker     eIoni
-   13  -11.5 cm     23 cm  -27.4 cm      0 eV   1.13 keV  72.2 mum  1.76 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 74,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.97 cm   21.2 cm  -48.5 cm   9.85 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    -10 cm   21.2 cm  -48.4 cm   8.87 keV   982 eV    756 mum   756 mum   Tracker     eIoni
-    2  -10.1 cm   21.2 cm  -48.4 cm   6.49 keV  2.38 keV   680 mum  1.44 mm    Tracker     eIoni
-    3  -10.1 cm   21.1 cm  -48.4 cm   5.39 keV   1.1 keV   511 mum  1.95 mm    Tracker     eIoni
-    4  -10.1 cm   21.1 cm  -48.4 cm   3.84 keV  1.54 keV   441 mum  2.39 mm    Tracker     eIoni
-    5  -10.2 cm   21.1 cm  -48.4 cm   1.16 keV  2.68 keV   342 mum  2.73 mm    Tracker     eIoni
-    6  -10.1 cm   21.1 cm  -48.4 cm      0 eV   1.16 keV  74.4 mum   2.8 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 73,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.89 cm   20.9 cm  -51.8 cm   8.73 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -9.95 cm   20.9 cm  -51.8 cm   7.29 keV  1.44 keV   669 mum   669 mum   Tracker     eIoni
-    2  -9.97 cm   20.9 cm  -51.8 cm   4.31 keV  2.98 keV   565 mum  1.23 mm    Tracker     eIoni
-    3  -9.97 cm   20.9 cm  -51.7 cm   2.62 keV  1.69 keV   373 mum  1.61 mm    Tracker     eIoni
-    4  -9.95 cm   20.9 cm  -51.7 cm    981 eV   1.64 keV   240 mum  1.85 mm    Tracker     eIoni
-    5  -9.95 cm   20.9 cm  -51.7 cm      0 eV    981 eV   59.8 mum  1.91 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 72,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.82 cm   20.7 cm  -54.4 cm   52.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -10.7 cm   20.8 cm  -54.5 cm   46.7 keV   5.4 keV  9.01 mm   9.01 mm    Tracker     eIoni
-    2  -11.2 cm     21 cm  -54.1 cm   40.9 keV  5.82 keV  7.49 mm   1.65 cm    Tracker     eIoni
-    3  -11.8 cm   21.1 cm  -53.9 cm   35.5 keV   5.4 keV  5.96 mm   2.25 cm    Tracker     eIoni
-    4  -12.1 cm   21.5 cm    -54 cm   31.1 keV  4.39 keV  4.67 mm   2.71 cm    Tracker     eIoni
-    5  -12.3 cm   21.8 cm  -54.1 cm   27.1 keV  4.01 keV  3.75 mm   3.09 cm    Tracker     eIoni
-    6  -12.1 cm     22 cm    -54 cm     23 keV  4.04 keV     3 mm   3.39 cm    Tracker     eIoni
-    7  -12.1 cm   22.2 cm  -54.1 cm   18.7 keV  4.33 keV  2.32 mm   3.62 cm    Tracker     eIoni
-    8  -12.1 cm   22.3 cm  -54.1 cm   15.4 keV  3.24 keV   1.7 mm   3.79 cm    Tracker     eIoni
-    9    -12 cm   22.4 cm  -54.1 cm   14.1 keV  1.36 keV   1.3 mm   3.92 cm    Tracker     eIoni
-   10    -12 cm   22.5 cm  -54.2 cm   10.8 keV  3.28 keV  1.15 mm   4.04 cm    Tracker     eIoni
-   11    -12 cm   22.6 cm  -54.2 cm   9.08 keV  1.72 keV   838 mum  4.12 cm    Tracker     eIoni
-   12    -12 cm   22.6 cm  -54.3 cm   6.73 keV  2.35 keV   696 mum  4.19 cm    Tracker     eIoni
-   13    -12 cm   22.6 cm  -54.3 cm   5.49 keV  1.24 keV   527 mum  4.24 cm    Tracker     eIoni
-   14    -12 cm   22.6 cm  -54.3 cm   2.65 keV  2.85 keV   448 mum  4.29 cm    Tracker     eIoni
-   15    -12 cm   22.6 cm  -54.3 cm    218 eV   2.43 keV   243 mum  4.31 cm    Tracker     eIoni
-   16    -12 cm   22.6 cm  -54.3 cm      0 eV    218 eV   14.9 mum  4.31 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 71,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -8.99 cm   18.6 cm  -74.3 cm     10 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -8.99 cm   18.6 cm  -74.3 cm   5.04 keV  4.97 keV   531 mum   531 mum   Chamber     eIoni
-    2  -8.97 cm   18.7 cm  -74.3 cm   3.89 keV  1.15 keV   330 mum   861 mum   Chamber     eIoni
-    3  -8.97 cm   18.6 cm  -74.3 cm   3.07 keV   825 eV    270 mum  1.13 mm    Chamber     eIoni
-    4  -8.97 cm   18.6 cm  -74.3 cm      0 eV   3.07 keV   211 mum  1.34 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.25 cm   10.4 cm  -1.47 m    11.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -5.25 cm   10.4 cm  -1.47 m       0 eV   11.7 keV   904 mum   904 mum   Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 69,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    217 mum   189 mum  -2.4 m    1.97 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    109 mum   199 mum  -2.4 m     954 keV     0 eV   2.73 mm   2.73 mm   TargetPV     compt
-    2   74.4 mum  -971 nm   -2.4 m     954 keV     0 eV    294 mum  3.02 mm    TrackerTransportation
-    3  -41.3 cm   -2.4 m    14.6 cm    954 keV     0 eV   3.52 m    3.53 m     WorldPVTransportation
-    4    -50 cm  -2.91 m    68.7 cm    954 keV     0 eV   74.9 cm   4.27 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 86,   Parent ID = 69
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    109 mum   199 mum  -2.4 m    1.01 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    240 mum   244 mum  -2.4 m     618 keV   393 keV   416 mum   416 mum  TargetPV     eIoni
-    2    173 mum   269 mum  -2.4 m     262 keV   356 keV   314 mum   730 mum  TargetPV     eIoni
-    3    171 mum   274 mum  -2.4 m       0 eV    262 keV   120 mum   850 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    227 mum   185 mum  -2.4 m     741 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   58.7 mum   210 mum  -2.4 m     741 keV     0 eV   3.11 mm   3.11 mm    TrackerTransportation
-    2  -4.34 cm   6.75 mm   -1.6 m     741 keV     0 eV   80.1 cm   80.4 cm    ChamberTransportation
-    3  -5.42 cm   8.38 mm   -1.4 m     741 keV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -8.68 cm   1.33 cm    -80 cm    741 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -9.76 cm   1.49 cm    -60 cm    741 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6    -13 cm   1.98 cm  0.114 fm    741 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -14.1 cm   2.15 cm     20 cm    741 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -17.4 cm   2.64 cm     80 cm    741 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -18.4 cm    2.8 cm      1 m     741 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -21.7 cm   3.29 cm    1.6 m     741 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11  -22.8 cm   3.45 cm    1.8 m     741 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12    -26 cm   3.94 cm    2.4 m     741 keV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -28.8 cm   4.36 cm   2.91 m     741 keV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 66
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    225 mum   200 mum  -2.4 m    19.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    111 mum   142 mum  -2.4 m    19.6 MeV     0 eV   3.64 mm   3.64 mm    TrackerTransportation
-    2  -2.49 cm  -1.27 cm   -1.6 m    19.6 MeV     0 eV     80 cm   80.4 cm    ChamberTransportation
-    3  -3.12 cm  -1.59 cm   -1.4 m    19.6 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -4.99 cm  -2.56 cm    -80 cm   19.6 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -5.62 cm  -2.88 cm    -60 cm   19.6 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -7.49 cm  -3.85 cm      0 fm   19.6 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -8.12 cm  -4.17 cm     20 cm   19.6 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8    -10 cm  -5.13 cm     80 cm   19.6 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -10.6 cm  -5.45 cm      1 m    19.6 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -12.5 cm  -6.42 cm    1.6 m    19.6 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -13.1 cm  -6.74 cm    1.8 m    19.6 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12    -15 cm  -7.71 cm    2.4 m    19.6 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -16.6 cm  -8.53 cm   2.91 m    19.6 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 17
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    149 mum   189 mum  -2.4 m    98.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    149 mum   190 mum  -2.4 m    77.5 MeV  40.4 keV  36.6 mum  36.6 mum  TargetPV     eBrem
-    2    171 mum   197 mum  -2.4 m    70.8 MeV   606 keV   333 mum   370 mum  TargetPV     eBrem
-    3    173 mum   213 mum  -2.4 m    66.3 MeV   282 keV   221 mum   591 mum  TargetPV     eBrem
-    4    196 mum   230 mum  -2.4 m    21.9 MeV   160 keV   164 mum   755 mum  TargetPV     eBrem
-    5    607 mum   766 mum  -2.4 m    15.3 MeV   2.1 MeV  1.57 mm   2.33 mm   TargetPV     eBrem
-    6    766 mum  1.11 mm   -2.4 m    11.5 MeV  1.03 MeV   893 mum  3.22 mm   TargetPV     eBrem
-    7    792 mum  1.14 mm   -2.4 m      11 MeV   107 keV  81.7 mum   3.3 mm   TargetPV     eBrem
-    8    836 mum  1.21 mm   -2.4 m     654 keV   274 keV   249 mum  3.55 mm   TargetPV     eBrem
-    9    792 mum  1.27 mm   -2.4 m     247 keV   407 keV   326 mum  3.88 mm   TargetPV     eIoni
-   10    783 mum  1.27 mm   -2.4 m       0 eV    247 keV   110 mum  3.99 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 94,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    836 mum  1.21 mm   -2.4 m    10.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    378 mum  3.19 mm   -2.4 m    10.1 MeV     0 eV   2.58 mm   2.58 mm    TrackerTransportation
-    2  -55.3 cm    2.4 m   -48.7 cm   10.1 MeV     0 eV   3.12 m    3.12 m     WorldPVTransportation
-    3  -67.1 cm   2.91 m   -7.98 cm   10.1 MeV     0 eV   66.3 cm   3.78 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 93,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    792 mum  1.14 mm   -2.4 m     409 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    932 mum  1.23 mm   -2.4 m     320 keV    89 keV   348 mum   348 mum  TargetPV     compt
-    2   4.63 mm   3.08 mm   -2.4 m       0 eV    320 keV  4.24 mm   4.59 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 92,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    766 mum  1.11 mm   -2.4 m    2.71 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.02 mm   1.31 mm   -2.4 m    1.85 MeV   859 keV   715 mum   715 mum  TargetPV     compt
-    2   1.09 mm   1.31 mm   -2.4 m    1.85 MeV     0 eV   1.24 mm   1.96 mm    TrackerTransportation
-    3   4.83 cm   2.52 mm   -1.6 m    1.85 MeV     0 eV   80.1 cm   80.3 cm    ChamberTransportation
-    4   6.01 cm   2.82 mm   -1.4 m    1.85 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    5   9.54 cm   3.72 mm    -80 cm   1.85 MeV     0 eV   60.1 cm    1.6 m     ChamberTransportation
-    6   10.7 cm   4.02 mm    -60 cm   1.85 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    7   14.3 cm   4.93 mm      0 fm   1.85 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    8   15.4 cm   5.23 mm     20 cm   1.85 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    9     19 cm   6.14 mm     80 cm   1.85 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-   10   20.2 cm   6.44 mm      1 m    1.85 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   11   23.7 cm   7.34 mm    1.6 m    1.85 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   12   24.9 cm   7.64 mm    1.8 m    1.85 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   13   28.4 cm   8.55 mm    2.4 m    1.85 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   14   31.4 cm   9.32 mm   2.91 m    1.85 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 91,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    607 mum   766 mum  -2.4 m    4.51 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    934 mum   983 mum  -2.4 m    4.51 MeV     0 eV   2.69 mm   2.69 mm    TrackerTransportation
-    2    9.9 cm   6.62 cm   -1.6 m    4.51 MeV     0 eV   80.9 cm   81.1 cm    ChamberTransportation
-    3   12.3 cm   8.25 cm   -1.4 m    4.51 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4   19.7 cm   13.1 cm    -80 cm   4.51 MeV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   22.2 cm   14.8 cm    -60 cm   4.51 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6   29.5 cm   19.7 cm      0 fm   4.51 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7     32 cm   21.3 cm     20 cm   4.51 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8   39.3 cm   26.2 cm     80 cm   4.51 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   41.8 cm   27.8 cm      1 m    4.51 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10   49.1 cm   32.7 cm    1.6 m    4.51 MeV     0 eV   60.6 cm   4.05 m     ChamberTransportation
-   11   51.6 cm   34.3 cm    1.8 m    4.51 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   58.9 cm   39.2 cm    2.4 m    4.51 MeV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   65.2 cm   43.4 cm   2.91 m    4.51 MeV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 90,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    196 mum   230 mum  -2.4 m    44.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    638 mum   690 mum  -2.4 m    44.3 MeV     0 eV    4.1 mm    4.1 mm    TrackerTransportation
-    2   8.81 cm   9.16 cm   -1.6 m    44.3 MeV     0 eV     81 cm   81.4 cm    ChamberTransportation
-    3     11 cm   11.4 cm   -1.4 m    44.3 MeV     0 eV   20.2 cm   1.02 m     TrackerTransportation
-    4   17.6 cm   18.2 cm    -80 cm   44.3 MeV     0 eV   60.7 cm   1.62 m     ChamberTransportation
-    5   19.8 cm   20.5 cm    -60 cm   44.3 MeV     0 eV   20.2 cm   1.83 m     TrackerTransportation
-    6   26.3 cm   27.3 cm      0 fm   44.3 MeV     0 eV   60.7 cm   2.43 m     ChamberTransportation
-    7   28.5 cm   29.6 cm     20 cm   44.3 MeV     0 eV   20.2 cm   2.64 m     TrackerTransportation
-    8   35.1 cm   36.4 cm     80 cm   44.3 MeV     0 eV   60.7 cm   3.24 m     ChamberTransportation
-    9   37.3 cm   38.7 cm      1 m    44.3 MeV     0 eV   20.2 cm   3.45 m     TrackerTransportation
-   10   43.8 cm   45.5 cm    1.6 m    44.3 MeV     0 eV   60.7 cm   4.05 m     ChamberTransportation
-   11     46 cm   47.8 cm    1.8 m    44.3 MeV     0 eV   20.2 cm   4.26 m     TrackerTransportation
-   12   52.6 cm   54.6 cm    2.4 m    44.3 MeV     0 eV   60.7 cm   4.86 m     WorldPVTransportation
-   13   58.1 cm   60.4 cm   2.91 m    44.3 MeV     0 eV   51.6 cm   5.38 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 89,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    173 mum   213 mum  -2.4 m    4.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    633 mum   606 mum  -2.4 m    4.18 MeV     0 eV   4.25 mm   4.25 mm    TrackerTransportation
-    2   8.81 cm   7.53 cm   -1.6 m    4.18 MeV     0 eV   80.8 cm   81.2 cm    ChamberTransportation
-    3     11 cm    9.4 cm   -1.4 m    4.18 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4   17.6 cm     15 cm    -80 cm   4.18 MeV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   19.7 cm   16.9 cm    -60 cm   4.18 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6   26.3 cm   22.5 cm      0 fm   4.18 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   28.5 cm   24.3 cm     20 cm   4.18 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8     35 cm   29.9 cm     80 cm   4.18 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   37.2 cm   31.8 cm      1 m    4.18 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10   43.8 cm   37.4 cm    1.6 m    4.18 MeV     0 eV   60.6 cm   4.05 m     ChamberTransportation
-   11     46 cm   39.3 cm    1.8 m    4.18 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   52.5 cm   44.9 cm    2.4 m    4.18 MeV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   58.1 cm   49.7 cm   2.91 m    4.18 MeV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 88,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    171 mum   197 mum  -2.4 m    6.15 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    385 mum   482 mum  -2.4 m    6.15 MeV     0 eV   4.44 mm   4.44 mm    TrackerTransportation
-    2   3.91 cm   5.19 cm   -1.6 m    6.15 MeV     0 eV   80.3 cm   80.7 cm    ChamberTransportation
-    3   4.88 cm   6.48 cm   -1.4 m    6.15 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   7.78 cm   10.3 cm    -80 cm   6.15 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   8.75 cm   11.6 cm    -60 cm   6.15 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   11.7 cm   15.5 cm      0 fm   6.15 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7   12.6 cm   16.8 cm     20 cm   6.15 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   15.5 cm   20.6 cm     80 cm   6.15 MeV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9   16.5 cm   21.9 cm      1 m    6.15 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   19.4 cm   25.8 cm    1.6 m    6.15 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   20.4 cm   27.1 cm    1.8 m    6.15 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   23.3 cm   30.9 cm    2.4 m    6.15 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13   25.7 cm   34.2 cm   2.91 m    6.15 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 87,   Parent ID = 65
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    149 mum   190 mum  -2.4 m    20.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    234 mum   283 mum  -2.4 m    20.7 MeV     0 eV   4.76 mm   4.76 mm    TrackerTransportation
-    2   1.45 cm    1.6 cm   -1.6 m    20.7 MeV     0 eV     80 cm   80.5 cm    ChamberTransportation
-    3    1.8 cm   1.99 cm   -1.4 m    20.7 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.87 cm   3.17 cm    -80 cm   20.7 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   3.23 cm   3.56 cm    -60 cm   20.7 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   4.29 cm   4.73 cm -0.114 fm   20.7 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   4.65 cm   5.13 cm     20 cm   20.7 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   5.72 cm    6.3 cm     80 cm   20.7 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   6.07 cm    6.7 cm      1 m    20.7 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   7.14 cm   7.87 cm    1.6 m    20.7 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11    7.5 cm   8.26 cm    1.8 m    20.7 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   8.56 cm   9.44 cm    2.4 m    20.7 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   9.47 cm   10.4 cm   2.91 m    20.7 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 16,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   32.7 mum  21.1 mum -2.41 m     1.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    147 mum   289 mum  -2.4 m     1.4 MeV     0 eV   1.15 cm   1.15 cm    TrackerTransportation
-    2   8.13 mm   1.89 cm   -1.6 m     1.4 MeV     0 eV     80 cm   81.2 cm    ChamberTransportation
-    3   1.01 cm   2.36 cm   -1.4 m     1.4 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   1.61 cm   3.76 cm    -80 cm    1.4 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   1.81 cm   4.22 cm    -60 cm    1.4 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   2.41 cm   5.62 cm      0 fm    1.4 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   2.61 cm   6.09 cm     20 cm    1.4 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   3.21 cm   7.49 cm     80 cm    1.4 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   3.41 cm   7.95 cm      1 m     1.4 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   4.01 cm   9.35 cm    1.6 m     1.4 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   4.21 cm   9.82 cm    1.8 m     1.4 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   4.81 cm   11.2 cm    2.4 m     1.4 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   5.32 cm   12.4 cm   2.91 m     1.4 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 15,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.5 mum  7.96 mum -2.41 m      14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    220 mum   221 mum  -2.4 m       0 eV   1.25 MeV  1.01 cm   1.01 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 95,   Parent ID = 15
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    220 mum   221 mum  -2.4 m    11.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    346 mum   776 mum  -2.4 m    8.99 MeV  2.73 MeV  2.03 mm   2.03 mm   TargetPV     eIoni
-    2    435 mum   749 mum  -2.4 m    8.45 MeV   538 keV   328 mum  2.36 mm    TrackerTransportation
-    3   48.3 cm   39.8 cm  -1.17 m    8.18 MeV   256 keV  1.38 m    1.39 m     Tracker     eIoni
-    4   64.2 cm   57.5 cm    -80 cm    8.1 MeV  78.4 keV  44.1 cm   1.83 m     ChamberTransportation
-    5   67.2 cm   62.1 cm  -72.4 cm   8.05 MeV  47.7 keV  9.44 cm   1.92 m     TrackerTransportation
-    6   1.03 m    1.05 m       0 fm   7.88 MeV   168 keV  91.6 cm   2.84 m     ChamberTransportation
-    7   1.07 m     1.1 m    7.79 cm   7.84 MeV  47.9 keV  10.4 cm   2.94 m     TrackerTransportation
-    8   1.47 m    1.58 m    65.2 cm   7.66 MeV   155 keV  84.9 cm   3.79 m     Tracker     eIoni
-    9   1.56 m    1.66 m    77.5 cm   7.62 MeV  26.2 keV  17.1 cm   3.96 m     Tracker     eIoni
-   10   2.21 m    2.16 m    1.71 m    7.37 MeV   229 keV  1.25 m    5.21 m     Tracker     eIoni
-   11    2.4 m    2.28 m    1.94 m    7.32 MeV  55.5 keV  31.7 cm   5.53 m     WorldPVTransportation
-   12   2.91 m    2.58 m    2.51 m    7.17 MeV   152 keV    83 cm   6.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 99,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.21 m    2.16 m    1.71 m    15.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.21 m    2.16 m    1.72 m    13.6 keV   1.8 keV   1.3 mm    1.3 mm    Tracker     eIoni
-    2   2.21 m    2.16 m    1.72 m    11.8 keV  1.83 keV  1.11 mm   2.41 mm    Tracker     eIoni
-    3   2.21 m    2.16 m    1.72 m    10.7 keV  1.07 keV   927 mum  3.34 mm    Tracker     eIoni
-    4   2.21 m    2.16 m    1.72 m    9.41 keV  1.33 keV   833 mum  4.17 mm    Tracker     eIoni
-    5   2.21 m    2.16 m    1.72 m    6.99 keV  2.42 keV   722 mum  4.89 mm    Tracker     eIoni
-    6   2.21 m    2.16 m    1.72 m    4.94 keV  2.06 keV   544 mum  5.44 mm    Tracker     eIoni
-    7   2.21 m    2.16 m    1.72 m    2.44 keV   2.5 keV   413 mum  5.85 mm    Tracker     eIoni
-    8   2.21 m    2.16 m    1.72 m     157 eV   2.28 keV   220 mum  6.07 mm    Tracker     eIoni
-    9   2.21 m    2.16 m    1.72 m       0 eV    157 eV   12.6 mum  6.08 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 98,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.56 m    1.66 m    77.5 cm   15.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.56 m    1.66 m    77.5 cm   13.4 keV  2.24 keV  1.33 mm   1.33 mm    Tracker     eIoni
-    2   1.56 m    1.66 m    77.4 cm   11.6 keV  1.87 keV  1.09 mm   2.42 mm    Tracker     eIoni
-    3   1.56 m    1.66 m    77.4 cm   9.55 keV  2.01 keV   904 mum  3.32 mm    Tracker     eIoni
-    4   1.56 m    1.66 m    77.4 cm   6.61 keV  2.95 keV   733 mum  4.05 mm    Tracker     eIoni
-    5   1.56 m    1.66 m    77.4 cm   5.87 keV   742 eV    519 mum  4.57 mm    Tracker     eIoni
-    6   1.56 m    1.66 m    77.3 cm    510 eV   5.36 keV   471 mum  5.04 mm    Tracker     eIoni
-    7   1.56 m    1.66 m    77.3 cm      0 eV    510 eV   28.3 mum  5.07 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 97,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.47 m    1.58 m    65.2 cm   19.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.48 m    1.58 m      65 cm   15.8 keV  3.93 keV  1.84 mm   1.84 mm    Tracker     eIoni
-    2   1.48 m    1.58 m    64.9 cm   13.3 keV  2.51 keV  1.34 mm   3.18 mm    Tracker     eIoni
-    3   1.48 m    1.58 m    64.8 cm   11.3 keV     2 keV  1.07 mm   4.26 mm    Tracker     eIoni
-    4   1.48 m    1.58 m    64.7 cm   8.86 keV  2.43 keV   881 mum  5.14 mm    Tracker     eIoni
-    5   1.48 m    1.58 m    64.7 cm    5.7 keV  3.16 keV   679 mum  5.82 mm    Tracker     eIoni
-    6   1.48 m    1.58 m    64.7 cm   3.63 keV  2.06 keV   460 mum  6.28 mm    Tracker     eIoni
-    7   1.48 m    1.58 m    64.7 cm   3.52 eV   3.63 keV   327 mum   6.6 mm    Tracker     eIoni
-    8   1.48 m    1.58 m    64.7 cm      0 eV   3.52 eV   1.89 mum   6.6 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 96,   Parent ID = 95
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   48.3 cm   39.8 cm  -1.17 m      16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   48.4 cm   39.9 cm  -1.17 m    14.9 keV  1.07 keV  1.37 mm   1.37 mm    Tracker     eIoni
-    2   48.4 cm     40 cm  -1.17 m    13.8 keV  1.18 keV  1.24 mm   2.61 mm    Tracker     eIoni
-    3   48.3 cm     40 cm  -1.17 m      12 keV  1.76 keV  1.12 mm   3.73 mm    Tracker     eIoni
-    4   48.3 cm     40 cm  -1.17 m    10.3 keV   1.7 keV   943 mum  4.67 mm    Tracker     eIoni
-    5   48.2 cm     40 cm  -1.17 m    9.29 keV     1 keV   793 mum  5.47 mm    Tracker     eIoni
-    6   48.1 cm     40 cm  -1.17 m    7.58 keV  1.71 keV   713 mum  6.18 mm    Tracker     eIoni
-    7   48.1 cm     40 cm  -1.17 m    6.34 keV  1.24 keV   585 mum  6.76 mm    Tracker     eIoni
-    8   48.1 cm     40 cm  -1.17 m    3.56 keV  2.78 keV   502 mum  7.27 mm    Tracker     eIoni
-    9   48.1 cm     40 cm  -1.17 m       0 eV   3.56 keV   322 mum  7.59 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 14,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   4.02 mum  1.98 mum -2.41 m     583 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    151 mum  70.9 mum  -2.4 m     458 keV   125 keV  1.09 cm   1.09 cm   TargetPV     compt
-    2   -1.4 mm    531 mum  -2.4 m     458 keV     0 eV   2.52 mm   1.35 cm    TrackerTransportation
-    3   -2.4 m    71.3 cm   59.4 cm    458 keV     0 eV    3.9 m    3.92 m     WorldPVTransportation
-    4  -2.91 m    86.5 cm   1.23 m     458 keV     0 eV     83 cm   4.74 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 13,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -6.06 mum  2.52 mum -2.41 m    1.02 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   46.9 mum -24.9 mum -2.41 m     972 keV  48.6 keV  5.54 mm   5.54 mm   TargetPV     compt
-    2   -217 mum   651 mum  -2.4 m     378 keV   595 keV  3.39 mm   8.93 mm   TargetPV     compt
-    3   7.59 mm  -4.92 mm   -2.4 m       0 eV    378 keV  1.02 cm   1.92 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 12,   Parent ID = 5
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.08 mum  4.59 mum -2.41 m     610 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -233 mum   144 mum  -2.4 m     610 keV     0 eV    1.4 cm    1.4 cm    TrackerTransportation
-    2  -1.39 cm    8.1 mm   -1.6 m     610 keV     0 eV     80 cm   81.4 cm    ChamberTransportation
-    3  -1.73 cm   1.01 cm   -1.4 m     610 keV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.75 cm   1.61 cm    -80 cm    610 keV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -3.09 cm    1.8 cm    -60 cm    610 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -4.11 cm    2.4 cm -0.114 fm    610 keV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -4.45 cm    2.6 cm     20 cm    610 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -5.47 cm    3.2 cm     80 cm    610 keV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -5.82 cm    3.4 cm      1 m     610 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -6.84 cm   3.99 cm    1.6 m     610 keV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -7.18 cm   4.19 cm    1.8 m     610 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   -8.2 cm   4.79 cm    2.4 m     610 keV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -9.07 cm    5.3 cm   2.91 m     610 keV     0 eV     51 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 4,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    111 nm   -877 nm  -2.41 m    1.24 GeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.24 mum -2.78 mum -2.41 m    1.23 GeV  1.36 MeV   728 mum   728 mum  TargetPV     eBrem
-    2  -2.05 mum -2.34 mum -2.41 m     964 MeV  1.29 MeV  89.6 mum   818 mum  TargetPV     eBrem
-    3  -1.67 mum -2.35 mum -2.41 m     899 MeV   149 keV   127 mum   945 mum  TargetPV     eBrem
-    4  -1.59 mum -2.44 mum -2.41 m     897 MeV  47.1 keV  35.7 mum   981 mum  TargetPV     eBrem
-    5  -1.49 mum -2.53 mum -2.41 m     855 MeV  34.7 keV  29.1 mum  1.01 mm   TargetPV     eBrem
-    6  -2.07 mum -2.63 mum -2.41 m     854 MeV   390 keV   295 mum   1.3 mm   TargetPV     eBrem
-    7  -5.42 mum -7.38 mum -2.41 m     848 MeV   669 keV   617 mum  1.92 mm   TargetPV     eBrem
-    8   -6.8 mum -7.95 mum -2.41 m     327 MeV   193 keV   173 mum  2.09 mm   TargetPV     eBrem
-    9  -6.93 mum -25.9 mum -2.41 m     198 MeV  1.17 MeV   993 mum  3.09 mm   TargetPV     eBrem
-   10  -36.9 mum  86.7 mum -2.41 m     169 MeV  3.41 MeV  2.26 mm   5.35 mm   TargetPV     eBrem
-   11  -52.1 mum   106 mum -2.41 m     156 MeV   255 keV   247 mum   5.6 mm   TargetPV     eBrem
-   12   -180 mum   130 mum -2.41 m     146 MeV  2.15 MeV  1.37 mm   6.96 mm   TargetPV     eBrem
-   13   -185 mum   137 mum -2.41 m     141 MeV  94.7 keV  71.7 mum  7.04 mm   TargetPV     eBrem
-   14   -200 mum   179 mum -2.41 m    68.5 MeV   881 keV   745 mum  7.78 mm   TargetPV     eBrem
-   15   -231 mum   229 mum -2.41 m    63.3 MeV   539 keV   456 mum  8.24 mm   TargetPV     eBrem
-   16   -279 mum   251 mum -2.41 m    61.6 MeV   631 keV   395 mum  8.63 mm   TargetPV     eBrem
-   17   -299 mum   184 mum -2.41 m      61 MeV   200 keV   169 mum   8.8 mm   TargetPV     eBrem
-   18   -315 mum  -142 mum  -2.4 m    55.9 MeV  1.53 MeV  1.04 mm   9.84 mm   TargetPV     eBrem
-   19   -235 mum  -231 mum  -2.4 m    50.1 MeV   436 keV   390 mum  1.02 cm   TargetPV     eBrem
-   20    158 mum  -402 mum  -2.4 m    44.8 MeV  1.38 MeV  1.03 mm   1.13 cm   TargetPV     eBrem
-   21    621 mum  -546 mum  -2.4 m      40 MeV  2.84 MeV  1.79 mm   1.31 cm   TargetPV     eBrem
-   22    726 mum  -869 mum  -2.4 m    23.4 MeV  1.68 MeV  1.22 mm   1.43 cm   TargetPV     eBrem
-   23    607 mum  -937 mum  -2.4 m    22.6 MeV   763 keV   639 mum  1.49 cm    TrackerTransportation
-   24  -10.1 cm  -3.46 cm  -2.11 m    22.3 MeV  58.5 keV  30.5 cm     32 cm    Tracker     eIoni
-   25  -58.9 cm  -19.1 cm  -92.7 cm     22 MeV   261 keV  1.29 m    1.61 m     Tracker     eIoni
-   26  -63.4 cm  -20.1 cm    -80 cm     22 MeV  19.1 keV  13.5 cm   1.75 m     ChamberTransportation
-   27  -66.6 cm  -20.6 cm  -71.5 cm   21.9 MeV  54.5 keV  9.12 cm   1.84 m     Chamber     eBrem
-   28  -67.2 cm  -20.8 cm  -69.6 cm   21.9 MeV  10.1 keV  2.01 cm   1.86 m     TrackerTransportation
-   29  -88.9 cm  -28.5 cm 0.0335 fm   21.7 MeV   145 keV  73.3 cm   2.59 m     ChamberTransportation
-   30  -95.3 cm  -30.6 cm     20 cm   21.6 MeV   113 keV  21.2 cm    2.8 m     TrackerTransportation
-   31  -1.09 m   -38.7 cm     80 cm   21.4 MeV   125 keV  62.2 cm   3.43 m     ChamberTransportation
-   32  -1.14 m   -40.4 cm      1 m    21.3 MeV  80.1 keV  20.6 cm   3.63 m     TrackerTransportation
-   33  -1.16 m   -41.3 cm   1.07 m    21.3 MeV  11.9 keV  7.18 cm    3.7 m     Tracker     eIoni
-   34  -1.31 m   -49.7 cm    1.6 m    21.2 MeV   111 keV  55.8 cm   4.26 m     ChamberTransportation
-   35  -1.35 m   -53.1 cm    1.8 m    20.7 MeV   103 keV  20.3 cm   4.47 m     Chamber     eBrem
-   36  -1.35 m   -53.2 cm    1.8 m    20.7 MeV   703 eV   4.86 mm   4.47 m     TrackerTransportation
-   37  -1.35 m   -53.3 cm   1.81 m    20.7 MeV   488 eV   6.82 mm   4.48 m     Tracker     eIoni
-   38  -1.48 m   -62.7 cm    2.4 m    20.5 MeV   122 keV  61.4 cm   5.09 m     WorldPVTransportation
-   39  -1.58 m   -71.5 cm   2.91 m    20.4 MeV   103 keV  52.7 cm   5.62 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 130,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.35 m   -53.3 cm   1.81 m    25.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.35 m   -53.5 cm   1.81 m    23.6 keV  1.81 keV   2.7 mm    2.7 mm    Tracker     eIoni
-    2  -1.35 m   -53.7 cm   1.81 m    19.2 keV  4.38 keV  2.41 mm    5.1 mm    Tracker     eIoni
-    3  -1.35 m   -53.7 cm   1.81 m    16.8 keV  2.33 keV  1.77 mm   6.87 mm    Tracker     eIoni
-    4  -1.34 m   -53.8 cm    1.8 m      10 keV  6.85 keV  1.46 mm   8.33 mm    Tracker     eIoni
-    5  -1.34 m   -53.8 cm    1.8 m    8.97 keV  1.03 keV   767 mum   9.1 mm    Tracker     eIoni
-    6  -1.34 m   -53.8 cm    1.8 m    6.49 keV  2.48 keV   687 mum  9.79 mm    Tracker     eIoni
-    7  -1.34 m   -53.8 cm    1.8 m    3.92 keV  2.57 keV   511 mum  1.03 cm    Tracker     eIoni
-    8  -1.34 m   -53.8 cm    1.8 m    2.72 keV  1.21 keV   347 mum  1.06 cm    Tracker     eIoni
-    9  -1.34 m   -53.8 cm    1.8 m    40.7 eV   2.67 keV   250 mum  1.09 cm    Tracker     eIoni
-   10  -1.34 m   -53.8 cm    1.8 m       0 eV   40.7 eV   6.42 mum  1.09 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 129,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.35 m   -53.1 cm    1.8 m     404 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.35 m   -53.2 cm    1.8 m     404 keV     0 eV   4.84 mm   4.84 mm    TrackerTransportation
-    2  -1.45 m   -62.1 cm    2.4 m     404 keV     0 eV   61.6 cm     62 cm    WorldPVTransportation
-    3  -1.54 m   -69.7 cm   2.91 m     404 keV     0 eV   52.3 cm   1.14 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 128,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.33 m   -51.5 cm   1.71 m    9.99 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.33 m   -51.5 cm   1.71 m    8.76 keV  1.23 keV   530 mum   530 mum   Chamber     eIoni
-    2  -1.33 m   -51.5 cm   1.71 m     8.2 keV   560 eV    481 mum  1.01 mm    Chamber     eIoni
-    3  -1.33 m   -51.5 cm   1.71 m    2.13 keV  6.07 keV   459 mum  1.47 mm    Chamber     eIoni
-    4  -1.33 m   -51.5 cm   1.71 m       0 eV   2.13 keV   128 mum   1.6 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 127,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.16 m   -41.3 cm   1.07 m    12.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.16 m   -41.3 cm   1.07 m    11.4 keV   864 eV    970 mum   970 mum   Tracker     eIoni
-    2  -1.16 m   -41.2 cm   1.07 m    9.63 keV  1.77 keV   891 mum  1.86 mm    Tracker     eIoni
-    3  -1.16 m   -41.1 cm   1.07 m    3.23 keV   6.4 keV   739 mum   2.6 mm    Tracker     eIoni
-    4  -1.16 m   -41.1 cm   1.07 m     1.7 keV  1.53 keV   296 mum   2.9 mm    Tracker     eIoni
-    5  -1.16 m   -41.1 cm   1.07 m       0 eV    1.7 keV   128 mum  3.02 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 126,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.13 m   -39.9 cm   94.2 cm   14.4 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.13 m   -39.9 cm   94.2 cm   11.1 keV  3.32 keV   727 mum   727 mum   Chamber     eIoni
-    2  -1.13 m   -39.9 cm   94.2 cm   6.83 keV  4.27 keV   578 mum  1.31 mm    Chamber     eIoni
-    3  -1.13 m   -39.9 cm   94.2 cm   4.41 keV  2.42 keV   405 mum  1.71 mm    Chamber     eIoni
-    4  -1.13 m   -39.9 cm   94.2 cm   2.42 keV  1.99 keV   300 mum  2.01 mm    Chamber     eIoni
-    5  -1.13 m   -39.9 cm   94.2 cm      0 eV   2.42 keV   153 mum  2.16 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 125,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -90.2 cm  -28.9 cm   4.15 cm   37.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -90.2 cm  -29.1 cm   4.06 cm   34.4 keV  3.34 keV  2.36 mm   2.36 mm    Chamber     eIoni
-    2  -90.1 cm  -28.9 cm   4.06 cm   30.9 keV  3.51 keV  2.07 mm   4.42 mm    Chamber     eIoni
-    3    -90 cm  -28.9 cm   3.99 cm     25 keV  5.82 keV  1.78 mm    6.2 mm    Chamber     eIoni
-    4    -90 cm  -28.9 cm   3.92 cm   23.4 keV  1.63 keV  1.35 mm   7.55 mm    Chamber     eIoni
-    5    -90 cm  -28.8 cm   3.95 cm   21.2 keV   2.2 keV  1.24 mm   8.79 mm    Chamber     eIoni
-    6  -89.9 cm  -28.9 cm   3.89 cm   17.7 keV  3.48 keV   1.1 mm   9.89 mm    Chamber     eIoni
-    7  -89.9 cm  -28.9 cm   3.93 cm   17.2 keV   571 eV    899 mum  1.08 cm    Chamber     eIoni
-    8  -89.9 cm  -28.9 cm   3.98 cm   15.1 keV  2.02 keV   868 mum  1.17 cm    Chamber     eIoni
-    9  -89.9 cm  -28.9 cm   4.01 cm   13.6 keV  1.54 keV   764 mum  1.24 cm    Chamber     eIoni
-   10  -89.9 cm  -28.9 cm   4.01 cm   12.5 keV  1.05 keV   690 mum  1.31 cm    Chamber     eIoni
-   11  -89.8 cm  -28.9 cm   4.03 cm     11 keV  1.53 keV   641 mum  1.38 cm    Chamber     eIoni
-   12  -89.8 cm  -28.9 cm   4.05 cm   9.74 keV  1.27 keV   574 mum  1.43 cm    Chamber     eIoni
-   13  -89.8 cm  -28.9 cm   4.08 cm   8.65 keV  1.09 keV   520 mum  1.48 cm    Chamber     eIoni
-   14  -89.8 cm  -28.9 cm    4.1 cm   6.49 keV  2.15 keV   477 mum  1.53 cm    Chamber     eIoni
-   15  -89.8 cm  -28.9 cm    4.1 cm    4.1 keV   2.4 keV   392 mum  1.57 cm    Chamber     eIoni
-   16  -89.8 cm  -28.9 cm    4.1 cm   1.77 keV  2.33 keV   283 mum   1.6 cm    Chamber     eIoni
-   17  -89.8 cm  -28.9 cm    4.1 cm      0 eV   1.77 keV  99.7 mum  1.61 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 124,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -66.6 cm  -20.6 cm  -71.5 cm   82.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -67.2 cm  -20.8 cm  -69.6 cm   82.5 keV     0 eV   1.97 cm   1.97 cm    TrackerTransportation
-    2  -88.8 cm  -29.7 cm      0 fm   82.5 keV     0 eV   73.4 cm   75.4 cm    ChamberTransportation
-    3    -95 cm  -32.2 cm     20 cm   82.5 keV     0 eV   21.1 cm   96.5 cm    TrackerTransportation
-    4  -1.14 m   -39.9 cm     80 cm   82.5 keV     0 eV   63.3 cm    1.6 m     ChamberTransportation
-    5   -1.2 m   -42.5 cm      1 m    82.5 keV     0 eV   21.1 cm   1.81 m     TrackerTransportation
-    6  -1.38 m   -50.1 cm    1.6 m    82.5 keV     0 eV   63.3 cm   2.44 m     ChamberTransportation
-    7  -1.45 m   -52.7 cm    1.8 m    82.5 keV     0 eV   21.1 cm   2.65 m     TrackerTransportation
-    8  -1.63 m   -60.4 cm    2.4 m    82.5 keV     0 eV   63.3 cm   3.29 m     WorldPVTransportation
-    9  -1.79 m   -66.9 cm   2.91 m    82.5 keV     0 eV   53.8 cm   3.82 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 123,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -58.9 cm  -19.1 cm  -92.7 cm   8.17 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -58.9 cm    -19 cm  -92.7 cm   6.93 keV  1.23 keV   626 mum   626 mum   Tracker     eIoni
-    2  -58.9 cm    -19 cm  -92.7 cm   5.45 keV  1.48 keV   539 mum  1.17 mm    Tracker     eIoni
-    3    -59 cm    -19 cm  -92.8 cm   1.63 keV  3.82 keV   445 mum  1.61 mm    Tracker     eIoni
-    4    -59 cm    -19 cm  -92.8 cm      0 eV   1.63 keV   120 mum  1.73 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 122,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -10.1 cm  -3.46 cm  -2.11 m     286 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -3.86 cm  -15.5 cm  -2.05 m     252 keV  33.9 keV  16.1 cm   16.1 cm    Tracker     eIoni
-    2  -5.64 mm  -20.1 cm  -2.02 m     221 keV  18.1 keV  6.45 cm   22.6 cm    Tracker     eIoni
-    3   3.71 cm  -24.9 cm     -2 m     193 keV  18.3 keV   7.3 cm   29.9 cm    Tracker     eIoni
-    4   11.4 cm  -23.6 cm  -2.02 m     167 keV  25.8 keV  8.54 cm   38.4 cm    Tracker     eIoni
-    5     13 cm  -29.2 cm     -2 m     147 keV  19.9 keV  6.75 cm   45.2 cm    Tracker     eIoni
-    6   11.2 cm  -33.2 cm  -2.02 m     122 keV  12.3 keV  5.24 cm   50.4 cm    Tracker     eIoni
-    7   10.3 cm  -36.9 cm  -2.03 m     108 keV  13.6 keV  3.95 cm   54.3 cm    Tracker     eIoni
-    8    8.6 cm  -38.3 cm  -2.01 m    95.8 keV  12.4 keV  3.21 cm   57.6 cm    Tracker     eIoni
-    9   9.84 cm  -37.1 cm  -2.02 m    79.1 keV  16.7 keV  2.61 cm   60.2 cm    Tracker     eIoni
-   10   10.8 cm  -38.4 cm  -2.03 m    69.8 keV  9.34 keV  1.87 cm     62 cm    Tracker     eIoni
-   11   10.9 cm  -39.8 cm  -2.03 m    61.7 keV  8.05 keV  1.51 cm   63.5 cm    Tracker     eIoni
-   12   10.3 cm  -40.7 cm  -2.03 m    55.4 keV  6.31 keV  1.21 cm   64.8 cm    Tracker     eIoni
-   13   10.2 cm  -41.6 cm  -2.03 m      49 keV  6.37 keV  1.01 cm   65.8 cm    Tracker     eIoni
-   14   10.1 cm  -42.4 cm  -2.03 m    40.6 keV  8.46 keV  8.16 mm   66.6 cm    Tracker     eIoni
-   15   9.76 cm  -42.8 cm  -2.03 m    33.4 keV  7.18 keV  5.89 mm   67.2 cm    Tracker     eIoni
-   16   9.41 cm  -42.9 cm  -2.03 m    29.2 keV  4.18 keV  4.24 mm   67.6 cm    Tracker     eIoni
-   17   9.08 cm  -42.9 cm  -2.03 m    21.1 keV  8.07 keV  3.39 mm   67.9 cm    Tracker     eIoni
-   18   8.96 cm  -43.1 cm  -2.03 m    18.6 keV  2.58 keV  2.03 mm   68.1 cm    Tracker     eIoni
-   19   8.92 cm  -43.2 cm  -2.03 m    16.9 keV  1.69 keV  1.69 mm   68.3 cm    Tracker     eIoni
-   20    8.8 cm  -43.3 cm  -2.03 m    12.9 keV  4.01 keV  1.47 mm   68.5 cm    Tracker     eIoni
-   21   8.72 cm  -43.3 cm  -2.03 m    11.5 keV  1.35 keV  1.03 mm   68.6 cm    Tracker     eIoni
-   22   8.64 cm  -43.3 cm  -2.03 m    9.79 keV  1.75 keV   902 mum  68.6 cm    Tracker     eIoni
-   23    8.6 cm  -43.4 cm  -2.03 m    8.89 keV   895 eV    751 mum  68.7 cm    Tracker     eIoni
-   24   8.63 cm  -43.4 cm  -2.03 m    2.27 keV  6.62 keV   681 mum  68.8 cm    Tracker     eIoni
-   25   8.62 cm  -43.4 cm  -2.03 m       0 eV   2.27 keV   197 mum  68.8 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 133,   Parent ID = 122
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   11.2 cm  -33.2 cm  -2.02 m    13.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   11.1 cm  -33.2 cm  -2.02 m    11.9 keV  1.34 keV  1.07 mm   1.07 mm    Tracker     eIoni
-    2     11 cm  -33.1 cm  -2.03 m    9.09 keV   2.8 keV   933 mum     2 mm    Tracker     eIoni
-    3     11 cm  -33.2 cm  -2.03 m    4.93 keV  4.17 keV   697 mum   2.7 mm    Tracker     eIoni
-    4     11 cm  -33.1 cm  -2.03 m    3.33 keV   1.6 keV   412 mum  3.11 mm    Tracker     eIoni
-    5     11 cm  -33.1 cm  -2.03 m     732 eV    2.6 keV   304 mum  3.41 mm    Tracker     eIoni
-    6     11 cm  -33.1 cm  -2.03 m       0 eV    732 eV   41.8 mum  3.45 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 132,   Parent ID = 122
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.71 cm  -24.9 cm     -2 m    9.96 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   3.72 cm  -24.9 cm     -2 m    6.19 keV  3.78 keV   764 mum   764 mum   Tracker     eIoni
-    2   3.74 cm    -25 cm     -2 m    3.83 keV  2.36 keV   492 mum  1.26 mm    Tracker     eIoni
-    3   3.73 cm    -25 cm     -2 m    3.06 keV   769 eV    341 mum   1.6 mm    Tracker     eIoni
-    4    3.7 cm    -25 cm     -2 m    1.54 keV  1.52 keV   282 mum  1.88 mm    Tracker     eIoni
-    5    3.7 cm    -25 cm     -2 m       0 eV   1.54 keV   111 mum  1.99 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 131,   Parent ID = 122
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.64 mm  -20.1 cm  -2.02 m      13 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -5.45 mm    -20 cm  -2.02 m    7.54 keV  5.43 keV  1.04 mm   1.04 mm    Tracker     eIoni
-    2   -5.2 mm    -20 cm  -2.02 m    5.27 keV  2.27 keV   582 mum  1.62 mm    Tracker     eIoni
-    3  -5.11 mm    -20 cm  -2.02 m    3.58 keV  1.68 keV   434 mum  2.06 mm    Tracker     eIoni
-    4  -5.19 mm    -20 cm  -2.02 m     537 eV   3.05 keV   324 mum  2.38 mm    Tracker     eIoni
-    5  -5.19 mm    -20 cm  -2.02 m       0 eV    537 eV   29.8 mum  2.41 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 121,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    726 mum  -869 mum  -2.4 m    14.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    609 mum  -939 mum  -2.4 m    14.9 MeV     0 eV    624 mum   624 mum   TrackerTransportation
-    2  -15.3 cm  -9.21 cm   -1.6 m    14.9 MeV     0 eV     82 cm     82 cm    ChamberTransportation
-    3  -19.1 cm  -11.5 cm   -1.4 m    14.9 MeV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4  -30.6 cm  -18.3 cm    -80 cm   14.9 MeV     0 eV   61.5 cm   1.64 m     ChamberTransportation
-    5  -34.4 cm  -20.6 cm    -60 cm   14.9 MeV     0 eV   20.5 cm   1.84 m     TrackerTransportation
-    6  -45.9 cm  -27.5 cm      0 fm   14.9 MeV     0 eV   61.5 cm   2.46 m     ChamberTransportation
-    7  -49.7 cm  -29.7 cm     20 cm   14.9 MeV     0 eV   20.5 cm   2.66 m     TrackerTransportation
-    8  -61.2 cm  -36.6 cm     80 cm   14.9 MeV     0 eV   61.5 cm   3.28 m     ChamberTransportation
-    9  -65.1 cm  -38.8 cm      1 m    14.9 MeV     0 eV   20.5 cm   3.48 m     TrackerTransportation
-   10  -76.6 cm  -45.7 cm    1.6 m    14.9 MeV     0 eV   61.5 cm    4.1 m     ChamberTransportation
-   11  -80.4 cm    -48 cm    1.8 m    14.9 MeV     0 eV   20.5 cm    4.3 m     TrackerTransportation
-   12  -91.9 cm  -54.8 cm    2.4 m    14.9 MeV     0 eV   61.5 cm   4.92 m     WorldPVTransportation
-   13  -1.02 m   -60.6 cm   2.91 m    14.9 MeV     0 eV   52.3 cm   5.44 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 120,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    621 mum  -546 mum  -2.4 m    1.93 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    929 mum -1.22 mm   -2.4 m    1.93 MeV     0 eV   1.92 mm   1.92 mm    TrackerTransportation
-    2   27.9 cm  -61.4 cm    -80 cm   1.93 MeV     0 eV   1.74 m    1.74 m     ChamberTransportation
-    3   30.5 cm  -67.2 cm  -64.8 cm   1.93 MeV     0 eV   16.5 cm    1.9 m     TrackerTransportation
-    4   41.8 cm    -92 cm      0 fm   1.93 MeV     0 eV   70.3 cm   2.61 m     ChamberTransportation
-    5   45.3 cm  -99.7 cm     20 cm   1.93 MeV     0 eV   21.7 cm   2.82 m     TrackerTransportation
-    6   55.7 cm  -1.23 m      80 cm   1.93 MeV     0 eV   65.1 cm   3.47 m     ChamberTransportation
-    7   59.2 cm   -1.3 m       1 m    1.93 MeV     0 eV   21.7 cm   3.69 m     TrackerTransportation
-    8   69.6 cm  -1.53 m     1.6 m    1.93 MeV     0 eV   65.1 cm   4.34 m     ChamberTransportation
-    9   73.1 cm  -1.61 m     1.8 m    1.93 MeV     0 eV   21.7 cm   4.56 m     TrackerTransportation
-   10   83.5 cm  -1.84 m     2.4 m    1.93 MeV     0 eV   65.1 cm   5.21 m     WorldPVTransportation
-   11   92.4 cm  -2.03 m    2.91 m    1.93 MeV     0 eV   55.3 cm   5.76 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 119,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    158 mum  -402 mum  -2.4 m    3.95 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.21 mm  -1.28 mm   -2.4 m    3.95 MeV     0 eV   3.74 mm   3.74 mm    TrackerTransportation
-    2   48.7 cm  -40.5 cm    -80 cm   3.95 MeV     0 eV   1.72 m    1.72 m     ChamberTransportation
-    3   54.7 cm  -45.6 cm    -60 cm   3.95 MeV     0 eV   21.5 cm   1.94 m     TrackerTransportation
-    4   72.9 cm  -60.7 cm  0.114 fm   3.95 MeV     0 eV   64.5 cm   2.58 m     ChamberTransportation
-    5     79 cm  -65.8 cm     20 cm   3.95 MeV     0 eV   21.5 cm    2.8 m     TrackerTransportation
-    6   97.2 cm  -80.9 cm     80 cm   3.95 MeV     0 eV   64.5 cm   3.44 m     ChamberTransportation
-    7   1.03 m     -86 cm      1 m    3.95 MeV     0 eV   21.5 cm   3.66 m     TrackerTransportation
-    8   1.21 m   -1.01 m     1.6 m    3.95 MeV     0 eV   64.5 cm    4.3 m     ChamberTransportation
-    9   1.28 m   -1.06 m     1.8 m    3.95 MeV     0 eV   21.5 cm   4.52 m     TrackerTransportation
-   10   1.46 m   -1.21 m     2.4 m    3.95 MeV     0 eV   64.5 cm   5.16 m     WorldPVTransportation
-   11   1.61 m   -1.34 m    2.91 m    3.95 MeV     0 eV   54.8 cm   5.71 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 118,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -235 mum  -231 mum  -2.4 m    5.37 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.14 mm  -1.17 mm   -2.4 m    5.37 MeV     0 eV   4.72 mm   4.72 mm    TrackerTransportation
-    2     50 cm  -34.1 cm    -80 cm   5.37 MeV     0 eV   1.71 m    1.71 m     ChamberTransportation
-    3   56.3 cm  -38.4 cm    -60 cm   5.37 MeV     0 eV   21.4 cm   1.93 m     TrackerTransportation
-    4     75 cm  -51.2 cm      0 fm   5.37 MeV     0 eV   64.1 cm   2.57 m     ChamberTransportation
-    5   81.2 cm  -55.4 cm     20 cm   5.37 MeV     0 eV   21.4 cm   2.78 m     TrackerTransportation
-    6   99.9 cm  -68.2 cm     80 cm   5.37 MeV     0 eV   64.1 cm   3.43 m     ChamberTransportation
-    7   1.06 m   -72.4 cm      1 m    5.37 MeV     0 eV   21.4 cm   3.64 m     TrackerTransportation
-    8   1.25 m   -85.2 cm    1.6 m    5.37 MeV     0 eV   64.1 cm   4.28 m     ChamberTransportation
-    9   1.31 m   -89.4 cm    1.8 m    5.37 MeV     0 eV   21.4 cm   4.49 m     TrackerTransportation
-   10    1.5 m   -1.02 m     2.4 m    5.37 MeV     0 eV   64.1 cm   5.14 m     WorldPVTransportation
-   11   1.66 m   -1.13 m    2.91 m    5.37 MeV     0 eV   54.5 cm   5.68 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 117,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -315 mum  -142 mum  -2.4 m     3.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    687 mum -1.55 mm   -2.4 m     3.6 MeV     0 eV   5.09 mm   5.09 mm    TrackerTransportation
-    2   16.8 cm  -23.8 cm   -1.6 m     3.6 MeV     0 eV   85.1 cm   85.6 cm    ChamberTransportation
-    3     17 cm    -24 cm  -1.59 m     3.6 MeV     0 eV   8.62 mm   86.4 cm    TrackerTransportation
-    4   33.6 cm  -47.4 cm    -80 cm    3.6 MeV     0 eV   84.2 cm   1.71 m     ChamberTransportation
-    5   37.8 cm  -53.3 cm    -60 cm    3.6 MeV     0 eV   21.3 cm   1.92 m     TrackerTransportation
-    6   50.4 cm    -71 cm      0 fm    3.6 MeV     0 eV   63.8 cm   2.56 m     ChamberTransportation
-    7   54.6 cm  -76.9 cm     20 cm    3.6 MeV     0 eV   21.3 cm   2.77 m     TrackerTransportation
-    8   67.1 cm  -94.6 cm     80 cm    3.6 MeV     0 eV   63.8 cm   3.41 m     ChamberTransportation
-    9   71.3 cm     -1 m       1 m     3.6 MeV     0 eV   21.3 cm   3.62 m     TrackerTransportation
-   10   83.9 cm  -1.18 m     1.6 m     3.6 MeV     0 eV   63.8 cm   4.26 m     ChamberTransportation
-   11   88.1 cm  -1.24 m     1.8 m     3.6 MeV     0 eV   21.3 cm   4.47 m     TrackerTransportation
-   12   1.01 m   -1.42 m     2.4 m     3.6 MeV     0 eV   63.8 cm   5.11 m     WorldPVTransportation
-   13   1.11 m   -1.57 m    2.91 m     3.6 MeV     0 eV   54.2 cm   5.65 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 116,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -299 mum   184 mum -2.41 m     352 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -214 mum  -293 mum  -2.4 m       0 eV    352 keV  1.35 mm   1.35 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 115,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -279 mum   251 mum -2.41 m    1.06 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -866 mum -2.25 mm   -2.4 m    1.06 MeV     0 eV   6.46 mm   6.46 mm    TrackerTransportation
-    2  -23.9 cm  -1.02 m       0 fm   1.06 MeV     0 eV   2.62 m    2.62 m     ChamberTransportation
-    3  -25.8 cm   -1.1 m      20 cm   1.06 MeV     0 eV   21.8 cm   2.84 m     TrackerTransportation
-    4  -31.8 cm  -1.35 m      80 cm   1.06 MeV     0 eV   65.4 cm   3.49 m     ChamberTransportation
-    5  -33.8 cm  -1.44 m       1 m    1.06 MeV     0 eV   21.8 cm   3.71 m     TrackerTransportation
-    6  -39.7 cm  -1.69 m     1.6 m    1.06 MeV     0 eV   65.4 cm   4.37 m     ChamberTransportation
-    7  -41.7 cm  -1.78 m     1.8 m    1.06 MeV     0 eV   21.8 cm   4.58 m     TrackerTransportation
-    8  -47.6 cm  -2.03 m     2.4 m    1.06 MeV     0 eV   65.4 cm   5.24 m     WorldPVTransportation
-    9  -52.7 cm  -2.25 m    2.91 m    1.06 MeV     0 eV   55.6 cm   5.79 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 114,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -231 mum   229 mum -2.41 m    4.64 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -451 mum   431 mum  -2.4 m     367 keV     0 eV   3.14 mm   3.14 mm   TargetPV     compt
-    2  -2.06 mm   1.31 mm   -2.4 m       0 eV    367 keV  1.97 mm   5.11 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 134,   Parent ID = 114
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -451 mum   431 mum  -2.4 m    4.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -468 nm    656 mum  -2.4 m    3.36 MeV   917 keV   957 mum   957 mum  TargetPV     eIoni
-    2    527 mum   482 mum  -2.4 m    2.51 MeV   853 keV   819 mum  1.78 mm   TargetPV     eIoni
-    3    429 mum   398 mum  -2.4 m     289 keV  2.22 MeV   684 mum  2.46 mm   TargetPV     eIoni
-    4    428 mum   402 mum  -2.4 m       0 eV    289 keV   137 mum   2.6 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 113,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -200 mum   179 mum -2.41 m    71.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -554 mum   610 mum  -2.4 m    71.3 MeV     0 eV   6.79 mm   6.79 mm    TrackerTransportation
-    2  -4.24 cm   5.16 cm   -1.6 m    71.3 MeV     0 eV   80.3 cm     81 cm    ChamberTransportation
-    3  -5.29 cm   6.43 cm   -1.4 m    71.3 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4  -8.43 cm   10.3 cm    -80 cm   71.3 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5  -9.47 cm   11.5 cm    -60 cm   71.3 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6  -12.6 cm   15.3 cm      0 fm   71.3 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7  -13.7 cm   16.6 cm     20 cm   71.3 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8  -16.8 cm   20.4 cm     80 cm   71.3 MeV     0 eV   60.2 cm   3.22 m     ChamberTransportation
-    9  -17.8 cm   21.7 cm      1 m    71.3 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10    -21 cm   25.5 cm    1.6 m    71.3 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11    -22 cm   26.8 cm    1.8 m    71.3 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12  -25.2 cm   30.6 cm    2.4 m    71.3 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13  -27.8 cm   33.9 cm   2.91 m    71.3 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 112,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -185 mum   137 mum -2.41 m    4.75 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -214 mum   184 mum -2.41 m     2.2 MeV  2.55 MeV   644 mum   644 mum  TargetPV     compt
-    2   2.56 mm  -1.27 mm   -2.4 m     2.2 MeV     0 eV   7.55 mm   8.19 mm    TrackerTransportation
-    3   64.9 cm  -34.1 cm    -80 cm    2.2 MeV     0 eV   1.76 m    1.77 m     ChamberTransportation
-    4   67.2 cm  -35.3 cm  -74.3 cm    2.2 MeV     0 eV   6.29 cm   1.83 m     TrackerTransportation
-    5   97.2 cm  -51.1 cm      0 fm    2.2 MeV     0 eV   81.6 cm   2.65 m     ChamberTransportation
-    6   1.05 m   -55.3 cm     20 cm    2.2 MeV     0 eV     22 cm   2.87 m     TrackerTransportation
-    7    1.3 m     -68 cm     80 cm    2.2 MeV     0 eV     66 cm   3.53 m     ChamberTransportation
-    8   1.38 m   -72.3 cm      1 m     2.2 MeV     0 eV     22 cm   3.75 m     TrackerTransportation
-    9   1.62 m     -85 cm    1.6 m     2.2 MeV     0 eV     66 cm    4.4 m     ChamberTransportation
-   10    1.7 m   -89.3 cm    1.8 m     2.2 MeV     0 eV     22 cm   4.62 m     TrackerTransportation
-   11   1.94 m   -1.02 m     2.4 m     2.2 MeV     0 eV     66 cm   5.28 m     WorldPVTransportation
-   12   2.15 m   -1.13 m    2.91 m     2.2 MeV     0 eV   56.1 cm   5.84 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 111,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -180 mum   130 mum -2.41 m    8.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -606 mum   777 mum  -2.4 m    8.38 MeV     0 eV   7.62 mm   7.62 mm    TrackerTransportation
-    2  -4.56 cm    6.9 cm   -1.6 m    8.38 MeV     0 eV   80.4 cm   81.2 cm    ChamberTransportation
-    3  -5.68 cm   8.61 cm   -1.4 m    8.38 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4  -9.05 cm   13.7 cm    -80 cm   8.38 MeV     0 eV   60.3 cm   1.62 m     ChamberTransportation
-    5  -10.2 cm   15.4 cm    -60 cm   8.38 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6  -13.5 cm   20.6 cm      0 fm   8.38 MeV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7  -14.7 cm   22.3 cm     20 cm   8.38 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8    -18 cm   27.4 cm     80 cm   8.38 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9  -19.2 cm   29.1 cm      1 m    8.38 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10  -22.5 cm   34.2 cm    1.6 m    8.38 MeV     0 eV   60.3 cm   4.03 m     ChamberTransportation
-   11  -23.7 cm   35.9 cm    1.8 m    8.38 MeV     0 eV   20.1 cm   4.23 m     TrackerTransportation
-   12    -27 cm     41 cm    2.4 m    8.38 MeV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13  -29.9 cm   45.4 cm   2.91 m    8.38 MeV     0 eV   51.3 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 110,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -52.1 mum   106 mum -2.41 m    12.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -105 mum   145 mum -2.41 m       0 eV   11.7 MeV   852 mum   852 mum  TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 135,   Parent ID = 110
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -105 mum   145 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -105 mum   145 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 137,   Parent ID = 135
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -105 mum   145 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    432 mum  -792 mum -2.41 m       0 eV    511 keV  1.09 mm   1.09 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 136,   Parent ID = 135
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -105 mum   145 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -461 mum   768 mum -2.41 m     369 keV   142 keV   723 mum   723 mum  TargetPV     compt
-    2  -1.42 mm   1.69 mm  -2.41 m       0 eV    369 keV  1.82 mm   2.54 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 109,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -36.9 mum  86.7 mum -2.41 m    25.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -163 mum   224 mum -2.41 m       0 eV   6.12 MeV  1.82 mm   1.82 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 139,   Parent ID = 109
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -163 mum   224 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 141,   Parent ID = 139
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.47 mm   6.41 mm   -2.4 m     511 keV     0 eV   9.77 mm   9.77 mm    TrackerTransportation
-    2   63.3 cm    2.4 m    45.7 cm    511 keV     0 eV   3.78 m    3.79 m     WorldPVTransportation
-    3   76.8 cm   2.91 m    1.07 m     511 keV     0 eV   80.6 cm    4.6 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 140,   Parent ID = 139
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -1.5 mm  -4.84 mm  -2.41 m       0 eV    511 keV     8 mm      8 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 138,   Parent ID = 109
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -163 mum   224 mum -2.41 m    18.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -114 mum   259 mum -2.41 m    15.1 MeV   629 keV   388 mum   388 mum  TargetPV     eBrem
-    2   -142 mum   337 mum -2.41 m    12.5 MeV   582 keV   412 mum   799 mum  TargetPV     eBrem
-    3   -196 mum -68.1 mum -2.41 m    11.4 MeV   674 keV   603 mum   1.4 mm   TargetPV     eBrem
-    4   -694 mum -1.01 mm  -2.41 m    8.65 MeV  1.61 MeV  1.23 mm   2.64 mm   TargetPV     eBrem
-    5   -682 mum -1.61 mm  -2.41 m    7.39 MeV   687 keV   654 mum  3.29 mm   TargetPV     eBrem
-    6  -1.09 mm  -1.86 mm  -2.41 m    3.87 MeV  1.38 MeV  1.15 mm   4.44 mm   TargetPV     eBrem
-    7   -847 mum -2.15 mm  -2.41 m     2.7 MeV  1.17 MeV   897 mum  5.34 mm   TargetPV     eIoni
-    8  -1.18 mm  -2.36 mm  -2.41 m    1.98 MeV   714 keV   715 mum  6.05 mm   TargetPV     eIoni
-    9  -1.49 mm  -2.29 mm  -2.41 m    1.42 MeV   566 keV   597 mum  6.65 mm   TargetPV     eIoni
-   10  -1.64 mm  -2.18 mm  -2.41 m     937 keV   481 keV   497 mum  7.15 mm   TargetPV     eIoni
-   11  -1.67 mm   -2.3 mm  -2.41 m     567 keV   369 keV   399 mum  7.55 mm   TargetPV     eIoni
-   12  -1.69 mm  -2.29 mm  -2.41 m    7.81 keV   560 keV   296 mum  7.84 mm   TargetPV     eIoni
-   13  -1.69 mm  -2.29 mm  -2.41 m       0 eV   7.81 keV   495 nm   7.84 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 147,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.09 mm  -1.86 mm  -2.41 m    2.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.31 mm  -2.93 mm  -2.41 m    1.51 MeV   638 keV   1.2 mm    1.2 mm   TargetPV     compt
-    2  -1.26 mm  -3.42 mm  -2.41 m    1.11 MeV   394 keV   496 mum   1.7 mm   TargetPV     compt
-    3  -2.52 mm   -2.1 cm   -2.4 m    1.11 MeV     0 eV    1.9 cm   2.06 cm    TrackerTransportation
-    4  -17.3 cm   -2.4 m   -1.45 m    1.11 MeV     0 eV   2.57 m    2.59 m     WorldPVTransportation
-    5    -21 cm  -2.91 m   -1.25 m    1.11 MeV     0 eV     55 cm   3.14 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 146,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -682 mum -1.61 mm  -2.41 m     568 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.55 mm  -2.09 cm  -2.43 m     399 keV   169 keV  2.85 cm   2.85 cm   TargetPV     compt
-    2  -3.15 mm  -2.16 cm  -2.43 m       0 eV    399 keV   893 mum  2.94 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 145,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -694 mum -1.01 mm  -2.41 m    1.17 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.45 mm  -1.25 cm   -2.4 m     349 keV   819 keV  1.29 cm   1.29 cm   TargetPV     compt
-    2  -3.69 mm  -1.23 cm   -2.4 m       0 eV    349 keV   426 mum  1.33 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 144,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -196 mum -68.1 mum -2.41 m     357 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -228 mum  -134 mum -2.41 m       0 eV    357 keV  73.7 mum  73.7 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 143,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -142 mum   337 mum -2.41 m    2.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.62 mm  -5.38 mm   -2.4 m    2.03 MeV     0 eV    9.4 mm    9.4 mm    TrackerTransportation
-    2  -1.46 m    -2.4 m    36.7 cm   2.03 MeV     0 eV   3.94 m    3.95 m     WorldPVTransportation
-    3  -1.77 m   -2.91 m    95.6 cm   2.03 MeV     0 eV   83.9 cm   4.79 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 142,   Parent ID = 138
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -114 mum   259 mum -2.41 m    2.49 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    382 mum  1.04 mm   -2.4 m     965 keV  1.52 MeV  3.09 mm   3.09 mm   TargetPV     compt
-    2   2.73 mm    948 mum  -2.4 m     453 keV   512 keV  2.88 mm   5.97 mm   TargetPV     compt
-    3   4.49 mm   4.34 mm   -2.4 m       0 eV    453 keV  3.84 mm   9.81 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 108,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -6.93 mum -25.9 mum -2.41 m     128 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -41.9 mum -15.8 mum -2.41 m       0 eV      0 eV   1.33 mm   1.33 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 149,   Parent ID = 108
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -41.9 mum -15.8 mum -2.41 m    87.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -42.7 mum -15.7 mum -2.41 m    86.4 MeV  29.8 keV  26.5 mum  26.5 mum  TargetPV     eBrem
-    2  -43.6 mum -16.7 mum -2.41 m    85.7 MeV  74.7 keV  50.3 mum  76.8 mum  TargetPV     eBrem
-    3  -43.4 mum -17.3 mum -2.41 m    76.7 MeV  17.7 keV  14.7 mum  91.4 mum  TargetPV     eBrem
-    4  -38.2 mum -16.9 mum -2.41 m    75.4 MeV   610 keV   426 mum   518 mum  TargetPV     eBrem
-    5  -28.6 mum -16.2 mum -2.41 m      59 MeV   118 keV   121 mum   639 mum  TargetPV     eBrem
-    6   43.6 mum  -115 mum -2.41 m    56.7 MeV   1.9 MeV  1.39 mm   2.03 mm   TargetPV     eBrem
-    7   57.1 mum  -105 mum -2.41 m    50.8 MeV   121 keV   105 mum  2.13 mm   TargetPV     eBrem
-    8   98.5 mum -99.8 mum -2.41 m    49.2 MeV  1.01 MeV   554 mum  2.69 mm   TargetPV     eBrem
-    9    230 mum -89.8 mum -2.41 m    38.3 MeV  1.06 MeV   616 mum   3.3 mm   TargetPV     eBrem
-   10    270 mum -59.2 mum -2.41 m    36.7 MeV   535 keV   373 mum  3.68 mm   TargetPV     eBrem
-   11    282 mum   -61 mum -2.41 m    36.2 MeV   105 keV  88.1 mum  3.76 mm   TargetPV     eBrem
-   12    275 mum -57.2 mum -2.41 m    34.9 MeV   806 keV   340 mum   4.1 mm   TargetPV     eBrem
-   13    376 mum   254 mum  -2.4 m    32.6 MeV     2 MeV  1.31 mm   5.41 mm   TargetPV     eBrem
-   14    571 mum   316 mum  -2.4 m    4.25 MeV  1.42 MeV  1.16 mm   6.58 mm   TargetPV     eBrem
-   15    618 mum   304 mum  -2.4 m    3.39 MeV   268 keV   229 mum  6.81 mm   TargetPV     eBrem
-   16   1.05 mm    232 mum  -2.4 m    1.86 MeV  1.53 MeV   841 mum  7.65 mm   TargetPV     eIoni
-   17   1.16 mm   68.2 mum  -2.4 m     430 keV  1.43 MeV   586 mum  8.24 mm   TargetPV     eIoni
-   18   1.15 mm   95.7 mum  -2.4 m    99.1 keV   331 keV   237 mum  8.47 mm   TargetPV     eIoni
-   19   1.15 mm   93.8 mum  -2.4 m       0 eV   99.1 keV  25.2 mum   8.5 mm   TargetPV     eIoni
-   20   1.15 mm   93.8 mum  -2.4 m       0 eV      0 eV      0 fm    8.5 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 166,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.15 mm   93.8 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.64 mm  -2.77 mm   -2.4 m       0 eV    511 keV  3.23 mm   3.23 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 165,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.15 mm   93.8 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.11 cm   2.36 cm   -2.4 m     454 keV  57.4 keV  2.65 cm   2.65 cm   TargetPV     compt
-    2  -1.12 cm   2.42 cm   -2.4 m       0 eV    454 keV   677 mum  2.72 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 164,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    618 mum   304 mum  -2.4 m     589 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.01 cm  -3.16 mm   -2.4 m       0 eV     88 keV  1.07 cm   1.07 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 167,   Parent ID = 164
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.01 cm  -3.16 mm   -2.4 m     501 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.01 cm  -3.16 mm   -2.4 m     133 keV   369 keV   270 mum   270 mum  TargetPV     eIoni
-    2   1.01 cm  -3.16 mm   -2.4 m       0 eV    133 keV  42.9 mum   313 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 163,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    571 mum   316 mum  -2.4 m      27 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    357 mum  1.09 mm   -2.4 m      27 MeV     0 eV   3.74 mm   3.74 mm    TrackerTransportation
-    2  -4.64 cm   17.2 cm   -1.6 m      27 MeV     0 eV   81.9 cm   82.3 cm    ChamberTransportation
-    3   -5.8 cm   21.4 cm   -1.4 m      27 MeV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4  -9.31 cm   34.2 cm    -80 cm     27 MeV     0 eV   61.4 cm   1.64 m     ChamberTransportation
-    5  -10.5 cm   38.5 cm    -60 cm     27 MeV     0 eV   20.5 cm   1.85 m     TrackerTransportation
-    6    -14 cm   51.2 cm -0.114 fm     27 MeV     0 eV   61.4 cm   2.46 m     ChamberTransportation
-    7  -15.1 cm   55.5 cm     20 cm     27 MeV     0 eV   20.5 cm   2.67 m     TrackerTransportation
-    8  -18.6 cm   68.3 cm     80 cm     27 MeV     0 eV   61.4 cm   3.28 m     ChamberTransportation
-    9  -19.8 cm   72.5 cm      1 m      27 MeV     0 eV   20.5 cm   3.49 m     TrackerTransportation
-   10  -23.3 cm   85.3 cm    1.6 m      27 MeV     0 eV   61.4 cm    4.1 m     ChamberTransportation
-   11  -24.5 cm   89.6 cm    1.8 m      27 MeV     0 eV   20.5 cm    4.3 m     TrackerTransportation
-   12    -28 cm   1.02 m     2.4 m      27 MeV     0 eV   61.4 cm   4.92 m     WorldPVTransportation
-   13    -31 cm   1.13 m    2.91 m      27 MeV     0 eV   52.2 cm   5.44 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 162,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    376 mum   254 mum  -2.4 m     291 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    617 mum   522 mum  -2.4 m       0 eV    291 keV  1.31 mm   1.31 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 161,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    275 mum -57.2 mum -2.41 m     516 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    308 mum   464 mum  -2.4 m     516 keV     0 eV   6.07 mm   6.07 mm    TrackerTransportation
-    2    4.7 mm   6.94 cm   -1.6 m     516 keV     0 eV   80.3 cm   80.9 cm    ChamberTransportation
-    3    5.8 mm   8.66 cm   -1.4 m     516 keV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   9.09 mm   13.8 cm    -80 cm    516 keV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   1.02 cm   15.6 cm    -60 cm    516 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   1.35 cm   20.7 cm  0.114 fm    516 keV     0 eV   60.2 cm   2.42 m     ChamberTransportation
-    7   1.46 cm   22.5 cm     20 cm    516 keV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   1.79 cm   27.6 cm     80 cm    516 keV     0 eV   60.2 cm   3.22 m     ChamberTransportation
-    9    1.9 cm   29.3 cm      1 m     516 keV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   2.23 cm   34.5 cm    1.6 m     516 keV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   2.34 cm   36.2 cm    1.8 m     516 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   2.66 cm   41.4 cm    2.4 m     516 keV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13   2.94 cm   45.8 cm   2.91 m     516 keV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 160,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    282 mum   -61 mum -2.41 m     317 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    297 mum -42.6 mum -2.41 m       0 eV    317 keV   605 mum   605 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 159,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    270 mum -59.2 mum -2.41 m    1.11 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    845 mum  -155 mum  -2.4 m     902 keV   210 keV   4.5 mm    4.5 mm   TargetPV     compt
-    2    858 mum   192 mum  -2.4 m     387 keV   515 keV   827 mum  5.33 mm   TargetPV     compt
-    3    292 mum   786 mum  -2.4 m       0 eV    387 keV   821 mum  6.15 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 158,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    230 mum -89.8 mum -2.41 m    9.83 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    854 mum  21.8 mum  -2.4 m    9.83 MeV     0 eV   6.87 mm   6.87 mm    TrackerTransportation
-    2   7.38 cm   1.31 cm   -1.6 m    9.83 MeV     0 eV   80.3 cm     81 cm    ChamberTransportation
-    3    9.2 cm   1.63 cm   -1.4 m    9.83 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   14.7 cm   2.61 cm    -80 cm   9.83 MeV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   16.5 cm   2.94 cm    -60 cm   9.83 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6     22 cm   3.91 cm      0 fm   9.83 MeV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7   23.8 cm   4.24 cm     20 cm   9.83 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   29.3 cm   5.22 cm     80 cm   9.83 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   31.1 cm   5.54 cm      1 m    9.83 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   36.5 cm   6.52 cm    1.6 m    9.83 MeV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   38.4 cm   6.85 cm    1.8 m    9.83 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   43.8 cm   7.82 cm    2.4 m    9.83 MeV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13   48.5 cm   8.66 cm   2.91 m    9.83 MeV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 157,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   98.5 mum -99.8 mum -2.41 m     532 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.12 mm    248 mum  -2.4 m       0 eV    532 keV  5.03 mm   5.03 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 156,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   57.1 mum  -105 mum -2.41 m     5.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    706 mum   454 mum  -2.4 m     5.8 MeV     0 eV   8.04 mm   8.04 mm    TrackerTransportation
-    2   6.56 cm   5.64 cm   -1.6 m     5.8 MeV     0 eV   80.5 cm   81.3 cm    ChamberTransportation
-    3   8.18 cm   7.04 cm   -1.4 m     5.8 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   13.1 cm   11.2 cm    -80 cm    5.8 MeV     0 eV   60.3 cm   1.62 m     ChamberTransportation
-    5   14.7 cm   12.6 cm    -60 cm    5.8 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6   19.5 cm   16.8 cm      0 fm    5.8 MeV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7   21.2 cm   18.2 cm     20 cm    5.8 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8     26 cm   22.4 cm     80 cm    5.8 MeV     0 eV   60.3 cm   3.23 m     ChamberTransportation
-    9   27.7 cm   23.8 cm      1 m     5.8 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10   32.5 cm     28 cm    1.6 m     5.8 MeV     0 eV   60.3 cm   4.03 m     ChamberTransportation
-   11   34.1 cm   29.4 cm    1.8 m     5.8 MeV     0 eV   20.1 cm   4.23 m     TrackerTransportation
-   12     39 cm   33.6 cm    2.4 m     5.8 MeV     0 eV   60.3 cm   4.84 m     WorldPVTransportation
-   13   43.1 cm   37.2 cm   2.91 m     5.8 MeV     0 eV   51.3 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 155,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   43.6 mum  -115 mum -2.41 m     435 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    793 mum   431 mum  -2.4 m     265 keV   170 keV  7.36 mm   7.36 mm   TargetPV     compt
-    2    995 mum   700 mum  -2.4 m       0 eV    265 keV   339 mum   7.7 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 154,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -28.6 mum -16.2 mum -2.41 m    16.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    765 mum -89.8 mum  -2.4 m       0 eV      0 eV   6.51 mm   6.51 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 169,   Parent ID = 154
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    765 mum -89.8 mum  -2.4 m    9.46 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    452 mum   715 mum  -2.4 m    7.49 MeV  1.96 MeV  1.72 mm   1.72 mm   TargetPV     eIoni
-    2    324 mum  1.05 mm   -2.4 m    5.13 MeV  2.36 MeV  1.45 mm   3.17 mm   TargetPV     eIoni
-    3   65.5 mum  1.28 mm   -2.4 m    4.35 MeV   783 keV   796 mum  3.96 mm    TrackerTransportation
-    4  -18.3 cm   9.91 cm   -1.9 m    4.24 MeV  93.2 keV    54 cm   54.3 cm    Tracker     eIoni
-    5  -23.4 cm   14.9 cm  -1.73 m    4.18 MeV  31.9 keV  18.5 cm   72.8 cm    Tracker     eIoni
-    6    -27 cm   22.1 cm  -1.59 m    4.14 MeV  27.6 keV  16.6 cm   89.5 cm    Tracker     eIoni
-    7  -29.3 cm   25.4 cm   -1.5 m    4.11 MeV  13.3 keV  9.37 cm   98.8 cm    Tracker     eIoni
-    8  -35.7 cm     39 cm  -1.16 m    4.01 MeV  64.8 keV  37.8 cm   1.37 m     Tracker     eIoni
-    9  -42.1 cm   53.1 cm    -80 cm   3.94 MeV  71.8 keV    39 cm   1.76 m     ChamberTransportation
-   10  -48.2 cm   57.2 cm    -60 cm   3.85 MeV  81.1 keV  22.3 cm   1.98 m     TrackerTransportation
-   11    -86 cm   49.4 cm 0.0456 fm   3.73 MeV   115 keV  71.9 cm    2.7 m     ChamberTransportation
-   12  -94.7 cm   45.7 cm     20 cm   3.61 MeV  95.8 keV  23.3 cm   2.93 m     TrackerTransportation
-   13  -1.15 m    37.7 cm   51.2 cm   3.54 MeV  62.7 keV  38.1 cm   3.31 m     Tracker     eIoni
-   14  -1.46 m    30.2 cm     80 cm   3.46 MeV  77.7 keV  43.2 cm   3.75 m     ChamberTransportation
-   15  -1.48 m    30.1 cm   82.3 cm   3.28 MeV  39.1 keV  3.06 cm   3.78 m     Chamber     eIoni
-   16  -1.54 m    29.9 cm   89.1 cm   3.23 MeV  47.2 keV     9 cm   3.87 m     TrackerTransportation
-   17  -1.59 m    31.9 cm   97.1 cm   3.17 MeV  12.8 keV  9.96 cm   3.97 m     Tracker     eIoni
-   18   -1.8 m    38.7 cm   1.21 m    3.11 MeV  53.4 keV  32.4 cm   4.29 m     Tracker     eIoni
-   19   -2.4 m    72.5 cm   2.11 m    2.92 MeV   186 keV  1.15 m    5.44 m     WorldPVTransportation
-   20  -2.91 m    89.6 cm   2.43 m    2.81 MeV   112 keV  63.3 cm   6.07 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 181,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.93 m      46 cm   1.41 m    7.29 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.93 m      46 cm   1.41 m    2.53 keV  4.76 keV   565 mum   565 mum   Tracker     eIoni
-    2  -1.93 m      46 cm   1.41 m     585 eV   1.94 keV   230 mum   795 mum   Tracker     eIoni
-    3  -1.93 m      46 cm   1.41 m       0 eV    585 eV   32.7 mum   828 mum   Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 180,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -1.8 m    38.7 cm   1.21 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   -1.8 m    38.7 cm   1.21 m    8.74 keV   1.4 keV   780 mum   780 mum   Tracker     eIoni
-    2   -1.8 m    38.6 cm   1.21 m     6.8 keV  1.94 keV   669 mum  1.45 mm    Tracker     eIoni
-    3   -1.8 m    38.7 cm   1.21 m    3.92 keV  2.88 keV   531 mum  1.98 mm    Tracker     eIoni
-    4   -1.8 m    38.6 cm   1.21 m    1.85 keV  2.07 keV   347 mum  2.33 mm    Tracker     eIoni
-    5   -1.8 m    38.6 cm   1.21 m       0 eV   1.85 keV   145 mum  2.47 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 179,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 m    31.9 cm   97.1 cm   47.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.59 m    31.7 cm   97.7 cm   33.5 keV  3.73 keV  6.47 mm   6.47 mm    Tracker     eIoni
-    2  -1.59 m    31.4 cm   97.9 cm   31.8 keV  1.73 keV  4.27 mm   1.07 cm    Tracker     eIoni
-    3  -1.59 m    31.1 cm   98.1 cm   28.2 keV   3.6 keV  3.91 mm   1.46 cm    Tracker     eIoni
-    4  -1.59 m    30.8 cm   98.1 cm   25.1 keV  3.13 keV  3.21 mm   1.79 cm    Tracker     eIoni
-    5  -1.58 m    30.7 cm     98 cm     22 keV  3.09 keV  2.65 mm   2.05 cm    Tracker     eIoni
-    6  -1.58 m    30.6 cm   98.1 cm   19.4 keV  2.54 keV  2.17 mm   2.27 cm    Tracker     eIoni
-    7  -1.58 m    30.5 cm   98.2 cm   16.8 keV  2.69 keV   1.8 mm   2.45 cm    Tracker     eIoni
-    8  -1.58 m    30.6 cm   98.3 cm   14.8 keV  1.94 keV  1.45 mm   2.59 cm    Tracker     eIoni
-    9  -1.58 m    30.5 cm   98.3 cm   13.3 keV  1.52 keV  1.23 mm   2.72 cm    Tracker     eIoni
-   10  -1.58 m    30.4 cm   98.4 cm   11.4 keV  1.91 keV  1.07 mm   2.82 cm    Tracker     eIoni
-   11  -1.58 m    30.4 cm   98.4 cm   6.95 keV  4.45 keV   890 mum  2.91 cm    Tracker     eIoni
-   12  -1.58 m    30.4 cm   98.4 cm   4.61 keV  2.34 keV   540 mum  2.97 cm    Tracker     eIoni
-   13  -1.58 m    30.4 cm   98.5 cm   3.46 keV  1.15 keV   392 mum  3.01 cm    Tracker     eIoni
-   14  -1.58 m    30.4 cm   98.5 cm   2.08 keV  1.38 keV   314 mum  3.04 cm    Tracker     eIoni
-   15  -1.58 m    30.4 cm   98.5 cm      0 eV   2.08 keV   173 mum  3.05 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 182,   Parent ID = 179
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 m    31.7 cm   97.7 cm    9.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.59 m    31.7 cm   97.7 cm   8.89 keV   915 eV    752 mum   752 mum   Tracker     eIoni
-    2  -1.59 m    31.7 cm   97.8 cm   5.84 keV  3.05 keV   681 mum  1.43 mm    Tracker     eIoni
-    3  -1.59 m    31.7 cm   97.8 cm   4.37 keV  1.46 keV   469 mum   1.9 mm    Tracker     eIoni
-    4  -1.59 m    31.7 cm   97.8 cm   3.33 keV  1.04 keV   377 mum  2.28 mm    Tracker     eIoni
-    5  -1.59 m    31.7 cm   97.8 cm   1.78 keV  1.55 keV   304 mum  2.58 mm    Tracker     eIoni
-    6  -1.59 m    31.7 cm   97.8 cm      0 eV   1.78 keV   136 mum  2.72 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 178,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.48 m    30.1 cm   82.3 cm    140 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.48 m    30.7 cm   83.4 cm    111 keV    29 keV  1.83 cm   1.83 cm    Chamber     eIoni
-    2  -1.47 m    30.8 cm   83.3 cm    100 keV  10.6 keV  1.25 cm   3.08 cm    Chamber     eIoni
-    3  -1.47 m    31.1 cm   83.1 cm   86.5 keV  13.9 keV  1.07 cm   4.15 cm    Chamber     eIoni
-    4  -1.46 m    31.4 cm   83.1 cm   78.4 keV  8.11 keV  8.42 mm   4.99 cm    Chamber     eIoni
-    5  -1.46 m    31.9 cm   83.1 cm   67.2 keV  11.2 keV   7.2 mm   5.71 cm    Chamber     eIoni
-    6  -1.46 m    32.1 cm   83.3 cm   61.3 keV  5.88 keV  5.65 mm   6.28 cm    Chamber     eIoni
-    7  -1.46 m      32 cm   83.1 cm   52.4 keV  8.93 keV  4.89 mm   6.77 cm    Chamber     eIoni
-    8  -1.46 m    31.8 cm   83.2 cm   49.5 keV  2.86 keV  3.83 mm   7.15 cm    Chamber     eIoni
-    9  -1.46 m    31.5 cm   83.1 cm   37.1 keV  12.5 keV  3.53 mm    7.5 cm    Chamber     eIoni
-   10  -1.46 m    31.4 cm     83 cm   29.3 keV  7.78 keV   2.3 mm   7.73 cm    Chamber     eIoni
-   11  -1.46 m    31.5 cm   83.1 cm   26.7 keV  2.62 keV  1.66 mm    7.9 cm    Chamber     eIoni
-   12  -1.46 m    31.5 cm   83.1 cm   20.8 keV  5.83 keV  1.47 mm   8.04 cm    Chamber     eIoni
-   13  -1.46 m    31.5 cm   83.1 cm   17.3 keV  3.55 keV  1.08 mm   8.15 cm    Chamber     eIoni
-   14  -1.46 m    31.5 cm   83.1 cm   14.1 keV   3.2 keV   874 mum  8.24 cm    Chamber     eIoni
-   15  -1.46 m    31.5 cm   83.1 cm   11.6 keV  2.45 keV   712 mum  8.31 cm    Chamber     eIoni
-   16  -1.46 m    31.5 cm   83.1 cm   8.31 keV  3.33 keV   600 mum  8.37 cm    Chamber     eIoni
-   17  -1.46 m    31.5 cm   83.1 cm   5.52 keV  2.78 keV   463 mum  8.42 cm    Chamber     eIoni
-   18  -1.46 m    31.5 cm   83.1 cm   1.59 keV  3.93 keV   352 mum  8.45 cm    Chamber     eIoni
-   19  -1.46 m    31.5 cm   83.1 cm      0 eV   1.59 keV  85.5 mum  8.46 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 177,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.15 m    37.7 cm   51.2 cm   9.29 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.15 m    37.7 cm   51.1 cm   7.07 keV  2.23 keV   713 mum   713 mum   Tracker     eIoni
-    2  -1.15 m    37.6 cm   51.1 cm   6.06 keV     1 keV   549 mum  1.26 mm    Tracker     eIoni
-    3  -1.15 m    37.6 cm   51.1 cm   2.65 keV  3.41 keV   484 mum  1.75 mm    Tracker     eIoni
-    4  -1.15 m    37.6 cm   51.1 cm      0 eV   2.65 keV   244 mum  1.99 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 176,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -87.6 cm   48.8 cm   3.59 cm   25.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -87.6 cm   48.8 cm   3.65 cm   23.7 keV  1.86 keV  1.39 mm   1.39 mm    Chamber     eIoni
-    2  -87.6 cm   48.8 cm   3.65 cm     16 keV   7.7 keV  1.26 mm   2.65 mm    Chamber     eIoni
-    3  -87.6 cm   48.8 cm   3.63 cm   13.6 keV  2.41 keV   810 mum  3.46 mm    Chamber     eIoni
-    4  -87.6 cm   48.8 cm   3.59 cm   10.9 keV  2.67 keV   690 mum  4.15 mm    Chamber     eIoni
-    5  -87.6 cm   48.8 cm   3.57 cm   9.64 keV   1.3 keV   571 mum  4.72 mm    Chamber     eIoni
-    6  -87.6 cm   48.8 cm    3.6 cm   8.08 keV  1.56 keV   516 mum  5.24 mm    Chamber     eIoni
-    7  -87.6 cm   48.7 cm    3.6 cm   5.25 keV  2.83 keV   454 mum  5.69 mm    Chamber     eIoni
-    8  -87.6 cm   48.7 cm   3.62 cm   2.84 keV   2.4 keV   340 mum  6.03 mm    Chamber     eIoni
-    9  -87.6 cm   48.7 cm   3.62 cm      0 eV   2.84 keV   191 mum  6.22 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 175,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.4 cm   53.3 cm    -79 cm     11 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -42.4 cm   53.3 cm    -79 cm   8.82 keV  2.17 keV   573 mum   573 mum   Chamber     eIoni
-    2  -42.4 cm   53.3 cm  -79.1 cm   5.59 keV  3.24 keV   484 mum  1.06 mm    Chamber     eIoni
-    3  -42.4 cm   53.3 cm  -79.1 cm   1.83 keV  3.75 keV   354 mum  1.41 mm    Chamber     eIoni
-    4  -42.4 cm   53.3 cm  -79.1 cm      0 eV   1.83 keV   104 mum  1.52 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 174,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -35.7 cm     39 cm  -1.16 m    36.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    -36 cm   39.3 cm  -1.16 m    31.8 keV  5.01 keV  4.97 mm   4.97 mm    Tracker     eIoni
-    2  -36.4 cm   39.2 cm  -1.16 m    29.1 keV  2.66 keV   3.9 mm   8.87 mm    Tracker     eIoni
-    3  -36.6 cm     39 cm  -1.16 m    25.7 keV  3.46 keV  3.38 mm   1.22 cm    Tracker     eIoni
-    4  -36.8 cm     39 cm  -1.16 m    23.4 keV  2.24 keV  2.75 mm    1.5 cm    Tracker     eIoni
-    5  -36.9 cm   38.9 cm  -1.16 m    20.5 keV  2.89 keV  2.39 mm   1.74 cm    Tracker     eIoni
-    6  -36.7 cm   38.9 cm  -1.16 m    18.9 keV  1.63 keV  1.95 mm   1.93 cm    Tracker     eIoni
-    7  -36.8 cm   38.8 cm  -1.16 m      17 keV  1.93 keV  1.73 mm   2.11 cm    Tracker     eIoni
-    8  -36.7 cm   38.8 cm  -1.17 m    15.1 keV  1.88 keV  1.48 mm   2.25 cm    Tracker     eIoni
-    9  -36.6 cm   38.8 cm  -1.17 m      11 keV   4.1 keV  1.26 mm   2.38 cm    Tracker     eIoni
-   10  -36.6 cm   38.8 cm  -1.17 m    9.61 keV  1.37 keV   854 mum  2.47 cm    Tracker     eIoni
-   11  -36.6 cm   38.8 cm  -1.17 m    6.81 keV   2.8 keV   737 mum  2.54 cm    Tracker     eIoni
-   12  -36.6 cm   38.8 cm  -1.17 m    4.55 keV  2.26 keV   532 mum  2.59 cm    Tracker     eIoni
-   13  -36.5 cm   38.8 cm  -1.17 m    2.81 keV  1.74 keV   388 mum  2.63 cm    Tracker     eIoni
-   14  -36.5 cm   38.8 cm  -1.17 m    1.04 keV  1.77 keV   259 mum  2.66 cm    Tracker     eIoni
-   15  -36.5 cm   38.8 cm  -1.17 m       0 eV   1.04 keV  64.6 mum  2.66 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 173,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -29.3 cm   25.4 cm   -1.5 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -29.3 cm   25.5 cm   -1.5 m    8.83 keV  1.25 keV   775 mum   775 mum   Tracker     eIoni
-    2  -29.3 cm   25.5 cm   -1.5 m    5.63 keV   3.2 keV   677 mum  1.45 mm    Tracker     eIoni
-    3  -29.3 cm   25.5 cm   -1.5 m    1.97 keV  3.66 keV   456 mum  1.91 mm    Tracker     eIoni
-    4  -29.3 cm   25.5 cm   -1.5 m       0 eV   1.97 keV   159 mum  2.07 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 172,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -27 cm   22.1 cm  -1.59 m    17.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    -27 cm   22.2 cm  -1.59 m    15.9 keV  1.45 keV  1.52 mm   1.52 mm    Tracker     eIoni
-    2    -27 cm   22.3 cm  -1.59 m    14.7 keV  1.14 keV  1.35 mm   2.87 mm    Tracker     eIoni
-    3  -27.1 cm   22.4 cm  -1.59 m    12.9 keV  1.82 keV  1.22 mm    4.1 mm    Tracker     eIoni
-    4  -27.2 cm   22.5 cm  -1.59 m    9.72 keV  3.21 keV  1.04 mm   5.13 mm    Tracker     eIoni
-    5  -27.1 cm   22.4 cm  -1.59 m    7.11 keV  2.61 keV   745 mum  5.88 mm    Tracker     eIoni
-    6  -27.1 cm   22.4 cm  -1.59 m    5.25 keV  1.86 keV   552 mum  6.43 mm    Tracker     eIoni
-    7  -27.1 cm   22.4 cm  -1.59 m    3.89 keV  1.36 keV   432 mum  6.86 mm    Tracker     eIoni
-    8    -27 cm   22.4 cm  -1.59 m     544 eV   3.35 keV   345 mum  7.21 mm    Tracker     eIoni
-    9    -27 cm   22.4 cm  -1.59 m       0 eV    544 eV   30.2 mum  7.24 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 171,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -23.4 cm   14.9 cm  -1.73 m    31.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -23.5 cm   14.6 cm  -1.73 m    27.6 keV  3.67 keV   3.8 mm    3.8 mm    Tracker     eIoni
-    2  -23.3 cm   14.5 cm  -1.73 m    16.4 keV  11.2 keV   3.1 mm    6.9 mm    Tracker     eIoni
-    3  -23.2 cm   14.5 cm  -1.73 m    15.3 keV  1.16 keV  1.42 mm   8.32 mm    Tracker     eIoni
-    4  -23.3 cm   14.5 cm  -1.73 m    13.9 keV  1.34 keV  1.28 mm    9.6 mm    Tracker     eIoni
-    5  -23.3 cm   14.5 cm  -1.73 m    9.26 keV  4.69 keV  1.14 mm   1.07 cm    Tracker     eIoni
-    6  -23.3 cm   14.4 cm  -1.73 m     5.8 keV  3.45 keV   710 mum  1.15 cm    Tracker     eIoni
-    7  -23.4 cm   14.4 cm  -1.73 m    3.95 keV  1.85 keV   466 mum  1.19 cm    Tracker     eIoni
-    8  -23.3 cm   14.4 cm  -1.73 m    2.96 keV   996 eV    349 mum  1.23 cm    Tracker     eIoni
-    9  -23.3 cm   14.4 cm  -1.73 m    1.46 keV   1.5 keV   273 mum  1.25 cm    Tracker     eIoni
-   10  -23.3 cm   14.4 cm  -1.73 m       0 eV   1.46 keV   102 mum  1.26 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 170,   Parent ID = 169
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -18.3 cm   9.91 cm   -1.9 m      11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -18.2 cm   9.89 cm   -1.9 m    9.41 keV  1.63 keV   859 mum   859 mum   Tracker     eIoni
-    2  -18.2 cm    9.9 cm   -1.9 m    8.04 keV  1.38 keV   722 mum  1.58 mm    Tracker     eIoni
-    3  -18.1 cm   9.86 cm   -1.9 m    6.33 keV  1.71 keV   617 mum   2.2 mm    Tracker     eIoni
-    4  -18.1 cm   9.83 cm   -1.9 m    4.99 keV  1.34 keV   501 mum   2.7 mm    Tracker     eIoni
-    5  -18.1 cm   9.82 cm   -1.9 m    2.41 keV  2.59 keV   416 mum  3.12 mm    Tracker     eIoni
-    6  -18.1 cm   9.83 cm   -1.9 m       0 eV   2.41 keV   215 mum  3.33 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 168,   Parent ID = 154
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    765 mum -89.8 mum  -2.4 m    5.77 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    624 mum  -154 mum  -2.4 m    4.29 MeV   888 keV   794 mum   794 mum  TargetPV     eBrem
-    2   1.33 mm   -234 mum  -2.4 m    3.08 MeV  1.21 MeV   959 mum  1.75 mm   TargetPV     eIoni
-    3   1.72 mm   68.4 mum  -2.4 m    2.27 MeV   814 keV   776 mum  2.53 mm   TargetPV     eIoni
-    4   1.83 mm    163 mum  -2.4 m    1.61 MeV   659 keV   645 mum  3.18 mm   TargetPV     eIoni
-    5    1.8 mm    335 mum  -2.4 m     992 keV   259 keV   273 mum  3.45 mm   TargetPV     eBrem
-    6   1.75 mm    433 mum  -2.4 m     194 keV   312 keV   316 mum  3.76 mm   TargetPV     eBrem
-    7   1.75 mm    439 mum  -2.4 m       0 eV    194 keV  76.6 mum  3.84 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 185,   Parent ID = 168
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.75 mm    433 mum  -2.4 m     486 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.88 mm   4.58 mm   -2.4 m       0 eV    486 keV  4.99 mm   4.99 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 184,   Parent ID = 168
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.8 mm    335 mum  -2.4 m     359 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.57 mm   1.41 mm   -2.4 m       0 eV    359 keV  2.05 mm   2.05 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 183,   Parent ID = 168
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    624 mum  -154 mum  -2.4 m     589 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.59 mm  -3.27 mm   -2.4 m     205 keV   384 keV  4.47 mm   4.47 mm   TargetPV     compt
-    2   3.51 mm   -2.8 mm   -2.4 m       0 eV    205 keV   993 mum  5.47 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 153,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.2 mum -16.9 mum -2.41 m     761 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.04 mm    181 mum  -2.4 m       0 eV    761 keV  8.49 mm   8.49 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 152,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.4 mum -17.3 mum -2.41 m     8.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    254 mum  -380 mum  -2.4 m     8.9 MeV     0 eV      1 cm      1 cm    TrackerTransportation
-    2    2.4 cm  -2.93 cm   -1.6 m     8.9 MeV     0 eV   80.1 cm   81.1 cm    ChamberTransportation
-    3   2.99 cm  -3.66 cm   -1.4 m     8.9 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   4.77 cm  -5.83 cm    -80 cm    8.9 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   5.37 cm  -6.55 cm    -60 cm    8.9 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   7.15 cm  -8.72 cm      0 fm    8.9 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   7.74 cm  -9.44 cm     20 cm    8.9 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   9.52 cm  -11.6 cm     80 cm    8.9 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9   10.1 cm  -12.3 cm      1 m     8.9 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   11.9 cm  -14.5 cm    1.6 m     8.9 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   12.5 cm  -15.2 cm    1.8 m     8.9 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   14.3 cm  -17.4 cm    2.4 m     8.9 MeV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13   15.8 cm  -19.2 cm   2.91 m     8.9 MeV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 151,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.6 mum -16.7 mum -2.41 m     631 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    130 mum  -453 mum  -2.4 m     631 keV     0 eV   1.01 cm   1.01 cm    TrackerTransportation
-    2    1.4 cm  -3.52 cm   -1.6 m     631 keV     0 eV   80.1 cm   81.1 cm    ChamberTransportation
-    3   1.74 cm  -4.39 cm   -1.4 m     631 keV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.78 cm  -6.99 cm    -80 cm    631 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   3.13 cm  -7.86 cm    -60 cm    631 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   4.16 cm  -10.5 cm      0 fm    631 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   4.51 cm  -11.3 cm     20 cm    631 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   5.55 cm  -13.9 cm     80 cm    631 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9   5.89 cm  -14.8 cm      1 m     631 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   6.93 cm  -17.4 cm    1.6 m     631 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   7.28 cm  -18.3 cm    1.8 m     631 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   8.31 cm  -20.9 cm    2.4 m     631 keV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13    9.2 cm  -23.1 cm   2.91 m     631 keV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 150,   Parent ID = 149
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.7 mum -15.7 mum -2.41 m     903 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -257 mum  -162 mum  -2.4 m     408 keV   496 keV  9.21 mm   9.21 mm   TargetPV     compt
-    2   -705 mum  2.39 mm   -2.4 m     408 keV     0 eV   2.74 mm    1.2 cm    TrackerTransportation
-    3  -42.1 cm    2.4 m   -1.57 m     408 keV     0 eV   2.57 m    2.58 m     WorldPVTransportation
-    4  -51.1 cm   2.91 m   -1.39 m     408 keV     0 eV   54.7 cm   3.13 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 148,   Parent ID = 108
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -41.9 mum -15.8 mum -2.41 m    40.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    354 mum   137 mum -2.41 m    36.6 MeV  3.16 MeV  2.42 mm   2.42 mm   TargetPV     eBrem
-    2    469 mum   129 mum -2.41 m    35.3 MeV   904 keV   596 mum  3.01 mm   TargetPV     eBrem
-    3    103 mum -1.29 mm   -2.4 m      25 MeV  10.3 MeV  4.95 mm   7.96 mm   TargetPV     eIoni
-    4   17.1 mum -1.36 mm   -2.4 m    6.72 MeV  17.1 MeV  1.46 mm   9.42 mm   TargetPV     eBrem
-    5   -249 mum -1.99 mm   -2.4 m    5.23 MeV  1.49 MeV  1.31 mm   1.07 cm   TargetPV     eIoni
-    6   -224 mum -2.71 mm   -2.4 m    3.98 MeV  1.25 MeV   1.1 mm   1.18 cm   TargetPV     eIoni
-    7   -278 mum -2.71 mm   -2.4 m    2.95 MeV  1.03 MeV   913 mum  1.27 cm   TargetPV     eIoni
-    8   -579 mum -3.02 mm   -2.4 m    2.19 MeV   762 keV   755 mum  1.35 cm   TargetPV     eIoni
-    9   -363 mum -3.11 mm   -2.4 m    1.55 MeV   635 keV   632 mum  1.41 cm   TargetPV     eIoni
-   10   -258 mum -3.17 mm   -2.4 m    1.07 MeV   487 keV   522 mum  1.46 cm   TargetPV     eIoni
-   11   -330 mum -3.12 mm   -2.4 m     589 keV   478 keV   428 mum  1.51 cm   TargetPV     eIoni
-   12   -351 mum -3.18 mm   -2.4 m     187 keV   402 keV   304 mum  1.54 cm   TargetPV     eIoni
-   13   -355 mum -3.18 mm   -2.4 m       0 eV    187 keV  72.9 mum  1.54 cm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 188,   Parent ID = 148
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.1 mum -1.36 mm   -2.4 m    1.25 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -595 mum -2.51 mm   -2.4 m    1.25 MeV     0 eV   1.62 mm   1.62 mm    TrackerTransportation
-    2  -1.27 m    -2.4 m   -42.6 cm   1.25 MeV     0 eV   3.35 m    3.36 m     WorldPVTransportation
-    3  -1.54 m   -2.91 m   -6.58 mm   1.25 MeV     0 eV   71.3 cm   4.07 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 187,   Parent ID = 148
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    469 mum   129 mum -2.41 m     342 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    259 mum   784 mum  -2.4 m       0 eV    342 keV  5.71 mm   5.71 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 186,   Parent ID = 148
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    354 mum   137 mum -2.41 m     362 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    812 mum   342 mum  -2.4 m       0 eV    362 keV  3.02 mm   3.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 107,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -6.8 mum -7.95 mum -2.41 m     520 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -64 mum -25.8 mum -2.41 m       0 eV      0 eV   7.03 mm   7.03 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 190,   Parent ID = 107
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -64 mum -25.8 mum -2.41 m     201 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -64.8 mum   -26 mum -2.41 m     200 MeV   220 keV  51.9 mum  51.9 mum  TargetPV     eBrem
-    2  -67.3 mum -25.8 mum -2.41 m     198 MeV   435 keV   102 mum   154 mum  TargetPV     eBrem
-    3  -65.6 mum -32.9 mum  -2.4 m     196 MeV  1.77 MeV   983 mum  1.14 mm   TargetPV     eBrem
-    4  -89.4 mum -75.6 mum  -2.4 m     184 MeV   714 keV   649 mum  1.79 mm   TargetPV     eBrem
-    5  -91.1 mum -77.2 mum  -2.4 m     183 MeV   309 keV   207 mum  1.99 mm   TargetPV     eBrem
-    6  -92.5 mum -81.2 mum  -2.4 m     181 MeV   103 keV  93.5 mum  2.09 mm   TargetPV     eBrem
-    7   -118 mum  -148 mum  -2.4 m     179 MeV  1.51 MeV  1.06 mm   3.14 mm   TargetPV     eBrem
-    8   -159 mum  -194 mum  -2.4 m    70.8 MeV   965 keV   766 mum  3.91 mm   TargetPV     eBrem
-    9   -165 mum  -228 mum  -2.4 m    63.8 MeV   712 keV   386 mum  4.29 mm   TargetPV     eBrem
-   10   -295 mum  -328 mum  -2.4 m    62.1 MeV   1.7 MeV  1.14 mm   5.44 mm    TrackerTransportation
-   11  -3.34 cm  -3.37 mm  -2.21 m    62.1 MeV  37.1 keV  19.6 cm   20.2 cm    Tracker     eIoni
-   12  -12.8 cm  -9.15 mm  -1.66 m    61.1 MeV   121 keV  55.7 cm   75.9 cm    Tracker     eIoni
-   13  -13.8 cm  -9.29 mm   -1.6 m    61.1 MeV  18.9 keV  5.83 cm   81.7 cm    ChamberTransportation
-   14  -17.1 cm  -1.04 cm   -1.4 m    60.9 MeV   134 keV  20.3 cm   1.02 m     TrackerTransportation
-   15  -27.3 cm  -9.32 mm    -80 cm   60.8 MeV   133 keV  60.9 cm   1.63 m     ChamberTransportation
-   16  -30.3 cm  -1.09 cm  -63.4 cm   60.6 MeV   128 keV  16.9 cm    1.8 m     Chamber     eIoni
-   17  -30.8 cm  -1.04 cm    -60 cm   60.6 MeV  14.7 keV  3.44 cm   1.83 m     TrackerTransportation
-   18  -38.1 cm  -9.47 mm  -8.18 mm   60.4 MeV   126 keV  59.6 cm   2.43 m     Tracker     eIoni
-   19  -38.2 cm  -9.34 mm -0.00355 fm   60.4 MeV   1.7 keV  8.25 mm   2.44 m     ChamberTransportation
-   20  -39.4 cm  -7.67 mm    8.1 cm   59.9 MeV  63.5 keV  8.18 cm   2.52 m     Chamber     eBrem
-   21  -40.9 cm  -3.36 mm     20 cm   59.8 MeV  58.6 keV    12 cm   2.64 m     TrackerTransportation
-   22  -47.7 cm    9.8 mm   72.5 cm   59.7 MeV   115 keV  52.9 cm   3.17 m     Tracker     eIoni
-   23  -48.6 cm   1.19 cm     80 cm   59.7 MeV  15.6 keV  7.59 cm   3.24 m     ChamberTransportation
-   24  -51.1 cm   1.63 cm      1 m    59.5 MeV   132 keV  20.2 cm   3.45 m     TrackerTransportation
-   25  -59.2 cm   3.32 cm    1.6 m    59.4 MeV   127 keV  60.6 cm   4.05 m     ChamberTransportation
-   26  -61.8 cm   4.38 cm    1.8 m    59.2 MeV   128 keV  20.2 cm   4.25 m     TrackerTransportation
-   27  -71.9 cm   9.84 cm    2.4 m    59.1 MeV   136 keV  61.1 cm   4.86 m     WorldPVTransportation
-   28  -78.6 cm   13.9 cm    2.8 m      59 MeV  91.7 keV  40.5 cm   5.27 m     WorldPV     eIoni
-   29  -79.1 cm   14.2 cm   2.83 m    58.9 MeV  13.3 keV  3.43 cm    5.3 m     WorldPV     eIoni
-   30  -80.4 cm   15.1 cm   2.91 m    58.9 MeV  13.4 keV  8.03 cm   5.38 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 210,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -79.1 cm   14.2 cm   2.83 m    34.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -79.3 cm   13.9 cm   2.83 m    30.7 keV   3.5 keV   4.4 mm    4.4 mm    WorldPV     eIoni
-    2  -79.6 cm   13.9 cm   2.83 m    25.1 keV  5.53 keV  3.67 mm   8.07 mm    WorldPV     eIoni
-    3  -79.8 cm   13.8 cm   2.83 m    22.7 keV  2.48 keV  2.66 mm   1.07 cm    WorldPV     eIoni
-    4    -80 cm   13.7 cm   2.83 m    19.5 keV  3.11 keV  2.27 mm    1.3 cm    WorldPV     eIoni
-    5  -80.2 cm   13.7 cm   2.83 m    17.8 keV  1.75 keV  1.81 mm   1.48 cm    WorldPV     eIoni
-    6  -80.3 cm   13.7 cm   2.83 m    15.7 keV  2.12 keV  1.58 mm   1.64 cm    WorldPV     eIoni
-    7  -80.4 cm   13.7 cm   2.83 m    14.3 keV  1.37 keV  1.33 mm   1.77 cm    WorldPV     eIoni
-    8  -80.4 cm   13.7 cm   2.83 m      13 keV  1.26 keV  1.17 mm   1.89 cm    WorldPV     eIoni
-    9  -80.4 cm   13.6 cm   2.83 m    4.42 keV  8.62 keV  1.05 mm   1.99 cm    WorldPV     eIoni
-   10  -80.4 cm   13.6 cm   2.83 m    3.52 keV   896 eV    380 mum  2.03 cm    WorldPV     eIoni
-   11  -80.4 cm   13.6 cm   2.83 m     1.8 keV  1.72 keV   319 mum  2.06 cm    WorldPV     eIoni
-   12  -80.4 cm   13.6 cm   2.83 m       0 eV    1.8 keV   139 mum  2.08 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 209,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.6 cm   13.9 cm    2.8 m    33.6 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -78.2 cm     14 cm    2.8 m    30.1 keV   3.5 keV  4.28 mm   4.28 mm    WorldPV     eIoni
-    2    -78 cm   13.7 cm    2.8 m    25.9 keV  4.18 keV  3.55 mm   7.83 mm    WorldPV     eIoni
-    3  -77.8 cm   13.6 cm    2.8 m    23.9 keV     2 keV  2.79 mm   1.06 cm    WorldPV     eIoni
-    4  -77.8 cm   13.6 cm    2.8 m    17.7 keV  6.17 keV  2.46 mm   1.31 cm    WorldPV     eIoni
-    5  -77.7 cm   13.6 cm    2.8 m    15.3 keV  2.43 keV  1.57 mm   1.47 cm    WorldPV     eIoni
-    6  -77.7 cm   13.7 cm    2.8 m    11.2 keV  4.09 keV  1.29 mm   1.59 cm    WorldPV     eIoni
-    7  -77.7 cm   13.8 cm    2.8 m    9.67 keV  1.55 keV   874 mum  1.68 cm    WorldPV     eIoni
-    8  -77.8 cm   13.8 cm    2.8 m    7.73 keV  1.94 keV   742 mum  1.76 cm    WorldPV     eIoni
-    9  -77.8 cm   13.8 cm    2.8 m     4.9 keV  2.83 keV   596 mum  1.82 cm    WorldPV     eIoni
-   10  -77.8 cm   13.8 cm    2.8 m    3.49 keV  1.41 keV   410 mum  1.86 cm    WorldPV     eIoni
-   11  -77.8 cm   13.8 cm    2.8 m    2.55 keV   944 eV    317 mum  1.89 cm    WorldPV     eIoni
-   12  -77.8 cm   13.8 cm    2.8 m    35.9 eV   2.51 keV   232 mum  1.91 cm    WorldPV     eIoni
-   13  -77.8 cm   13.8 cm    2.8 m       0 eV   35.9 eV   6.03 mum  1.91 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 208,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.4 cm   3.42 cm   1.62 m    10.1 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -59.4 cm    3.4 cm   1.62 m    8.83 keV  1.25 keV   534 mum   534 mum   Chamber     eIoni
-    2  -59.4 cm   3.38 cm   1.62 m    4.43 keV   4.4 keV   484 mum  1.02 mm    Chamber     eIoni
-    3  -59.4 cm   3.39 cm   1.62 m    1.72 keV  2.72 keV   301 mum  1.32 mm    Chamber     eIoni
-    4  -59.4 cm   3.39 cm   1.62 m       0 eV   1.72 keV  95.4 mum  1.41 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 207,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -50.3 cm   1.49 cm   93.6 cm   11.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -50.3 cm   1.48 cm   93.6 cm   10.8 keV  1.15 keV   613 mum   613 mum   Chamber     eIoni
-    2  -50.3 cm   1.49 cm   93.7 cm   9.34 keV  1.44 keV   564 mum  1.18 mm    Chamber     eIoni
-    3  -50.3 cm   1.48 cm   93.6 cm   7.98 keV  1.37 keV   505 mum  1.68 mm    Chamber     eIoni
-    4  -50.3 cm   1.48 cm   93.7 cm   6.81 keV  1.17 keV   450 mum  2.13 mm    Chamber     eIoni
-    5  -50.3 cm    1.5 cm   93.6 cm   5.86 keV   951 eV    404 mum  2.54 mm    Chamber     eIoni
-    6  -50.3 cm   1.51 cm   93.6 cm   4.58 keV  1.28 keV   366 mum   2.9 mm    Chamber     eIoni
-    7  -50.4 cm    1.5 cm   93.6 cm   2.04 keV  2.54 keV   308 mum  3.21 mm    Chamber     eIoni
-    8  -50.4 cm    1.5 cm   93.6 cm      0 eV   2.04 keV   121 mum  3.33 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 206,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -47.7 cm    9.8 mm   72.5 cm   19.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -47.7 cm   8.09 mm   72.5 cm   16.4 keV  3.02 keV  1.79 mm   1.79 mm    Tracker     eIoni
-    2  -47.6 cm    7.2 mm   72.4 cm   12.9 keV  3.45 keV  1.41 mm    3.2 mm    Tracker     eIoni
-    3  -47.5 cm   6.53 mm   72.4 cm   10.6 keV   2.3 keV  1.03 mm   4.23 mm    Tracker     eIoni
-    4  -47.5 cm   5.88 mm   72.4 cm   9.33 keV  1.28 keV   821 mum  5.06 mm    Tracker     eIoni
-    5  -47.4 cm   5.45 mm   72.4 cm   8.17 keV  1.16 keV   716 mum  5.77 mm    Tracker     eIoni
-    6  -47.4 cm      5 mm   72.4 cm   7.29 keV   878 eV    626 mum   6.4 mm    Tracker     eIoni
-    7  -47.4 cm   4.56 mm   72.4 cm   5.92 keV  1.37 keV   565 mum  6.96 mm    Tracker     eIoni
-    8  -47.4 cm   4.42 mm   72.4 cm   1.19 keV  4.74 keV   474 mum  7.44 mm    Tracker     eIoni
-    9  -47.4 cm   4.45 mm   72.4 cm      0 eV   1.19 keV    77 mum  7.51 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 205,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -39.4 cm  -7.67 mm    8.1 cm    516 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1    -41 cm  -4.86 mm     20 cm    516 keV     0 eV     12 cm     12 cm    TrackerTransportation
-    2  -49.3 cm   9.28 mm     80 cm    516 keV     0 eV   60.6 cm   72.6 cm    ChamberTransportation
-    3    -52 cm    1.4 cm      1 m     516 keV     0 eV   20.2 cm   92.8 cm    TrackerTransportation
-    4  -60.2 cm   2.81 cm    1.6 m     516 keV     0 eV   60.6 cm   1.53 m     ChamberTransportation
-    5    -63 cm   3.29 cm    1.8 m     516 keV     0 eV   20.2 cm   1.74 m     TrackerTransportation
-    6  -71.2 cm    4.7 cm    2.4 m     516 keV     0 eV   60.6 cm   2.34 m     WorldPVTransportation
-    7  -78.2 cm    5.9 cm   2.91 m     516 keV     0 eV   51.5 cm   2.86 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 204,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.1 cm  -9.47 mm  -8.18 mm     11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -38.1 cm  -1.02 cm  -7.81 mm   9.39 keV  1.62 keV   856 mum   856 mum   Tracker     eIoni
-    2  -38.1 cm  -1.06 cm  -7.28 mm   7.03 keV  2.36 keV   720 mum  1.58 mm    Tracker     eIoni
-    3  -38.1 cm  -1.11 cm  -7.13 mm   5.32 keV  1.72 keV   547 mum  2.12 mm    Tracker     eIoni
-    4  -38.1 cm  -1.14 cm  -7.33 mm    4.6 keV   715 eV    437 mum  2.56 mm    Tracker     eIoni
-    5  -38.1 cm  -1.16 cm  -7.65 mm   3.93 keV   673 eV    392 mum  2.95 mm    Tracker     eIoni
-    6  -38.1 cm  -1.14 cm  -7.39 mm   2.36 keV  1.57 keV   347 mum   3.3 mm    Tracker     eIoni
-    7  -38.1 cm  -1.13 cm  -7.31 mm      0 eV   2.36 keV   209 mum  3.51 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 203,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -30.3 cm  -1.09 cm  -63.4 cm   74.8 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -30.8 cm  -1.14 cm  -63.4 cm   62.8 keV    12 keV  6.67 mm   6.67 mm    Chamber     eIoni
-    2  -31.1 cm  -1.06 cm  -63.6 cm   58.6 keV  4.16 keV  5.07 mm   1.17 cm    Chamber     eIoni
-    3  -30.8 cm  -8.94 mm  -63.7 cm   52.5 keV  6.18 keV  4.57 mm   1.63 cm    Chamber     eIoni
-    4  -30.7 cm  -6.25 mm  -63.7 cm   45.7 keV  6.72 keV  3.84 mm   2.02 cm    Chamber     eIoni
-    5  -30.7 cm  -6.51 mm  -63.4 cm   40.8 keV  4.96 keV  3.13 mm   2.33 cm    Chamber     eIoni
-    6  -30.9 cm  -6.71 mm  -63.4 cm   34.3 keV  6.46 keV  2.64 mm   2.59 cm    Chamber     eIoni
-    7    -31 cm  -6.42 mm  -63.5 cm   30.8 keV  3.49 keV  2.06 mm    2.8 cm    Chamber     eIoni
-    8    -31 cm  -5.57 mm  -63.4 cm     18 keV  12.8 keV  1.77 mm   2.98 cm    Chamber     eIoni
-    9  -30.9 cm  -6.01 mm  -63.4 cm   15.2 keV  2.82 keV   914 mum  3.07 cm    Chamber     eIoni
-   10  -30.9 cm  -5.92 mm  -63.4 cm   11.4 keV  3.82 keV   766 mum  3.15 cm    Chamber     eIoni
-   11  -30.9 cm  -5.96 mm  -63.3 cm   10.1 keV  1.23 keV   588 mum   3.2 cm    Chamber     eIoni
-   12  -30.9 cm  -6.06 mm  -63.3 cm   3.46 keV  6.67 keV   536 mum  3.26 cm    Chamber     eIoni
-   13  -30.9 cm  -6.12 mm  -63.3 cm    291 eV   3.17 keV   242 mum  3.28 cm    Chamber     eIoni
-   14  -30.9 cm  -6.12 mm  -63.3 cm      0 eV    291 eV   13.5 mum  3.28 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 202,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.1 cm  -9.41 mm  -1.58 m    13.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -14.1 cm  -9.19 mm  -1.58 m    10.2 keV  3.24 keV   683 mum   683 mum   Chamber     eIoni
-    2  -14.1 cm  -9.39 mm  -1.58 m    8.38 keV  1.84 keV   540 mum  1.22 mm    Chamber     eIoni
-    3  -14.1 cm  -9.46 mm  -1.58 m    4.84 keV  3.54 keV   466 mum  1.69 mm    Chamber     eIoni
-    4  -14.1 cm  -9.49 mm  -1.58 m     157 eV   4.68 keV   321 mum  2.01 mm    Chamber     eIoni
-    5  -14.1 cm  -9.49 mm  -1.58 m       0 eV    157 eV   9.62 mum  2.02 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 201,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -12.8 cm  -9.15 mm  -1.66 m     849 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -21.4 cm   1.34 cm   -1.6 m     832 keV  17.3 keV  10.7 cm   10.7 cm    ChamberTransportation
-    2    -24 cm   2.11 cm  -1.58 m     812 keV  19.8 keV  4.09 cm   14.8 cm    TrackerTransportation
-    3    -86 cm   15.8 cm  -1.27 m     683 keV   129 keV  72.7 cm   87.5 cm    Tracker     eIoni
-    4  -1.35 m    17.1 cm  -1.24 m     533 keV  95.8 keV  51.6 cm   1.39 m     Tracker     eIoni
-    5  -1.67 m    22.3 cm  -1.46 m     462 keV  70.7 keV  40.9 cm    1.8 m     Tracker     eIoni
-    6  -1.76 m      24 cm  -1.48 m     438 keV  14.4 keV  9.48 cm   1.89 m     Tracker     eIoni
-    7  -2.01 m    30.3 cm  -1.34 m     384 keV  53.9 keV  30.8 cm    2.2 m     Tracker     eIoni
-    8  -2.22 m    39.3 cm  -1.23 m     339 keV  45.4 keV  25.3 cm   2.46 m     Tracker     eIoni
-    9  -2.26 m    41.8 cm  -1.26 m     306 keV  18.8 keV  6.29 cm   2.52 m     Tracker     eIoni
-   10   -2.4 m    44.2 cm  -1.35 m     265 keV  40.6 keV  17.9 cm    2.7 m     Tracker     eIoni
-   11   -2.4 m    44.2 cm  -1.35 m     264 keV   644 eV   3.41 mm    2.7 m     WorldPVTransportation
-   12  -2.53 m    41.2 cm   -1.4 m     233 keV  31.6 keV  14.2 cm   2.84 m     WorldPV     eIoni
-   13  -2.58 m    42.7 cm  -1.31 m     195 keV  38.2 keV  11.6 cm   2.96 m     WorldPV     eIoni
-   14  -2.62 m    36.4 cm  -1.27 m     174 keV  20.9 keV  8.66 cm   3.05 m     WorldPV     eIoni
-   15  -2.62 m    35.8 cm  -1.26 m     161 keV  2.21 keV  7.84 mm   3.05 m     WorldPV     eIoni
-   16  -2.66 m    31.5 cm  -1.25 m     142 keV  19.7 keV  6.35 cm   3.12 m     WorldPV     eIoni
-   17  -2.68 m    27.1 cm  -1.26 m     120 keV  21.7 keV  5.11 cm   3.17 m     WorldPV     eIoni
-   18  -2.69 m    26.3 cm  -1.26 m    96.9 keV  14.5 keV  1.07 cm   3.18 m     WorldPV     eIoni
-   19   -2.7 m    24.4 cm  -1.27 m    87.1 keV  9.84 keV  2.67 cm   3.21 m     WorldPV     eIoni
-   20  -2.72 m    23.5 cm  -1.26 m    72.3 keV  14.8 keV  2.21 cm   3.23 m     WorldPV     eIoni
-   21  -2.74 m      23 cm  -1.26 m    63.7 keV  8.61 keV   1.6 cm   3.24 m     WorldPV     eIoni
-   22  -2.75 m    22.9 cm  -1.25 m    55.9 keV  7.76 keV  1.28 cm   3.26 m     WorldPV     eIoni
-   23  -2.75 m    22.3 cm  -1.26 m    50.1 keV  5.85 keV  1.02 cm   3.27 m     WorldPV     eIoni
-   24  -2.76 m    21.8 cm  -1.26 m    42.3 keV  7.78 keV  8.45 mm   3.27 m     WorldPV     eIoni
-   25  -2.76 m    21.4 cm  -1.26 m    37.4 keV  4.85 keV  6.31 mm   3.28 m     WorldPV     eIoni
-   26  -2.77 m    21.1 cm  -1.26 m    33.6 keV  3.88 keV  5.13 mm   3.29 m     WorldPV     eIoni
-   27  -2.77 m    20.7 cm  -1.26 m    29.2 keV  4.35 keV  4.28 mm   3.29 m     WorldPV     eIoni
-   28  -2.77 m    20.5 cm  -1.26 m    24.4 keV  4.81 keV  3.39 mm   3.29 m     WorldPV     eIoni
-   29  -2.77 m    20.3 cm  -1.26 m    21.9 keV  2.47 keV  2.54 mm    3.3 m     WorldPV     eIoni
-   30  -2.77 m    20.1 cm  -1.26 m    16.9 keV  5.02 keV  2.16 mm    3.3 m     WorldPV     eIoni
-   31  -2.77 m      20 cm  -1.26 m    12.2 keV  4.71 keV  1.47 mm    3.3 m     WorldPV     eIoni
-   32  -2.77 m      20 cm  -1.26 m      11 keV  1.21 keV   962 mum   3.3 m     WorldPV     eIoni
-   33  -2.77 m      20 cm  -1.26 m    10.2 keV   804 eV    853 mum   3.3 m     WorldPV     eIoni
-   34  -2.77 m      20 cm  -1.26 m    7.95 keV  2.22 keV   783 mum   3.3 m     WorldPV     eIoni
-   35  -2.77 m      20 cm  -1.26 m    6.64 keV  1.31 keV   611 mum   3.3 m     WorldPV     eIoni
-   36  -2.77 m      20 cm  -1.26 m    4.82 keV  1.81 keV   521 mum   3.3 m     WorldPV     eIoni
-   37  -2.77 m      20 cm  -1.26 m    3.01 keV  1.82 keV   405 mum   3.3 m     WorldPV     eIoni
-   38  -2.77 m      20 cm  -1.26 m     455 eV   2.55 keV   278 mum   3.3 m     WorldPV     eIoni
-   39  -2.77 m      20 cm  -1.26 m       0 eV    455 eV   25.4 mum   3.3 m     WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 215,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.69 m    26.3 cm  -1.26 m    8.65 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.69 m    26.3 cm  -1.26 m    6.36 keV  2.29 keV   662 mum   662 mum   WorldPV     eIoni
-    2  -2.69 m    26.3 cm  -1.26 m    4.96 keV   1.4 keV   503 mum  1.17 mm    WorldPV     eIoni
-    3  -2.69 m    26.3 cm  -1.26 m     3.7 keV  1.26 keV   414 mum  1.58 mm    WorldPV     eIoni
-    4  -2.69 m    26.3 cm  -1.26 m    2.14 keV  1.55 keV   332 mum  1.91 mm    WorldPV     eIoni
-    5  -2.69 m    26.3 cm  -1.26 m       0 eV   2.14 keV   181 mum  2.09 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 214,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.62 m    35.8 cm  -1.26 m    10.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.62 m    35.7 cm  -1.26 m     6.4 keV  3.77 keV   782 mum   782 mum   WorldPV     eIoni
-    2  -2.62 m    35.7 cm  -1.26 m     4.5 keV   1.9 keV   505 mum  1.29 mm    WorldPV     eIoni
-    3  -2.62 m    35.7 cm  -1.26 m    3.11 keV  1.39 keV   385 mum  1.67 mm    WorldPV     eIoni
-    4  -2.62 m    35.7 cm  -1.26 m     237 eV   2.87 keV   286 mum  1.96 mm    WorldPV     eIoni
-    5  -2.62 m    35.7 cm  -1.26 m       0 eV    237 eV   15.6 mum  1.97 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 213,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.26 m    41.8 cm  -1.26 m    14.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -2.26 m    41.9 cm  -1.27 m    11.5 keV  2.98 keV  1.19 mm   1.19 mm    Tracker     eIoni
-    2  -2.26 m      42 cm  -1.27 m    8.95 keV  2.54 keV   898 mum  2.09 mm    Tracker     eIoni
-    3  -2.26 m      42 cm  -1.27 m    5.25 keV   3.7 keV   686 mum  2.77 mm    Tracker     eIoni
-    4  -2.26 m    42.1 cm  -1.27 m    3.49 keV  1.76 keV   433 mum  3.21 mm    Tracker     eIoni
-    5  -2.26 m    42.1 cm  -1.27 m    1.67 keV  1.82 keV   316 mum  3.52 mm    Tracker     eIoni
-    6  -2.26 m    42.1 cm  -1.27 m       0 eV   1.67 keV   124 mum  3.65 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 212,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.76 m      24 cm  -1.48 m    9.63 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.76 m      24 cm  -1.48 m    7.87 keV  1.76 keV   739 mum   739 mum   Tracker     eIoni
-    2  -1.76 m    24.1 cm  -1.48 m    5.89 keV  1.97 keV   605 mum  1.34 mm    Tracker     eIoni
-    3  -1.76 m      24 cm  -1.48 m    5.03 keV   860 eV    472 mum  1.82 mm    Tracker     eIoni
-    4  -1.76 m      24 cm  -1.48 m    3.71 keV  1.32 keV   419 mum  2.24 mm    Tracker     eIoni
-    5  -1.76 m      24 cm  -1.48 m    1.18 keV  2.53 keV   333 mum  2.57 mm    Tracker     eIoni
-    6  -1.76 m      24 cm  -1.48 m       0 eV   1.18 keV    76 mum  2.64 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 211,   Parent ID = 201
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.35 m    17.1 cm  -1.24 m    54.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.35 m    16.4 cm  -1.24 m      49 keV  5.42 keV  9.75 mm   9.75 mm    Tracker     eIoni
-    2  -1.35 m    15.7 cm  -1.24 m    44.4 keV  4.57 keV  8.14 mm   1.79 cm    Tracker     eIoni
-    3  -1.35 m    15.8 cm  -1.24 m    40.8 keV  3.57 keV  6.85 mm   2.47 cm    Tracker     eIoni
-    4  -1.36 m    15.8 cm  -1.25 m    36.1 keV  4.72 keV  5.95 mm   3.07 cm    Tracker     eIoni
-    5  -1.36 m    15.4 cm  -1.24 m    28.8 keV  7.31 keV  4.81 mm   3.55 cm    Tracker     eIoni
-    6  -1.36 m    15.3 cm  -1.25 m    26.1 keV  2.65 keV  3.32 mm   3.88 cm    Tracker     eIoni
-    7  -1.37 m    15.2 cm  -1.25 m    22.4 keV  3.75 keV  2.84 mm   4.17 cm    Tracker     eIoni
-    8  -1.37 m      15 cm  -1.25 m    17.4 keV  4.98 keV  2.23 mm   4.39 cm    Tracker     eIoni
-    9  -1.37 m    14.9 cm  -1.25 m    15.8 keV  1.61 keV  1.53 mm   4.54 cm    Tracker     eIoni
-   10  -1.37 m    14.8 cm  -1.25 m    13.4 keV  2.39 keV  1.34 mm   4.68 cm    Tracker     eIoni
-   11  -1.37 m    14.8 cm  -1.25 m    11.4 keV  2.01 keV  1.08 mm   4.78 cm    Tracker     eIoni
-   12  -1.37 m    14.7 cm  -1.25 m    10.3 keV  1.12 keV   891 mum  4.87 cm    Tracker     eIoni
-   13  -1.37 m    14.6 cm  -1.25 m    8.13 keV  2.16 keV   793 mum  4.95 cm    Tracker     eIoni
-   14  -1.37 m    14.6 cm  -1.25 m    5.75 keV  2.38 keV   623 mum  5.01 cm    Tracker     eIoni
-   15  -1.37 m    14.5 cm  -1.25 m    2.59 keV  3.16 keV   463 mum  5.06 cm    Tracker     eIoni
-   16  -1.37 m    14.5 cm  -1.25 m       0 eV   2.59 keV   237 mum  5.08 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 200,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.34 cm  -3.37 mm  -2.21 m      21 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -3.19 cm  -2.16 mm  -2.21 m    18.4 keV  2.56 keV  2.01 mm   2.01 mm    Tracker     eIoni
-    2   -3.1 cm   -831 mum -2.21 m    16.8 keV  1.62 keV  1.67 mm   3.68 mm    Tracker     eIoni
-    3  -3.03 cm  -97.5 mum -2.21 m    10.3 keV  6.51 keV  1.46 mm   5.14 mm    Tracker     eIoni
-    4  -3.02 cm    290 mum  -2.2 m    8.54 keV  1.76 keV   794 mum  5.93 mm    Tracker     eIoni
-    5  -3.05 cm   -279 mum  -2.2 m    7.04 keV   1.5 keV   654 mum  6.58 mm    Tracker     eIoni
-    6  -3.07 cm   -588 mum  -2.2 m    5.68 keV  1.35 keV   547 mum  7.13 mm    Tracker     eIoni
-    7  -3.04 cm   -339 mum -2.21 m    3.55 keV  2.13 keV   459 mum  7.59 mm    Tracker     eIoni
-    8  -3.01 cm   -254 mum -2.21 m    1.89 keV  1.67 keV   321 mum  7.91 mm    Tracker     eIoni
-    9  -3.02 cm   -274 mum  -2.2 m       0 eV   1.89 keV   149 mum  8.06 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 199,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -165 mum  -228 mum  -2.4 m    6.27 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -300 mum  -331 mum  -2.4 m    6.27 MeV     0 eV   1.14 mm   1.14 mm    TrackerTransportation
-    2  -9.58 cm  -7.36 cm   -1.6 m    6.27 MeV     0 eV   80.9 cm     81 cm    ChamberTransportation
-    3    -12 cm  -9.19 cm   -1.4 m    6.27 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4  -19.1 cm  -14.7 cm    -80 cm   6.27 MeV     0 eV   60.7 cm   1.62 m     ChamberTransportation
-    5  -21.5 cm  -16.5 cm    -60 cm   6.27 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6  -28.7 cm    -22 cm -0.114 fm   6.27 MeV     0 eV   60.7 cm   2.43 m     ChamberTransportation
-    7  -31.1 cm  -23.9 cm     20 cm   6.27 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8  -38.2 cm  -29.3 cm     80 cm   6.27 MeV     0 eV   60.7 cm   3.24 m     ChamberTransportation
-    9  -40.6 cm  -31.2 cm      1 m    6.27 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10  -47.8 cm  -36.7 cm    1.6 m    6.27 MeV     0 eV   60.7 cm   4.05 m     ChamberTransportation
-   11  -50.2 cm  -38.5 cm    1.8 m    6.27 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12  -57.4 cm    -44 cm    2.4 m    6.27 MeV     0 eV   60.7 cm   4.86 m     WorldPVTransportation
-   13  -63.4 cm  -48.7 cm   2.91 m    6.27 MeV     0 eV   51.6 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 198,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -159 mum  -194 mum  -2.4 m     107 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -233 mum  -295 mum  -2.4 m     107 MeV     0 eV   1.51 mm   1.51 mm    TrackerTransportation
-    2  -3.94 cm  -5.41 cm   -1.6 m     107 MeV     0 eV   80.3 cm   80.4 cm    ChamberTransportation
-    3  -4.92 cm  -6.76 cm   -1.4 m     107 MeV     0 eV   20.1 cm      1 m     TrackerTransportation
-    4  -7.85 cm  -10.8 cm    -80 cm    107 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5  -8.83 cm  -12.1 cm    -60 cm    107 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6  -11.8 cm  -16.2 cm      0 fm    107 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7  -12.7 cm  -17.5 cm     20 cm    107 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8  -15.7 cm  -21.6 cm     80 cm    107 MeV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9  -16.7 cm  -22.9 cm      1 m     107 MeV     0 eV   20.1 cm   3.41 m     TrackerTransportation
-   10  -19.6 cm  -26.9 cm    1.6 m     107 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11  -20.6 cm  -28.3 cm    1.8 m     107 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12  -23.5 cm  -32.3 cm    2.4 m     107 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13    -26 cm  -35.7 cm   2.91 m     107 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 197,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -118 mum  -148 mum  -2.4 m     614 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -159 mum  -296 mum  -2.4 m     614 keV     0 eV   2.28 mm   2.28 mm    TrackerTransportation
-    2  -1.48 cm  -5.25 cm   -1.6 m     614 keV     0 eV   80.2 cm   80.4 cm    ChamberTransportation
-    3  -1.85 cm  -6.55 cm   -1.4 m     614 keV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -2.95 cm  -10.5 cm    -80 cm    614 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -3.31 cm  -11.8 cm    -60 cm    614 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -4.41 cm  -15.7 cm      0 fm    614 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -4.78 cm    -17 cm     20 cm    614 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -5.87 cm  -20.9 cm     80 cm    614 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -6.24 cm  -22.2 cm      1 m     614 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -7.34 cm  -26.1 cm    1.6 m     614 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   -7.7 cm  -27.4 cm    1.8 m     614 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   -8.8 cm  -31.3 cm    2.4 m     614 keV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -9.74 cm  -34.7 cm   2.91 m     614 keV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 196,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -92.5 mum -81.2 mum  -2.4 m     2.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -127 mum  -211 mum  -2.4 m     2.5 MeV     0 eV   3.33 mm   3.33 mm    TrackerTransportation
-    2  -8.46 mm  -3.14 cm   -1.6 m     2.5 MeV     0 eV   80.1 cm   80.4 cm    ChamberTransportation
-    3  -1.05 cm  -3.92 cm   -1.4 m     2.5 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -1.61 cm  -5.98 cm  -87.1 cm    416 keV     0 eV   52.9 cm   1.53 m     Tracker     compt
-    5    2.4 m    21.6 cm  -89.6 cm    416 keV     0 eV   2.43 m    3.97 m     WorldPVTransportation
-    6   2.91 m    27.4 cm  -90.1 cm    416 keV     0 eV   51.3 cm   4.48 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 216,   Parent ID = 196
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.61 cm  -5.98 cm  -87.1 cm   2.08 MeV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -2.85 cm  -6.39 cm    -80 cm   2.08 MeV  9.69 keV  7.23 cm   7.23 cm    ChamberTransportation
-    2  -3.98 cm  -10.1 cm  -67.8 cm   1.61 MeV  63.1 keV  13.4 cm   20.6 cm    Chamber     eBrem
-    3  -7.02 cm  -8.52 cm  -63.2 cm   1.48 MeV  24.7 keV  5.87 cm   26.5 cm    Chamber     eIoni
-    4  -9.01 cm   -7.8 cm    -60 cm   1.46 MeV  13.7 keV  4.02 cm   30.5 cm    TrackerTransportation
-    5  -41.8 cm  -13.6 cm      0 fm   1.35 MeV   115 keV  71.1 cm   1.02 m     ChamberTransportation
-    6  -51.3 cm  -4.17 cm     20 cm   1.16 MeV   165 keV  41.3 cm   1.43 m     TrackerTransportation
-    7  -17.2 cm  -5.31 cm   59.7 cm   1.06 MeV  87.5 keV  53.2 cm   1.96 m     Tracker     eIoni
-    8   3.03 cm   6.63 mm     80 cm   1.02 MeV  40.8 keV    30 cm   2.26 m     ChamberTransportation
-    9   10.4 cm   3.61 cm   97.9 cm    853 keV   171 keV    33 cm   2.59 m     Chamber     eIoni
-   10   5.86 cm    3.3 cm   84.3 cm    624 keV   136 keV  25.8 cm   2.85 m     Chamber     eIoni
-   11   4.89 cm   1.71 cm     80 cm    580 keV  43.4 keV  6.09 cm   2.91 m     TrackerTransportation
-   12  -8.95 cm   7.39 cm   40.9 cm    491 keV  89.3 keV    46 cm   3.37 m     Tracker     eIoni
-   13  -32.4 cm     21 cm   22.1 cm    423 keV  67.7 keV  36.3 cm   3.73 m     Tracker     eIoni
-   14    -37 cm     25 cm     20 cm    412 keV  11.3 keV  6.57 cm    3.8 m     ChamberTransportation
-   15  -35.7 cm   28.4 cm   15.3 cm    364 keV  48.3 keV  9.68 cm   3.89 m     Chamber     eIoni
-   16  -35.9 cm   28.8 cm   11.3 cm    303 keV  60.5 keV  8.07 cm   3.98 m     Chamber     eIoni
-   17  -34.4 cm   32.3 cm   9.12 cm    262 keV  41.3 keV  6.15 cm   4.04 m     Chamber     eIoni
-   18  -34.9 cm   35.7 cm   9.06 cm    217 keV  44.5 keV  4.91 cm   4.09 m     Chamber     eIoni
-   19  -34.7 cm   33.2 cm    8.3 cm    180 keV  36.9 keV  3.68 cm   4.12 m     Chamber     eIoni
-   20  -36.1 cm   34.6 cm   8.74 cm    153 keV  27.3 keV  2.74 cm   4.15 m     Chamber     eIoni
-   21  -36.3 cm   33.5 cm   7.68 cm    139 keV  14.3 keV   2.1 cm   4.17 m     Chamber     eIoni
-   22  -35.7 cm   32.5 cm   6.99 cm    121 keV  17.8 keV   1.8 cm   4.19 m     Chamber     eIoni
-   23  -34.8 cm   32.8 cm   6.59 cm   89.7 keV  31.3 keV  1.44 cm    4.2 m     Chamber     eIoni
-   24  -34.5 cm   32.3 cm   6.35 cm   61.4 keV  28.3 keV  8.89 mm   4.21 m     Chamber     eIoni
-   25  -34.2 cm   32.4 cm   6.17 cm   53.8 keV  7.61 keV   4.9 mm   4.22 m     Chamber     eIoni
-   26  -34.3 cm   32.2 cm   6.31 cm   47.8 keV  5.94 keV     4 mm   4.22 m     Chamber     eIoni
-   27  -34.4 cm   32.2 cm   6.14 cm   44.7 keV  3.17 keV  3.35 mm   4.23 m     Chamber     eIoni
-   28  -34.4 cm   32.1 cm    6.3 cm   42.9 keV   1.8 keV  3.02 mm   4.23 m     Chamber     eIoni
-   29  -34.3 cm     32 cm    6.2 cm   34.3 keV  8.55 keV  2.84 mm   4.23 m     Chamber     eIoni
-   30  -34.4 cm   31.9 cm   6.12 cm   29.6 keV  4.72 keV  2.06 mm   4.23 m     Chamber     eIoni
-   31  -34.4 cm   31.8 cm   6.12 cm   23.2 keV  6.44 keV  1.68 mm   4.23 m     Chamber     eIoni
-   32  -34.3 cm   31.9 cm   6.12 cm   18.8 keV  4.32 keV  1.23 mm   4.24 m     Chamber     eIoni
-   33  -34.4 cm   31.9 cm   6.18 cm     16 keV  2.82 keV   963 mum  4.24 m     Chamber     eIoni
-   34  -34.4 cm   31.9 cm   6.19 cm   15.7 keV   290 eV    810 mum  4.24 m     Chamber     eIoni
-   35  -34.4 cm   31.8 cm   6.21 cm   11.8 keV   3.9 keV   795 mum  4.24 m     Chamber     eIoni
-   36  -34.4 cm   31.8 cm   6.23 cm   10.6 keV  1.22 keV   609 mum  4.24 m     Chamber     eIoni
-   37  -34.4 cm   31.8 cm   6.25 cm   8.99 keV  1.63 keV   557 mum  4.24 m     Chamber     eIoni
-   38  -34.4 cm   31.8 cm   6.24 cm   7.25 keV  1.74 keV   491 mum  4.24 m     Chamber     eIoni
-   39  -34.4 cm   31.8 cm   6.24 cm    240 eV   7.01 keV   422 mum  4.24 m     Chamber     eIoni
-   40  -34.4 cm   31.8 cm   6.24 cm      0 eV    240 eV     12 mum  4.24 m     Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 222,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.86 cm    3.3 cm   84.3 cm   93.1 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   5.34 cm   3.73 cm   84.4 cm   80.8 keV  12.3 keV  9.44 mm   9.44 mm    Chamber     eIoni
-    2   4.98 cm   4.09 cm   84.6 cm   73.4 keV  7.34 keV  7.55 mm    1.7 cm    Chamber     eIoni
-    3   4.64 cm    4.4 cm   84.7 cm   61.1 keV  12.4 keV  6.49 mm   2.35 cm    Chamber     eIoni
-    4   4.77 cm   4.11 cm   84.5 cm   53.2 keV   7.9 keV  4.86 mm   2.83 cm    Chamber     eIoni
-    5   4.64 cm   4.23 cm   84.3 cm   46.6 keV  6.55 keV  3.93 mm   3.23 cm    Chamber     eIoni
-    6   4.82 cm   4.09 cm   84.3 cm   42.9 keV  3.69 keV  3.23 mm   3.55 cm    Chamber     eIoni
-    7   4.71 cm   3.92 cm   84.3 cm   31.9 keV  11.1 keV  2.85 mm   3.83 cm    Chamber     eIoni
-    8    4.6 cm    3.9 cm   84.4 cm   29.6 keV  2.27 keV  1.86 mm   4.02 cm    Chamber     eIoni
-    9   4.53 cm   3.95 cm   84.3 cm     28 keV  1.64 keV  1.68 mm   4.19 cm    Chamber     eIoni
-   10   4.57 cm   4.06 cm   84.3 cm   25.4 keV  2.55 keV  1.56 mm   4.34 cm    Chamber     eIoni
-   11   4.59 cm      4 cm   84.2 cm   19.9 keV  5.52 keV  1.37 mm   4.48 cm    Chamber     eIoni
-   12   4.59 cm   4.03 cm   84.3 cm     12 keV   7.9 keV  1.02 mm   4.58 cm    Chamber     eIoni
-   13   4.58 cm      4 cm   84.3 cm   8.67 keV  3.33 keV   615 mum  4.65 cm    Chamber     eIoni
-   14   4.59 cm   3.99 cm   84.3 cm   4.56 keV  4.11 keV   478 mum  4.69 cm    Chamber     eIoni
-   15   4.59 cm   3.99 cm   84.3 cm    560 eV      4 keV   307 mum  4.72 cm    Chamber     eIoni
-   16   4.59 cm   3.99 cm   84.3 cm      0 eV    560 eV   23.8 mum  4.73 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 221,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -17.2 cm  -5.31 cm   59.7 cm     11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -17.1 cm  -5.39 cm   59.7 cm   9.66 keV  1.35 keV   856 mum   856 mum   Tracker     eIoni
-    2  -17.1 cm   -5.4 cm   59.7 cm   7.26 keV   2.4 keV   741 mum   1.6 mm    Tracker     eIoni
-    3    -17 cm  -5.37 cm   59.7 cm   4.94 keV  2.32 keV   563 mum  2.16 mm    Tracker     eIoni
-    4    -17 cm  -5.38 cm   59.7 cm   3.87 keV  1.07 keV   413 mum  2.57 mm    Tracker     eIoni
-    5    -17 cm  -5.36 cm   59.7 cm   1.34 keV  2.53 keV   343 mum  2.92 mm    Tracker     eIoni
-    6    -17 cm  -5.36 cm   59.7 cm      0 eV   1.34 keV  90.3 mum  3.01 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 220,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.7 cm  -11.6 cm    4.1 cm   9.07 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -43.7 cm  -11.6 cm   4.12 cm   5.38 keV  3.69 keV   494 mum   494 mum   Chamber     eIoni
-    2  -43.7 cm  -11.6 cm   4.11 cm   3.25 keV  2.13 keV   345 mum   839 mum   Chamber     eIoni
-    3  -43.7 cm  -11.7 cm    4.1 cm   1.57 keV  1.68 keV   226 mum  1.07 mm    Chamber     eIoni
-    4  -43.7 cm  -11.7 cm    4.1 cm      0 eV   1.57 keV  84.4 mum  1.15 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 219,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -45.6 cm  -9.81 cm      8 cm   9.68 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -45.6 cm  -9.79 cm   8.01 cm   3.02 keV  6.66 keV   518 mum   518 mum   Chamber     eIoni
-    2  -45.6 cm  -9.79 cm   8.01 cm      0 eV   3.02 keV   207 mum   726 mum   Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 218,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -7.02 cm  -8.52 cm  -63.2 cm    107 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -6.47 cm  -9.04 cm  -62.8 cm     94 keV  13.1 keV  1.18 cm   1.18 cm    Chamber     eIoni
-    2  -6.18 cm  -9.36 cm  -63.3 cm   86.6 keV  7.45 keV   9.6 mm   2.14 cm    Chamber     eIoni
-    3  -6.51 cm  -9.87 cm  -63.2 cm   78.3 keV  8.25 keV  8.43 mm   2.99 cm    Chamber     eIoni
-    4  -6.44 cm  -10.2 cm  -63.6 cm   52.5 keV  25.9 keV  7.18 mm    3.7 cm    Chamber     eIoni
-    5  -6.67 cm    -10 cm  -63.6 cm   49.2 keV   3.3 keV  3.84 mm   4.09 cm    Chamber     eIoni
-    6  -6.86 cm  -10.2 cm  -63.7 cm   45.9 keV  3.26 keV   3.5 mm   4.44 cm    Chamber     eIoni
-    7  -6.67 cm  -10.2 cm  -63.8 cm   41.3 keV  4.66 keV  3.15 mm   4.75 cm    Chamber     eIoni
-    8  -6.71 cm  -10.1 cm  -63.7 cm   40.1 keV  1.21 keV  2.69 mm   5.02 cm    Chamber     eIoni
-    9  -6.81 cm  -9.99 cm  -63.8 cm   37.5 keV  2.54 keV  2.58 mm   5.28 cm    Chamber     eIoni
-   10  -6.77 cm    -10 cm  -63.7 cm   34.6 keV  2.96 keV  2.34 mm   5.51 cm    Chamber     eIoni
-   11  -6.81 cm    -10 cm  -63.8 cm      0 eV   34.6 keV  2.08 mm   5.72 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 217,   Parent ID = 216
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.98 cm  -10.1 cm  -67.8 cm    405 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -2.19 cm  -8.94 cm    -60 cm    405 keV     0 eV   8.04 cm   8.04 cm    TrackerTransportation
-    2   11.6 cm    523 mum     0 fm    405 keV     0 eV   62.2 cm   70.3 cm    ChamberTransportation
-    3   16.3 cm   3.05 cm     20 cm    405 keV     0 eV   20.7 cm     91 cm    TrackerTransportation
-    4   30.1 cm     12 cm     80 cm    405 keV     0 eV   62.2 cm   1.53 m     ChamberTransportation
-    5   34.7 cm     15 cm      1 m     405 keV     0 eV   20.7 cm   1.74 m     TrackerTransportation
-    6   48.6 cm     24 cm    1.6 m     405 keV     0 eV   62.2 cm   2.36 m     ChamberTransportation
-    7   53.2 cm     27 cm    1.8 m     405 keV     0 eV   20.7 cm   2.57 m     TrackerTransportation
-    8     67 cm     36 cm    2.4 m     405 keV     0 eV   62.2 cm   3.19 m     WorldPVTransportation
-    9   78.8 cm   43.6 cm   2.91 m     405 keV     0 eV   52.9 cm   3.72 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 195,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -91.1 mum -77.2 mum  -2.4 m     492 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -91.2 mum  -214 mum  -2.4 m     492 keV     0 eV   3.42 mm   3.42 mm    TrackerTransportation
-    2   -127 mum -3.22 cm   -1.6 m     492 keV     0 eV   80.1 cm   80.4 cm    ChamberTransportation
-    3   -135 mum -4.02 cm   -1.4 m     492 keV     0 eV     20 cm      1 m     TrackerTransportation
-    4   -162 mum -6.42 cm    -80 cm    492 keV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5   -171 mum -7.22 cm    -60 cm    492 keV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6   -197 mum -9.62 cm  0.114 fm    492 keV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   -206 mum -10.4 cm     20 cm    492 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -233 mum -12.8 cm     80 cm    492 keV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   -242 mum -13.6 cm      1 m     492 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   -268 mum   -16 cm    1.6 m     492 keV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   -277 mum -16.8 cm    1.8 m     492 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   -304 mum -19.2 cm    2.4 m     492 keV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   -326 mum -21.3 cm   2.91 m     492 keV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 194,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -89.4 mum -75.6 mum  -2.4 m    10.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -189 mum -59.3 mum  -2.4 m    10.8 MeV     0 eV   3.63 mm   3.63 mm    TrackerTransportation
-    2  -2.21 cm   3.53 mm   -1.6 m    10.8 MeV     0 eV     80 cm   80.4 cm    ChamberTransportation
-    3  -2.76 cm   4.42 mm   -1.4 m    10.8 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -4.41 cm   7.11 mm    -80 cm   10.8 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -4.96 cm   8.01 mm    -60 cm   10.8 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6   -6.6 cm   1.07 cm      0 fm   10.8 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -7.15 cm   1.16 cm     20 cm   10.8 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8   -8.8 cm   1.43 cm     80 cm   10.8 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -9.34 cm   1.52 cm      1 m    10.8 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10    -11 cm   1.79 cm    1.6 m    10.8 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -11.5 cm   1.88 cm    1.8 m    10.8 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -13.2 cm   2.15 cm    2.4 m    10.8 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -14.6 cm   2.37 cm   2.91 m    10.8 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 193,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -65.6 mum -32.9 mum  -2.4 m     767 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -171 mum  -243 mum  -2.4 m     767 keV     0 eV   4.28 mm   4.28 mm    TrackerTransportation
-    2     -2 cm  -3.96 cm   -1.6 m     767 keV     0 eV   80.1 cm   80.5 cm    ChamberTransportation
-    3  -2.49 cm  -4.94 cm   -1.4 m     767 keV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -3.98 cm  -7.89 cm    -80 cm    767 keV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -4.48 cm  -8.88 cm    -60 cm    767 keV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -5.96 cm  -11.8 cm      0 fm    767 keV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -6.46 cm  -12.8 cm     20 cm    767 keV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -7.94 cm  -15.8 cm     80 cm    767 keV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -8.44 cm  -16.7 cm      1 m     767 keV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -9.93 cm  -19.7 cm    1.6 m     767 keV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11  -10.4 cm  -20.7 cm    1.8 m     767 keV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -11.9 cm  -23.6 cm    2.4 m     767 keV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -13.2 cm  -26.1 cm   2.91 m     767 keV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 192,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -67.3 mum -25.8 mum -2.41 m    1.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -183 mum -98.7 mum  -2.4 m    1.09 MeV     0 eV   5.26 mm   5.26 mm    TrackerTransportation
-    2  -1.78 cm  -1.12 cm   -1.6 m    1.09 MeV     0 eV     80 cm   80.6 cm    ChamberTransportation
-    3  -2.22 cm   -1.4 cm   -1.4 m    1.09 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -3.53 cm  -2.23 cm    -80 cm   1.09 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -3.97 cm  -2.51 cm    -60 cm   1.09 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -5.29 cm  -3.34 cm      0 fm   1.09 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -5.73 cm  -3.62 cm     20 cm   1.09 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -7.05 cm  -4.45 cm     80 cm   1.09 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -7.49 cm  -4.73 cm      1 m    1.09 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -8.81 cm  -5.56 cm    1.6 m    1.09 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -9.25 cm  -5.84 cm    1.8 m    1.09 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -10.6 cm  -6.67 cm    2.4 m    1.09 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -11.7 cm  -7.38 cm   2.91 m    1.09 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 191,   Parent ID = 190
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -64.8 mum   -26 mum -2.41 m     542 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -121 mum -23.9 mum  -2.4 m     192 keV   351 keV  2.51 mm   2.51 mm   TargetPV     compt
-    2   -869 mum  43.1 mum  -2.4 m       0 eV    192 keV  1.11 mm   3.62 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 189,   Parent ID = 107
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -64 mum -25.8 mum -2.41 m     318 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -64.2 mum -25.9 mum -2.41 m     309 MeV  42.4 keV  35.3 mum  35.3 mum  TargetPV     eBrem
-    2  -80.4 mum -34.1 mum  -2.4 m     277 MeV  1.03 MeV   735 mum   770 mum  TargetPV     eBrem
-    3  -83.2 mum   -22 mum  -2.4 m     270 MeV   583 keV   461 mum  1.23 mm   TargetPV     eBrem
-    4  -87.9 mum -6.42 mum  -2.4 m     138 MeV   1.2 MeV   762 mum  1.99 mm   TargetPV     eBrem
-    5  -94.7 mum  -300 nm   -2.4 m    80.1 MeV   454 keV   364 mum  2.36 mm   TargetPV     eBrem
-    6  -41.8 mum  43.9 mum  -2.4 m    77.5 MeV   944 keV   681 mum  3.04 mm   TargetPV     eBrem
-    7   53.4 mum   143 mum  -2.4 m    51.4 MeV  1.36 MeV  1.01 mm   4.05 mm   TargetPV     eBrem
-    8   64.8 mum   145 mum  -2.4 m    45.8 MeV  62.7 keV  66.2 mum  4.12 mm   TargetPV     eBrem
-    9   65.7 mum   145 mum  -2.4 m    45.3 MeV  7.77 keV  8.33 mum  4.13 mm   TargetPV     eBrem
-   10   83.5 mum   240 mum  -2.4 m    42.5 MeV   2.1 MeV  1.04 mm   5.17 mm   TargetPV     eBrem
-   11    110 mum   210 mum  -2.4 m      42 MeV   515 keV   269 mum  5.44 mm    TrackerTransportation
-   12   5.56 cm   -6.3 cm  -1.98 m    41.9 MeV    87 keV  42.7 cm   43.3 cm    Tracker     eIoni
-   13   10.6 cm  -11.5 cm   -1.6 m    41.8 MeV  80.9 keV  38.8 cm   82.1 cm    ChamberTransportation
-   14   13.2 cm  -13.9 cm  -1.44 m    41.7 MeV   104 keV  16.4 cm   98.4 cm    Chamber     eBrem
-   15   13.8 cm  -14.5 cm   -1.4 m    41.7 MeV  11.9 keV   4.1 cm   1.03 m     TrackerTransportation
-   16     23 cm    -23 cm    -80 cm   41.5 MeV   134 keV  61.3 cm   1.64 m     ChamberTransportation
-   17   24.8 cm  -24.9 cm  -65.4 cm   41.5 MeV  67.2 keV  14.9 cm   1.79 m     Chamber     eBrem
-   18   25.5 cm  -26.1 cm    -60 cm   41.4 MeV  41.1 keV  5.53 cm   1.84 m     TrackerTransportation
-   19   31.4 cm    -38 cm 0.0241 fm   41.3 MeV   127 keV  61.5 cm   2.46 m     ChamberTransportation
-   20   32.6 cm  -41.6 cm   17.6 cm   40.9 MeV   108 keV    18 cm   2.64 m     Chamber     eIoni
-   21   32.8 cm  -42.3 cm     20 cm   40.9 MeV  17.1 keV  2.46 cm   2.66 m     TrackerTransportation
-   22     37 cm    -59 cm     80 cm   40.8 MeV   131 keV  62.4 cm   3.29 m     ChamberTransportation
-   23   38.4 cm  -64.5 cm      1 m    40.7 MeV  89.2 keV  20.8 cm   3.49 m     TrackerTransportation
-   24   44.3 cm    -83 cm    1.6 m    40.5 MeV   134 keV  63.1 cm   4.13 m     ChamberTransportation
-   25   46.3 cm  -89.5 cm    1.8 m    40.4 MeV   102 keV  21.1 cm   4.34 m     TrackerTransportation
-   26   51.7 cm  -1.12 m    2.37 m    40.3 MeV   122 keV  61.8 cm   4.95 m     Tracker     eIoni
-   27     52 cm  -1.13 m     2.4 m    40.3 MeV  5.62 keV  2.79 cm   4.98 m     WorldPVTransportation
-   28   57.7 cm  -1.32 m    2.91 m    40.1 MeV   117 keV  54.8 cm   5.53 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 239,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   51.7 cm  -1.12 m    2.37 m    17.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   51.6 cm  -1.12 m    2.37 m    14.4 keV  3.46 keV  1.59 mm   1.59 mm    Tracker     eIoni
-    2   51.6 cm  -1.12 m    2.38 m     6.1 keV  8.27 keV  1.18 mm   2.77 mm    Tracker     eIoni
-    3   51.6 cm  -1.12 m    2.38 m    3.31 keV   2.8 keV   486 mum  3.25 mm    Tracker     eIoni
-    4   51.6 cm  -1.12 m    2.38 m    1.79 keV  1.51 keV   302 mum  3.55 mm    Tracker     eIoni
-    5   51.6 cm  -1.12 m    2.38 m       0 eV   1.79 keV   138 mum  3.69 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 238,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   46.1 cm  -88.7 cm   1.78 m    31.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     46 cm  -88.7 cm   1.78 m    29.2 keV   2.7 keV  1.87 mm   1.87 mm    Chamber     eIoni
-    2   45.9 cm  -88.8 cm   1.77 m    27.9 keV  1.31 keV  1.65 mm   3.52 mm    Chamber     eIoni
-    3   45.8 cm  -88.9 cm   1.78 m    18.3 keV  9.62 keV  1.56 mm   5.08 mm    Chamber     eIoni
-    4   45.8 cm  -88.9 cm   1.78 m    15.2 keV  3.09 keV   931 mum  6.01 mm    Chamber     eIoni
-    5   45.8 cm  -88.9 cm   1.77 m    11.8 keV  3.45 keV   768 mum  6.77 mm    Chamber     eIoni
-    6   45.8 cm  -88.9 cm   1.77 m    8.44 keV  3.32 keV   605 mum  7.38 mm    Chamber     eIoni
-    7   45.8 cm  -88.9 cm   1.77 m     4.3 keV  4.14 keV   468 mum  7.85 mm    Chamber     eIoni
-    8   45.8 cm  -88.9 cm   1.77 m       0 eV    4.3 keV   294 mum  8.14 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 237,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   37.5 cm    -61 cm   87.2 cm   19.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   37.5 cm    -61 cm   87.2 cm   17.5 keV   2.2 keV  1.01 mm   1.01 mm    Chamber     eIoni
-    2   37.4 cm    -61 cm   87.2 cm    1.9 keV  15.6 keV   887 mum   1.9 mm    Chamber     eIoni
-    3   37.4 cm    -61 cm   87.2 cm      0 eV    1.9 keV   109 mum  2.01 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 236,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   32.6 cm  -41.6 cm   17.6 cm    250 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   34.6 cm  -41.2 cm   18.7 cm    220 keV  29.8 keV  4.57 cm   4.57 cm    Chamber     eIoni
-    2   36.1 cm  -42.1 cm   19.5 cm    192 keV  28.3 keV  3.75 cm   8.32 cm    Chamber     eIoni
-    3   37.5 cm  -43.2 cm   19.5 cm    166 keV  25.6 keV  3.01 cm   11.3 cm    Chamber     eIoni
-    4   37.4 cm  -43.1 cm   19.4 cm    125 keV   641 eV   1.67 mm   11.5 cm    Chamber     eIoni
-    5   36.4 cm  -43.2 cm     19 cm    108 keV  17.2 keV  1.52 cm     13 cm    Chamber     eIoni
-    6     37 cm  -43.2 cm   19.4 cm   94.4 keV  13.6 keV   1.2 cm   14.2 cm    Chamber     eIoni
-    7   37.4 cm  -43.3 cm   19.8 cm   88.5 keV  5.85 keV  9.66 mm   15.2 cm    Chamber     eIoni
-    8   37.6 cm  -43.6 cm     20 cm   80.2 keV  8.34 keV  8.72 mm   16.1 cm    Chamber     eIoni
-    9   37.6 cm  -43.6 cm     20 cm   80.2 keV     0 eV   1.89 mum  16.1 cm    TrackerTransportation
-   10   38.6 cm    -42 cm   20.3 cm   69.4 keV  10.8 keV  1.92 cm     18 cm    Tracker     eIoni
-   11   38.5 cm  -40.9 cm   21.2 cm   58.5 keV  10.9 keV  1.49 cm   19.5 cm    Tracker     eIoni
-   12   38.3 cm  -40.2 cm   21.9 cm   53.7 keV   4.8 keV  1.11 cm   20.6 cm    Tracker     eIoni
-   13   38.4 cm  -39.6 cm   22.6 cm   48.5 keV  5.23 keV  9.52 mm   21.5 cm    Tracker     eIoni
-   14   38.1 cm  -39.1 cm   23.1 cm   38.6 keV  9.86 keV     8 mm   22.3 cm    Tracker     eIoni
-   15   37.8 cm  -38.7 cm   23.4 cm   34.6 keV  4.01 keV  5.41 mm   22.9 cm    Tracker     eIoni
-   16   37.4 cm  -38.5 cm   23.5 cm   31.5 keV  3.07 keV  4.49 mm   23.3 cm    Tracker     eIoni
-   17   37.6 cm  -38.5 cm   23.8 cm   29.7 keV  1.85 keV  3.85 mm   23.7 cm    Tracker     eIoni
-   18   37.8 cm  -38.4 cm     24 cm   27.9 keV   1.8 keV  3.48 mm     24 cm    Tracker     eIoni
-   19   37.8 cm  -38.1 cm   24.2 cm   26.1 keV  1.76 keV  3.15 mm   24.4 cm    Tracker     eIoni
-   20   37.5 cm    -38 cm   24.2 cm   22.9 keV   3.2 keV  2.83 mm   24.6 cm    Tracker     eIoni
-   21   37.5 cm  -38.1 cm     24 cm   21.4 keV  1.53 keV  2.31 mm   24.9 cm    Tracker     eIoni
-   22   37.4 cm  -38.2 cm   23.9 cm   18.6 keV  2.82 keV  2.07 mm   25.1 cm    Tracker     eIoni
-   23   37.3 cm  -38.4 cm   23.8 cm   14.2 keV  4.37 keV  1.68 mm   25.3 cm    Tracker     eIoni
-   24   37.3 cm  -38.4 cm   23.9 cm   11.5 keV  2.72 keV  1.16 mm   25.4 cm    Tracker     eIoni
-   25   37.2 cm  -38.4 cm   23.9 cm   9.55 keV  1.93 keV   897 mum  25.5 cm    Tracker     eIoni
-   26   37.2 cm  -38.4 cm   23.9 cm   8.17 keV  1.37 keV   732 mum  25.5 cm    Tracker     eIoni
-   27   37.2 cm  -38.4 cm     24 cm   4.11 keV  4.06 keV   627 mum  25.6 cm    Tracker     eIoni
-   28   37.2 cm  -38.4 cm     24 cm   1.44 keV  2.67 keV   360 mum  25.6 cm    Tracker     eIoni
-   29   37.2 cm  -38.4 cm     24 cm      0 eV   1.44 keV   101 mum  25.6 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 240,   Parent ID = 236
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   37.4 cm  -43.1 cm   19.4 cm   40.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   37.3 cm  -43.2 cm   19.6 cm   37.3 keV  3.01 keV   2.6 mm    2.6 mm    Chamber     eIoni
-    2   37.4 cm  -43.1 cm   19.7 cm   15.2 keV  22.1 keV  2.32 mm   4.92 mm    Chamber     eIoni
-    3   37.5 cm  -43.1 cm   19.7 cm   10.8 keV  4.34 keV   766 mum  5.68 mm    Chamber     eIoni
-    4   37.5 cm  -43.1 cm   19.7 cm   2.07 keV  8.76 keV   567 mum  6.25 mm    Chamber     eIoni
-    5   37.5 cm  -43.1 cm   19.7 cm      0 eV   2.07 keV   124 mum  6.37 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 235,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.8 cm  -24.9 cm  -65.4 cm   4.45 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   24.9 cm    -25 cm  -65.1 cm      0 eV   4.45 keV  3.02 mm   3.02 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 234,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   13.2 cm  -13.9 cm  -1.44 m    3.66 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   13.2 cm    -14 cm  -1.44 m       0 eV   3.66 keV  4.45 mm   4.45 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 233,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.56 cm   -6.3 cm  -1.98 m      14 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   5.66 cm  -6.28 cm  -1.98 m    11.5 keV  2.47 keV  1.14 mm   1.14 mm    Tracker     eIoni
-    2   5.72 cm  -6.23 cm  -1.98 m    10.4 keV  1.13 keV   899 mum  2.04 mm    Tracker     eIoni
-    3   5.75 cm   -6.3 cm  -1.98 m    8.08 keV  2.29 keV   800 mum  2.84 mm    Tracker     eIoni
-    4    5.8 cm  -6.33 cm  -1.98 m    3.99 keV  4.08 keV   620 mum  3.46 mm    Tracker     eIoni
-    5   5.81 cm  -6.33 cm  -1.98 m     824 eV   3.17 keV   351 mum  3.81 mm    Tracker     eIoni
-    6   5.81 cm  -6.33 cm  -1.98 m       0 eV    824 eV   48.1 mum  3.86 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 232,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   83.5 mum   240 mum  -2.4 m     757 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    113 mum   206 mum  -2.4 m     757 keV     0 eV    269 mum   269 mum   TrackerTransportation
-    2   9.03 cm  -10.3 cm   -1.6 m     757 keV     0 eV   81.2 cm   81.2 cm    ChamberTransportation
-    3   11.3 cm  -12.9 cm   -1.4 m     757 keV     0 eV   20.3 cm   1.01 m     TrackerTransportation
-    4     18 cm  -20.7 cm    -80 cm    757 keV     0 eV   60.9 cm   1.62 m     ChamberTransportation
-    5   20.3 cm  -23.3 cm    -60 cm    757 keV     0 eV   20.3 cm   1.83 m     TrackerTransportation
-    6   27.1 cm  -31.1 cm      0 fm    757 keV     0 eV   60.9 cm   2.44 m     ChamberTransportation
-    7   29.3 cm  -33.6 cm     20 cm    757 keV     0 eV   20.3 cm   2.64 m     TrackerTransportation
-    8   36.1 cm  -41.4 cm     80 cm    757 keV     0 eV   60.9 cm   3.25 m     ChamberTransportation
-    9   38.3 cm    -44 cm      1 m     757 keV     0 eV   20.3 cm   3.45 m     TrackerTransportation
-   10   45.1 cm  -51.8 cm    1.6 m     757 keV     0 eV   60.9 cm   4.06 m     ChamberTransportation
-   11   47.3 cm  -54.4 cm    1.8 m     757 keV     0 eV   20.3 cm   4.26 m     TrackerTransportation
-   12   54.1 cm  -62.1 cm    2.4 m     757 keV     0 eV   60.9 cm   4.87 m     WorldPVTransportation
-   13   59.8 cm  -68.7 cm   2.91 m     757 keV     0 eV   51.7 cm   5.39 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 231,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   65.7 mum   145 mum  -2.4 m     464 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    194 mum   169 mum  -2.4 m     464 keV     0 eV   1.31 mm   1.31 mm    TrackerTransportation
-    2   7.94 cm   1.49 cm   -1.6 m     464 keV     0 eV   80.4 cm   80.5 cm    ChamberTransportation
-    3   9.92 cm   1.86 cm   -1.4 m     464 keV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   15.9 cm   2.96 cm    -80 cm    464 keV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   17.8 cm   3.33 cm    -60 cm    464 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   23.8 cm   4.44 cm      0 fm    464 keV     0 eV   60.3 cm   2.41 m     ChamberTransportation
-    7   25.8 cm   4.81 cm     20 cm    464 keV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   31.7 cm   5.91 cm     80 cm    464 keV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   33.7 cm   6.28 cm      1 m     464 keV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   39.6 cm   7.38 cm    1.6 m     464 keV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   41.6 cm   7.75 cm    1.8 m     464 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   47.5 cm   8.86 cm    2.4 m     464 keV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13   52.6 cm    9.8 cm   2.91 m     464 keV     0 eV   51.3 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 230,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   64.8 mum   145 mum  -2.4 m     5.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    223 mum   164 mum  -2.4 m     5.5 MeV     0 eV   1.32 mm   1.32 mm    TrackerTransportation
-    2   9.68 cm   1.17 cm   -1.6 m     5.5 MeV     0 eV   80.6 cm   80.7 cm    ChamberTransportation
-    3   12.1 cm   1.46 cm   -1.4 m     5.5 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   19.3 cm   2.33 cm    -80 cm    5.5 MeV     0 eV   60.4 cm   1.61 m     ChamberTransportation
-    5   21.8 cm   2.61 cm    -60 cm    5.5 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6     29 cm   3.48 cm  0.114 fm    5.5 MeV     0 eV   60.4 cm   2.42 m     ChamberTransportation
-    7   31.4 cm   3.77 cm     20 cm    5.5 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   38.7 cm   4.64 cm     80 cm    5.5 MeV     0 eV   60.4 cm   3.22 m     ChamberTransportation
-    9   41.1 cm   4.92 cm      1 m     5.5 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10   48.3 cm   5.79 cm    1.6 m     5.5 MeV     0 eV   60.4 cm   4.03 m     ChamberTransportation
-   11   50.7 cm   6.08 cm    1.8 m     5.5 MeV     0 eV   20.1 cm   4.23 m     TrackerTransportation
-   12     58 cm   6.95 cm    2.4 m     5.5 MeV     0 eV   60.4 cm   4.84 m     WorldPVTransportation
-   13   64.1 cm   7.68 cm   2.91 m     5.5 MeV     0 eV   51.4 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 229,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   53.4 mum   143 mum  -2.4 m    24.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    277 mum   192 mum  -2.4 m    24.7 MeV     0 eV   1.39 mm   1.39 mm    TrackerTransportation
-    2     13 cm   2.85 cm   -1.6 m    24.7 MeV     0 eV   81.1 cm   81.2 cm    ChamberTransportation
-    3   16.3 cm   3.56 cm   -1.4 m    24.7 MeV     0 eV   20.3 cm   1.02 m     TrackerTransportation
-    4     26 cm   5.69 cm    -80 cm   24.7 MeV     0 eV   60.8 cm   1.62 m     ChamberTransportation
-    5   29.3 cm   6.39 cm    -60 cm   24.7 MeV     0 eV   20.3 cm   1.83 m     TrackerTransportation
-    6     39 cm   8.52 cm      0 fm   24.7 MeV     0 eV   60.8 cm   2.43 m     ChamberTransportation
-    7   42.3 cm   9.23 cm     20 cm   24.7 MeV     0 eV   20.3 cm   2.64 m     TrackerTransportation
-    8     52 cm   11.4 cm     80 cm   24.7 MeV     0 eV   60.8 cm   3.25 m     ChamberTransportation
-    9   55.3 cm   12.1 cm      1 m    24.7 MeV     0 eV   20.3 cm   3.45 m     TrackerTransportation
-   10     65 cm   14.2 cm    1.6 m    24.7 MeV     0 eV   60.8 cm   4.06 m     ChamberTransportation
-   11   68.2 cm   14.9 cm    1.8 m    24.7 MeV     0 eV   20.3 cm   4.26 m     TrackerTransportation
-   12     78 cm     17 cm    2.4 m    24.7 MeV     0 eV   60.8 cm   4.87 m     WorldPVTransportation
-   13   86.3 cm   18.8 cm   2.91 m    24.7 MeV     0 eV   51.7 cm   5.38 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 228,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -41.8 mum  43.9 mum  -2.4 m    1.73 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    170 mum   103 mum  -2.4 m    1.73 MeV     0 eV   2.39 mm   2.39 mm    TrackerTransportation
-    2   7.16 cm   2.01 cm   -1.6 m    1.73 MeV     0 eV   80.3 cm   80.6 cm    ChamberTransportation
-    3   8.94 cm   2.51 cm   -1.4 m    1.73 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   14.3 cm      4 cm    -80 cm   1.73 MeV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   16.1 cm    4.5 cm    -60 cm   1.73 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   21.4 cm      6 cm      0 fm   1.73 MeV     0 eV   60.3 cm   2.41 m     ChamberTransportation
-    7   23.2 cm    6.5 cm     20 cm   1.73 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   28.6 cm   7.99 cm     80 cm   1.73 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   30.4 cm   8.49 cm      1 m    1.73 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   35.7 cm   9.99 cm    1.6 m    1.73 MeV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   37.5 cm   10.5 cm    1.8 m    1.73 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   42.9 cm     12 cm    2.4 m    1.73 MeV     0 eV   60.3 cm   4.82 m     WorldPVTransportation
-   13   47.4 cm   13.3 cm   2.91 m    1.73 MeV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 227,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.7 mum  -300 nm   -2.4 m    57.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -38.7 mum  65.7 mum  -2.4 m       0 eV      0 eV   1.74 mm   1.74 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 242,   Parent ID = 227
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.7 mum  65.7 mum  -2.4 m      43 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   13.6 mum   131 mum  -2.4 m    41.5 MeV  1.52 MeV  1.33 mm   1.33 mm    TrackerTransportation
-    2   37.3 cm   1.13 cm  -1.59 m    41.3 MeV   191 keV  88.9 cm   89.1 cm    Tracker     eIoni
-    3   50.7 cm    1.9 cm  -1.31 m    41.2 MeV  58.3 keV  31.6 cm   1.21 m     Tracker     eIoni
-    4   57.2 cm   2.25 cm  -1.16 m    41.2 MeV  36.4 keV  15.8 cm   1.36 m     Tracker     eIoni
-    5   76.5 cm   4.09 cm  -72.6 cm     41 MeV   105 keV  47.8 cm   1.84 m     Tracker     eIoni
-    6   1.04 m    6.12 cm  -14.4 cm   40.9 MeV   138 keV  64.3 cm   2.49 m     Tracker     eIoni
-    7    1.1 m    6.58 cm      0 fm   40.8 MeV  29.5 keV  15.5 cm   2.64 m     ChamberTransportation
-    8    1.1 m    6.64 cm   1.97 cm   40.8 MeV  11.1 keV  2.13 cm   2.66 m     TrackerTransportation
-    9   1.42 m    9.33 cm     80 cm   40.6 MeV   182 keV  84.3 cm   3.51 m     ChamberTransportation
-   10   1.44 m    9.39 cm   84.4 cm   40.5 MeV    38 keV  4.75 cm   3.55 m     Chamber     eIoni
-   11   1.49 m    10.1 cm   96.7 cm   40.3 MeV  96.2 keV  13.2 cm   3.69 m     Chamber     eIoni
-   12    1.5 m    10.2 cm      1 m    40.3 MeV  31.9 keV  3.58 cm   3.72 m     TrackerTransportation
-   13   1.63 m    10.2 cm    1.3 m    40.2 MeV  65.4 keV  32.3 cm   4.04 m     Tracker     eIoni
-   14   1.77 m    10.1 cm    1.6 m    40.1 MeV  77.8 keV  33.4 cm   4.38 m     ChamberTransportation
-   15   1.86 m      10 cm    1.8 m      40 MeV   128 keV  21.9 cm    4.6 m     TrackerTransportation
-   16   2.12 m    11.6 cm    2.4 m    39.8 MeV   142 keV  65.6 cm   5.25 m     WorldPVTransportation
-   17    2.3 m    12.1 cm   2.78 m    39.8 MeV  88.6 keV  41.3 cm   5.67 m     WorldPV     eIoni
-   18    2.3 m    12.1 cm   2.78 m    39.7 MeV   625 eV   5.27 mm   5.67 m     WorldPV     eIoni
-   19   2.35 m    12.1 cm   2.91 m    39.7 MeV  25.9 keV  14.1 cm   5.81 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 253,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.3 m    12.1 cm   2.78 m    8.66 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.3 m    12.1 cm   2.78 m    7.56 keV  1.11 keV   664 mum   664 mum   WorldPV     eIoni
-    2    2.3 m      12 cm   2.78 m    6.31 keV  1.25 keV   584 mum  1.25 mm    WorldPV     eIoni
-    3    2.3 m      12 cm   2.78 m    2.82 keV  3.49 keV   500 mum  1.75 mm    WorldPV     eIoni
-    4    2.3 m      12 cm   2.78 m     631 eV   2.18 keV   260 mum  2.01 mm    WorldPV     eIoni
-    5    2.3 m      12 cm   2.78 m       0 eV    631 eV   35.3 mum  2.04 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 252,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    2.3 m    12.1 cm   2.78 m    8.31 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    2.3 m      12 cm   2.78 m    5.84 keV  2.46 keV   636 mum   636 mum   WorldPV     eIoni
-    2    2.3 m      12 cm   2.78 m    4.41 keV  1.43 keV   469 mum   1.1 mm    WorldPV     eIoni
-    3    2.3 m      12 cm   2.77 m     356 eV   4.06 keV   380 mum  1.48 mm    WorldPV     eIoni
-    4    2.3 m      12 cm   2.77 m       0 eV    356 eV   20.5 mum   1.5 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 251,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.83 m    10.1 cm   1.73 m    9.61 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.83 m      10 cm   1.73 m    8.01 keV   1.6 keV   515 mum   515 mum   Chamber     eIoni
-    2   1.83 m    10.1 cm   1.73 m    5.34 keV  2.67 keV   452 mum   967 mum   Chamber     eIoni
-    3   1.83 m    10.1 cm   1.73 m     686 eV   4.65 keV   344 mum  1.31 mm    Chamber     eIoni
-    4   1.83 m    10.1 cm   1.73 m       0 eV    686 eV   29.6 mum  1.34 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 250,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.63 m    10.2 cm    1.3 m      11 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.63 m    10.1 cm    1.3 m       9 keV  2.01 keV   856 mum   856 mum   Tracker     eIoni
-    2   1.63 m    10.1 cm    1.3 m       8 keV   998 eV    690 mum  1.55 mm    Tracker     eIoni
-    3   1.63 m    10.2 cm    1.3 m    6.54 keV  1.46 keV   614 mum  2.16 mm    Tracker     eIoni
-    4   1.63 m    10.1 cm   1.29 m    5.27 keV  1.27 keV   514 mum  2.67 mm    Tracker     eIoni
-    5   1.63 m    10.2 cm   1.29 m    2.52 keV  2.75 keV   434 mum  3.11 mm    Tracker     eIoni
-    6   1.63 m    10.2 cm   1.29 m     748 eV   1.77 keV   229 mum  3.34 mm    Tracker     eIoni
-    7   1.63 m    10.2 cm   1.29 m       0 eV    748 eV   42.8 mum  3.38 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 249,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.49 m    10.1 cm   96.7 cm     93 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.49 m    10.2 cm   96.7 cm   83.3 keV   1.3 keV  1.19 mm   1.19 mm    Chamber     eBrem
-    2   1.48 m    10.4 cm   96.8 cm   74.7 keV  8.66 keV  7.93 mm   9.12 mm    Chamber     eIoni
-    3   1.48 m    10.8 cm   96.5 cm   60.6 keV  14.1 keV  6.65 mm   1.58 cm    Chamber     eIoni
-    4   1.48 m    10.9 cm   96.4 cm   30.4 keV  30.2 keV  4.81 mm   2.06 cm    Chamber     eIoni
-    5   1.48 m    10.9 cm   96.5 cm   24.4 keV  5.96 keV  1.74 mm   2.23 cm    Chamber     eIoni
-    6   1.48 m    10.9 cm   96.5 cm   23.8 keV   668 eV   1.31 mm   2.36 cm    Chamber     eIoni
-    7   1.48 m    10.8 cm   96.5 cm   19.7 keV  4.07 keV  1.27 mm   2.49 cm    Chamber     eIoni
-    8   1.48 m    10.8 cm   96.5 cm   16.9 keV  2.83 keV  1.01 mm   2.59 cm    Chamber     eIoni
-    9   1.48 m    10.8 cm   96.5 cm     14 keV  2.85 keV   854 mum  2.68 cm    Chamber     eIoni
-   10   1.48 m    10.8 cm   96.5 cm   11.7 keV  2.35 keV   709 mum  2.75 cm    Chamber     eIoni
-   11   1.48 m    10.8 cm   96.4 cm   4.68 keV     7 keV   602 mum  2.81 cm    Chamber     eIoni
-   12   1.48 m    10.8 cm   96.5 cm   2.53 keV  2.15 keV   313 mum  2.84 cm    Chamber     eIoni
-   13   1.48 m    10.8 cm   96.5 cm      0 eV   2.53 keV   163 mum  2.86 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 254,   Parent ID = 249
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.49 m    10.2 cm   96.7 cm   8.38 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.49 m    10.3 cm   96.8 cm      0 eV   8.38 keV  1.31 mm   1.31 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 248,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.44 m    9.39 cm   84.4 cm    109 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   1.45 m    9.96 cm   84.8 cm   98.8 keV  10.1 keV  1.21 cm   1.21 cm    Chamber     eIoni
-    2   1.45 m    10.2 cm   84.6 cm   86.6 keV  12.3 keV  1.04 cm   2.26 cm    Chamber     eIoni
-    3   1.46 m    10.6 cm   84.9 cm     79 keV  7.52 keV  8.42 mm    3.1 cm    Chamber     eIoni
-    4   1.46 m    10.9 cm   85.3 cm   72.3 keV  6.73 keV  7.29 mm   3.83 cm    Chamber     eIoni
-    5   1.46 m    10.9 cm   85.7 cm   52.4 keV  19.9 keV  6.33 mm   4.46 cm    Chamber     eIoni
-    6   1.46 m    11.1 cm   85.5 cm   47.3 keV  5.13 keV  3.84 mm   4.84 cm    Chamber     eIoni
-    7   1.46 m    11.2 cm   85.6 cm   40.5 keV  6.78 keV   3.3 mm   5.17 cm    Chamber     eIoni
-    8   1.46 m    11.3 cm   85.7 cm   38.1 keV  2.45 keV  2.62 mm   5.44 cm    Chamber     eIoni
-    9   1.46 m    11.2 cm   85.6 cm   35.9 keV  2.15 keV  2.39 mm   5.67 cm    Chamber     eIoni
-   10   1.46 m    11.4 cm   85.7 cm     32 keV  3.85 keV  2.19 mm   5.89 cm    Chamber     eIoni
-   11   1.46 m    11.3 cm   85.6 cm   29.5 keV  2.58 keV  1.88 mm   6.08 cm    Chamber     eIoni
-   12   1.46 m    11.3 cm   85.6 cm   26.3 keV   3.2 keV  1.67 mm   6.25 cm    Chamber     eIoni
-   13   1.46 m    11.2 cm   85.6 cm   22.3 keV  3.93 keV  1.44 mm   6.39 cm    Chamber     eIoni
-   14   1.46 m    11.2 cm   85.7 cm   18.8 keV  3.56 keV  1.17 mm   6.51 cm    Chamber     eIoni
-   15   1.46 m    11.2 cm   85.6 cm   16.4 keV  2.37 keV   959 mum  6.61 cm    Chamber     eIoni
-   16   1.46 m    11.2 cm   85.6 cm   7.51 keV   8.9 keV   830 mum  6.69 cm    Chamber     eIoni
-   17   1.46 m    11.2 cm   85.7 cm   3.55 keV  3.97 keV   432 mum  6.73 cm    Chamber     eIoni
-   18   1.46 m    11.2 cm   85.6 cm      0 eV   3.55 keV   248 mum  6.76 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 247,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.04 m    6.12 cm  -14.4 cm   15.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.04 m    6.01 cm  -14.3 cm   13.1 keV  2.41 keV  1.31 mm   1.31 mm    Tracker     eIoni
-    2   1.04 m    5.92 cm  -14.3 cm   11.8 keV  1.31 keV  1.05 mm   2.37 mm    Tracker     eIoni
-    3   1.04 m    5.89 cm  -14.2 cm   10.9 keV   887 eV    927 mum  3.29 mm    Tracker     eIoni
-    4   1.04 m    5.88 cm  -14.2 cm   8.62 keV  2.31 keV   849 mum  4.14 mm    Tracker     eIoni
-    5   1.04 m    5.82 cm  -14.2 cm    6.2 keV  2.42 keV   660 mum   4.8 mm    Tracker     eIoni
-    6   1.04 m    5.78 cm  -14.2 cm    593 eV   5.61 keV   493 mum   5.3 mm    Tracker     eIoni
-    7   1.04 m    5.78 cm  -14.2 cm      0 eV    593 eV   33.1 mum  5.33 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 246,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   76.5 cm   4.09 cm  -72.6 cm   41.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1     76 cm   3.96 cm  -72.4 cm     38 keV  3.39 keV  6.09 mm   6.09 mm    Tracker     eIoni
-    2   75.8 cm   3.71 cm    -72 cm   35.6 keV  2.35 keV  5.26 mm   1.13 cm    Tracker     eIoni
-    3   75.5 cm   3.76 cm  -71.7 cm   32.5 keV  3.11 keV  4.71 mm   1.61 cm    Tracker     eIoni
-    4   75.6 cm   3.58 cm  -71.3 cm   30.1 keV  2.39 keV  4.06 mm   2.01 cm    Tracker     eIoni
-    5   75.6 cm   3.52 cm    -71 cm   25.6 keV  4.49 keV  3.56 mm   2.37 cm    Tracker     eIoni
-    6   75.3 cm   3.41 cm  -70.9 cm   21.7 keV  3.93 keV  2.75 mm   2.64 cm    Tracker     eIoni
-    7   75.3 cm   3.54 cm  -70.7 cm   19.5 keV  2.23 keV  2.12 mm   2.85 cm    Tracker     eIoni
-    8   75.2 cm   3.65 cm  -70.6 cm   17.9 keV  1.61 keV  1.81 mm   3.04 cm    Tracker     eIoni
-    9   75.3 cm   3.74 cm  -70.5 cm   16.3 keV   1.6 keV  1.59 mm   3.19 cm    Tracker     eIoni
-   10   75.3 cm   3.77 cm  -70.4 cm     14 keV  2.32 keV   1.4 mm   3.33 cm    Tracker     eIoni
-   11   75.4 cm   3.82 cm  -70.4 cm   11.8 keV  2.17 keV  1.14 mm   3.45 cm    Tracker     eIoni
-   12   75.4 cm   3.87 cm  -70.4 cm   10.2 keV   1.6 keV   925 mum  3.54 cm    Tracker     eIoni
-   13   75.5 cm   3.94 cm  -70.4 cm   8.56 keV  1.63 keV   785 mum  3.62 cm    Tracker     eIoni
-   14   75.4 cm   3.95 cm  -70.4 cm   7.53 keV  1.03 keV   656 mum  3.69 cm    Tracker     eIoni
-   15   75.4 cm   3.97 cm  -70.4 cm   3.37 keV  4.16 keV   582 mum  3.74 cm    Tracker     eIoni
-   16   75.4 cm   3.98 cm  -70.4 cm   2.58 keV   790 eV    307 mum  3.77 cm    Tracker     eIoni
-   17   75.4 cm   3.97 cm  -70.4 cm    1.3 keV  1.28 keV   236 mum   3.8 cm    Tracker     eIoni
-   18   75.4 cm   3.96 cm  -70.4 cm      0 eV    1.3 keV  86.7 mum  3.81 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 245,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   57.2 cm   2.25 cm  -1.16 m    12.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   57.1 cm   2.24 cm  -1.16 m    10.6 keV   1.5 keV   957 mum   957 mum   Tracker     eIoni
-    2   57.1 cm   2.24 cm  -1.16 m    8.93 keV   1.7 keV   823 mum  1.78 mm    Tracker     eIoni
-    3   57.1 cm    2.2 cm  -1.16 m    5.03 keV   3.9 keV   685 mum  2.46 mm    Tracker     eIoni
-    4     57 cm   2.19 cm  -1.16 m    2.98 keV  2.05 keV   418 mum  2.88 mm    Tracker     eIoni
-    5   57.1 cm   2.18 cm  -1.16 m     286 eV    2.7 keV   275 mum  3.16 mm    Tracker     eIoni
-    6   57.1 cm   2.18 cm  -1.16 m       0 eV    286 eV   17.5 mum  3.18 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 244,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   50.7 cm    1.9 cm  -1.31 m    34.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   51.1 cm    1.9 cm  -1.31 m    30.8 keV  4.14 keV  4.56 mm   4.56 mm    Tracker     eIoni
-    2   51.3 cm   2.18 cm  -1.31 m    28.6 keV  2.21 keV  3.69 mm   8.26 mm    Tracker     eIoni
-    3   51.5 cm   2.35 cm  -1.31 m    25.1 keV  3.45 keV  3.28 mm   1.15 cm    Tracker     eIoni
-    4   51.6 cm   2.45 cm  -1.31 m    23.2 keV  1.96 keV  2.65 mm   1.42 cm    Tracker     eIoni
-    5   51.4 cm   2.41 cm  -1.31 m    19.8 keV  3.36 keV  2.35 mm   1.65 cm    Tracker     eIoni
-    6   51.5 cm    2.5 cm   -1.3 m    16.4 keV  3.43 keV  1.85 mm   1.84 cm    Tracker     eIoni
-    7   51.5 cm   2.55 cm   -1.3 m    15.1 keV  1.26 keV  1.41 mm   1.98 cm    Tracker     eIoni
-    8   51.6 cm   2.66 cm   -1.3 m    12.5 keV  2.58 keV  1.27 mm   2.11 cm    Tracker     eIoni
-    9   51.6 cm   2.73 cm   -1.3 m     7.1 keV  5.44 keV   997 mum  2.21 cm    Tracker     eIoni
-   10   51.6 cm   2.68 cm   -1.3 m    6.58 keV   518 eV    552 mum  2.26 cm    Tracker     eIoni
-   11   51.6 cm   2.72 cm   -1.3 m    4.57 keV  2.01 keV   517 mum  2.31 cm    Tracker     eIoni
-   12   51.6 cm   2.71 cm   -1.3 m    3.07 keV  1.51 keV   390 mum  2.35 cm    Tracker     eIoni
-   13   51.6 cm   2.69 cm   -1.3 m    1.23 keV  1.84 keV   283 mum  2.38 cm    Tracker     eIoni
-   14   51.6 cm   2.69 cm   -1.3 m       0 eV   1.23 keV  80.8 mum  2.39 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 243,   Parent ID = 242
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   37.3 cm   1.13 cm  -1.59 m    18.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   37.4 cm   9.67 mm  -1.59 m    12.9 keV   5.5 keV  1.67 mm   1.67 mm    Tracker     eIoni
-    2   37.4 cm   9.13 mm  -1.59 m    12.1 keV   851 eV   1.04 mm    2.7 mm    Tracker     eIoni
-    3   37.5 cm   8.64 mm  -1.59 m    8.61 keV  3.47 keV   951 mum  3.66 mm    Tracker     eIoni
-    4   37.4 cm   8.72 mm  -1.59 m       7 keV  1.62 keV   660 mum  4.31 mm    Tracker     eIoni
-    5   37.4 cm   8.83 mm  -1.59 m    5.55 keV  1.45 keV   544 mum  4.86 mm    Tracker     eIoni
-    6   37.4 cm   8.93 mm  -1.59 m    3.01 keV  2.54 keV   451 mum  5.31 mm    Tracker     eIoni
-    7   37.3 cm   9.02 mm  -1.59 m    1.51 keV   1.5 keV   278 mum  5.59 mm    Tracker     eIoni
-    8   37.3 cm   9.04 mm  -1.59 m       0 eV   1.51 keV   107 mum   5.7 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 241,   Parent ID = 227
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.7 mum  65.7 mum  -2.4 m    13.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -50.1 mum  51.2 mum  -2.4 m      12 MeV   176 keV   177 mum   177 mum  TargetPV     eBrem
-    2  -43.2 mum  44.5 mum  -2.4 m      11 MeV  62.3 keV  50.9 mum   228 mum  TargetPV     eBrem
-    3  -24.3 mum  -124 mum  -2.4 m    8.21 MeV   595 keV   475 mum   703 mum  TargetPV     eBrem
-    4   -156 mum  35.8 mum  -2.4 m    6.37 MeV  1.36 MeV   338 mum  1.04 mm   TargetPV     eBrem
-    5   -451 mum  18.6 mum  -2.4 m    5.05 MeV   763 keV   756 mum   1.8 mm   TargetPV     eBrem
-    6  -1.21 mm   96.5 mum  -2.4 m    3.76 MeV  1.29 MeV  1.07 mm   2.87 mm   TargetPV     eIoni
-    7  -1.33 mm   -134 mum  -2.4 m    2.95 MeV   809 keV   879 mum  3.75 mm   TargetPV     eIoni
-    8   -870 mum  -126 mum  -2.4 m    1.76 MeV   748 keV   720 mum  4.47 mm   TargetPV     eBrem
-    9   -707 mum  -109 mum  -2.4 m    1.23 MeV   533 keV   559 mum  5.02 mm   TargetPV     eIoni
-   10   -605 mum -82.1 mum  -2.4 m     183 keV  1.04 MeV   460 mum  5.48 mm   TargetPV     eIoni
-   11   -609 mum   -81 mum  -2.4 m       0 eV    183 keV  70.5 mum  5.55 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 260,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -870 mum  -126 mum  -2.4 m     440 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.69 mm    703 mum -2.41 m     350 keV  89.9 keV  8.15 mm   8.15 mm   TargetPV     compt
-    2  -2.89 mm    739 mum -2.41 m       0 eV    350 keV   235 mum  8.39 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 259,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -451 mum  18.6 mum  -2.4 m     558 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.09 cm  -8.21 mm   -2.4 m     367 keV   191 keV  1.37 cm   1.37 cm   TargetPV     compt
-    2  -1.03 cm  -1.96 cm   -2.4 m       0 eV    367 keV  1.15 cm   2.52 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 258,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -156 mum  35.8 mum  -2.4 m     473 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.47 mm  -4.64 mm  -2.41 m     400 keV  73.4 keV  9.15 mm   9.15 mm   TargetPV     compt
-    2  -4.15 mm  -5.98 mm  -2.41 m       0 eV    400 keV  2.14 mm   1.13 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 257,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -24.3 mum  -124 mum  -2.4 m    2.25 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.54 mm   8.62 mm  -2.41 m       0 eV   1.23 MeV  1.19 cm   1.19 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 261,   Parent ID = 257
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.54 mm   8.62 mm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.54 mm   8.62 mm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 263,   Parent ID = 261
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.54 mm   8.62 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -5.83 mm   6.59 mm  -2.41 m       0 eV    511 keV  4.01 mm   4.01 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 262,   Parent ID = 261
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.54 mm   8.62 mm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -274 mum     1 cm  -2.41 m     173 keV   338 keV  2.76 mm   2.76 mm   TargetPV     compt
-    2   -480 mum  9.95 mm  -2.41 m       0 eV    173 keV   249 mum  3.01 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 256,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -43.2 mum  44.5 mum  -2.4 m     910 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -38.4 mum -50.7 mum  -2.4 m     910 keV     0 eV   1.09 mm   1.09 mm    TrackerTransportation
-    2   3.43 mm  -7.01 cm   -1.6 m     910 keV     0 eV   80.3 cm   80.4 cm    ChamberTransportation
-    3    4.3 mm  -8.76 cm   -1.4 m     910 keV     0 eV   20.1 cm      1 m     TrackerTransportation
-    4   6.91 mm    -14 cm    -80 cm    910 keV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   7.77 mm  -15.8 cm    -60 cm    910 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   1.04 cm    -21 cm      0 fm    910 keV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7   1.12 cm  -22.8 cm     20 cm    910 keV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   1.38 cm    -28 cm     80 cm    910 keV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9   1.47 cm  -29.8 cm      1 m     910 keV     0 eV   20.1 cm   3.41 m     TrackerTransportation
-   10   1.73 cm    -35 cm    1.6 m     910 keV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   1.82 cm  -36.8 cm    1.8 m     910 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   2.08 cm    -42 cm    2.4 m     910 keV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13    2.3 cm  -46.5 cm   2.91 m     910 keV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 255,   Parent ID = 241
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -50.1 mum  51.2 mum  -2.4 m     1.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    145 mum  -215 mum  -2.4 m     1.3 MeV     0 eV   1.18 mm   1.18 mm    TrackerTransportation
-    2   13.7 cm  -18.8 cm   -1.6 m     1.3 MeV     0 eV   83.3 cm   83.4 cm    ChamberTransportation
-    3   17.1 cm  -23.4 cm   -1.4 m     1.3 MeV     0 eV   20.8 cm   1.04 m     TrackerTransportation
-    4   27.4 cm  -37.5 cm    -80 cm    1.3 MeV     0 eV   62.5 cm   1.67 m     ChamberTransportation
-    5   30.9 cm  -42.2 cm    -60 cm    1.3 MeV     0 eV   20.8 cm   1.88 m     TrackerTransportation
-    6   41.1 cm  -56.2 cm      0 fm    1.3 MeV     0 eV   62.5 cm    2.5 m     ChamberTransportation
-    7   44.6 cm  -60.9 cm     20 cm    1.3 MeV     0 eV   20.8 cm   2.71 m     TrackerTransportation
-    8   54.8 cm    -75 cm     80 cm    1.3 MeV     0 eV   62.5 cm   3.33 m     ChamberTransportation
-    9   58.3 cm  -79.7 cm      1 m     1.3 MeV     0 eV   20.8 cm   3.54 m     TrackerTransportation
-   10   68.5 cm  -93.7 cm    1.6 m     1.3 MeV     0 eV   62.5 cm   4.17 m     ChamberTransportation
-   11     72 cm  -98.4 cm    1.8 m     1.3 MeV     0 eV   20.8 cm   4.37 m     TrackerTransportation
-   12   82.3 cm  -1.12 m     2.4 m     1.3 MeV     0 eV   62.5 cm      5 m     WorldPVTransportation
-   13     91 cm  -1.24 m    2.91 m     1.3 MeV     0 eV   53.1 cm   5.53 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 226,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -87.9 mum -6.42 mum  -2.4 m     131 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -107 mum   -24 mum  -2.4 m     131 MeV     0 eV   3.42 mm   3.42 mm    TrackerTransportation
-    2  -4.67 mm  -4.15 mm   -1.6 m     131 MeV     0 eV     80 cm   80.3 cm    ChamberTransportation
-    3  -5.81 mm  -5.18 mm   -1.4 m     131 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -9.24 mm  -8.27 mm    -80 cm    131 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -1.04 cm  -9.31 mm    -60 cm    131 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -1.38 cm  -1.24 cm -0.114 fm    131 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -1.49 cm  -1.34 cm     20 cm    131 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -1.84 cm  -1.65 cm     80 cm    131 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -1.95 cm  -1.76 cm      1 m     131 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10  -2.29 cm  -2.06 cm    1.6 m     131 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11  -2.41 cm  -2.17 cm    1.8 m     131 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12  -2.75 cm  -2.48 cm    2.4 m     131 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13  -3.04 cm  -2.74 cm   2.91 m     131 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 225,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -83.2 mum   -22 mum  -2.4 m    6.18 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -72 mum -13.3 mum  -2.4 m    2.52 MeV     0 eV   2.83 mm   2.83 mm   TargetPV     compt
-    2   -349 mum   661 mum  -2.4 m    2.52 MeV     0 eV   1.53 mm   4.36 mm    TrackerTransportation
-    3  -98.7 cm    2.4 m     2.4 m    2.52 MeV     0 eV   5.45 m    5.46 m     WorldPVTransportation
-    4  -1.09 m    2.66 m    2.91 m    2.52 MeV     0 eV   58.5 cm   6.04 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 264,   Parent ID = 225
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -72 mum -13.3 mum  -2.4 m    3.66 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -180 mum   266 mum  -2.4 m    2.72 MeV   938 keV   865 mum   865 mum  TargetPV     eIoni
-    2   48.9 mum   157 mum  -2.4 m    1.87 MeV   852 keV   719 mum  1.58 mm   TargetPV     eIoni
-    3  -32.4 mum -17.1 mum  -2.4 m    1.06 MeV   813 keV   578 mum  2.16 mm   TargetPV     eIoni
-    4  -39.7 mum   128 mum  -2.4 m     406 keV   333 keV   357 mum  2.52 mm   TargetPV     eBrem
-    5  -51.5 mum   129 mum  -2.4 m       0 eV    406 keV   219 mum  2.74 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 265,   Parent ID = 264
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -39.7 mum   128 mum  -2.4 m     317 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -70.4 mum   176 mum  -2.4 m     317 keV     0 eV    220 mum   220 mum   TrackerTransportation
-    2  -11.6 cm   18.3 cm   -1.6 m     317 keV     0 eV   82.9 cm   82.9 cm    ChamberTransportation
-    3  -14.5 cm   22.9 cm   -1.4 m     317 keV     0 eV   20.7 cm   1.04 m     TrackerTransportation
-    4  -23.2 cm   36.6 cm    -80 cm    317 keV     0 eV   62.2 cm   1.66 m     ChamberTransportation
-    5  -26.1 cm   41.1 cm    -60 cm    317 keV     0 eV   20.7 cm   1.86 m     TrackerTransportation
-    6  -34.8 cm   54.8 cm      0 fm    317 keV     0 eV   62.2 cm   2.49 m     ChamberTransportation
-    7  -37.7 cm   59.4 cm     20 cm    317 keV     0 eV   20.7 cm   2.69 m     TrackerTransportation
-    8  -46.4 cm   73.1 cm     80 cm    317 keV     0 eV   62.2 cm   3.32 m     ChamberTransportation
-    9  -49.3 cm   77.7 cm      1 m     317 keV     0 eV   20.7 cm   3.52 m     TrackerTransportation
-   10    -58 cm   91.4 cm    1.6 m     317 keV     0 eV   62.2 cm   4.14 m     ChamberTransportation
-   11  -60.9 cm   95.9 cm    1.8 m     317 keV     0 eV   20.7 cm   4.35 m     TrackerTransportation
-   12  -69.6 cm    1.1 m     2.4 m     317 keV     0 eV   62.2 cm   4.97 m     WorldPVTransportation
-   13    -77 cm   1.21 m    2.91 m     317 keV     0 eV   52.8 cm    5.5 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 224,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -80.4 mum -34.1 mum  -2.4 m    30.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -97.9 mum  31.8 mum  -2.4 m    30.8 MeV     0 eV   4.64 mm   4.64 mm    TrackerTransportation
-    2  -3.11 mm   1.14 cm   -1.6 m    30.8 MeV     0 eV     80 cm   80.5 cm    ChamberTransportation
-    3  -3.86 mm   1.42 cm   -1.4 m    30.8 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -6.11 mm   2.28 cm    -80 cm   30.8 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -6.87 mm   2.56 cm    -60 cm   30.8 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -9.12 mm   3.41 cm      0 fm   30.8 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -9.88 mm    3.7 cm     20 cm   30.8 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -1.21 cm   4.55 cm     80 cm   30.8 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -1.29 cm   4.83 cm      1 m    30.8 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -1.51 cm   5.68 cm    1.6 m    30.8 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -1.59 cm   5.97 cm    1.8 m    30.8 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -1.81 cm   6.82 cm    2.4 m    30.8 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -2.01 cm   7.54 cm   2.91 m    30.8 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 223,   Parent ID = 189
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -64.2 mum -25.9 mum -2.41 m    9.85 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -89.6 mum -34.2 mum  -2.4 m       0 eV      0 eV    3.9 mm    3.9 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 267,   Parent ID = 223
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -89.6 mum -34.2 mum  -2.4 m    4.05 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    402 mum  72.7 mum  -2.4 m    3.06 MeV   992 keV   945 mum   945 mum  TargetPV     eIoni
-    2    217 mum   460 mum  -2.4 m    2.23 MeV   827 keV   789 mum  1.73 mm   TargetPV     eIoni
-    3  -16.7 mum   449 mum  -2.4 m    1.59 MeV   647 keV   651 mum  2.38 mm   TargetPV     eIoni
-    4   -211 mum   416 mum  -2.4 m     802 keV   785 keV   536 mum  2.92 mm   TargetPV     eIoni
-    5   -229 mum   440 mum  -2.4 m     104 keV   699 keV   372 mum  3.29 mm   TargetPV     eIoni
-    6   -232 mum   438 mum  -2.4 m       0 eV    104 keV  27.1 mum  3.32 mm   TargetPV     eIoni
-    7   -232 mum   438 mum  -2.4 m       0 eV      0 eV      0 fm   3.32 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 269,   Parent ID = 267
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -232 mum   438 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -359 mum   529 mum  -2.4 m     511 keV     0 eV    204 mum   204 mum   TrackerTransportation
-    2   -2.4 m    1.71 m    8.07 cm    511 keV     0 eV   3.85 m    3.85 m     WorldPVTransportation
-    3  -2.91 m    2.07 m    60.8 cm    511 keV     0 eV   81.8 cm   4.67 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 268,   Parent ID = 267
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -232 mum   438 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.18 mm  -1.99 mm   -2.4 m       0 eV    511 keV  5.48 mm   5.48 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 266,   Parent ID = 223
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -89.6 mum -34.2 mum  -2.4 m    4.78 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -439 mum   101 mum  -2.4 m    3.56 MeV   877 keV   721 mum   721 mum  TargetPV     eBrem
-    2   -256 mum   518 mum  -2.4 m    2.07 MeV   687 keV   646 mum  1.37 mm   TargetPV     eBrem
-    3  -94.5 mum   471 mum  -2.4 m    1.17 MeV   505 keV   484 mum  1.85 mm   TargetPV     eBrem
-    4   -174 mum   470 mum  -2.4 m     432 keV   167 keV   174 mum  2.03 mm   TargetPV     eBrem
-    5   -183 mum   481 mum  -2.4 m    18.5 keV   413 keV   235 mum  2.26 mm   TargetPV     eIoni
-    6   -183 mum   481 mum  -2.4 m       0 eV   18.5 keV  1.82 mum  2.26 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 273,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -174 mum   470 mum  -2.4 m     571 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    961 mum   825 mum  -2.4 m     571 keV     0 eV   1.94 mm   1.94 mm    TrackerTransportation
-    2    2.4 m      75 cm   83.7 cm    571 keV     0 eV    4.1 m     4.1 m     WorldPVTransportation
-    3   2.91 m      91 cm   1.53 m     571 keV     0 eV   87.1 cm   4.97 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 272,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.5 mum   471 mum  -2.4 m     391 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    145 mum   718 mum -2.41 m       0 eV    391 keV  3.82 mm   3.82 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 271,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -256 mum   518 mum  -2.4 m     811 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -6.65 mm   1.47 mm  -2.42 m     755 keV  55.9 keV   1.8 cm    1.8 cm   TargetPV     compt
-    2  -7.49 mm    519 mum -2.42 m     608 keV   147 keV  5.85 mm   2.39 cm   TargetPV     compt
-    3  -7.53 mm   1.08 mm  -2.43 m       0 eV    608 keV  1.43 mm   2.53 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 270,   Parent ID = 266
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -439 mum   101 mum  -2.4 m     335 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.01 mm   1.44 mm   -2.4 m       0 eV    335 keV  1.47 mm   1.47 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 106,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.42 mum -7.38 mum -2.41 m     6.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -80.1 mum -83.3 mum  -2.4 m     6.1 MeV     0 eV   1.26 cm   1.26 cm    TrackerTransportation
-    2  -4.82 mm   -4.9 mm   -1.6 m     6.1 MeV     0 eV     80 cm   81.3 cm    ChamberTransportation
-    3  -6.01 mm  -6.11 mm   -1.4 m     6.1 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -9.56 mm  -9.72 mm    -80 cm    6.1 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -1.07 cm  -1.09 cm    -60 cm    6.1 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -1.43 cm  -1.45 cm      0 fm    6.1 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -1.55 cm  -1.57 cm     20 cm    6.1 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -1.9 cm  -1.94 cm     80 cm    6.1 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -2.02 cm  -2.06 cm      1 m     6.1 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -2.38 cm  -2.42 cm    1.6 m     6.1 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   -2.5 cm  -2.54 cm    1.8 m     6.1 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -2.85 cm   -2.9 cm    2.4 m     6.1 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -3.15 cm  -3.21 cm   2.91 m     6.1 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 105,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.07 mum -2.63 mum -2.41 m     654 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -47.4 mum -30.6 mum  -2.4 m     595 keV  58.3 keV  1.21 cm   1.21 cm   TargetPV     compt
-    2   -480 mum  -197 mum  -2.4 m     595 keV     0 eV    1.2 mm   1.33 cm    TrackerTransportation
-    3  -62.9 cm  -24.2 cm    -80 cm    595 keV     0 eV   1.74 m    1.75 m     ChamberTransportation
-    4  -67.2 cm  -25.9 cm  -68.9 cm    595 keV     0 eV     12 cm   1.87 m     TrackerTransportation
-    5  -94.3 cm  -36.3 cm      0 fm    595 keV     0 eV   74.8 cm   2.62 m     ChamberTransportation
-    6  -1.02 m   -39.3 cm     20 cm    595 keV     0 eV   21.7 cm   2.83 m     TrackerTransportation
-    7  -1.26 m   -48.4 cm     80 cm    595 keV     0 eV   65.1 cm   3.48 m     ChamberTransportation
-    8  -1.34 m   -51.4 cm      1 m     595 keV     0 eV   21.7 cm    3.7 m     TrackerTransportation
-    9  -1.57 m   -60.5 cm    1.6 m     595 keV     0 eV   65.1 cm   4.35 m     ChamberTransportation
-   10  -1.65 m   -63.5 cm    1.8 m     595 keV     0 eV   21.7 cm   4.57 m     TrackerTransportation
-   11  -1.88 m   -72.6 cm    2.4 m     595 keV     0 eV   65.1 cm   5.22 m     WorldPVTransportation
-   12  -2.09 m   -80.3 cm   2.91 m     595 keV     0 eV   55.3 cm   5.77 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 104,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 mum -2.53 mum -2.41 m    41.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -755 nm  -2.98 mum -2.41 m       0 eV   6.32 MeV   412 mum   412 mum  TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 275,   Parent ID = 104
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -755 nm  -2.98 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 277,   Parent ID = 275
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   5.18 mum  9.01 mm  -2.42 m       0 eV    511 keV  9.69 mm   9.69 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 276,   Parent ID = 275
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.52 mum -4.21 mm  -2.41 m     308 keV   203 keV  4.52 mm   4.52 mm   TargetPV     compt
-    2    192 mum -4.23 mm  -2.41 m     298 keV  10.2 keV   284 mum  4.81 mm   TargetPV     compt
-    3   4.01 mm  -6.27 mm  -2.41 m       0 eV    298 keV  5.29 mm   1.01 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 274,   Parent ID = 104
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -755 nm  -2.98 mum -2.41 m    33.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   83.6 mum   138 mum -2.41 m    26.3 MeV  1.35 MeV  1.02 mm   1.02 mm   TargetPV     eBrem
-    2   77.4 mum   143 mum -2.41 m    22.4 MeV  91.5 keV  98.9 mum  1.12 mm   TargetPV     eBrem
-    3   81.8 mum   151 mum -2.41 m    10.8 MeV   216 keV  82.7 mum   1.2 mm   TargetPV     eBrem
-    4  -91.4 mum   257 mum -2.41 m    8.49 MeV   637 keV   591 mum  1.79 mm   TargetPV     eBrem
-    5    213 mum  -815 mum -2.41 m     6.7 MeV  1.78 MeV  1.55 mm   3.34 mm   TargetPV     eIoni
-    6   -642 mum  -248 mum -2.41 m    4.98 MeV  1.73 MeV   1.3 mm   4.64 mm   TargetPV     eIoni
-    7   -802 mum  -256 mum -2.41 m    4.36 MeV   215 keV   200 mum  4.84 mm   TargetPV     eBrem
-    8  -1.18 mm   -558 mum -2.41 m    1.45 MeV  2.91 MeV   969 mum  5.81 mm   TargetPV     eIoni
-    9  -1.36 mm   -603 mum -2.41 m     755 keV   697 keV   503 mum  6.32 mm   TargetPV     eIoni
-   10  -1.35 mm   -578 mum -2.41 m     310 keV   446 keV   355 mum  6.67 mm   TargetPV     eIoni
-   11  -1.35 mm   -586 mum -2.41 m       0 eV    310 keV   152 mum  6.82 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 282,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -802 mum  -256 mum -2.41 m     403 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -979 mum  -518 mum -2.41 m     386 keV  17.6 keV   861 mum   861 mum  TargetPV     compt
-    2  -1.15 mm   -664 mum -2.41 m       0 eV    386 keV   349 mum  1.21 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 281,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -91.4 mum   257 mum -2.41 m    1.67 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -966 mum    -1 cm   -2.4 m    1.67 MeV     0 eV   1.54 cm   1.54 cm    TrackerTransportation
-    2  -20.5 cm   -2.4 m    25.4 cm   1.67 MeV     0 eV   3.58 m    3.59 m     WorldPVTransportation
-    3  -24.8 cm  -2.91 m    82.1 cm   1.67 MeV     0 eV   76.3 cm   4.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 280,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   81.8 mum   151 mum -2.41 m    11.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    269 mum   743 mum  -2.4 m    11.4 MeV     0 eV   1.19 cm   1.19 cm    TrackerTransportation
-    2   1.28 cm   4.05 cm   -1.6 m    11.4 MeV     0 eV   80.1 cm   81.3 cm    ChamberTransportation
-    3   1.59 cm   5.04 cm   -1.4 m    11.4 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.53 cm   8.02 cm    -80 cm   11.4 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   2.84 cm   9.01 cm    -60 cm   11.4 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   3.78 cm     12 cm  0.114 fm   11.4 MeV     0 eV   60.1 cm   2.42 m     ChamberTransportation
-    7    4.1 cm     13 cm     20 cm   11.4 MeV     0 eV     20 cm   2.62 m     TrackerTransportation
-    8   5.04 cm     16 cm     80 cm   11.4 MeV     0 eV   60.1 cm   3.22 m     ChamberTransportation
-    9   5.35 cm     17 cm      1 m    11.4 MeV     0 eV     20 cm   3.42 m     TrackerTransportation
-   10   6.29 cm   19.9 cm    1.6 m    11.4 MeV     0 eV   60.1 cm   4.02 m     ChamberTransportation
-   11    6.6 cm   20.9 cm    1.8 m    11.4 MeV     0 eV     20 cm   4.22 m     TrackerTransportation
-   12   7.54 cm   23.9 cm    2.4 m    11.4 MeV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13   8.34 cm   26.4 cm   2.91 m    11.4 MeV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 279,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   77.4 mum   143 mum -2.41 m    3.85 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -201 mum     1 mm   -2.4 m    3.85 MeV     0 eV    1.2 cm    1.2 cm    TrackerTransportation
-    2  -1.88 cm   5.83 cm   -1.6 m    3.85 MeV     0 eV   80.2 cm   81.4 cm    ChamberTransportation
-    3  -2.34 cm   7.27 cm   -1.4 m    3.85 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4  -3.73 cm   11.6 cm    -80 cm   3.85 MeV     0 eV   60.2 cm   1.62 m     ChamberTransportation
-    5   -4.2 cm     13 cm    -60 cm   3.85 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6  -5.59 cm   17.3 cm      0 fm   3.85 MeV     0 eV   60.2 cm   2.42 m     ChamberTransportation
-    7  -6.05 cm   18.7 cm     20 cm   3.85 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8  -7.45 cm     23 cm     80 cm   3.85 MeV     0 eV   60.2 cm   3.22 m     ChamberTransportation
-    9  -7.91 cm   24.5 cm      1 m    3.85 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   -9.3 cm   28.8 cm    1.6 m    3.85 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11  -9.77 cm   30.2 cm    1.8 m    3.85 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12  -11.2 cm   34.5 cm    2.4 m    3.85 MeV     0 eV   60.2 cm   4.83 m     WorldPVTransportation
-   13  -12.3 cm   38.2 cm   2.91 m    3.85 MeV     0 eV   51.1 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 278,   Parent ID = 274
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   83.6 mum   138 mum -2.41 m    6.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -245 mum   333 mum  -2.4 m    6.23 MeV     0 eV   1.21 cm   1.21 cm    TrackerTransportation
-    2  -2.19 cm   1.32 cm   -1.6 m    6.23 MeV     0 eV     80 cm   81.3 cm    ChamberTransportation
-    3  -2.74 cm   1.64 cm   -1.4 m    6.23 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -4.36 cm   2.61 cm    -80 cm   6.23 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -4.91 cm   2.93 cm    -60 cm   6.23 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -6.53 cm    3.9 cm  0.114 fm   6.23 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -7.08 cm   4.22 cm     20 cm   6.23 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -8.71 cm   5.18 cm     80 cm   6.23 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -9.25 cm   5.51 cm      1 m    6.23 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -10.9 cm   6.47 cm    1.6 m    6.23 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -11.4 cm   6.79 cm    1.8 m    6.23 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12    -13 cm   7.76 cm    2.4 m    6.23 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -14.4 cm   8.58 cm   2.91 m    6.23 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 103,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.59 mum -2.44 mum -2.41 m    1.88 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   24.7 mum -21.5 mum  -2.4 m       0 eV    860 keV  1.01 cm   1.01 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 283,   Parent ID = 103
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 mum -21.5 mum  -2.4 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1   24.7 mum -21.5 mum  -2.4 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 285,   Parent ID = 283
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 mum -21.5 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    382 mum  2.78 mm   -2.4 m     271 keV   240 keV  2.98 mm   2.98 mm   TargetPV     compt
-    2    941 mum  2.99 mm   -2.4 m       0 eV    271 keV   814 mum  3.79 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 284,   Parent ID = 283
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 mum -21.5 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -862 mum -6.96 mm   -2.4 m       0 eV    511 keV  7.39 mm   7.39 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 102,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.67 mum -2.35 mum -2.41 m    65.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   29.3 mum -14.8 mum  -2.4 m       0 eV      0 eV   1.02 cm   1.02 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 287,   Parent ID = 102
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.3 mum -14.8 mum  -2.4 m    47.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   51.6 mum -16.6 mum  -2.4 m    42.3 MeV  5.34 MeV   3.5 mm    3.5 mm    TrackerTransportation
-    2   6.42 cm   3.61 cm   -1.6 m    42.1 MeV   175 keV  80.3 cm   80.7 cm    ChamberTransportation
-    3   7.87 cm   4.73 cm   -1.4 m    41.8 MeV   109 keV  20.1 cm   1.01 m     Chamber     eIoni
-    4   7.87 cm   4.73 cm   -1.4 m    41.8 MeV     0 eV   27.6 mum  1.01 m     TrackerTransportation
-    5   11.7 cm   5.74 cm    -80 cm   41.7 MeV   129 keV  60.1 cm   1.61 m     ChamberTransportation
-    6   12.9 cm      6 cm    -60 cm   41.6 MeV  84.5 keV    20 cm   1.81 m     TrackerTransportation
-    7   14.4 cm   5.48 cm  -37.4 cm   41.5 MeV  44.8 keV  22.7 cm   2.04 m     Tracker     eIoni
-    8   16.9 cm   4.76 cm -0.0568 fm   41.4 MeV  75.7 keV  37.5 cm   2.41 m     ChamberTransportation
-    9   18.2 cm   4.14 cm     20 cm   41.3 MeV   112 keV  20.1 cm   2.61 m     TrackerTransportation
-   10   21.6 cm   3.43 cm     80 cm   41.1 MeV   119 keV  60.1 cm   3.21 m     ChamberTransportation
-   11   22.5 cm   3.04 cm      1 m      41 MeV   116 keV    20 cm   3.41 m     TrackerTransportation
-   12   22.6 cm   2.43 cm   1.53 m    40.9 MeV   113 keV  52.6 cm   3.94 m     Tracker     eIoni
-   13   22.6 cm   2.23 cm    1.6 m    40.9 MeV  16.3 keV  7.45 cm   4.01 m     ChamberTransportation
-   14   22.9 cm   2.24 cm   1.77 m    40.7 MeV   110 keV  16.8 cm   4.18 m     Chamber     eIoni
-   15   22.8 cm   2.08 cm    1.8 m    40.7 MeV  16.1 keV  3.23 cm   4.21 m     TrackerTransportation
-   16   22.6 cm  -1.62 cm    2.4 m    40.6 MeV   129 keV  60.1 cm   4.81 m     WorldPVTransportation
-   17   22.6 cm  -1.72 cm   2.42 m    40.6 MeV     8 keV  2.37 cm   4.84 m     WorldPV     eIoni
-   18   22.3 cm   -4.2 cm   2.91 m    40.5 MeV   101 keV  48.7 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 296,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   22.6 cm  -1.72 cm   2.42 m    11.6 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   22.6 cm  -1.64 cm   2.42 m    10.4 keV  1.16 keV   907 mum   907 mum   WorldPV     eIoni
-    2   22.6 cm  -1.58 cm   2.42 m    5.12 keV   5.3 keV   805 mum  1.71 mm    WorldPV     eIoni
-    3   22.6 cm  -1.55 cm   2.42 m    3.61 keV  1.52 keV   425 mum  2.14 mm    WorldPV     eIoni
-    4   22.6 cm  -1.54 cm   2.42 m    2.22 keV  1.38 keV   325 mum  2.46 mm    WorldPV     eIoni
-    5   22.6 cm  -1.53 cm   2.42 m       0 eV   2.22 keV   191 mum  2.65 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 295,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   22.9 cm   2.24 cm   1.77 m    48.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     23 cm    2.4 cm   1.77 m      45 keV   3.5 keV  3.43 mm   3.43 mm    Chamber     eIoni
-    2   23.1 cm   2.51 cm   1.77 m    39.7 keV  5.36 keV  3.06 mm   6.49 mm    Chamber     eIoni
-    3     23 cm    2.4 cm   1.77 m    33.9 keV  5.78 keV  2.54 mm   9.03 mm    Chamber     eIoni
-    4   22.9 cm   2.38 cm   1.77 m    31.1 keV  2.78 keV  2.03 mm   1.11 cm    Chamber     eIoni
-    5   22.9 cm   2.25 cm   1.77 m    28.9 keV   2.2 keV   1.8 mm   1.29 cm    Chamber     eIoni
-    6     23 cm   2.24 cm   1.77 m    27.5 keV  1.39 keV  1.63 mm   1.45 cm    Chamber     eIoni
-    7   23.1 cm   2.26 cm   1.77 m    23.6 keV  3.94 keV  1.53 mm    1.6 cm    Chamber     eIoni
-    8   23.1 cm    2.2 cm   1.77 m    13.8 keV  9.79 keV  1.25 mm   1.73 cm    Chamber     eIoni
-    9   23.1 cm   2.21 cm   1.77 m    10.9 keV  2.88 keV   699 mum   1.8 cm    Chamber     eIoni
-   10   23.1 cm   2.19 cm   1.77 m    7.82 keV  3.09 keV   570 mum  1.85 cm    Chamber     eIoni
-   11   23.1 cm   2.21 cm   1.77 m    2.83 keV  4.99 keV   444 mum   1.9 cm    Chamber     eIoni
-   12   23.1 cm   2.21 cm   1.77 m       0 eV   2.83 keV   190 mum  1.92 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 294,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   22.6 cm   2.43 cm   1.53 m    12.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   22.6 cm   2.52 cm   1.53 m    12.4 keV   455 eV   1.03 mm   1.03 mm    Tracker     eIoni
-    2   22.6 cm   2.61 cm   1.53 m    11.4 keV  1.06 keV   985 mum  2.02 mm    Tracker     eIoni
-    3   22.6 cm   2.68 cm   1.53 m    8.98 keV  2.38 keV   887 mum   2.9 mm    Tracker     eIoni
-    4   22.6 cm   2.73 cm   1.53 m    7.97 keV  1.01 keV   689 mum  3.59 mm    Tracker     eIoni
-    5   22.6 cm    2.7 cm   1.53 m    7.29 keV   677 eV    612 mum   4.2 mm    Tracker     eIoni
-    6   22.6 cm   2.68 cm   1.53 m    5.96 keV  1.33 keV   565 mum  4.77 mm    Tracker     eIoni
-    7   22.6 cm   2.66 cm   1.53 m    4.17 keV  1.79 keV   477 mum  5.25 mm    Tracker     eIoni
-    8   22.6 cm   2.63 cm   1.53 m    2.31 keV  1.86 keV   364 mum  5.61 mm    Tracker     eIoni
-    9   22.6 cm   2.62 cm   1.53 m       0 eV   2.31 keV   203 mum  5.81 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 293,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   21.8 cm   3.35 cm   83.8 cm   11.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   21.8 cm   3.32 cm   83.9 cm      9 keV  2.33 keV   587 mum   587 mum   Chamber     eIoni
-    2   21.7 cm   3.31 cm   83.9 cm   6.75 keV  2.25 keV   491 mum  1.08 mm    Chamber     eIoni
-    3   21.7 cm   3.31 cm   83.9 cm      0 eV   6.75 keV   402 mum  1.48 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 292,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.7 cm   4.34 cm   13.4 cm   16.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   17.7 cm   4.38 cm   13.4 cm   10.1 keV   6.8 keV   854 mum   854 mum   Chamber     eIoni
-    2   17.7 cm   4.39 cm   13.4 cm   8.69 keV  1.39 keV   534 mum  1.39 mm    Chamber     eIoni
-    3   17.7 cm   4.39 cm   13.4 cm   7.25 keV  1.44 keV   478 mum  1.87 mm    Chamber     eIoni
-    4   17.8 cm   4.39 cm   13.4 cm   5.43 keV  1.82 keV   422 mum  2.29 mm    Chamber     eIoni
-    5   17.8 cm   4.39 cm   13.4 cm      0 eV   5.43 keV   348 mum  2.64 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 291,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.4 cm   5.48 cm  -37.4 cm   60.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   14.6 cm   4.53 cm  -36.8 cm   54.6 keV  6.19 keV  1.18 cm   1.18 cm    Tracker     eIoni
-    2   14.4 cm   3.61 cm  -36.8 cm   50.7 keV  3.92 keV  9.81 mm   2.16 cm    Tracker     eIoni
-    3   14.9 cm   2.94 cm  -36.8 cm   30.2 keV  20.5 keV  8.62 mm   3.03 cm    Tracker     eIoni
-    4     15 cm   2.61 cm  -36.7 cm   23.8 keV  6.43 keV  3.57 mm   3.38 cm    Tracker     eIoni
-    5   15.1 cm    2.4 cm  -36.7 cm   21.1 keV  2.64 keV  2.44 mm   3.63 cm    Tracker     eIoni
-    6   15.2 cm    2.3 cm  -36.6 cm   19.3 keV  1.84 keV  2.03 mm   3.83 cm    Tracker     eIoni
-    7   15.1 cm   2.33 cm  -36.5 cm   8.72 keV  10.6 keV  1.78 mm   4.01 cm    Tracker     eIoni
-    8   15.1 cm    2.3 cm  -36.4 cm   7.66 keV  1.07 keV   668 mum  4.07 cm    Tracker     eIoni
-    9   15.2 cm   2.26 cm  -36.4 cm   5.49 keV  2.17 keV   591 mum  4.13 cm    Tracker     eIoni
-   10   15.2 cm   2.27 cm  -36.4 cm   3.83 keV  1.66 keV   447 mum  4.18 cm    Tracker     eIoni
-   11   15.2 cm   2.26 cm  -36.4 cm      0 eV   3.83 keV   341 mum  4.21 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 290,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   12.7 cm   5.96 cm  -63.1 cm   16.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   12.7 cm   5.99 cm  -63.1 cm   14.8 keV  1.78 keV   840 mum   840 mum   Chamber     eIoni
-    2   12.7 cm   5.98 cm  -63.1 cm   11.4 keV  3.41 keV   748 mum  1.59 mm    Chamber     eIoni
-    3   12.7 cm      6 cm  -63.1 cm   10.5 keV   931 eV    591 mum  2.18 mm    Chamber     eIoni
-    4   12.7 cm      6 cm  -63.1 cm   9.37 keV  1.12 keV   552 mum  2.73 mm    Chamber     eIoni
-    5   12.7 cm   5.99 cm  -63.1 cm   8.35 keV  1.02 keV   506 mum  3.24 mm    Chamber     eIoni
-    6   12.7 cm   5.96 cm  -63.1 cm   7.33 keV  1.02 keV   464 mum   3.7 mm    Chamber     eIoni
-    7   12.7 cm   5.95 cm  -63.1 cm   4.55 keV  2.78 keV   425 mum  4.13 mm    Chamber     eIoni
-    8   12.7 cm   5.94 cm  -63.1 cm   4.37 keV   184 eV    307 mum  4.43 mm    Chamber     eIoni
-    9   12.7 cm   5.94 cm  -63.1 cm    638 eV   3.73 keV   298 mum  4.73 mm    Chamber     eIoni
-   10   12.7 cm   5.94 cm  -63.1 cm      0 eV    638 eV   27.3 mum  4.76 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 289,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.87 cm   4.73 cm   -1.4 m     163 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   7.88 cm   4.73 cm   -1.4 m     163 keV     0 eV   90.8 mum  90.8 mum   TrackerTransportation
-    2   13.3 cm   4.49 cm  -1.37 m     138 keV  24.6 keV  6.45 cm   6.46 cm    Tracker     eIoni
-    3   17.4 cm   6.87 cm  -1.37 m     121 keV  17.2 keV   4.9 cm   11.4 cm    Tracker     eIoni
-    4   20.6 cm   6.18 cm  -1.35 m     106 keV  14.7 keV  3.91 cm   15.3 cm    Tracker     eIoni
-    5   19.9 cm    5.1 cm  -1.32 m      93 keV  13.3 keV  3.12 cm   18.4 cm    Tracker     eIoni
-    6   19.8 cm   5.52 cm   -1.3 m    79.4 keV  13.6 keV  2.47 cm   20.9 cm    Tracker     eIoni
-    7   21.3 cm   6.11 cm  -1.29 m    69.8 keV  9.57 keV  1.88 cm   22.7 cm    Tracker     eIoni
-    8   22.6 cm   5.59 cm   -1.3 m      56 keV  13.8 keV  1.51 cm   24.3 cm    Tracker     eIoni
-    9   23.6 cm   5.45 cm   -1.3 m    46.9 keV  9.17 keV  1.03 cm   25.3 cm    Tracker     eIoni
-   10   24.1 cm   5.06 cm   -1.3 m    41.5 keV  5.36 keV  7.54 mm     26 cm    Tracker     eIoni
-   11   24.3 cm    5.2 cm  -1.31 m    38.5 keV  2.95 keV  6.11 mm   26.6 cm    Tracker     eIoni
-   12   24.3 cm   5.04 cm  -1.31 m    35.6 keV  2.98 keV   5.4 mm   27.2 cm    Tracker     eIoni
-   13   24.2 cm   5.22 cm  -1.32 m    29.6 keV  5.93 keV  4.69 mm   27.7 cm    Tracker     eIoni
-   14   24.1 cm   5.18 cm  -1.32 m    24.5 keV   5.1 keV  3.47 mm     28 cm    Tracker     eIoni
-   15     24 cm   5.11 cm  -1.32 m    20.8 keV  3.73 keV  2.56 mm   28.3 cm    Tracker     eIoni
-   16     24 cm   4.92 cm  -1.32 m    18.1 keV   2.7 keV  1.98 mm   28.5 cm    Tracker     eIoni
-   17     24 cm   4.77 cm  -1.32 m    16.5 keV  1.61 keV  1.62 mm   28.6 cm    Tracker     eIoni
-   18   23.9 cm   4.64 cm  -1.32 m    14.8 keV  1.64 keV  1.42 mm   28.8 cm    Tracker     eIoni
-   19   23.9 cm   4.53 cm  -1.32 m    11.9 keV  2.94 keV  1.23 mm   28.9 cm    Tracker     eIoni
-   20   23.8 cm   4.46 cm  -1.32 m    10.1 keV  1.81 keV   934 mum    29 cm    Tracker     eIoni
-   21   23.8 cm   4.43 cm  -1.32 m    8.89 keV  1.19 keV   775 mum  29.1 cm    Tracker     eIoni
-   22   23.8 cm   4.37 cm  -1.32 m    6.67 keV  2.23 keV   681 mum  29.1 cm    Tracker     eIoni
-   23   23.8 cm    4.4 cm  -1.32 m    5.22 keV  1.45 keV   523 mum  29.2 cm    Tracker     eIoni
-   24   23.8 cm   4.37 cm  -1.32 m    2.37 keV  2.84 keV   430 mum  29.2 cm    Tracker     eIoni
-   25   23.8 cm   4.37 cm  -1.32 m       0 eV   2.37 keV   211 mum  29.2 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 288,   Parent ID = 287
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    7.1 cm   4.14 cm  -1.51 m      14 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   7.11 cm   4.16 cm  -1.51 m      13 keV   988 eV    710 mum   710 mum   Chamber     eIoni
-    2   7.09 cm   4.13 cm  -1.51 m    11.5 keV  1.54 keV   664 mum  1.37 mm    Chamber     eIoni
-    3    7.1 cm   4.15 cm  -1.51 m    6.19 keV  5.32 keV   595 mum  1.97 mm    Chamber     eIoni
-    4    7.1 cm   4.16 cm  -1.51 m     468 eV   5.72 keV   380 mum  2.35 mm    Chamber     eIoni
-    5    7.1 cm   4.16 cm  -1.51 m       0 eV    468 eV   19.9 mum  2.37 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 286,   Parent ID = 102
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.3 mum -14.8 mum  -2.4 m    16.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    365 mum   223 mum  -2.4 m    9.59 MeV  2.26 MeV  1.28 mm   1.28 mm   TargetPV     eBrem
-    2    238 mum   457 mum  -2.4 m    6.91 MeV  2.68 MeV   1.7 mm   2.98 mm   TargetPV     eIoni
-    3  -27.7 mum   223 mum  -2.4 m    5.43 MeV  1.48 MeV  1.14 mm   4.11 mm    TrackerTransportation
-    4   43.5 cm  -36.6 cm  -2.14 m     5.3 MeV   107 keV  62.7 cm   63.1 cm    Tracker     eIoni
-    5   51.7 cm  -43.2 cm   -2.1 m    5.28 MeV  15.1 keV  11.2 cm   74.3 cm    Tracker     eIoni
-    6   1.52 m    -1.2 m   -1.62 m    5.03 MeV   240 keV  1.36 m     2.1 m     Tracker     eIoni
-    7   1.54 m   -1.21 m   -1.62 m    5.01 MeV   4.3 keV  1.52 cm   2.12 m     Tracker     eIoni
-    8    2.4 m   -1.46 m   -1.26 m    4.84 MeV   171 keV  97.5 cm   3.09 m     WorldPVTransportation
-    9   2.91 m   -1.59 m   -1.12 m    4.75 MeV  93.1 keV  54.8 cm   3.64 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 301,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.54 m   -1.21 m   -1.62 m    11.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.54 m   -1.21 m   -1.62 m    9.39 keV  2.44 keV   928 mum   928 mum   Tracker     eIoni
-    2   1.54 m    -1.2 m   -1.62 m    3.28 keV  6.11 keV   720 mum  1.65 mm    Tracker     eIoni
-    3   1.54 m    -1.2 m   -1.62 m     894 eV   2.39 keV   300 mum  1.95 mm    Tracker     eIoni
-    4   1.54 m    -1.2 m   -1.62 m       0 eV    894 eV   53.1 mum     2 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 300,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.52 m    -1.2 m   -1.62 m    8.21 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.52 m    -1.2 m   -1.63 m    5.91 keV  2.31 keV   629 mum   629 mum   Tracker     eIoni
-    2   1.52 m    -1.2 m   -1.63 m    4.53 keV  1.38 keV   473 mum   1.1 mm    Tracker     eIoni
-    3   1.52 m    -1.2 m   -1.63 m    3.22 keV  1.31 keV   387 mum  1.49 mm    Tracker     eIoni
-    4   1.52 m    -1.2 m   -1.63 m    1.38 keV  1.84 keV   295 mum  1.79 mm    Tracker     eIoni
-    5   1.52 m    -1.2 m   -1.63 m       0 eV   1.38 keV  94.7 mum  1.88 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 299,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   51.7 cm  -43.2 cm   -2.1 m    11.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   51.7 cm  -43.3 cm   -2.1 m    10.2 keV  1.22 keV   893 mum   893 mum   Tracker     eIoni
-    2   51.6 cm  -43.3 cm   -2.1 m    9.14 keV  1.07 keV   785 mum  1.68 mm    Tracker     eIoni
-    3   51.6 cm  -43.3 cm   -2.1 m    6.31 keV  2.83 keV   701 mum  2.38 mm    Tracker     eIoni
-    4   51.6 cm  -43.3 cm   -2.1 m    5.24 keV  1.07 keV   500 mum  2.88 mm    Tracker     eIoni
-    5   51.6 cm  -43.4 cm   -2.1 m    4.04 keV   1.2 keV   432 mum  3.31 mm    Tracker     eIoni
-    6   51.5 cm  -43.4 cm   -2.1 m     781 eV   3.26 keV   355 mum  3.67 mm    Tracker     eIoni
-    7   51.5 cm  -43.4 cm   -2.1 m       0 eV    781 eV   45.1 mum  3.71 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 298,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   43.5 cm  -36.6 cm  -2.14 m    21.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   43.6 cm  -36.5 cm  -2.14 m    17.7 keV  3.45 keV  2.03 mm   2.03 mm    Tracker     eIoni
-    2   43.7 cm  -36.4 cm  -2.14 m    13.5 keV  4.12 keV  1.56 mm   3.59 mm    Tracker     eIoni
-    3   43.8 cm  -36.4 cm  -2.14 m    12.8 keV   752 eV    1.1 mm   4.69 mm    Tracker     eIoni
-    4   43.8 cm  -36.3 cm  -2.14 m      11 keV  1.77 keV  1.02 mm   5.71 mm    Tracker     eIoni
-    5   43.9 cm  -36.4 cm  -2.14 m    8.75 keV  2.27 keV   857 mum  6.57 mm    Tracker     eIoni
-    6     44 cm  -36.3 cm  -2.14 m    7.54 keV  1.21 keV   670 mum  7.24 mm    Tracker     eIoni
-    7     44 cm  -36.3 cm  -2.14 m    4.61 keV  2.92 keV   582 mum  7.82 mm    Tracker     eIoni
-    8     44 cm  -36.3 cm  -2.14 m     936 eV   3.68 keV   392 mum  8.22 mm    Tracker     eIoni
-    9     44 cm  -36.3 cm  -2.14 m       0 eV    936 eV   56.2 mum  8.27 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 297,   Parent ID = 286
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    365 mum   223 mum  -2.4 m    4.94 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.55 mm   -243 mum  -2.4 m    4.94 MeV     0 eV   2.57 mm   2.57 mm    TrackerTransportation
-    2    2.4 m     -94 cm    2.1 m    4.94 MeV     0 eV   5.18 m    5.19 m     WorldPVTransportation
-    3   2.83 m   -1.11 m    2.91 m    4.94 MeV     0 eV   93.4 cm   6.12 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 101,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.05 mum -2.34 mum -2.41 m     267 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -68.7 nm  -2.92 mum -2.41 m       0 eV      0 eV   2.08 mm   2.08 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 303,   Parent ID = 101
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -68.7 nm  -2.92 mum -2.41 m     205 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.19 mum -8.44 mum -2.41 m     203 MeV   535 keV   380 mum   380 mum  TargetPV     eBrem
-    2  -1.05 mum -24.3 mum -2.41 m     198 MeV   577 keV   445 mum   826 mum  TargetPV     eBrem
-    3    165 nm  -32.4 mum -2.41 m     197 MeV   226 keV   209 mum  1.04 mm   TargetPV     eBrem
-    4  -82.4 mum  -133 mum -2.41 m     184 MeV  2.97 MeV  2.32 mm   3.35 mm   TargetPV     eBrem
-    5  -79.3 mum  -150 mum -2.41 m    96.5 MeV   623 keV   466 mum  3.82 mm   TargetPV     eBrem
-    6  -80.4 mum  -150 mum -2.41 m    66.5 MeV  82.8 keV  77.9 mum   3.9 mm   TargetPV     eBrem
-    7  -94.5 mum  -168 mum -2.41 m    59.8 MeV   652 keV   440 mum  4.34 mm   TargetPV     eBrem
-    8  -65.4 mum  -116 mum -2.41 m    48.9 MeV  3.69 MeV  1.35 mm   5.69 mm   TargetPV     eBrem
-    9  -52.7 mum  -125 mum -2.41 m    31.8 MeV   934 keV   359 mum  6.04 mm   TargetPV     eBrem
-   10  -6.67 mum  -224 mum -2.41 m    22.7 MeV   484 keV   365 mum  6.41 mm   TargetPV     eBrem
-   11   75.5 mum  -272 mum  -2.4 m    21.7 MeV   529 keV   449 mum  6.86 mm   TargetPV     eBrem
-   12    266 mum   259 mum  -2.4 m    14.8 MeV  2.26 MeV  1.89 mm   8.75 mm   TargetPV     eBrem
-   13    370 mum   209 mum  -2.4 m    13.5 MeV   742 keV   582 mum  9.33 mm   TargetPV     eBrem
-   14   -370 mum  94.5 mum  -2.4 m     9.9 MeV  2.15 MeV   1.8 mm   1.11 cm   TargetPV     eBrem
-   15   -266 mum  -308 mum  -2.4 m    8.19 MeV   473 keV   438 mum  1.16 cm   TargetPV     eBrem
-   16    172 mum  -646 mum  -2.4 m    6.79 MeV   724 keV   642 mum  1.22 cm   TargetPV     eBrem
-   17    381 mum  -707 mum  -2.4 m    2.49 MeV   334 keV   319 mum  1.25 cm   TargetPV     eBrem
-   18    456 mum  -950 mum  -2.4 m     1.5 MeV   990 keV   694 mum  1.32 cm   TargetPV     eIoni
-   19    237 mum -1.15 mm   -2.4 m    1.03 MeV   468 keV   519 mum  1.37 cm   TargetPV     eIoni
-   20    222 mum  -959 mum  -2.4 m     633 keV   395 keV   425 mum  1.42 cm   TargetPV     eIoni
-   21    149 mum  -915 mum  -2.4 m     272 keV   361 keV   323 mum  1.45 cm   TargetPV     eIoni
-   22    146 mum  -907 mum  -2.4 m       0 eV    272 keV   125 mum  1.46 cm   TargetPV     eIoni
-   23    146 mum  -907 mum  -2.4 m       0 eV      0 eV      0 fm   1.46 cm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 322,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    146 mum  -907 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.55 mm    273 mum  -2.4 m       0 eV    511 keV  4.61 mm   4.61 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 321,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    146 mum  -907 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.28 mm  -1.75 mm   -2.4 m     511 keV     0 eV    3.3 mm    3.3 mm    TrackerTransportation
-    2   -2.4 m   -83.4 cm  -36.5 cm    511 keV     0 eV   3.25 m    3.26 m     WorldPVTransportation
-    3  -2.91 m   -1.01 m    6.84 cm    511 keV     0 eV   69.2 cm   3.95 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 320,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    381 mum  -707 mum  -2.4 m    3.97 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.46 cm  -9.38 mm  -2.41 m    2.11 MeV  1.86 MeV  1.82 cm   1.82 cm   TargetPV     compt
-    2    2.5 cm  -2.49 cm  -2.41 m    2.11 MeV     0 eV    1.9 cm   3.72 cm    WorldPVTransportation
-    3   1.59 m   -2.38 m   -2.91 m    2.11 MeV     0 eV   2.87 m    2.91 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 319,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    172 mum  -646 mum  -2.4 m     682 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    1.2 cm  -5.56 mm   -2.4 m     350 keV   332 keV  1.33 cm   1.33 cm   TargetPV     compt
-    2   1.31 cm   -4.6 mm   -2.4 m       0 eV    350 keV  1.62 mm   1.49 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 318,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -266 mum  -308 mum  -2.4 m    1.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.46 cm   -2.5 cm  -2.42 m    1.23 MeV     0 eV   3.43 cm   3.43 cm    WorldPVTransportation
-    2   40.5 cm  -67.4 cm  -2.91 m    1.23 MeV     0 eV   90.2 cm   93.6 cm OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 317,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -370 mum  94.5 mum  -2.4 m    1.48 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.69 mm  -7.74 mm  -2.41 m     608 keV   874 keV   9.4 mm    9.4 mm   TargetPV     compt
-    2   7.27 mm  -8.15 mm  -2.41 m     192 keV   415 keV  6.58 mm    1.6 cm   TargetPV     compt
-    3      7 mm  -8.36 mm  -2.41 m       0 eV    192 keV   398 mum  1.64 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 316,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    370 mum   209 mum  -2.4 m     562 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   21.1 mum   730 mum  -2.4 m       0 eV    562 keV  2.13 mm   2.13 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 315,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    266 mum   259 mum  -2.4 m    4.56 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    419 mum  -149 mum  -2.4 m    4.56 MeV     0 eV   3.08 mm   3.08 mm    TrackerTransportation
-    2   4.04 cm  -10.7 cm   -1.6 m    4.56 MeV     0 eV   80.8 cm   81.1 cm    ChamberTransportation
-    3   5.05 cm  -13.4 cm   -1.4 m    4.56 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4   8.05 cm  -21.4 cm    -80 cm   4.56 MeV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   9.05 cm  -24.1 cm    -60 cm   4.56 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6     12 cm  -32.1 cm      0 fm   4.56 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   13.1 cm  -34.8 cm     20 cm   4.56 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8   16.1 cm  -42.8 cm     80 cm   4.56 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   17.1 cm  -45.5 cm      1 m    4.56 MeV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10   20.1 cm  -53.6 cm    1.6 m    4.56 MeV     0 eV   60.6 cm   4.04 m     ChamberTransportation
-   11   21.1 cm  -56.2 cm    1.8 m    4.56 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   24.1 cm  -64.3 cm    2.4 m    4.56 MeV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   26.6 cm  -71.1 cm   2.91 m    4.56 MeV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 314,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   75.5 mum  -272 mum  -2.4 m     516 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    516 mum  -119 mum  -2.4 m     516 keV     0 eV   4.84 mm   4.84 mm    TrackerTransportation
-    2   7.36 cm   2.53 cm   -1.6 m     516 keV     0 eV   80.4 cm   80.9 cm    ChamberTransportation
-    3   9.18 cm   3.17 cm   -1.4 m     516 keV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   14.7 cm   5.07 cm    -80 cm    516 keV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   16.5 cm   5.71 cm    -60 cm    516 keV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6     22 cm   7.61 cm      0 fm    516 keV     0 eV   60.3 cm   2.42 m     ChamberTransportation
-    7   23.8 cm   8.25 cm     20 cm    516 keV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   29.3 cm   10.2 cm     80 cm    516 keV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   31.1 cm   10.8 cm      1 m     516 keV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   36.6 cm   12.7 cm    1.6 m     516 keV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   38.4 cm   13.3 cm    1.8 m     516 keV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   43.9 cm   15.2 cm    2.4 m     516 keV     0 eV   60.3 cm   4.83 m     WorldPVTransportation
-   13   48.5 cm   16.9 cm   2.91 m     516 keV     0 eV   51.2 cm   5.34 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 313,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -6.67 mum  -224 mum -2.41 m    8.59 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    327 mum  -828 mum  -2.4 m    8.59 MeV     0 eV    5.3 mm    5.3 mm    TrackerTransportation
-    2   5.12 cm  -9.28 cm   -1.6 m    8.59 MeV     0 eV   80.7 cm   81.2 cm    ChamberTransportation
-    3   6.01 cm  -10.9 cm  -1.46 m       0 eV      0 eV   14.1 cm   95.3 cm    Chamber      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 324,   Parent ID = 313
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.01 cm  -10.9 cm  -1.46 m    3.37 MeV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   6.08 cm  -12.2 cm   -1.4 m    3.35 MeV  22.8 keV  6.23 cm   6.23 cm    TrackerTransportation
-    2   9.23 cm  -10.2 cm  -1.25 m    3.31 MeV  23.2 keV  15.6 cm   21.8 cm    Tracker     eIoni
-    3   9.74 cm  -9.12 cm  -1.18 m    3.23 MeV  14.5 keV  7.17 cm     29 cm    Tracker     eIoni
-    4   13.6 cm  -3.68 cm    -80 cm   3.16 MeV  74.1 keV  38.6 cm   67.6 cm    ChamberTransportation
-    5   15.1 cm  -1.99 cm    -60 cm   3.06 MeV  86.8 keV  21.4 cm     89 cm    TrackerTransportation
-    6   16.3 cm  -5.49 cm  -54.4 cm   3.03 MeV  11.1 keV   6.7 cm   95.7 cm    Tracker     eIoni
-    7   16.8 cm  -7.01 cm    -52 cm   3.02 MeV  5.85 keV   2.9 cm   98.6 cm    Tracker     eIoni
-    8   29.7 cm  -39.6 cm      0 fm   2.91 MeV   108 keV  63.4 cm   1.62 m     ChamberTransportation
-    9   34.8 cm  -48.5 cm     20 cm    2.8 MeV  97.4 keV  24.4 cm   1.86 m     TrackerTransportation
-   10   53.7 cm  -81.7 cm     23 cm   2.74 MeV  53.2 keV  38.5 cm   2.25 m     Tracker     eIoni
-   11   1.01 m   -1.51 m      32 cm   2.58 MeV   143 keV    85 cm    3.1 m     Tracker     eIoni
-   12   1.18 m    -1.7 m    35.7 cm   2.53 MeV  49.3 keV    26 cm   3.36 m     Tracker     eIoni
-   13   1.38 m   -1.87 m    43.2 cm   2.48 MeV  41.9 keV  27.2 cm   3.63 m     Tracker     eIoni
-   14   2.05 m    -2.4 m    64.9 cm   2.33 MeV   146 keV  89.9 cm   4.53 m     WorldPVTransportation
-   15   2.48 m   -2.88 m    72.9 cm    2.2 MeV   106 keV  65.5 cm   5.18 m     WorldPV     eIoni
-   16   2.53 m   -2.91 m    73.1 cm   2.19 MeV  8.99 keV  5.83 cm   5.24 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 335,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.48 m   -2.88 m    72.9 cm   23.3 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.48 m   -2.88 m    73.1 cm   19.5 keV  3.81 keV  2.37 mm   2.37 mm    WorldPV     eIoni
-    2   2.48 m   -2.88 m    73.2 cm   18.1 keV  1.41 keV  1.81 mm   4.18 mm    WorldPV     eIoni
-    3   2.48 m   -2.88 m    73.3 cm   15.8 keV  2.28 keV  1.62 mm    5.8 mm    WorldPV     eIoni
-    4   2.48 m   -2.87 m    73.3 cm   14.8 keV  1.04 keV  1.34 mm   7.14 mm    WorldPV     eIoni
-    5   2.48 m   -2.87 m    73.2 cm   12.4 keV  2.36 keV  1.23 mm   8.37 mm    WorldPV     eIoni
-    6   2.48 m   -2.87 m    73.2 cm   10.8 keV  1.59 keV   984 mum  9.35 mm    WorldPV     eIoni
-    7   2.48 m   -2.87 m    73.1 cm   7.36 keV  3.46 keV   840 mum  1.02 cm    WorldPV     eIoni
-    8   2.48 m   -2.87 m      73 cm   5.36 keV     2 keV   570 mum  1.08 cm    WorldPV     eIoni
-    9   2.48 m   -2.87 m      73 cm   2.95 keV  2.41 keV   439 mum  1.12 cm    WorldPV     eIoni
-   10   2.48 m   -2.87 m      73 cm   1.38 keV  1.57 keV   273 mum  1.15 cm    WorldPV     eIoni
-   11   2.48 m   -2.87 m      73 cm      0 eV   1.38 keV  94.7 mum  1.16 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 334,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.38 m   -1.87 m    43.2 cm   8.72 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.38 m   -1.87 m    43.3 cm    6.8 keV  1.91 keV   668 mum   668 mum   Tracker     eIoni
-    2   1.38 m   -1.87 m    43.2 cm   4.74 keV  2.07 keV   531 mum   1.2 mm    Tracker     eIoni
-    3   1.38 m   -1.87 m    43.2 cm    3.1 keV  1.63 keV   400 mum   1.6 mm    Tracker     eIoni
-    4   1.38 m   -1.87 m    43.2 cm    969 eV   2.13 keV   286 mum  1.88 mm    Tracker     eIoni
-    5   1.38 m   -1.87 m    43.2 cm      0 eV    969 eV   58.9 mum  1.94 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 333,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.18 m    -1.7 m    35.7 cm   8.22 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.18 m    -1.7 m    35.8 cm   6.07 keV  2.15 keV   630 mum   630 mum   Tracker     eIoni
-    2   1.18 m    -1.7 m    35.8 cm   4.27 keV   1.8 keV   484 mum  1.11 mm    Tracker     eIoni
-    3   1.18 m    -1.7 m    35.8 cm   1.82 keV  2.45 keV   370 mum  1.48 mm    Tracker     eIoni
-    4   1.18 m    -1.7 m    35.8 cm      0 eV   1.82 keV   141 mum  1.62 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 332,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.01 m   -1.51 m      32 cm   13.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.01 m   -1.51 m      32 cm   11.7 keV  1.63 keV  1.07 mm   1.07 mm    Tracker     eIoni
-    2   1.01 m   -1.51 m      32 cm      9 keV  2.65 keV   913 mum  1.98 mm    Tracker     eIoni
-    3   1.01 m   -1.51 m      32 cm   6.88 keV  2.13 keV   690 mum  2.68 mm    Tracker     eIoni
-    4   1.01 m   -1.51 m      32 cm   5.23 keV  1.65 keV   536 mum  3.21 mm    Tracker     eIoni
-    5   1.01 m   -1.51 m      32 cm    4.3 keV   927 eV    431 mum  3.64 mm    Tracker     eIoni
-    6   1.02 m   -1.51 m    32.1 cm   1.18 keV  3.12 keV   373 mum  4.02 mm    Tracker     eIoni
-    7   1.01 m   -1.51 m    32.1 cm      0 eV   1.18 keV  76.2 mum  4.09 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 331,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   53.7 cm  -81.7 cm     23 cm   9.79 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   53.7 cm  -81.7 cm     23 cm   8.39 keV   1.4 keV   751 mum   751 mum   Tracker     eIoni
-    2   53.7 cm  -81.7 cm   22.9 cm   6.02 keV  2.38 keV   642 mum  1.39 mm    Tracker     eIoni
-    3   53.7 cm  -81.7 cm   22.9 cm   2.45 keV  3.57 keV   481 mum  1.87 mm    Tracker     eIoni
-    4   53.7 cm  -81.7 cm   22.9 cm      0 eV   2.45 keV   221 mum   2.1 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 330,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0     30 cm    -40 cm   9.42 mm     11 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     30 cm    -40 cm    9.6 mm   9.04 keV     2 keV   575 mum   575 mum   Chamber     eIoni
-    2     30 cm    -40 cm   9.44 mm   6.89 keV  2.15 keV   493 mum  1.07 mm    Chamber     eIoni
-    3     30 cm    -40 cm   9.38 mm   4.67 keV  2.22 keV   407 mum  1.48 mm    Chamber     eIoni
-    4     30 cm    -40 cm   9.46 mm   3.47 keV   1.2 keV   313 mum  1.79 mm    Chamber     eIoni
-    5     30 cm    -40 cm   9.46 mm   64.4 eV   3.41 keV   243 mum  2.03 mm    Chamber     eIoni
-    6     30 cm    -40 cm   9.46 mm      0 eV   64.4 eV   6.17 mum  2.04 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 329,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   16.8 cm  -7.01 cm    -52 cm   8.16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   16.8 cm  -6.96 cm    -52 cm   5.97 keV  2.19 keV   625 mum   625 mum   Tracker     eIoni
-    2   16.9 cm  -6.93 cm    -52 cm    4.9 keV  1.07 keV   477 mum   1.1 mm    Tracker     eIoni
-    3   16.9 cm   -6.9 cm    -52 cm   4.08 keV   813 eV    410 mum  1.51 mm    Tracker     eIoni
-    4   16.9 cm  -6.87 cm    -52 cm   2.74 keV  1.34 keV   358 mum  1.87 mm    Tracker     eIoni
-    5   16.9 cm  -6.88 cm    -52 cm    399 eV   2.34 keV   252 mum  2.12 mm    Tracker     eIoni
-    6   16.9 cm  -6.88 cm    -52 cm      0 eV    399 eV   22.6 mum  2.15 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 328,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   16.3 cm  -5.49 cm  -54.4 cm   14.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   16.2 cm  -5.47 cm  -54.4 cm   10.3 keV  4.52 keV  1.23 mm   1.23 mm    Tracker     eIoni
-    2   16.1 cm  -5.52 cm  -54.4 cm   7.76 keV  2.51 keV   792 mum  2.02 mm    Tracker     eIoni
-    3   16.1 cm  -5.55 cm  -54.3 cm   3.19 keV  4.57 keV   598 mum  2.62 mm    Tracker     eIoni
-    4   16.1 cm  -5.54 cm  -54.3 cm    852 eV   2.34 keV   293 mum  2.91 mm    Tracker     eIoni
-    5   16.1 cm  -5.54 cm  -54.3 cm      0 eV    852 eV   50.1 mum  2.96 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 327,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.4 cm  -2.79 cm  -69.5 cm   9.62 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   14.4 cm  -2.78 cm  -69.5 cm      7 keV  2.62 keV   516 mum   516 mum   Chamber     eIoni
-    2   14.4 cm  -2.79 cm  -69.5 cm   5.78 keV  1.22 keV   412 mum   927 mum   Chamber     eIoni
-    3   14.4 cm   -2.8 cm  -69.5 cm   2.86 keV  2.93 keV   362 mum  1.29 mm    Chamber     eIoni
-    4   14.4 cm   -2.8 cm  -69.5 cm      0 eV   2.86 keV   192 mum  1.48 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 326,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.74 cm  -9.12 cm  -1.18 m      64 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.58 cm  -10.1 cm  -1.17 m      56 keV  7.95 keV  1.29 cm   1.29 cm    Tracker     eIoni
-    2   9.04 cm  -10.3 cm  -1.16 m    44.1 keV  11.9 keV  1.03 cm   2.32 cm    Tracker     eIoni
-    3   8.94 cm  -10.9 cm  -1.16 m    39.1 keV  4.95 keV  6.76 mm   2.99 cm    Tracker     eIoni
-    4   8.47 cm  -11.2 cm  -1.16 m    35.8 keV  3.33 keV  5.54 mm   3.55 cm    Tracker     eIoni
-    5   8.18 cm  -11.5 cm  -1.16 m    33.5 keV  2.31 keV  4.75 mm   4.02 cm    Tracker     eIoni
-    6   7.79 cm  -11.6 cm  -1.16 m    29.2 keV  4.32 keV  4.26 mm   4.45 cm    Tracker     eIoni
-    7   7.59 cm  -11.9 cm  -1.16 m    23.7 keV  5.46 keV  3.38 mm   4.79 cm    Tracker     eIoni
-    8    7.4 cm    -12 cm  -1.16 m    21.6 keV  2.05 keV  2.43 mm   5.03 cm    Tracker     eIoni
-    9    7.4 cm  -12.1 cm  -1.16 m      19 keV  2.69 keV  2.11 mm   5.24 cm    Tracker     eIoni
-   10   7.33 cm  -12.3 cm  -1.15 m    16.8 keV  2.16 keV  1.74 mm   5.41 cm    Tracker     eIoni
-   11   7.35 cm  -12.4 cm  -1.15 m    12.7 keV  4.05 keV  1.46 mm   5.56 cm    Tracker     eIoni
-   12   7.31 cm  -12.5 cm  -1.15 m    8.27 keV  4.47 keV  1.02 mm   5.66 cm    Tracker     eIoni
-   13   7.29 cm  -12.5 cm  -1.15 m    6.87 keV   1.4 keV   633 mum  5.72 cm    Tracker     eIoni
-   14   7.28 cm  -12.6 cm  -1.15 m    5.49 keV  1.38 keV   535 mum  5.78 cm    Tracker     eIoni
-   15   7.26 cm  -12.6 cm  -1.15 m    3.11 keV  2.38 keV   447 mum  5.82 cm    Tracker     eIoni
-   16   7.28 cm  -12.6 cm  -1.15 m    1.19 keV  1.92 keV   286 mum  5.85 cm    Tracker     eIoni
-   17   7.28 cm  -12.6 cm  -1.15 m       0 eV   1.19 keV  77.2 mum  5.86 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 325,   Parent ID = 324
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.23 cm  -10.2 cm  -1.25 m    18.6 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.36 cm  -10.3 cm  -1.25 m    16.9 keV  1.63 keV  1.68 mm   1.68 mm    Tracker     eIoni
-    2   9.42 cm  -10.4 cm  -1.25 m    14.8 keV  2.12 keV  1.47 mm   3.16 mm    Tracker     eIoni
-    3   9.44 cm  -10.5 cm  -1.25 m    13.2 keV  1.66 keV  1.23 mm   4.39 mm    Tracker     eIoni
-    4    9.4 cm  -10.5 cm  -1.25 m    11.9 keV  1.26 keV  1.06 mm   5.45 mm    Tracker     eIoni
-    5   9.32 cm  -10.6 cm  -1.25 m    9.61 keV  2.28 keV   934 mum  6.38 mm    Tracker     eIoni
-    6   9.34 cm  -10.6 cm  -1.25 m    5.55 keV  4.06 keV   737 mum  7.12 mm    Tracker     eIoni
-    7   9.37 cm  -10.6 cm  -1.25 m    3.82 keV  1.73 keV   451 mum  7.57 mm    Tracker     eIoni
-    8   9.35 cm  -10.6 cm  -1.25 m    2.34 keV  1.48 keV   340 mum  7.91 mm    Tracker     eIoni
-    9   9.33 cm  -10.6 cm  -1.25 m       0 eV   2.34 keV   206 mum  8.12 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 323,   Parent ID = 313
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.01 cm  -10.9 cm  -1.46 m     4.2 MeV     0 eV      0 fm      0 fm    Chamber   initStep
-    1    6.7 cm    -11 cm   -1.4 m    4.16 MeV  31.3 keV  6.12 cm   6.12 cm    TrackerTransportation
-    2   7.16 cm  -11.2 cm  -1.37 m    4.16 MeV  3.75 keV  2.79 cm   8.91 cm    Tracker     eBrem
-    3   7.18 cm  -11.2 cm  -1.37 m    4.08 MeV   251 eV    956 mum  9.01 cm    Tracker     eIoni
-    4   14.8 cm  -13.4 cm    -80 cm   3.99 MeV  95.8 keV    58 cm   67.1 cm    ChamberTransportation
-    5   14.7 cm  -15.6 cm    -60 cm   3.88 MeV  91.3 keV  21.3 cm   88.3 cm    TrackerTransportation
-    6   9.31 cm  -18.4 cm    -21 cm    3.8 MeV  64.6 keV  39.5 cm   1.28 m     Tracker     eIoni
-    7   6.47 cm  -18.9 cm 0.0284 fm   3.78 MeV  29.6 keV  21.2 cm   1.49 m     ChamberTransportation
-    8   3.85 cm  -24.5 cm   13.7 cm   3.67 MeV  66.8 keV  15.3 cm   1.64 m     Chamber     eIoni
-    9   3.13 cm  -25.5 cm     20 cm   3.64 MeV  23.4 keV  6.54 cm   1.71 m     TrackerTransportation
-   10   1.26 cm  -40.3 cm     80 cm   3.54 MeV   107 keV  62.3 cm   2.33 m     ChamberTransportation
-   11   3.44 cm  -42.7 cm      1 m    3.44 MeV  88.9 keV  21.7 cm   2.55 m     TrackerTransportation
-   12   9.05 cm  -47.5 cm    1.4 m    3.35 MeV  66.7 keV  40.8 cm   2.96 m     Tracker     eIoni
-   13   9.64 cm    -51 cm   1.56 m    3.31 MeV    26 keV  16.8 cm   3.13 m     Tracker     eIoni
-   14   9.83 cm  -51.7 cm    1.6 m    3.31 MeV  3.83 keV  3.67 cm   3.16 m     ChamberTransportation
-   15   10.3 cm  -55.9 cm    1.8 m    3.21 MeV  77.8 keV  22.1 cm   3.38 m     TrackerTransportation
-   16   15.6 cm  -69.8 cm    2.4 m    3.11 MeV   102 keV  62.4 cm   4.01 m     WorldPVTransportation
-   17     17 cm  -87.2 cm   2.91 m    3.01 MeV  93.9 keV  54.4 cm   4.55 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 344,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0     10 cm  -53.3 cm   1.68 m    18.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1     10 cm  -53.3 cm   1.68 m    13.2 keV  5.38 keV   946 mum   946 mum   Chamber     eIoni
-    2     10 cm  -53.3 cm   1.68 m      11 keV  2.19 keV   670 mum  1.62 mm    Chamber     eIoni
-    3     10 cm  -53.2 cm   1.68 m    8.92 keV  2.06 keV   573 mum  2.19 mm    Chamber     eIoni
-    4     10 cm  -53.2 cm   1.68 m     550 eV   8.37 keV   488 mum  2.68 mm    Chamber     eIoni
-    5     10 cm  -53.2 cm   1.68 m       0 eV    550 eV   23.3 mum   2.7 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 343,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.64 cm    -51 cm   1.56 m    10.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.66 cm  -50.9 cm   1.56 m    7.37 keV  3.31 keV   828 mum   828 mum   Tracker     eIoni
-    2   9.61 cm  -50.9 cm   1.56 m    6.07 keV   1.3 keV   571 mum   1.4 mm    Tracker     eIoni
-    3   9.58 cm  -50.9 cm   1.56 m    3.46 keV  2.61 keV   484 mum  1.88 mm    Tracker     eIoni
-    4   9.56 cm  -50.9 cm   1.56 m     1.7 keV  1.76 keV   315 mum   2.2 mm    Tracker     eIoni
-    5   9.56 cm  -50.9 cm   1.56 m       0 eV    1.7 keV   128 mum  2.33 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 342,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.05 cm  -47.5 cm    1.4 m    21.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.03 cm  -47.3 cm    1.4 m    18.3 keV  3.37 keV  2.12 mm   2.12 mm    Tracker     eIoni
-    2   9.13 cm  -47.2 cm    1.4 m    12.9 keV  5.44 keV  1.66 mm   3.78 mm    Tracker     eIoni
-    3   9.14 cm  -47.3 cm    1.4 m    11.8 keV  1.13 keV  1.03 mm   4.81 mm    Tracker     eIoni
-    4    9.2 cm  -47.3 cm    1.4 m    10.6 keV  1.21 keV   923 mum  5.73 mm    Tracker     eIoni
-    5   9.15 cm  -47.2 cm    1.4 m    8.53 keV  2.03 keV   817 mum  6.55 mm    Tracker     eIoni
-    6   9.13 cm  -47.2 cm    1.4 m    7.48 keV  1.05 keV   653 mum  7.21 mm    Tracker     eIoni
-    7    9.1 cm  -47.1 cm    1.4 m    3.37 keV  4.12 keV   579 mum  7.78 mm    Tracker     eIoni
-    8   9.12 cm  -47.1 cm    1.4 m     899 eV   2.47 keV   307 mum  8.09 mm    Tracker     eIoni
-    9   9.12 cm  -47.1 cm    1.4 m       0 eV    899 eV   53.5 mum  8.14 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 341,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.34 cm  -41.5 cm   89.9 cm   10.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   2.31 cm  -41.5 cm   89.9 cm   9.69 keV  1.02 keV   561 mum   561 mum   Chamber     eIoni
-    2   2.32 cm  -41.5 cm   89.9 cm   8.26 keV  1.43 keV   518 mum  1.08 mm    Chamber     eIoni
-    3   2.33 cm  -41.5 cm   89.9 cm    4.6 keV  3.66 keV   461 mum  1.54 mm    Chamber     eIoni
-    4   2.32 cm  -41.5 cm   89.9 cm    2.7 keV   1.9 keV   309 mum  1.85 mm    Chamber     eIoni
-    5   2.32 cm  -41.5 cm   89.9 cm      0 eV    2.7 keV   178 mum  2.03 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 340,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.85 cm  -24.5 cm   13.7 cm   42.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   3.94 cm  -24.4 cm   13.9 cm   24.7 keV  18.3 keV  2.85 mm   2.85 mm    Chamber     eIoni
-    2   4.01 cm  -24.4 cm   13.9 cm   17.6 keV  7.11 keV  1.32 mm   4.17 mm    Chamber     eIoni
-    3   3.96 cm  -24.4 cm     14 cm   14.8 keV  2.74 keV   889 mum  5.06 mm    Chamber     eIoni
-    4   3.97 cm  -24.5 cm     14 cm   4.99 keV  9.82 keV   747 mum  5.81 mm    Chamber     eIoni
-    5   3.96 cm  -24.5 cm     14 cm   2.88 keV  2.11 keV   328 mum  6.13 mm    Chamber     eIoni
-    6   3.96 cm  -24.5 cm     14 cm      0 eV   2.88 keV   195 mum  6.33 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 339,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.31 cm  -18.4 cm    -21 cm   8.76 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   9.27 cm  -18.3 cm    -21 cm   6.75 keV  2.01 keV   671 mum   671 mum   Tracker     eIoni
-    2   9.24 cm  -18.3 cm  -20.9 cm   5.33 keV  1.41 keV   528 mum   1.2 mm    Tracker     eIoni
-    3   9.22 cm  -18.3 cm    -21 cm   4.23 keV   1.1 keV   438 mum  1.64 mm    Tracker     eIoni
-    4   9.19 cm  -18.3 cm    -21 cm   2.95 keV  1.29 keV   368 mum     2 mm    Tracker     eIoni
-    5    9.2 cm  -18.3 cm  -20.9 cm   1.72 keV  1.22 keV   272 mum  2.28 mm    Tracker     eIoni
-    6   9.21 cm  -18.3 cm  -20.9 cm      0 eV   1.72 keV   130 mum  2.41 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 338,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.8 cm  -14.4 cm  -71.4 cm     18 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   14.7 cm  -14.4 cm  -71.3 cm   16.4 keV  1.53 keV   912 mum   912 mum   Chamber     eIoni
-    2   14.7 cm  -14.3 cm  -71.3 cm   15.3 keV  1.11 keV   830 mum  1.74 mm    Chamber     eIoni
-    3   14.7 cm  -14.4 cm  -71.3 cm   13.3 keV  2.02 keV   773 mum  2.52 mm    Chamber     eIoni
-    4   14.6 cm  -14.4 cm  -71.3 cm   12.2 keV  1.12 keV   676 mum  3.19 mm    Chamber     eIoni
-    5   14.6 cm  -14.4 cm  -71.4 cm   11.4 keV   797 eV    624 mum  3.82 mm    Chamber     eIoni
-    6   14.6 cm  -14.4 cm  -71.3 cm    902 eV   10.5 keV   590 mum   4.4 mm    Chamber     eIoni
-    7   14.6 cm  -14.4 cm  -71.3 cm      0 eV    902 eV   40.9 mum  4.45 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 337,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.18 cm  -11.2 cm  -1.37 m      75 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   7.52 cm  -12.8 cm  -1.37 m    67.6 keV   7.4 keV   1.7 cm    1.7 cm    Tracker     eIoni
-    2   8.08 cm  -13.3 cm  -1.36 m    62.5 keV  5.06 keV  1.42 cm   3.12 cm    Tracker     eIoni
-    3   8.35 cm  -13.8 cm  -1.35 m    55.9 keV  6.58 keV  1.24 cm   4.36 cm    Tracker     eIoni
-    4    8.9 cm  -13.6 cm  -1.34 m    49.3 keV  6.61 keV  1.02 cm   5.39 cm    Tracker     eIoni
-    5   9.52 cm  -13.8 cm  -1.33 m    42.9 keV  6.43 keV  8.23 mm   6.21 cm    Tracker     eIoni
-    6   9.97 cm  -14.2 cm  -1.33 m    34.5 keV  8.37 keV  6.45 mm   6.85 cm    Tracker     eIoni
-    7   10.3 cm  -14.4 cm  -1.33 m    31.5 keV  2.97 keV  4.48 mm    7.3 cm    Tracker     eIoni
-    8   10.4 cm  -14.5 cm  -1.34 m    28.6 keV  2.93 keV  3.85 mm   7.69 cm    Tracker     eIoni
-    9   10.6 cm  -14.4 cm  -1.34 m    17.5 keV  11.1 keV  3.28 mm   8.02 cm    Tracker     eIoni
-   10   10.8 cm  -14.5 cm  -1.34 m      16 keV  1.53 keV  1.54 mm   8.17 cm    Tracker     eIoni
-   11   10.8 cm  -14.6 cm  -1.34 m      15 keV   916 eV   1.36 mm   8.31 cm    Tracker     eIoni
-   12   10.9 cm  -14.7 cm  -1.34 m    12.9 keV  2.17 keV  1.26 mm   8.43 cm    Tracker     eIoni
-   13   10.8 cm  -14.7 cm  -1.34 m    10.5 keV  2.32 keV  1.03 mm   8.53 cm    Tracker     eIoni
-   14   10.8 cm  -14.7 cm  -1.34 m    9.81 keV   730 eV    815 mum  8.62 cm    Tracker     eIoni
-   15   10.7 cm  -14.8 cm  -1.34 m    8.24 keV  1.58 keV   753 mum  8.69 cm    Tracker     eIoni
-   16   10.7 cm  -14.8 cm  -1.34 m    5.78 keV  2.45 keV   631 mum  8.75 cm    Tracker     eIoni
-   17   10.6 cm  -14.8 cm  -1.34 m       0 eV   5.78 keV   465 mum   8.8 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 336,   Parent ID = 323
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.16 cm  -11.2 cm  -1.37 m     1.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    7.3 cm  -11.4 cm  -1.37 m       0 eV    1.4 keV  5.33 mm   5.33 mm    Tracker      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 312,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -52.7 mum  -125 mum -2.41 m    16.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    551 mum -1.26 mm   -2.4 m    16.2 MeV     0 eV   5.75 mm   5.75 mm    TrackerTransportation
-    2   8.68 cm  -16.3 cm   -1.6 m    16.2 MeV     0 eV   82.1 cm   82.6 cm    ChamberTransportation
-    3   10.8 cm  -20.3 cm   -1.4 m    16.2 MeV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4   17.3 cm  -32.4 cm    -80 cm   16.2 MeV     0 eV   61.6 cm   1.65 m     ChamberTransportation
-    5   19.5 cm  -36.5 cm    -60 cm   16.2 MeV     0 eV   20.5 cm   1.85 m     TrackerTransportation
-    6   25.9 cm  -48.6 cm      0 fm   16.2 MeV     0 eV   61.6 cm   2.47 m     ChamberTransportation
-    7   28.1 cm  -52.6 cm     20 cm   16.2 MeV     0 eV   20.5 cm   2.67 m     TrackerTransportation
-    8   34.5 cm  -64.7 cm     80 cm   16.2 MeV     0 eV   61.6 cm   3.29 m     ChamberTransportation
-    9   36.7 cm  -68.8 cm      1 m    16.2 MeV     0 eV   20.5 cm   3.49 m     TrackerTransportation
-   10   43.2 cm  -80.9 cm    1.6 m    16.2 MeV     0 eV   61.6 cm   4.11 m     ChamberTransportation
-   11   45.3 cm  -84.9 cm    1.8 m    16.2 MeV     0 eV   20.5 cm   4.31 m     TrackerTransportation
-   12   51.8 cm    -97 cm    2.4 m    16.2 MeV     0 eV   61.6 cm   4.93 m     WorldPVTransportation
-   13   57.3 cm  -1.07 m    2.91 m    16.2 MeV     0 eV   52.3 cm   5.45 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 311,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -65.4 mum  -116 mum -2.41 m    7.23 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   39.8 mum  -592 mum  -2.4 m    5.57 MeV     0 eV   5.88 mm   5.88 mm   TargetPV     compt
-    2   38.6 mum  -580 mum  -2.4 m    5.57 MeV     0 eV   99.5 mum  5.98 mm    TrackerTransportation
-    3     -1 cm   9.76 cm   -1.6 m    5.57 MeV     0 eV   80.6 cm   81.2 cm    ChamberTransportation
-    4  -1.25 cm   12.2 cm   -1.4 m    5.57 MeV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    5     -2 cm   19.6 cm    -80 cm   5.57 MeV     0 eV   60.5 cm   1.62 m     ChamberTransportation
-    6  -2.26 cm     22 cm    -60 cm   5.57 MeV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    7  -3.01 cm   29.4 cm -0.114 fm   5.57 MeV     0 eV   60.5 cm   2.42 m     ChamberTransportation
-    8  -3.26 cm   31.9 cm     20 cm   5.57 MeV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    9  -4.01 cm   39.2 cm     80 cm   5.57 MeV     0 eV   60.5 cm   3.23 m     ChamberTransportation
-   10  -4.26 cm   41.7 cm      1 m    5.57 MeV     0 eV   20.2 cm   3.43 m     TrackerTransportation
-   11  -5.02 cm     49 cm    1.6 m    5.57 MeV     0 eV   60.5 cm   4.04 m     ChamberTransportation
-   12  -5.27 cm   51.5 cm    1.8 m    5.57 MeV     0 eV   20.2 cm   4.24 m     TrackerTransportation
-   13  -6.02 cm   58.9 cm    2.4 m    5.57 MeV     0 eV   60.5 cm   4.84 m     WorldPVTransportation
-   14  -6.66 cm   65.1 cm   2.91 m    5.57 MeV     0 eV   51.4 cm   5.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 345,   Parent ID = 311
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   39.8 mum  -592 mum  -2.4 m    1.66 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   51.6 mum  -667 mum  -2.4 m    1.45 MeV   212 keV   267 mum   267 mum   TrackerTransportation
-    2  -59.2 cm   92.3 cm  -2.16 m    1.23 MeV   201 keV  1.18 m    1.18 m     Tracker     eIoni
-    3  -1.06 m    1.33 m   -2.07 m    1.11 MeV   108 keV  65.7 cm   1.83 m     Tracker     eIoni
-    4  -1.49 m     1.9 m   -1.99 m     978 keV   127 keV  75.1 cm   2.59 m     Tracker     eIoni
-    5  -1.76 m    2.24 m   -1.89 m     860 keV  76.8 keV  46.9 cm   3.05 m     Tracker     eIoni
-    6  -1.84 m    2.28 m   -1.87 m     829 keV  17.4 keV  9.45 cm   3.15 m     Tracker     eIoni
-    7  -1.82 m     2.4 m   -1.85 m     808 keV  20.8 keV    13 cm   3.28 m     WorldPVTransportation
-    8  -1.73 m    2.91 m   -1.76 m     707 keV   101 keV  56.4 cm   3.84 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 350,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.84 m    2.28 m   -1.87 m    12.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.85 m    2.28 m   -1.87 m      12 keV   911 eV   1.03 mm   1.03 mm    Tracker     eIoni
-    2  -1.85 m    2.28 m   -1.87 m    9.04 keV  2.97 keV   943 mum  1.98 mm    Tracker     eIoni
-    3  -1.85 m    2.28 m   -1.87 m    7.77 keV  1.27 keV   693 mum  2.67 mm    Tracker     eIoni
-    4  -1.85 m    2.27 m   -1.87 m    7.05 keV   726 eV    599 mum  3.27 mm    Tracker     eIoni
-    5  -1.85 m    2.27 m   -1.87 m    6.33 keV   716 eV    548 mum  3.82 mm    Tracker     eIoni
-    6  -1.85 m    2.27 m   -1.87 m    5.35 keV   981 eV    501 mum  4.32 mm    Tracker     eIoni
-    7  -1.85 m    2.27 m   -1.87 m    2.48 keV  2.87 keV   439 mum  4.76 mm    Tracker     eIoni
-    8  -1.85 m    2.27 m   -1.87 m     347 eV   2.13 keV   224 mum  4.98 mm    Tracker     eIoni
-    9  -1.85 m    2.27 m   -1.87 m       0 eV    347 eV   20.2 mum     5 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 349,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.76 m    2.24 m   -1.89 m    41.6 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.76 m    2.25 m   -1.89 m    37.6 keV  3.97 keV  6.13 mm   6.13 mm    Tracker     eIoni
-    2  -1.76 m    2.25 m   -1.89 m    31.8 keV   5.8 keV  5.17 mm   1.13 cm    Tracker     eIoni
-    3  -1.76 m    2.25 m   -1.89 m    29.7 keV  2.12 keV  3.91 mm   1.52 cm    Tracker     eIoni
-    4  -1.76 m    2.25 m   -1.89 m    25.8 keV  3.91 keV  3.48 mm   1.87 cm    Tracker     eIoni
-    5  -1.76 m    2.25 m   -1.89 m    23.1 keV  2.69 keV  2.77 mm   2.15 cm    Tracker     eIoni
-    6  -1.77 m    2.25 m   -1.89 m    20.8 keV  2.31 keV  2.33 mm   2.38 cm    Tracker     eIoni
-    7  -1.77 m    2.25 m   -1.89 m    18.3 keV  2.51 keV  1.98 mm   2.58 cm    Tracker     eIoni
-    8  -1.77 m    2.25 m   -1.89 m    16.5 keV  1.75 keV  1.64 mm   2.74 cm    Tracker     eIoni
-    9  -1.77 m    2.25 m   -1.89 m    14.1 keV  2.42 keV  1.43 mm   2.88 cm    Tracker     eIoni
-   10  -1.77 m    2.25 m   -1.89 m    11.6 keV  2.45 keV  1.15 mm      3 cm    Tracker     eIoni
-   11  -1.77 m    2.25 m   -1.89 m    10.1 keV  1.58 keV   912 mum  3.09 cm    Tracker     eIoni
-   12  -1.77 m    2.25 m   -1.89 m    8.96 keV   1.1 keV   773 mum  3.17 cm    Tracker     eIoni
-   13  -1.77 m    2.25 m   -1.89 m    7.57 keV   1.4 keV   687 mum  3.24 cm    Tracker     eIoni
-   14  -1.77 m    2.25 m   -1.89 m    6.38 keV  1.18 keV   584 mum  3.29 cm    Tracker     eIoni
-   15  -1.77 m    2.25 m   -1.89 m    3.72 keV  2.66 keV   504 mum  3.34 cm    Tracker     eIoni
-   16  -1.77 m    2.25 m   -1.89 m    2.13 keV  1.59 keV   333 mum  3.38 cm    Tracker     eIoni
-   17  -1.77 m    2.25 m   -1.89 m       0 eV   2.13 keV   179 mum   3.4 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 348,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.49 m     1.9 m   -1.99 m    8.22 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.49 m     1.9 m   -1.99 m    4.95 keV  3.27 keV   630 mum   630 mum   Tracker     eIoni
-    2  -1.49 m     1.9 m   -1.99 m     154 eV    4.8 keV   414 mum  1.04 mm    Tracker     eIoni
-    3  -1.49 m     1.9 m   -1.99 m       0 eV    154 eV   12.5 mum  1.06 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 347,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.06 m    1.33 m   -2.07 m    11.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.06 m    1.33 m   -2.07 m    8.92 keV  2.52 keV   894 mum   894 mum   Tracker     eIoni
-    2  -1.06 m    1.33 m   -2.07 m    6.21 keV   2.7 keV   683 mum  1.58 mm    Tracker     eIoni
-    3  -1.06 m    1.33 m   -2.07 m    4.54 keV  1.67 keV   494 mum  2.07 mm    Tracker     eIoni
-    4  -1.06 m    1.33 m   -2.07 m    2.25 keV  2.29 keV   388 mum  2.46 mm    Tracker     eIoni
-    5  -1.06 m    1.33 m   -2.07 m       0 eV   2.25 keV   195 mum  2.65 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 346,   Parent ID = 345
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -59.2 cm   92.3 cm  -2.16 m    14.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -59.3 cm   92.2 cm  -2.16 m    12.7 keV  1.34 keV  1.15 mm   1.15 mm    Tracker     eIoni
-    2  -59.4 cm   92.2 cm  -2.16 m    11.3 keV  1.47 keV  1.02 mm   2.17 mm    Tracker     eIoni
-    3  -59.5 cm   92.2 cm  -2.16 m     9.9 keV  1.37 keV   879 mum  3.05 mm    Tracker     eIoni
-    4  -59.5 cm   92.3 cm  -2.16 m    8.19 keV  1.71 keV   759 mum  3.81 mm    Tracker     eIoni
-    5  -59.5 cm   92.3 cm  -2.16 m    5.55 keV  2.64 keV   627 mum  4.43 mm    Tracker     eIoni
-    6  -59.6 cm   92.3 cm  -2.16 m    4.05 keV   1.5 keV   451 mum  4.88 mm    Tracker     eIoni
-    7  -59.5 cm   92.3 cm  -2.16 m    1.22 keV  2.82 keV   355 mum  5.24 mm    Tracker     eIoni
-    8  -59.5 cm   92.3 cm  -2.16 m       0 eV   1.22 keV  79.8 mum  5.32 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 310,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.5 mum  -168 mum -2.41 m    6.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -183 mum  -512 mum  -2.4 m    6.03 MeV     0 eV   7.31 mm   7.31 mm    TrackerTransportation
-    2  -9.93 mm  -3.82 cm   -1.6 m    6.03 MeV     0 eV   80.1 cm   80.8 cm    ChamberTransportation
-    3  -1.24 cm  -4.77 cm   -1.4 m    6.03 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -1.97 cm  -7.59 cm    -80 cm   6.03 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -2.21 cm  -8.54 cm    -60 cm   6.03 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -2.94 cm  -11.4 cm      0 fm   6.03 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -3.19 cm  -12.3 cm     20 cm   6.03 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -3.92 cm  -15.1 cm     80 cm   6.03 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -4.16 cm  -16.1 cm      1 m    6.03 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -4.89 cm  -18.9 cm    1.6 m    6.03 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11  -5.13 cm  -19.9 cm    1.8 m    6.03 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -5.87 cm  -22.7 cm    2.4 m    6.03 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -6.49 cm  -25.1 cm   2.91 m    6.03 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 309,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -80.4 mum  -150 mum -2.41 m    29.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -218 mum  -228 mum  -2.4 m    29.9 MeV     0 eV   7.75 mm   7.75 mm    TrackerTransportation
-    2  -1.44 cm  -8.29 mm   -1.6 m    29.9 MeV     0 eV     80 cm   80.8 cm    ChamberTransportation
-    3   -1.8 cm  -1.03 cm   -1.4 m    29.9 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.86 cm  -1.63 cm    -80 cm   29.9 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -3.22 cm  -1.84 cm    -60 cm   29.9 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -4.28 cm  -2.44 cm  0.114 fm   29.9 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -4.64 cm  -2.64 cm     20 cm   29.9 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -5.7 cm  -3.25 cm     80 cm   29.9 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -6.06 cm  -3.45 cm      1 m    29.9 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -7.12 cm  -4.05 cm    1.6 m    29.9 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -7.48 cm  -4.25 cm    1.8 m    29.9 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -8.54 cm  -4.86 cm    2.4 m    29.9 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -9.45 cm  -5.37 cm   2.91 m    29.9 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 308,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -79.3 mum  -150 mum -2.41 m    86.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -191 mum  -250 mum  -2.4 m    86.6 MeV     0 eV   7.82 mm   7.82 mm    TrackerTransportation
-    2  -1.16 cm  -1.06 cm   -1.6 m    86.6 MeV     0 eV     80 cm   80.8 cm    ChamberTransportation
-    3  -1.45 cm  -1.32 cm   -1.4 m    86.6 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.31 cm  -2.09 cm    -80 cm   86.6 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   -2.6 cm  -2.35 cm    -60 cm   86.6 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -3.45 cm  -3.12 cm      0 fm   86.6 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -3.74 cm  -3.38 cm     20 cm   86.6 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -4.6 cm  -4.15 cm     80 cm   86.6 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -4.89 cm  -4.41 cm      1 m    86.6 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -5.74 cm  -5.19 cm    1.6 m    86.6 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -6.03 cm  -5.44 cm    1.8 m    86.6 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -6.89 cm  -6.22 cm    2.4 m    86.6 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -7.62 cm  -6.88 cm   2.91 m    86.6 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 307,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -82.4 mum  -133 mum -2.41 m    10.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -106 mum  -295 mum  -2.4 m    10.8 MeV     0 eV   8.29 mm   8.29 mm    TrackerTransportation
-    2  -2.41 mm   -1.6 cm   -1.6 m    10.8 MeV     0 eV     80 cm   80.8 cm    ChamberTransportation
-    3  -2.98 mm  -1.99 cm   -1.4 m    10.8 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -4.71 mm  -3.17 cm    -80 cm   10.8 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -5.28 mm  -3.56 cm    -60 cm   10.8 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -7.01 mm  -4.74 cm -0.114 fm   10.8 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -7.59 mm  -5.14 cm     20 cm   10.8 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -9.31 mm  -6.31 cm     80 cm   10.8 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -9.89 mm  -6.71 cm      1 m    10.8 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -1.16 cm  -7.88 cm    1.6 m    10.8 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -1.22 cm  -8.28 cm    1.8 m    10.8 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -1.39 cm  -9.46 cm    2.4 m    10.8 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -1.54 cm  -10.5 cm   2.91 m    10.8 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 306,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    165 nm  -32.4 mum -2.41 m     434 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -13.3 mum  -197 mum -2.41 m       0 eV    434 keV  4.47 mm   4.47 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 305,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.05 mum -24.3 mum -2.41 m     4.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -9.48 mum  -352 mum  -2.4 m     4.7 MeV     0 eV   1.08 cm   1.08 cm    TrackerTransportation
-    2   -633 mum -2.46 cm   -1.6 m     4.7 MeV     0 eV     80 cm   81.1 cm    ChamberTransportation
-    3   -789 mum -3.07 cm   -1.4 m     4.7 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -1.26 mm  -4.89 cm    -80 cm    4.7 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5  -1.41 mm  -5.49 cm    -60 cm    4.7 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -1.88 mm  -7.31 cm      0 fm    4.7 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7  -2.04 mm  -7.92 cm     20 cm    4.7 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   -2.5 mm  -9.74 cm     80 cm    4.7 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9  -2.66 mm  -10.3 cm      1 m     4.7 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -3.13 mm  -12.2 cm    1.6 m     4.7 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11  -3.28 mm  -12.8 cm    1.8 m     4.7 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -3.75 mm  -14.6 cm    2.4 m     4.7 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13  -4.15 mm  -16.1 cm   2.91 m     4.7 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 304,   Parent ID = 303
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.19 mum -8.44 mum -2.41 m     703 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -7.6 mum -46.9 mum -2.41 m     697 keV   5.9 keV  2.14 mm   2.14 mm   TargetPV     compt
-    2    603 mum  -987 mum  -2.4 m     697 keV     0 eV   9.19 mm   1.13 cm    TrackerTransportation
-    3   5.42 cm  -8.35 cm   -1.6 m     697 keV     0 eV   80.6 cm   81.7 cm    ChamberTransportation
-    4   6.76 cm  -10.4 cm   -1.4 m     697 keV     0 eV   20.2 cm   1.02 m     TrackerTransportation
-    5   10.8 cm  -16.6 cm    -80 cm    697 keV     0 eV   60.5 cm   1.62 m     ChamberTransportation
-    6   12.1 cm  -18.7 cm    -60 cm    697 keV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    7   16.1 cm  -24.8 cm      0 fm    697 keV     0 eV   60.5 cm   2.43 m     ChamberTransportation
-    8   17.5 cm  -26.9 cm     20 cm    697 keV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    9   21.5 cm  -33.1 cm     80 cm    697 keV     0 eV   60.5 cm   3.24 m     ChamberTransportation
-   10   22.8 cm  -35.2 cm      1 m     697 keV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   11   26.9 cm  -41.3 cm    1.6 m     697 keV     0 eV   60.5 cm   4.04 m     ChamberTransportation
-   12   28.2 cm  -43.4 cm    1.8 m     697 keV     0 eV   20.2 cm   4.24 m     TrackerTransportation
-   13   32.2 cm  -49.6 cm    2.4 m     697 keV     0 eV   60.5 cm   4.85 m     WorldPVTransportation
-   14   35.6 cm  -54.8 cm   2.91 m     697 keV     0 eV   51.4 cm   5.36 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 302,   Parent ID = 101
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -68.7 nm  -2.92 mum -2.41 m    60.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    510 mum   305 mum -2.41 m    47.1 MeV  5.06 MeV  3.55 mm   3.55 mm   TargetPV     eBrem
-    2    511 mum   311 mum -2.41 m    46.5 MeV   145 keV   124 mum  3.67 mm   TargetPV     eBrem
-    3    485 mum   449 mum -2.41 m      45 MeV   914 keV   706 mum  4.38 mm   TargetPV     eBrem
-    4    493 mum   365 mum -2.41 m    40.2 MeV  1.84 MeV  1.31 mm   5.69 mm   TargetPV     eBrem
-    5    490 mum   370 mum -2.41 m    39.7 MeV  42.4 keV  27.9 mum  5.72 mm   TargetPV     eBrem
-    6    466 mum   454 mum -2.41 m      38 MeV   545 keV   494 mum  6.21 mm   TargetPV     eBrem
-    7   51.4 mum   700 mum  -2.4 m    35.4 MeV  1.79 MeV  1.34 mm   7.56 mm   TargetPV     eBrem
-    8    -65 mum   723 mum  -2.4 m      33 MeV   533 keV   456 mum  8.01 mm   TargetPV     eBrem
-    9  -78.6 mum   509 mum  -2.4 m    30.7 MeV   695 keV   474 mum  8.49 mm   TargetPV     eBrem
-   10  -99.4 mum   540 mum  -2.4 m    28.2 MeV   124 keV  81.4 mum  8.57 mm   TargetPV     eBrem
-   11   -379 mum  1.24 mm   -2.4 m    25.4 MeV  1.73 MeV  1.36 mm   9.93 mm   TargetPV     eBrem
-   12   -417 mum  1.76 mm   -2.4 m    19.8 MeV  1.48 MeV     1 mm   1.09 cm   TargetPV     eBrem
-   13   -503 mum  2.01 mm   -2.4 m    17.9 MeV   579 keV   408 mum  1.13 cm   TargetPV     eBrem
-   14   -716 mum  2.74 mm   -2.4 m    13.6 MeV  4.24 MeV  1.46 mm   1.28 cm    TrackerTransportation
-   15  -1.33 m    34.6 cm  -1.55 m    13.3 MeV   304 keV  1.61 m    1.62 m     Tracker     eIoni
-   16   -2.4 m    52.4 cm  -82.6 cm   13.1 MeV   245 keV  1.31 m    2.94 m     WorldPVTransportation
-   17  -2.51 m    54.2 cm  -74.9 cm     13 MeV  27.9 keV  13.8 cm   3.07 m     WorldPV     eIoni
-   18   -2.7 m    56.9 cm  -63.4 cm   12.9 MeV    42 keV  22.3 cm    3.3 m     WorldPV     eIoni
-   19  -2.75 m    57.4 cm  -60.1 cm   12.8 MeV  11.5 keV  6.28 cm   3.36 m     WorldPV     eIoni
-   20  -2.81 m      58 cm  -56.8 cm   12.8 MeV  15.3 keV  6.49 cm   3.42 m     WorldPV     eIoni
-   21  -2.91 m    58.9 cm  -50.8 cm   12.8 MeV    24 keV  11.7 cm   3.54 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 368,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.81 m      58 cm  -56.8 cm   11.2 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.81 m      58 cm  -56.8 cm   9.24 keV  1.98 keV   875 mum   875 mum   WorldPV     eIoni
-    2  -2.81 m    58.1 cm  -56.8 cm   6.78 keV  2.46 keV   708 mum  1.58 mm    WorldPV     eIoni
-    3  -2.81 m    58.1 cm  -56.8 cm   5.15 keV  1.63 keV   530 mum  2.11 mm    WorldPV     eIoni
-    4  -2.81 m    58.1 cm  -56.8 cm   3.48 keV  1.67 keV   426 mum  2.54 mm    WorldPV     eIoni
-    5  -2.81 m    58.1 cm  -56.9 cm   1.63 keV  1.84 keV   316 mum  2.85 mm    WorldPV     eIoni
-    6  -2.81 m    58.1 cm  -56.9 cm      0 eV   1.63 keV   120 mum  2.97 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 367,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.75 m    57.4 cm  -60.1 cm   36.7 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.75 m    57.3 cm  -59.7 cm   21.7 keV  2.23 keV  4.19 mm   4.19 mm    WorldPV     eIoni
-    2  -2.75 m    57.2 cm  -59.7 cm     13 keV  8.72 keV  2.12 mm   6.31 mm    WorldPV     eIoni
-    3  -2.75 m    57.1 cm  -59.7 cm   11.5 keV  1.43 keV  1.04 mm   7.35 mm    WorldPV     eIoni
-    4  -2.75 m    57.1 cm  -59.7 cm   8.19 keV  3.35 keV   903 mum  8.25 mm    WorldPV     eIoni
-    5  -2.75 m    57.1 cm  -59.7 cm    7.1 keV   1.1 keV   628 mum  8.88 mm    WorldPV     eIoni
-    6  -2.75 m      57 cm  -59.7 cm   5.78 keV  1.32 keV   551 mum  9.43 mm    WorldPV     eIoni
-    7  -2.75 m      57 cm  -59.6 cm   3.62 keV  2.16 keV   465 mum  9.89 mm    WorldPV     eIoni
-    8  -2.75 m      57 cm  -59.6 cm   1.99 keV  1.63 keV   326 mum  1.02 cm    WorldPV     eIoni
-    9  -2.75 m      57 cm  -59.6 cm      0 eV   1.99 keV   161 mum  1.04 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 369,   Parent ID = 367
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.75 m    57.3 cm  -59.7 cm   12.8 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.75 m    57.3 cm  -59.6 cm   9.85 keV  2.92 keV  1.02 mm   1.02 mm    WorldPV     eIoni
-    2  -2.75 m    57.2 cm  -59.6 cm   8.79 keV  1.06 keV   755 mum  1.78 mm    WorldPV     eIoni
-    3  -2.75 m    57.2 cm  -59.6 cm   5.76 keV  3.03 keV   673 mum  2.45 mm    WorldPV     eIoni
-    4  -2.75 m    57.2 cm  -59.6 cm   4.37 keV  1.38 keV   463 mum  2.91 mm    WorldPV     eIoni
-    5  -2.75 m    57.2 cm  -59.6 cm   3.12 keV  1.26 keV   377 mum  3.29 mm    WorldPV     eIoni
-    6  -2.75 m    57.2 cm  -59.5 cm      0 eV   3.12 keV   287 mum  3.58 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 366,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.7 m    56.9 cm  -63.4 cm    105 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -2.7 m    57.7 cm  -63.3 cm   75.3 keV  1.66 keV  7.64 mm   7.64 mm    WorldPV     eIoni
-    2   -2.7 m      58 cm  -61.7 cm   69.8 keV  5.52 keV  1.71 cm   2.48 cm    WorldPV     eIoni
-    3  -2.71 m    58.2 cm  -60.4 cm   62.1 keV  7.62 keV  1.51 cm   3.98 cm    WorldPV     eIoni
-    4  -2.71 m      59 cm  -59.6 cm   55.7 keV  6.45 keV  1.23 cm   5.21 cm    WorldPV     eIoni
-    5  -2.72 m    59.3 cm  -58.9 cm   50.6 keV  5.11 keV  1.02 cm   6.22 cm    WorldPV     eIoni
-    6  -2.72 m    59.2 cm  -58.1 cm   46.3 keV  4.26 keV  8.59 mm   7.08 cm    WorldPV     eIoni
-    7  -2.72 m    59.8 cm  -58.5 cm   39.5 keV  6.83 keV  7.39 mm   7.82 cm    WorldPV     eIoni
-    8  -2.72 m    60.2 cm  -58.9 cm   30.8 keV  8.69 keV  5.63 mm   8.39 cm    WorldPV     eIoni
-    9  -2.72 m    60.2 cm  -59.1 cm   28.7 keV  2.09 keV   3.7 mm   8.76 cm    WorldPV     eIoni
-   10  -2.72 m    60.4 cm  -59.4 cm   24.8 keV  3.88 keV   3.3 mm   9.09 cm    WorldPV     eIoni
-   11  -2.72 m    60.3 cm  -59.5 cm   22.7 keV  2.14 keV  2.61 mm   9.35 cm    WorldPV     eIoni
-   12  -2.73 m    60.2 cm  -59.6 cm   19.7 keV     3 keV  2.28 mm   9.57 cm    WorldPV     eIoni
-   13  -2.72 m    60.2 cm  -59.8 cm   17.9 keV  1.83 keV  1.83 mm   9.76 cm    WorldPV     eIoni
-   14  -2.72 m    60.1 cm  -59.9 cm   15.6 keV  2.29 keV  1.59 mm   9.92 cm    WorldPV     eIoni
-   15  -2.72 m    60.2 cm    -60 cm   13.3 keV  2.28 keV  1.32 mm     10 cm    WorldPV     eIoni
-   16  -2.72 m    60.1 cm  -60.1 cm   11.4 keV  1.92 keV  1.07 mm   10.2 cm    WorldPV     eIoni
-   17  -2.72 m      60 cm  -60.1 cm   10.5 keV   846 eV    889 mum  10.2 cm    WorldPV     eIoni
-   18  -2.72 m    59.9 cm  -60.1 cm   9.27 keV  1.26 keV   815 mum  10.3 cm    WorldPV     eIoni
-   19  -2.72 m    59.9 cm  -60.1 cm   7.09 keV  2.18 keV   711 mum  10.4 cm    WorldPV     eIoni
-   20  -2.72 m    59.8 cm  -60.1 cm    335 eV   6.76 keV   551 mum  10.5 cm    WorldPV     eIoni
-   21  -2.72 m    59.8 cm  -60.1 cm      0 eV    335 eV   19.6 mum  10.5 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 370,   Parent ID = 366
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.7 m    57.7 cm  -63.3 cm   28.4 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -2.7 m    57.9 cm  -63.4 cm   24.7 keV  3.63 keV  3.24 mm   3.24 mm    WorldPV     eIoni
-    2   -2.7 m      58 cm  -63.6 cm   20.2 keV  4.58 keV  2.59 mm   5.83 mm    WorldPV     eIoni
-    3  -2.71 m    58.2 cm  -63.5 cm   18.4 keV  1.72 keV   1.9 mm   7.73 mm    WorldPV     eIoni
-    4  -2.71 m    58.3 cm  -63.6 cm   16.6 keV  1.89 keV  1.67 mm    9.4 mm    WorldPV     eIoni
-    5  -2.71 m    58.4 cm  -63.6 cm   13.9 keV  2.69 keV  1.43 mm   1.08 cm    WorldPV     eIoni
-    6   -2.7 m    58.5 cm  -63.7 cm   12.5 keV  1.37 keV  1.13 mm    1.2 cm    WorldPV     eIoni
-    7   -2.7 m    58.6 cm  -63.7 cm   11.1 keV  1.36 keV   992 mum  1.29 cm    WorldPV     eIoni
-    8   -2.7 m    58.6 cm  -63.8 cm   9.34 keV  1.79 keV   867 mum  1.38 cm    WorldPV     eIoni
-    9   -2.7 m    58.7 cm  -63.8 cm   4.18 keV  5.16 keV   716 mum  1.45 cm    WorldPV     eIoni
-   10   -2.7 m    58.7 cm  -63.8 cm    1.8 keV  2.38 keV   364 mum  1.49 cm    WorldPV     eIoni
-   11   -2.7 m    58.7 cm  -63.8 cm      0 eV    1.8 keV   139 mum   1.5 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 365,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.51 m    54.2 cm  -74.9 cm   22.7 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1  -2.51 m    54.3 cm  -75.1 cm   18.5 keV   4.2 keV  2.27 mm   2.27 mm    WorldPV     eIoni
-    2  -2.51 m    54.2 cm  -75.1 cm   16.9 keV  1.52 keV  1.67 mm   3.94 mm    WorldPV     eIoni
-    3  -2.51 m    54.2 cm  -75.1 cm   14.5 keV  2.46 keV  1.48 mm   5.42 mm    WorldPV     eIoni
-    4  -2.51 m    54.2 cm  -75.2 cm   13.1 keV  1.42 keV  1.19 mm   6.61 mm    WorldPV     eIoni
-    5  -2.51 m    54.2 cm  -75.3 cm   10.8 keV   2.3 keV  1.05 mm   7.66 mm    WorldPV     eIoni
-    6  -2.51 m    54.2 cm  -75.3 cm   6.92 keV  3.85 keV   835 mum   8.5 mm    WorldPV     eIoni
-    7  -2.51 m    54.3 cm  -75.3 cm    4.7 keV  2.22 keV   539 mum  9.03 mm    WorldPV     eIoni
-    8  -2.51 m    54.3 cm  -75.3 cm   1.52 keV  3.18 keV   397 mum  9.43 mm    WorldPV     eIoni
-    9  -2.51 m    54.3 cm  -75.3 cm      0 eV   1.52 keV   108 mum  9.54 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 364,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.33 m    34.6 cm  -1.55 m    13.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.33 m    34.6 cm  -1.55 m    12.5 keV  1.19 keV  1.11 mm   1.11 mm    Tracker     eIoni
-    2  -1.33 m    34.6 cm  -1.55 m    11.2 keV  1.27 keV   994 mum  2.11 mm    Tracker     eIoni
-    3  -1.33 m    34.6 cm  -1.55 m     9.9 keV  1.34 keV   877 mum  2.98 mm    Tracker     eIoni
-    4  -1.33 m    34.6 cm  -1.55 m    7.67 keV  2.23 keV   760 mum  3.74 mm    Tracker     eIoni
-    5  -1.33 m    34.7 cm  -1.55 m    6.18 keV  1.49 keV   591 mum  4.34 mm    Tracker     eIoni
-    6  -1.33 m    34.7 cm  -1.55 m    5.09 keV  1.08 keV   491 mum  4.83 mm    Tracker     eIoni
-    7  -1.33 m    34.7 cm  -1.55 m       0 eV   5.09 keV   423 mum  5.25 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 363,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -503 mum  2.01 mm   -2.4 m    1.28 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -685 mum  2.72 mm   -2.4 m    1.28 MeV     0 eV   1.32 mm   1.32 mm    TrackerTransportation
-    2  -61.9 cm    2.4 m    1.35 m    1.28 MeV     0 eV   4.49 m    4.49 m     WorldPVTransportation
-    3  -75.1 cm   2.91 m    2.15 m    1.28 MeV     0 eV   95.6 cm   5.45 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 362,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -417 mum  1.76 mm   -2.4 m    4.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -696 mum  2.44 mm   -2.4 m    4.14 MeV     0 eV   1.59 mm   1.59 mm    TrackerTransportation
-    2  -79.1 cm   1.93 m     1.6 m    4.14 MeV     0 eV   4.51 m    4.51 m     ChamberTransportation
-    3  -80.5 cm   1.97 m    1.67 m    4.14 MeV     0 eV   7.96 cm   4.59 m     TrackerTransportation
-    4  -94.9 cm   2.32 m     2.4 m    4.14 MeV     0 eV   82.3 cm   5.42 m     WorldPVTransportation
-    5  -1.05 m    2.57 m    2.91 m    4.14 MeV     0 eV   57.5 cm   5.99 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 361,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -379 mum  1.24 mm   -2.4 m     1.1 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -710 mum  2.08 mm   -2.4 m     1.1 MeV     0 eV   2.43 mm   2.43 mm    TrackerTransportation
-    2  -23.5 cm   59.9 cm    -80 cm    1.1 MeV     0 eV   1.72 m    1.73 m     ChamberTransportation
-    3  -26.4 cm   67.2 cm  -60.3 cm    1.1 MeV     0 eV   21.2 cm   1.94 m     TrackerTransportation
-    4  -35.3 cm   89.7 cm  0.114 fm    1.1 MeV     0 eV     65 cm   2.59 m     ChamberTransportation
-    5  -38.2 cm   97.2 cm     20 cm    1.1 MeV     0 eV   21.5 cm    2.8 m     TrackerTransportation
-    6    -47 cm    1.2 m      80 cm    1.1 MeV     0 eV   64.6 cm   3.45 m     ChamberTransportation
-    7    -50 cm   1.27 m       1 m     1.1 MeV     0 eV   21.5 cm   3.67 m     TrackerTransportation
-    8  -58.8 cm   1.49 m     1.6 m     1.1 MeV     0 eV   64.6 cm   4.31 m     ChamberTransportation
-    9  -61.7 cm   1.57 m     1.8 m     1.1 MeV     0 eV   21.5 cm   4.53 m     TrackerTransportation
-   10  -70.5 cm   1.79 m     2.4 m     1.1 MeV     0 eV   64.6 cm   5.17 m     WorldPVTransportation
-   11    -78 cm   1.98 m    2.91 m     1.1 MeV     0 eV   54.9 cm   5.72 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 360,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -99.4 mum   540 mum  -2.4 m    2.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -753 mum  1.53 mm   -2.4 m     645 keV     0 eV   2.94 mm   2.94 mm   TargetPV     compt
-    2  -5.58 mum  1.46 mm   -2.4 m     645 keV     0 eV   1.01 mm   3.95 mm    TrackerTransportation
-    3    2.4 m   -21.9 cm  -24.8 cm    645 keV     0 eV   3.23 m    3.23 m     WorldPVTransportation
-    4   2.91 m   -26.6 cm   20.9 cm    645 keV     0 eV   68.7 cm   3.92 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 371,   Parent ID = 360
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -753 mum  1.53 mm   -2.4 m    1.74 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.03 mm   1.57 mm   -2.4 m    1.21 MeV   533 keV   555 mum   555 mum  TargetPV     eIoni
-    2   -907 mum  1.53 mm   -2.4 m     726 keV   480 keV   456 mum  1.01 mm   TargetPV     eIoni
-    3   -885 mum  1.52 mm   -2.4 m    91.2 keV   635 keV   347 mum  1.36 mm   TargetPV     eIoni
-    4   -887 mum  1.52 mm   -2.4 m       0 eV   91.2 keV  23.7 mum  1.38 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 359,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.6 mum   509 mum  -2.4 m    1.56 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -894 mum  1.39 mm   -2.4 m       0 eV     88 keV  2.89 mm   2.89 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 372,   Parent ID = 359
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -894 mum  1.39 mm   -2.4 m    1.47 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -900 mum  1.39 mm   -2.4 m     846 keV  14.4 keV  11.3 mum  11.3 mum  TargetPV     eBrem
-    2   -927 mum  1.41 mm   -2.4 m    14.1 keV   832 keV   309 mum   320 mum  TargetPV     eBrem
-    3   -927 mum  1.41 mm   -2.4 m       0 eV   14.1 keV  1.19 mum   321 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 373,   Parent ID = 372
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -900 mum  1.39 mm   -2.4 m     611 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -934 mum  1.84 mm   -2.4 m     611 keV     0 eV    918 mum   918 mum   TrackerTransportation
-    2  -18.4 cm    2.4 m    1.83 m     611 keV     0 eV   4.87 m    4.87 m     WorldPVTransportation
-    3  -22.3 cm   2.91 m    2.73 m     611 keV     0 eV   1.04 m    5.91 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 358,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -65 mum   723 mum  -2.4 m     1.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -628 mum -1.49 mm   -2.4 m     1.9 MeV     0 eV   4.48 mm   4.48 mm    TrackerTransportation
-    2  -61.1 cm   -2.4 m    1.78 m     1.9 MeV     0 eV   4.86 m    4.86 m     WorldPVTransportation
-    3  -74.1 cm  -2.91 m    2.67 m     1.9 MeV     0 eV   1.03 m     5.9 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 357,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   51.4 mum   700 mum  -2.4 m     832 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.42 mm    657 mum  -2.4 m     832 keV     0 eV   4.54 mm   4.54 mm    TrackerTransportation
-    2  -55.1 cm  -1.53 cm    -80 cm    832 keV     0 eV   1.69 m     1.7 m     ChamberTransportation
-    3  -61.9 cm  -1.72 cm    -60 cm    832 keV     0 eV   21.1 cm   1.91 m     TrackerTransportation
-    4  -82.5 cm  -2.32 cm      0 fm    832 keV     0 eV   63.4 cm   2.54 m     ChamberTransportation
-    5  -89.4 cm  -2.52 cm     20 cm    832 keV     0 eV   21.1 cm   2.75 m     TrackerTransportation
-    6   -1.1 m   -3.12 cm     80 cm    832 keV     0 eV   63.4 cm   3.39 m     ChamberTransportation
-    7  -1.17 m   -3.32 cm      1 m     832 keV     0 eV   21.1 cm    3.6 m     TrackerTransportation
-    8  -1.37 m   -3.91 cm    1.6 m     832 keV     0 eV   63.4 cm   4.23 m     ChamberTransportation
-    9  -1.44 m   -4.11 cm    1.8 m     832 keV     0 eV   21.1 cm   4.45 m     TrackerTransportation
-   10  -1.65 m   -4.71 cm    2.4 m     832 keV     0 eV   63.4 cm   5.08 m     WorldPVTransportation
-   11  -1.82 m   -5.21 cm   2.91 m     832 keV     0 eV   53.9 cm   5.62 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 356,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    466 mum   454 mum -2.41 m    1.12 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.72 mm    500 mum  -2.4 m    1.12 MeV     0 eV   5.95 mm   5.95 mm    TrackerTransportation
-    2  -63.4 cm   1.37 cm    -80 cm   1.12 MeV     0 eV   1.72 m    1.73 m     ChamberTransportation
-    3  -67.2 cm   1.45 cm  -70.4 cm   1.12 MeV     0 eV   10.3 cm   1.83 m     TrackerTransportation
-    4    -95 cm   2.04 cm  0.114 fm   1.12 MeV     0 eV   75.7 cm   2.59 m     ChamberTransportation
-    5  -1.03 m     2.2 cm     20 cm   1.12 MeV     0 eV   21.5 cm    2.8 m     TrackerTransportation
-    6  -1.27 m     2.7 cm     80 cm   1.12 MeV     0 eV   64.5 cm   3.45 m     ChamberTransportation
-    7  -1.35 m    2.86 cm      1 m    1.12 MeV     0 eV   21.5 cm   3.66 m     TrackerTransportation
-    8  -1.42 m    3.03 cm    1.2 m     258 keV     0 eV   21.6 cm   3.88 m     Tracker     compt
-    9  -72.8 cm  -41.8 cm      1 m     258 keV     0 eV   85.3 cm   4.73 m     ChamberTransportation
-   10   -3.4 cm  -86.4 cm     80 cm    258 keV     0 eV   84.9 cm   5.58 m     TrackerTransportation
-   11   2.36 m    -2.4 m    11.1 cm    258 keV     0 eV   2.92 m     8.5 m     WorldPVTransportation
-   12   2.91 m   -2.76 m   -4.87 cm    258 keV     0 eV   67.7 cm   9.18 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 374,   Parent ID = 356
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.42 m    3.03 cm    1.2 m     867 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.65 m    8.23 cm    1.6 m     790 keV  76.2 keV  48.7 cm   48.7 cm    ChamberTransportation
-    2  -1.68 m    19.1 cm   1.68 m     613 keV   178 keV  23.8 cm   72.5 cm    Chamber     eIoni
-    3  -1.62 m    17.1 cm    1.7 m     451 keV  81.4 keV  11.7 cm   84.2 cm    Chamber     eIoni
-    4  -1.57 m    22.5 cm   1.71 m     356 keV  95.6 keV    11 cm   95.3 cm    Chamber     eIoni
-    5  -1.58 m    17.9 cm   1.68 m     327 keV  28.8 keV  7.81 cm   1.03 m     Chamber     eIoni
-    6  -1.58 m    14.7 cm   1.72 m     285 keV  41.7 keV  6.88 cm    1.1 m     Chamber     eIoni
-    7  -1.58 m    17.3 cm   1.74 m     204 keV  19.1 keV  4.21 cm   1.14 m     Chamber     eIoni
-    8  -1.57 m    19.3 cm   1.73 m     183 keV  20.8 keV  3.32 cm   1.17 m     Chamber     eIoni
-    9  -1.58 m    17.9 cm   1.71 m     169 keV  13.9 keV   2.8 cm    1.2 m     Chamber     eIoni
-   10  -1.58 m    18.9 cm    1.7 m     115 keV  6.75 keV  1.82 cm   1.22 m     Chamber     eIoni
-   11  -1.57 m    19.6 cm    1.7 m     104 keV  10.5 keV  1.32 cm   1.23 m     Chamber     eIoni
-   12  -1.57 m    19.8 cm   1.69 m    91.4 keV  12.9 keV  1.13 cm   1.25 m     Chamber     eIoni
-   13  -1.58 m      20 cm   1.69 m    81.7 keV  9.75 keV  9.16 mm   1.25 m     Chamber     eIoni
-   14  -1.58 m    20.3 cm   1.69 m    77.9 keV  3.73 keV  7.69 mm   1.26 m     Chamber     eIoni
-   15  -1.58 m    20.7 cm   1.69 m    71.3 keV  6.65 keV  7.12 mm   1.27 m     Chamber     eIoni
-   16  -1.58 m    20.3 cm   1.69 m    63.3 keV  8.01 keV   6.2 mm   1.28 m     Chamber     eIoni
-   17  -1.58 m    20.1 cm   1.69 m      54 keV  9.31 keV  5.13 mm   1.28 m     Chamber     eIoni
-   18  -1.58 m    20.3 cm   1.69 m    49.3 keV  4.64 keV  4.02 mm   1.28 m     Chamber     eIoni
-   19  -1.58 m    20.2 cm   1.69 m    44.6 keV  4.74 keV  3.51 mm   1.29 m     Chamber     eIoni
-   20  -1.58 m    20.1 cm   1.69 m    40.4 keV  4.15 keV  3.01 mm   1.29 m     Chamber     eIoni
-   21  -1.58 m    20.1 cm   1.69 m    15.2 keV  25.2 keV  2.61 mm   1.29 m     Chamber     eIoni
-   22  -1.58 m    20.1 cm   1.69 m      13 keV  2.22 keV   767 mum  1.29 m     Chamber     eIoni
-   23  -1.58 m    20.1 cm   1.69 m    8.95 keV  4.03 keV   661 mum   1.3 m     Chamber     eIoni
-   24  -1.58 m    20.1 cm   1.69 m       0 eV   8.95 keV   489 mum   1.3 m     Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 377,   Parent ID = 374
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.58 m    18.9 cm    1.7 m    47.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.58 m    19.1 cm    1.7 m    40.2 keV  7.37 keV  3.32 mm   3.32 mm    Chamber     eIoni
-    2  -1.57 m      19 cm    1.7 m    37.3 keV   2.9 keV  2.59 mm   5.91 mm    Chamber     eIoni
-    3  -1.57 m    18.9 cm    1.7 m    34.3 keV  2.95 keV  2.32 mm   8.22 mm    Chamber     eIoni
-    4  -1.57 m    18.9 cm    1.7 m      26 keV   8.3 keV  2.06 mm   1.03 cm    Chamber     eIoni
-    5  -1.57 m    18.8 cm    1.7 m      17 keV  9.03 keV  1.42 mm   1.17 cm    Chamber     eIoni
-    6  -1.57 m    18.9 cm    1.7 m    12.8 keV  4.19 keV   858 mum  1.26 cm    Chamber     eIoni
-    7  -1.57 m    18.9 cm    1.7 m    10.5 keV  2.33 keV   652 mum  1.32 cm    Chamber     eIoni
-    8  -1.57 m    18.9 cm    1.7 m    8.89 keV  1.56 keV   550 mum  1.38 cm    Chamber     eIoni
-    9  -1.57 m    18.9 cm    1.7 m    8.03 keV   867 eV    487 mum  1.43 cm    Chamber     eIoni
-   10  -1.57 m    18.9 cm    1.7 m    7.06 keV   963 eV    452 mum  1.47 cm    Chamber     eIoni
-   11  -1.57 m    18.9 cm    1.7 m    5.47 keV  1.59 keV   414 mum  1.51 cm    Chamber     eIoni
-   12  -1.57 m    18.9 cm    1.7 m     518 eV   4.95 keV   350 mum  1.55 cm    Chamber     eIoni
-   13  -1.57 m    18.9 cm    1.7 m       0 eV    518 eV     22 mum  1.55 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 376,   Parent ID = 374
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.58 m    17.3 cm   1.74 m    62.2 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.58 m    16.9 cm   1.74 m    53.9 keV  8.28 keV     5 mm      5 mm    Chamber     eIoni
-    2  -1.58 m    16.9 cm   1.74 m    50.6 keV  3.36 keV  4.02 mm   9.02 mm    Chamber     eIoni
-    3  -1.58 m    17.1 cm   1.74 m    44.2 keV  6.42 keV  3.64 mm   1.27 cm    Chamber     eIoni
-    4  -1.58 m    17.1 cm   1.74 m    37.8 keV  6.33 keV  2.97 mm   1.56 cm    Chamber     eIoni
-    5  -1.58 m    17.2 cm   1.74 m    34.5 keV  3.33 keV  2.37 mm    1.8 cm    Chamber     eIoni
-    6  -1.58 m    17.1 cm   1.74 m    26.8 keV  7.67 keV  2.08 mm   2.01 cm    Chamber     eIoni
-    7  -1.58 m    17.1 cm   1.74 m    21.8 keV  5.01 keV  1.48 mm   2.15 cm    Chamber     eIoni
-    8  -1.58 m    17.1 cm   1.74 m    15.6 keV  6.21 keV  1.14 mm   2.27 cm    Chamber     eIoni
-    9  -1.58 m    17.1 cm   1.74 m    9.34 keV  6.26 keV   788 mum  2.35 cm    Chamber     eIoni
-   10  -1.58 m    17.1 cm   1.74 m    8.19 keV  1.15 keV   505 mum   2.4 cm    Chamber     eIoni
-   11  -1.58 m    17.1 cm   1.74 m     882 eV   7.31 keV   458 mum  2.44 cm    Chamber     eIoni
-   12  -1.58 m    17.1 cm   1.74 m       0 eV    882 eV   39.8 mum  2.45 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 375,   Parent ID = 374
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.62 m    17.1 cm    1.7 m    79.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -1.62 m    17.5 cm    1.7 m    71.4 keV  8.52 keV  7.42 mm   7.42 mm    Chamber     eIoni
-    2  -1.62 m    17.8 cm   1.71 m    52.7 keV  18.7 keV  6.21 mm   1.36 cm    Chamber     eIoni
-    3  -1.62 m    17.9 cm   1.71 m    47.1 keV  5.56 keV  3.86 mm   1.75 cm    Chamber     eIoni
-    4  -1.62 m    17.8 cm   1.71 m    43.3 keV  3.82 keV  3.28 mm   2.08 cm    Chamber     eIoni
-    5  -1.62 m    17.6 cm   1.71 m    40.8 keV   2.5 keV  2.88 mm   2.37 cm    Chamber     eIoni
-    6  -1.62 m    17.6 cm    1.7 m    36.5 keV  4.26 keV  2.64 mm   2.63 cm    Chamber     eIoni
-    7  -1.62 m    17.7 cm   1.71 m    31.3 keV  5.26 keV  2.25 mm   2.85 cm    Chamber     eIoni
-    8  -1.62 m    17.8 cm   1.71 m      29 keV  2.26 keV  1.81 mm   3.04 cm    Chamber     eIoni
-    9  -1.62 m    17.9 cm   1.71 m    24.7 keV  4.35 keV  1.64 mm    3.2 cm    Chamber     eIoni
-   10  -1.62 m    17.9 cm   1.71 m    19.8 keV  4.81 keV  1.32 mm   3.33 cm    Chamber     eIoni
-   11  -1.62 m    17.9 cm   1.71 m    17.8 keV  2.07 keV  1.02 mm   3.43 cm    Chamber     eIoni
-   12  -1.62 m    17.9 cm   1.71 m    9.81 keV  7.95 keV   901 mum  3.52 cm    Chamber     eIoni
-   13  -1.62 m    17.9 cm   1.71 m     6.3 keV  3.51 keV   523 mum  3.58 cm    Chamber     eIoni
-   14  -1.62 m    17.9 cm   1.71 m    3.44 keV  2.87 keV   384 mum  3.61 cm    Chamber     eIoni
-   15  -1.62 m    17.9 cm   1.71 m       0 eV   3.44 keV   241 mum  3.64 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 355,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    490 mum   370 mum -2.41 m     454 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -239 mum  1.54 mm   -2.4 m     454 keV     0 eV   6.18 mm   6.18 mm    TrackerTransportation
-    2  -9.72 cm   15.7 cm   -1.6 m     454 keV     0 eV   82.1 cm   82.7 cm    ChamberTransportation
-    3  -12.1 cm   19.6 cm   -1.4 m     454 keV     0 eV   20.5 cm   1.03 m     TrackerTransportation
-    4  -19.4 cm   31.3 cm    -80 cm    454 keV     0 eV   61.6 cm   1.65 m     ChamberTransportation
-    5  -21.8 cm   35.2 cm    -60 cm    454 keV     0 eV   20.5 cm   1.85 m     TrackerTransportation
-    6  -29.1 cm   46.9 cm      0 fm    454 keV     0 eV   61.6 cm   2.47 m     ChamberTransportation
-    7  -31.5 cm   50.8 cm     20 cm    454 keV     0 eV   20.5 cm   2.67 m     TrackerTransportation
-    8  -38.8 cm   62.5 cm     80 cm    454 keV     0 eV   61.6 cm   3.29 m     ChamberTransportation
-    9  -41.2 cm   66.4 cm      1 m     454 keV     0 eV   20.5 cm   3.49 m     TrackerTransportation
-   10  -48.5 cm   78.1 cm    1.6 m     454 keV     0 eV   61.6 cm   4.11 m     ChamberTransportation
-   11  -50.9 cm     82 cm    1.8 m     454 keV     0 eV   20.5 cm   4.32 m     TrackerTransportation
-   12  -58.2 cm   93.7 cm    2.4 m     454 keV     0 eV   61.6 cm   4.93 m     WorldPVTransportation
-   13  -64.4 cm   1.04 m    2.91 m     454 keV     0 eV   52.3 cm   5.45 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 354,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    493 mum   365 mum -2.41 m    2.94 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -340 mum  1.79 mm   -2.4 m    2.94 MeV     0 eV   6.27 mm   6.27 mm    TrackerTransportation
-    2    -11 cm     19 cm   -1.6 m    2.94 MeV     0 eV   82.9 cm   83.5 cm    ChamberTransportation
-    3  -13.8 cm   23.7 cm   -1.4 m    2.94 MeV     0 eV   20.7 cm   1.04 m     TrackerTransportation
-    4  -22.1 cm   37.8 cm    -80 cm   2.94 MeV     0 eV   62.2 cm   1.66 m     ChamberTransportation
-    5  -24.8 cm   42.5 cm    -60 cm   2.94 MeV     0 eV   20.7 cm   1.87 m     TrackerTransportation
-    6  -33.1 cm   56.6 cm      0 fm   2.94 MeV     0 eV   62.2 cm   2.49 m     ChamberTransportation
-    7  -35.8 cm   61.3 cm     20 cm   2.94 MeV     0 eV   20.7 cm    2.7 m     TrackerTransportation
-    8  -44.1 cm   75.4 cm     80 cm   2.94 MeV     0 eV   62.2 cm   3.32 m     ChamberTransportation
-    9  -46.8 cm   80.1 cm      1 m    2.94 MeV     0 eV   20.7 cm   3.53 m     TrackerTransportation
-   10  -55.1 cm   94.2 cm    1.6 m    2.94 MeV     0 eV   62.2 cm   4.15 m     ChamberTransportation
-   11  -57.8 cm   98.9 cm    1.8 m    2.94 MeV     0 eV   20.7 cm   4.36 m     TrackerTransportation
-   12  -66.1 cm   1.13 m     2.4 m    2.94 MeV     0 eV   62.2 cm   4.98 m     WorldPVTransportation
-   13  -73.1 cm   1.25 m    2.91 m    2.94 MeV     0 eV   52.9 cm   5.51 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 353,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    485 mum   449 mum -2.41 m     594 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   56.3 mum   779 mum  -2.4 m     594 keV     0 eV   7.37 mm   7.37 mm    TrackerTransportation
-    2  -4.27 cm   3.36 cm  -1.67 m     481 keV     0 eV   73.4 cm   74.1 cm    Tracker     compt
-    3    -10 cm   4.65 cm   -1.6 m     481 keV     0 eV      9 cm   83.1 cm    ChamberTransportation
-    4    -24 cm   7.79 cm  -1.44 m     481 keV     0 eV   21.8 cm   1.05 m     TrackerTransportation
-    5   -2.4 m    56.2 cm   1.11 m     481 keV     0 eV   3.38 m    4.43 m     WorldPVTransportation
-    6  -2.91 m    67.7 cm   1.72 m     481 keV     0 eV   79.7 cm   5.22 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 378,   Parent ID = 353
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -4.27 cm   3.36 cm  -1.67 m     114 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.23 cm   3.76 cm  -1.65 m     102 keV  11.9 keV   3.5 cm    3.5 cm    Tracker     eIoni
-    2   9.29 mm   4.76 cm  -1.64 m    90.8 keV    11 keV   2.9 cm   6.41 cm    Tracker     eIoni
-    3   1.93 cm   5.87 cm  -1.62 m    77.9 keV  12.9 keV  2.37 cm   8.78 cm    Tracker     eIoni
-    4   6.38 mm   5.25 cm  -1.63 m    70.8 keV  7.03 keV  1.82 cm   10.6 cm    Tracker     eIoni
-    5   -2.2 mm   4.14 cm  -1.64 m      58 keV  12.8 keV  1.55 cm   12.1 cm    Tracker     eIoni
-    6  -1.13 cm   3.88 cm  -1.64 m    50.6 keV  7.42 keV  1.09 cm   13.2 cm    Tracker     eIoni
-    7   -1.9 cm   3.92 cm  -1.64 m      41 keV  9.59 keV   8.6 mm   14.1 cm    Tracker     eIoni
-    8  -2.35 cm   3.64 cm  -1.64 m      38 keV  3.06 keV     6 mm   14.7 cm    Tracker     eIoni
-    9  -2.85 cm   3.63 cm  -1.64 m    35.3 keV  2.63 keV  5.25 mm   15.2 cm    Tracker     eIoni
-   10  -2.96 cm   3.59 cm  -1.64 m    26.4 keV   559 eV   1.87 mm   15.4 cm    Tracker     eIoni
-   11  -3.14 cm   3.48 cm  -1.64 m    23.7 keV  2.67 keV  2.88 mm   15.7 cm    Tracker     eIoni
-   12  -3.27 cm    3.4 cm  -1.65 m    21.8 keV  1.91 keV  2.44 mm   15.9 cm    Tracker     eIoni
-   13  -3.31 cm   3.34 cm  -1.65 m    19.2 keV  2.57 keV  2.14 mm   16.2 cm    Tracker     eIoni
-   14  -3.45 cm   3.33 cm  -1.65 m    16.6 keV  2.61 keV  1.78 mm   16.3 cm    Tracker     eIoni
-   15  -3.58 cm    3.3 cm  -1.65 m    14.3 keV  2.34 keV  1.44 mm   16.5 cm    Tracker     eIoni
-   16  -3.61 cm   3.24 cm  -1.65 m      13 keV  1.29 keV  1.17 mm   16.6 cm    Tracker     eIoni
-   17  -3.63 cm   3.19 cm  -1.65 m    12.4 keV   591 eV   1.04 mm   16.7 cm    Tracker     eIoni
-   18  -3.56 cm   3.13 cm  -1.65 m    11.2 keV  1.18 keV   985 mum  16.8 cm    Tracker     eIoni
-   19  -3.55 cm    3.1 cm  -1.65 m    9.39 keV  1.85 keV   876 mum  16.9 cm    Tracker     eIoni
-   20  -3.51 cm   3.07 cm  -1.65 m    7.78 keV  1.61 keV   720 mum    17 cm    Tracker     eIoni
-   21  -3.48 cm   3.02 cm  -1.65 m    6.72 keV  1.06 keV   599 mum    17 cm    Tracker     eIoni
-   22  -3.53 cm   2.99 cm  -1.65 m    4.21 keV  2.51 keV   526 mum  17.1 cm    Tracker     eIoni
-   23  -3.53 cm   2.97 cm  -1.65 m    1.36 keV  2.85 keV   367 mum  17.1 cm    Tracker     eIoni
-   24  -3.54 cm   2.97 cm  -1.65 m       0 eV   1.36 keV  92.7 mum  17.1 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 379,   Parent ID = 378
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.96 cm   3.59 cm  -1.64 m    8.36 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -2.91 cm   3.57 cm  -1.64 m    6.97 keV  1.39 keV   640 mum   640 mum   Tracker     eIoni
-    2   -2.9 cm   3.56 cm  -1.64 m    5.48 keV  1.49 keV   543 mum  1.18 mm    Tracker     eIoni
-    3  -2.87 cm   3.59 cm  -1.64 m    1.52 keV  3.97 keV   447 mum  1.63 mm    Tracker     eIoni
-    4  -2.87 cm    3.6 cm  -1.64 m       0 eV   1.52 keV   108 mum  1.74 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 352,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    511 mum   311 mum -2.41 m     442 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    482 mum   420 mum -2.41 m       0 eV    442 keV  1.02 mm   1.02 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 351,   Parent ID = 302
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    510 mum   305 mum -2.41 m    8.74 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    498 mum   382 mum -2.41 m       0 eV   7.72 MeV  1.28 mm   1.28 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 380,   Parent ID = 351
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    498 mum   382 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1    498 mum   382 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 382,   Parent ID = 380
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    498 mum   382 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -139 mum  5.58 mm   -2.4 m       0 eV     88 keV  6.67 mm   6.67 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 383,   Parent ID = 382
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -139 mum  5.58 mm   -2.4 m     423 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -141 mum   5.6 mm   -2.4 m       0 eV    423 keV   230 mum   230 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 381,   Parent ID = 380
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    498 mum   382 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    541 mum  32.4 mum -2.41 m       0 eV    511 keV   449 mum   449 mum  TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 100,   Parent ID = 4
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.24 mum -2.78 mum -2.41 m    4.07 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   16.9 mum  41.4 mum  -2.4 m    4.07 MeV     0 eV   1.38 cm   1.38 cm    TrackerTransportation
-    2   1.13 mm    2.6 mm   -1.6 m    4.07 MeV     0 eV     80 cm   81.4 cm    ChamberTransportation
-    3    1.4 mm   3.24 mm   -1.4 m    4.07 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   2.24 mm   5.16 mm    -80 cm   4.07 MeV     0 eV     60 cm   1.61 m     ChamberTransportation
-    5   2.51 mm    5.8 mm    -60 cm   4.07 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   3.35 mm   7.72 mm      0 fm   4.07 MeV     0 eV     60 cm   2.41 m     ChamberTransportation
-    7   3.62 mm   8.36 mm     20 cm   4.07 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   4.46 mm   1.03 cm     80 cm   4.07 MeV     0 eV     60 cm   3.21 m     ChamberTransportation
-    9   4.73 mm   1.09 cm      1 m    4.07 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   5.57 mm   1.28 cm    1.6 m    4.07 MeV     0 eV     60 cm   4.01 m     ChamberTransportation
-   11   5.84 mm   1.35 cm    1.8 m    4.07 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   6.68 mm   1.54 cm    2.4 m    4.07 MeV     0 eV     60 cm   4.81 m     WorldPVTransportation
-   13   7.38 mm    1.7 cm   2.91 m    4.07 MeV     0 eV     51 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 3,   Parent ID = 1
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.3 nm   -850 nm  -2.42 m     441 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.04 mum  8.08 mum -2.42 m     439 MeV   258 keV   218 mum   218 mum  TargetPV     eBrem
-    2  -5.83 mum  13.8 mum -2.42 m     236 MeV   180 keV   139 mum   357 mum  TargetPV     eBrem
-    3  -7.71 mum  19.8 mum -2.42 m     220 MeV   330 keV   155 mum   513 mum  TargetPV     eBrem
-    4  -9.51 mum  36.2 mum -2.42 m    46.2 MeV   391 keV   286 mum   799 mum  TargetPV     eBrem
-    5   2.57 mum  53.1 mum -2.42 m    13.7 MeV   306 keV   262 mum  1.06 mm   TargetPV     eBrem
-    6    179 mum  -656 mum -2.42 m    8.31 MeV  4.31 MeV  1.61 mm   2.68 mm   TargetPV     eBrem
-    7    530 mum -1.82 mm  -2.42 m    6.61 MeV   1.7 MeV  1.52 mm    4.2 mm   TargetPV     eIoni
-    8    1.3 mm   -1.7 mm  -2.41 m    3.63 MeV  2.98 MeV  1.29 mm   5.49 mm   TargetPV     eIoni
-    9   1.28 mm  -1.66 mm  -2.41 m    2.56 MeV  53.4 keV  51.6 mum  5.54 mm   TargetPV     eBrem
-   10   1.11 mm  -1.28 mm  -2.41 m    1.81 MeV   757 keV   694 mum  6.23 mm   TargetPV     eIoni
-   11   1.05 mm  -1.48 mm  -2.41 m    1.27 MeV   532 keV   567 mum   6.8 mm   TargetPV     eIoni
-   12    870 mum -1.47 mm  -2.41 m     738 keV   537 keV   470 mum  7.27 mm   TargetPV     eIoni
-   13    923 mum -1.49 mm  -2.41 m     345 keV   393 keV   350 mum  7.62 mm   TargetPV     eIoni
-   14    932 mum -1.49 mm  -2.41 m       0 eV    345 keV   177 mum   7.8 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 390,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.28 mm  -1.66 mm  -2.41 m    1.02 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   4.03 mm    947 mum -2.42 m     454 keV   562 keV  4.92 mm   4.92 mm   TargetPV     compt
-    2   5.99 mm   3.26 mm  -2.42 m       0 eV    454 keV  3.43 mm   8.35 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 389,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    179 mum  -656 mum -2.42 m    1.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.26 mm  -6.25 mm  -2.41 m     243 keV   842 keV  1.18 cm   1.18 cm   TargetPV     compt
-    2   1.63 mm  -5.78 mm  -2.41 m       0 eV    243 keV   817 mum  1.26 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 388,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.57 mum  53.1 mum -2.42 m    32.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -127 mum  4.51 mum -2.41 m       0 eV      0 eV   1.04 cm   1.04 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 392,   Parent ID = 388
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -127 mum  4.51 mum -2.41 m    2.72 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -461 mum  -175 mum -2.41 m    1.95 MeV   771 keV   732 mum   732 mum  TargetPV     eIoni
-    2   -351 mum  -526 mum -2.41 m    1.14 MeV   805 keV   601 mum  1.33 mm   TargetPV     eIoni
-    3   -275 mum  -588 mum -2.41 m     659 keV   156 keV   159 mum  1.49 mm   TargetPV     eBrem
-    4   -219 mum  -615 mum -2.41 m    77.2 keV   582 keV   331 mum  1.82 mm   TargetPV     eIoni
-    5   -222 mum  -616 mum -2.41 m       0 eV   77.2 keV  16.5 mum  1.84 mm   TargetPV     eIoni
-    6   -222 mum  -616 mum -2.41 m       0 eV      0 eV      0 fm   1.84 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 395,   Parent ID = 392
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -222 mum  -616 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   6.67 mm  -2.72 mm  -2.41 m     273 keV   238 keV  7.61 mm   7.61 mm   TargetPV     compt
-    2    6.2 mm     -3 mm  -2.41 m       0 eV    273 keV  1.98 mm   9.59 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 394,   Parent ID = 392
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -222 mum  -616 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.11 cm   2.69 mm   -2.4 m       0 eV    511 keV   1.2 cm    1.2 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 393,   Parent ID = 392
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -275 mum  -588 mum -2.41 m     326 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    357 mum  -834 mum -2.41 m       0 eV    326 keV  1.15 mm   1.15 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 391,   Parent ID = 388
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -127 mum  4.51 mum -2.41 m    28.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   32.7 mum  -132 mum -2.41 m    5.05 MeV   1.6 MeV  1.28 mm   1.28 mm   TargetPV     eBrem
-    2   -426 mum  -130 mum -2.41 m    2.61 MeV  2.44 MeV  1.07 mm   2.35 mm   TargetPV     eIoni
-    3   -187 mum  -317 mum -2.41 m    1.67 MeV   939 keV   701 mum  3.05 mm   TargetPV     eIoni
-    4   -311 mum  -397 mum -2.41 m    1.05 MeV   620 keV   543 mum  3.59 mm   TargetPV     eIoni
-    5   -211 mum  -483 mum -2.41 m     499 keV   550 keV   424 mum  4.02 mm   TargetPV     eIoni
-    6   -199 mum  -456 mum -2.41 m    61.3 keV   437 keV   269 mum  4.28 mm   TargetPV     eIoni
-    7   -198 mum  -456 mum -2.41 m       0 eV   61.3 keV  12.5 mum   4.3 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 396,   Parent ID = 391
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   32.7 mum  -132 mum -2.41 m    21.8 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    709 mum  86.7 mum  -2.4 m    21.8 MeV     0 eV   5.92 mm   5.92 mm    TrackerTransportation
-    2   9.27 cm   2.98 cm   -1.6 m    21.8 MeV     0 eV   80.6 cm   81.2 cm    ChamberTransportation
-    3   11.6 cm   3.72 cm   -1.4 m    21.8 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   18.5 cm   5.95 cm    -80 cm   21.8 MeV     0 eV   60.4 cm   1.62 m     ChamberTransportation
-    5   20.8 cm   6.69 cm    -60 cm   21.8 MeV     0 eV   20.1 cm   1.82 m     TrackerTransportation
-    6   27.7 cm   8.92 cm      0 fm   21.8 MeV     0 eV   60.4 cm   2.42 m     ChamberTransportation
-    7     30 cm   9.67 cm     20 cm   21.8 MeV     0 eV   20.1 cm   2.62 m     TrackerTransportation
-    8   36.9 cm   11.9 cm     80 cm   21.8 MeV     0 eV   60.4 cm   3.23 m     ChamberTransportation
-    9   39.2 cm   12.6 cm      1 m    21.8 MeV     0 eV   20.1 cm   3.43 m     TrackerTransportation
-   10   46.1 cm   14.9 cm    1.6 m    21.8 MeV     0 eV   60.4 cm   4.04 m     ChamberTransportation
-   11   48.4 cm   15.6 cm    1.8 m    21.8 MeV     0 eV   20.1 cm   4.24 m     TrackerTransportation
-   12   55.3 cm   17.8 cm    2.4 m    21.8 MeV     0 eV   60.4 cm   4.84 m     WorldPVTransportation
-   13   61.2 cm   19.7 cm   2.91 m    21.8 MeV     0 eV   51.4 cm   5.35 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 387,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -9.51 mum  36.2 mum -2.42 m     174 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -27 mum   222 mum -2.41 m       0 eV      0 eV    4.8 mm    4.8 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 398,   Parent ID = 387
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -27 mum   222 mum -2.41 m    59.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -35.4 mum   258 mum -2.41 m    58.6 MeV   512 keV   434 mum   434 mum  TargetPV     eBrem
-    2  -51.2 mum   267 mum -2.41 m    49.4 MeV   238 keV   241 mum   675 mum  TargetPV     eBrem
-    3   -220 mum   205 mum -2.41 m    44.8 MeV  1.71 MeV  1.41 mm   2.08 mm   TargetPV     eBrem
-    4   -604 mum   213 mum -2.41 m    38.9 MeV  1.84 MeV   1.1 mm   3.18 mm   TargetPV     eBrem
-    5   -652 mum   224 mum -2.41 m    37.8 MeV   153 keV   133 mum  3.32 mm   TargetPV     eBrem
-    6   -981 mum   259 mum -2.41 m    34.4 MeV  1.96 MeV   740 mum  4.06 mm   TargetPV     eBrem
-    7  -1.98 mm    487 mum -2.41 m    6.11 MeV  2.64 MeV  2.13 mm   6.18 mm   TargetPV     eBrem
-    8  -2.12 mm    567 mum -2.41 m    5.22 MeV   528 keV   287 mum  6.47 mm   TargetPV     eBrem
-    9  -2.27 mm    180 mum -2.41 m       4 MeV   489 keV   470 mum  6.94 mm   TargetPV     eBrem
-   10  -3.03 mm    139 mum -2.41 m    3.04 MeV   953 keV   936 mum  7.87 mm   TargetPV     eIoni
-   11  -3.23 mm    472 mum -2.41 m    1.51 MeV   738 keV   618 mum  8.49 mm   TargetPV     eBrem
-   12  -3.47 mm    646 mum -2.41 m     997 keV   516 keV   523 mum  9.01 mm   TargetPV     eIoni
-   13  -3.33 mm    525 mum -2.41 m     560 keV   437 keV   418 mum  9.43 mm   TargetPV     eIoni
-   14  -3.28 mm    554 mum -2.41 m     113 keV   447 keV   297 mum  9.73 mm   TargetPV     eIoni
-   15  -3.28 mm    552 mum -2.41 m       0 eV    113 keV  31.2 mum  9.76 mm   TargetPV     eIoni
-   16  -3.28 mm    552 mum -2.41 m       0 eV      0 eV      0 fm   9.76 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 410,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.28 mm    552 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -2.96 mm    484 mum -2.41 m     447 keV  63.7 keV  3.94 mm   3.94 mm   TargetPV     compt
-    2  -2.95 mm   -1.6 mm  -2.41 m     186 keV   261 keV  3.97 mm   7.91 mm   TargetPV     compt
-    3  -2.82 mm  -1.34 mm  -2.41 m     108 keV  78.3 keV   288 mum  8.19 mm   TargetPV     compt
-    4  -2.88 mm  -1.44 mm  -2.41 m       0 eV    108 keV   120 mum  8.31 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 409,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.28 mm    552 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.44 mm    587 mum  -2.4 m       0 eV    511 keV  2.08 mm   2.08 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 408,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.23 mm    472 mum -2.41 m     793 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -5.15 mm   1.01 cm  -2.41 m       0 eV    793 keV  1.06 cm   1.06 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 407,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.27 mm    180 mum -2.41 m     737 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -3.95 mm    107 mum  -2.4 m     277 keV   460 keV  2.89 mm   2.89 mm   TargetPV     compt
-    2  -3.79 mm  -77.8 mum  -2.4 m     223 keV  54.6 keV   251 mum  3.14 mm   TargetPV     compt
-    3  -3.99 mm   -667 mum  -2.4 m     136 keV    87 keV   636 mum  3.78 mm   TargetPV     compt
-    4  -4.47 mm   -163 mum  -2.4 m       0 eV    136 keV   701 mum  4.48 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 406,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.12 mm    567 mum -2.41 m     364 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.99 mm  -1.33 mm  -2.41 m     196 keV   168 keV  3.66 mm   3.66 mm   TargetPV     compt
-    2   -4.5 mm   -308 mum  -2.4 m       0 eV    196 keV  1.91 mm   5.57 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 405,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.98 mm    487 mum -2.41 m    25.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -6.17 mm    313 mum  -2.4 m    25.7 MeV     0 eV   8.43 mm   8.43 mm    TrackerTransportation
-    2   -2.4 m   -9.87 cm   1.78 m    25.7 MeV     0 eV   4.82 m    4.83 m     WorldPVTransportation
-    3  -2.91 m     -12 cm   2.67 m    25.7 MeV     0 eV   1.03 m    5.85 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 404,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -981 mum   259 mum -2.41 m    1.36 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.81 mm    277 mum -2.41 m     260 keV   1.1 MeV  2.51 mm   2.51 mm   TargetPV     compt
-    2  -1.93 mm    161 mum -2.41 m     144 keV   116 keV   271 mum  2.78 mm   TargetPV     compt
-    3  -1.95 mm    122 mum -2.41 m       0 eV    144 keV   150 mum  2.93 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 403,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -652 mum   224 mum -2.41 m    1.03 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.19 mm    461 mum  -2.4 m    1.03 MeV     0 eV   1.04 cm   1.04 cm    TrackerTransportation
-    2  -58.1 cm    3.9 cm    -80 cm   1.03 MeV     0 eV    1.7 m    1.71 m     ChamberTransportation
-    3  -65.3 cm   4.39 cm    -60 cm   1.03 MeV     0 eV   21.3 cm   1.92 m     TrackerTransportation
-    4    -87 cm   5.83 cm      0 fm   1.03 MeV     0 eV   63.8 cm   2.56 m     ChamberTransportation
-    5  -94.2 cm   6.32 cm     20 cm   1.03 MeV     0 eV   21.3 cm   2.78 m     TrackerTransportation
-    6  -1.16 m    7.76 cm     80 cm   1.03 MeV     0 eV   63.8 cm   3.41 m     ChamberTransportation
-    7  -1.23 m    8.25 cm      1 m    1.03 MeV     0 eV   21.3 cm   3.63 m     TrackerTransportation
-    8  -1.45 m    9.69 cm    1.6 m    1.03 MeV     0 eV   63.8 cm   4.26 m     ChamberTransportation
-    9  -1.52 m    10.2 cm    1.8 m    1.03 MeV     0 eV   21.3 cm   4.48 m     TrackerTransportation
-   10  -1.74 m    11.6 cm    2.4 m    1.03 MeV     0 eV   63.8 cm   5.11 m     WorldPVTransportation
-   11  -1.92 m    12.9 cm   2.91 m    1.03 MeV     0 eV   54.2 cm   5.66 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 402,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -604 mum   213 mum -2.41 m    3.98 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -4.56 mm    675 mum  -2.4 m    3.98 MeV     0 eV   1.07 cm   1.07 cm    TrackerTransportation
-    2  -64.2 cm   7.51 cm    -80 cm   3.98 MeV     0 eV   1.72 m    1.73 m     ChamberTransportation
-    3  -67.2 cm   7.87 cm  -72.5 cm   3.98 MeV     0 eV   8.12 cm   1.82 m     TrackerTransportation
-    4  -96.1 cm   11.2 cm      0 fm   3.98 MeV     0 eV   78.1 cm    2.6 m     ChamberTransportation
-    5  -1.04 m    12.2 cm     20 cm   3.98 MeV     0 eV   21.5 cm   2.81 m     TrackerTransportation
-    6  -1.28 m      15 cm     80 cm   3.98 MeV     0 eV   64.6 cm   3.46 m     ChamberTransportation
-    7  -1.36 m    15.9 cm      1 m    3.98 MeV     0 eV   21.5 cm   3.67 m     TrackerTransportation
-    8   -1.6 m    18.7 cm    1.6 m    3.98 MeV     0 eV   64.6 cm   4.32 m     ChamberTransportation
-    9  -1.68 m    19.6 cm    1.8 m    3.98 MeV     0 eV   21.5 cm   4.54 m     TrackerTransportation
-   10  -1.92 m    22.4 cm    2.4 m    3.98 MeV     0 eV   64.6 cm   5.18 m     WorldPVTransportation
-   11  -2.12 m    24.8 cm   2.91 m    3.98 MeV     0 eV   54.9 cm   5.73 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 401,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -220 mum   205 mum -2.41 m    2.96 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -3.3 mm   1.13 mm   -2.4 m    2.96 MeV     0 eV   1.14 cm   1.14 cm    TrackerTransportation
-    2  -22.8 cm   6.85 cm   -1.6 m    2.96 MeV     0 eV   83.4 cm   84.5 cm    ChamberTransportation
-    3    -24 cm    7.2 cm  -1.56 m    2.96 MeV     0 eV   4.29 cm   88.8 cm    TrackerTransportation
-    4  -45.4 cm   13.6 cm    -80 cm   2.96 MeV     0 eV   79.1 cm   1.68 m     ChamberTransportation
-    5    -51 cm   15.3 cm    -60 cm   2.96 MeV     0 eV   20.8 cm   1.89 m     TrackerTransportation
-    6  -67.9 cm   20.3 cm      0 fm   2.96 MeV     0 eV   62.5 cm   2.51 m     ChamberTransportation
-    7  -73.5 cm     22 cm     20 cm   2.96 MeV     0 eV   20.8 cm   2.72 m     TrackerTransportation
-    8  -90.4 cm   27.1 cm     80 cm   2.96 MeV     0 eV   62.5 cm   3.35 m     ChamberTransportation
-    9    -96 cm   28.8 cm      1 m    2.96 MeV     0 eV   20.8 cm   3.56 m     TrackerTransportation
-   10  -1.13 m    33.8 cm    1.6 m    2.96 MeV     0 eV   62.5 cm   4.18 m     ChamberTransportation
-   11  -1.19 m    35.5 cm    1.8 m    2.96 MeV     0 eV   20.8 cm   4.39 m     TrackerTransportation
-   12  -1.35 m    40.6 cm    2.4 m    2.96 MeV     0 eV   62.5 cm   5.01 m     WorldPVTransportation
-   13   -1.5 m    44.9 cm   2.91 m    2.96 MeV     0 eV   53.2 cm   5.55 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 400,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -51.2 mum   267 mum -2.41 m     8.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -580 mum   466 mum -2.41 m    1.29 MeV  7.61 MeV  3.87 mm   3.87 mm   TargetPV     compt
-    2   6.15 mm   4.84 mm   -2.4 m    1.29 MeV     0 eV   1.17 cm   1.56 cm    TrackerTransportation
-    3    2.4 m    1.56 m    63.3 cm   1.29 MeV     0 eV   4.17 m    4.18 m     WorldPVTransportation
-    4   2.91 m    1.89 m    1.28 m    1.29 MeV     0 eV   88.8 cm   5.07 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 399,   Parent ID = 398
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -35.4 mum   258 mum -2.41 m     506 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -338 mum   327 mum -2.41 m       0 eV    506 keV  3.22 mm   3.22 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 397,   Parent ID = 387
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -27 mum   222 mum -2.41 m     113 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    -48 mum   242 mum -2.41 m     112 MeV   784 keV   581 mum   581 mum  TargetPV     eBrem
-    2  -38.9 mum   248 mum -2.41 m     109 MeV   233 keV   184 mum   765 mum  TargetPV     eBrem
-    3   6.04 mum   269 mum -2.41 m     107 MeV  1.89 MeV  1.06 mm   1.82 mm   TargetPV     eBrem
-    4    140 mum   240 mum -2.41 m    95.9 MeV  1.68 MeV  1.26 mm   3.08 mm   TargetPV     eBrem
-    5    159 mum   215 mum -2.41 m    81.6 MeV   446 keV   426 mum   3.5 mm   TargetPV     eBrem
-    6    160 mum   212 mum -2.41 m    81.2 MeV  28.8 keV  27.4 mum  3.53 mm   TargetPV     eBrem
-    7    164 mum   199 mum -2.41 m    80.7 MeV   112 keV  92.1 mum  3.62 mm   TargetPV     eBrem
-    8    184 mum   164 mum -2.41 m    77.3 MeV   384 keV   253 mum  3.88 mm   TargetPV     eBrem
-    9    183 mum   152 mum -2.41 m    74.2 MeV  77.1 keV  62.1 mum  3.94 mm   TargetPV     eBrem
-   10    183 mum   144 mum -2.41 m    71.8 MeV    88 keV  42.6 mum  3.98 mm   TargetPV     eBrem
-   11    218 mum  -118 mum -2.41 m    56.7 MeV  1.71 MeV  1.06 mm   5.04 mm   TargetPV     eBrem
-   12    528 mum -1.08 mm  -2.41 m    48.1 MeV  3.76 MeV  2.93 mm   7.98 mm   TargetPV     eBrem
-   13    195 mum -1.44 mm   -2.4 m    42.4 MeV  3.67 MeV  2.65 mm   1.06 cm   TargetPV     eBrem
-   14    191 mum -1.47 mm   -2.4 m    32.4 MeV  76.6 keV  44.4 mum  1.07 cm   TargetPV     eBrem
-   15    182 mum -1.63 mm   -2.4 m    31.2 MeV   295 keV   220 mum  1.09 cm   TargetPV     eBrem
-   16    164 mum -1.68 mm   -2.4 m    27.7 MeV   142 keV  87.2 mum   1.1 cm   TargetPV     eBrem
-   17    113 mum  -1.9 mm   -2.4 m    26.9 MeV   480 keV   330 mum  1.13 cm   TargetPV     eBrem
-   18   7.17 mum -2.44 mm   -2.4 m    14.6 MeV   858 keV   740 mum   1.2 cm   TargetPV     eBrem
-   19  -14.1 mum -2.54 mm   -2.4 m    14.1 MeV   143 keV   123 mum  1.22 cm   TargetPV     eBrem
-   20  -14.7 mum -2.54 mm   -2.4 m    12.9 MeV  1.31 keV  2.21 mum  1.22 cm   TargetPV     eBrem
-   21   -405 mum -3.44 mm   -2.4 m      10 MeV  2.93 MeV  2.13 mm   1.43 cm   TargetPV     eIoni
-   22   -523 mum -3.58 mm   -2.4 m    9.76 MeV   239 keV   231 mum  1.45 cm    TrackerTransportation
-   23  -18.4 cm  -17.8 cm  -2.29 m     9.7 MeV  49.5 keV  27.6 cm     29 cm    Tracker     eIoni
-   24  -87.5 cm  -61.3 cm  -1.88 m    9.52 MeV   170 keV  91.3 cm    1.2 m     Tracker     eIoni
-   25  -1.44 m   -1.05 m   -1.46 m    9.36 MeV   145 keV    83 cm   2.03 m     Tracker     eIoni
-   26  -1.72 m   -1.26 m   -1.25 m    9.24 MeV  74.7 keV  41.1 cm   2.44 m     Tracker     eIoni
-   27  -1.75 m   -1.28 m   -1.24 m    9.16 MeV  6.14 keV  3.61 cm   2.48 m     Tracker     eIoni
-   28   -2.4 m   -1.82 m   -78.4 cm   8.97 MeV   186 keV  96.3 cm   3.44 m     WorldPVTransportation
-   29   -2.4 m   -1.82 m   -78.3 cm   8.94 MeV   135 eV    1.4 mm   3.45 m     WorldPV     eIoni
-   30  -2.91 m   -2.48 m   -27.2 cm   8.77 MeV   177 keV  97.9 cm   4.42 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 436,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -2.4 m   -1.82 m   -78.3 cm   28.5 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   -2.4 m   -1.82 m   -78.3 cm   28.2 keV   312 eV    972 mum   972 mum   TrackerTransportation
-    2   -2.4 m   -1.83 m   -78.2 cm   25.1 keV  3.02 keV   3.2 mm   4.18 mm    Tracker     eIoni
-    3   -2.4 m   -1.83 m   -78.1 cm   22.3 keV  2.85 keV  2.66 mm   6.83 mm    Tracker     eIoni
-    4  -2.39 m   -1.83 m   -77.9 cm   20.1 keV  2.21 keV  2.21 mm   9.05 mm    Tracker     eIoni
-    5  -2.39 m   -1.83 m   -77.7 cm   17.9 keV  2.19 keV  1.89 mm   1.09 cm    Tracker     eIoni
-    6  -2.39 m   -1.83 m   -77.7 cm   14.7 keV   3.2 keV   1.6 mm   1.25 cm    Tracker     eIoni
-    7  -2.39 m   -1.83 m   -77.6 cm   12.9 keV   1.8 keV  1.22 mm   1.37 cm    Tracker     eIoni
-    8  -2.39 m   -1.83 m   -77.6 cm   11.5 keV  1.45 keV  1.03 mm   1.48 cm    Tracker     eIoni
-    9  -2.39 m   -1.83 m   -77.6 cm   8.62 keV  2.84 keV   896 mum  1.57 cm    Tracker     eIoni
-   10  -2.39 m   -1.83 m   -77.7 cm    5.8 keV  2.82 keV   660 mum  1.63 cm    Tracker     eIoni
-   11  -2.39 m   -1.83 m   -77.7 cm   4.51 keV  1.29 keV   466 mum  1.68 cm    Tracker     eIoni
-   12  -2.39 m   -1.83 m   -77.7 cm   2.36 keV  2.15 keV   386 mum  1.72 cm    Tracker     eIoni
-   13  -2.39 m   -1.83 m   -77.7 cm      0 eV   2.36 keV   209 mum  1.74 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 435,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.75 m   -1.28 m   -1.24 m    78.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.76 m   -1.27 m   -1.23 m    71.3 keV  7.07 keV  1.84 cm   1.84 cm    Tracker     eIoni
-    2  -1.76 m   -1.25 m   -1.23 m    54.6 keV  16.7 keV  1.56 cm    3.4 cm    Tracker     eIoni
-    3  -1.77 m   -1.25 m   -1.23 m    47.4 keV  7.18 keV  9.81 mm   4.38 cm    Tracker     eIoni
-    4  -1.77 m   -1.24 m   -1.23 m    42.8 keV  4.66 keV   7.7 mm   5.15 cm    Tracker     eIoni
-    5  -1.78 m   -1.24 m   -1.23 m    39.7 keV  3.03 keV  6.42 mm    5.8 cm    Tracker     eIoni
-    6  -1.78 m   -1.23 m   -1.22 m    36.7 keV  3.06 keV  5.68 mm   6.36 cm    Tracker     eIoni
-    7  -1.78 m   -1.23 m   -1.22 m    32.5 keV   4.2 keV  4.94 mm   6.86 cm    Tracker     eIoni
-    8  -1.78 m   -1.23 m   -1.22 m    27.5 keV  4.98 keV  4.05 mm   7.26 cm    Tracker     eIoni
-    9  -1.78 m   -1.22 m   -1.22 m    25.2 keV  2.33 keV  3.08 mm   7.57 cm    Tracker     eIoni
-   10  -1.79 m   -1.22 m   -1.22 m    20.3 keV   4.9 keV  2.66 mm   7.84 cm    Tracker     eIoni
-   11  -1.79 m   -1.22 m   -1.22 m    18.2 keV  2.09 keV  1.91 mm   8.03 cm    Tracker     eIoni
-   12  -1.79 m   -1.22 m   -1.22 m    16.9 keV  1.25 keV  1.63 mm   8.19 cm    Tracker     eIoni
-   13  -1.79 m   -1.22 m   -1.22 m    15.3 keV  1.59 keV  1.47 mm   8.34 cm    Tracker     eIoni
-   14  -1.79 m   -1.22 m   -1.22 m    13.1 keV  2.21 keV  1.29 mm   8.47 cm    Tracker     eIoni
-   15  -1.79 m   -1.22 m   -1.22 m    12.3 keV   813 eV   1.05 mm   8.57 cm    Tracker     eIoni
-   16  -1.79 m   -1.22 m   -1.22 m    10.9 keV  1.37 keV   973 mum  8.67 cm    Tracker     eIoni
-   17  -1.79 m   -1.22 m   -1.22 m    9.75 keV  1.18 keV   849 mum  8.75 cm    Tracker     eIoni
-   18  -1.79 m   -1.22 m   -1.22 m    7.56 keV  2.19 keV   748 mum  8.83 cm    Tracker     eIoni
-   19  -1.79 m   -1.22 m   -1.22 m    5.42 keV  2.15 keV   584 mum  8.89 cm    Tracker     eIoni
-   20  -1.79 m   -1.22 m   -1.22 m    3.59 keV  1.82 keV   443 mum  8.93 cm    Tracker     eIoni
-   21  -1.79 m   -1.22 m   -1.22 m     2.2 keV  1.39 keV   324 mum  8.96 cm    Tracker     eIoni
-   22  -1.79 m   -1.22 m   -1.22 m       0 eV    2.2 keV   188 mum  8.98 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 434,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.72 m   -1.26 m   -1.25 m    43.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.73 m   -1.26 m   -1.25 m    38.3 keV  5.17 keV  6.58 mm   6.58 mm    Tracker     eIoni
-    2  -1.73 m   -1.26 m   -1.26 m    32.1 keV  6.15 keV  5.33 mm   1.19 cm    Tracker     eIoni
-    3  -1.73 m   -1.26 m   -1.26 m    27.6 keV   4.5 keV  3.97 mm   1.59 cm    Tracker     eIoni
-    4  -1.73 m   -1.26 m   -1.26 m    24.2 keV  3.37 keV   3.1 mm    1.9 cm    Tracker     eIoni
-    5  -1.73 m   -1.25 m   -1.26 m      21 keV  3.26 keV  2.51 mm   2.15 cm    Tracker     eIoni
-    6  -1.73 m   -1.25 m   -1.26 m    18.9 keV  2.04 keV  2.01 mm   2.35 cm    Tracker     eIoni
-    7  -1.73 m   -1.25 m   -1.26 m    15.8 keV  3.14 keV  1.73 mm   2.52 cm    Tracker     eIoni
-    8  -1.74 m   -1.25 m   -1.26 m    10.3 keV  5.52 keV  1.34 mm   2.66 cm    Tracker     eIoni
-    9  -1.74 m   -1.25 m   -1.26 m     9.2 keV  1.08 keV   792 mum  2.74 cm    Tracker     eIoni
-   10  -1.74 m   -1.25 m   -1.26 m    1.68 keV  7.52 keV   705 mum  2.81 cm    Tracker     eIoni
-   11  -1.74 m   -1.25 m   -1.26 m       0 eV   1.68 keV   125 mum  2.82 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 433,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.44 m   -1.05 m   -1.46 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -1.44 m   -1.05 m   -1.46 m    9.08 keV  1.02 keV   777 mum   777 mum   Tracker     eIoni
-    2  -1.44 m   -1.05 m   -1.46 m    8.14 keV   947 eV    696 mum  1.47 mm    Tracker     eIoni
-    3  -1.44 m   -1.05 m   -1.46 m    7.03 keV   1.1 keV   624 mum   2.1 mm    Tracker     eIoni
-    4  -1.44 m   -1.05 m   -1.46 m     5.8 keV  1.24 keV   547 mum  2.64 mm    Tracker     eIoni
-    5  -1.44 m   -1.05 m   -1.46 m    2.98 keV  2.82 keV   466 mum  3.11 mm    Tracker     eIoni
-    6  -1.44 m   -1.05 m   -1.46 m       0 eV   2.98 keV   275 mum  3.39 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 432,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -87.5 cm  -61.3 cm  -1.88 m    13.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -87.5 cm  -61.4 cm  -1.88 m    11.4 keV  1.85 keV  1.06 mm   1.06 mm    Tracker     eIoni
-    2  -87.4 cm  -61.4 cm  -1.89 m    9.44 keV  1.91 keV   886 mum  1.95 mm    Tracker     eIoni
-    3  -87.3 cm  -61.5 cm  -1.89 m    8.09 keV  1.35 keV   724 mum  2.67 mm    Tracker     eIoni
-    4  -87.3 cm  -61.4 cm  -1.89 m    6.56 keV  1.54 keV   621 mum  3.29 mm    Tracker     eIoni
-    5  -87.3 cm  -61.4 cm  -1.89 m    5.44 keV  1.11 keV   516 mum  3.81 mm    Tracker     eIoni
-    6  -87.3 cm  -61.4 cm  -1.89 m     511 eV   4.93 keV   445 mum  4.25 mm    Tracker     eIoni
-    7  -87.3 cm  -61.4 cm  -1.89 m       0 eV    511 eV   28.4 mum  4.28 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 431,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -18.4 cm  -17.8 cm  -2.29 m    8.21 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1  -18.4 cm  -17.8 cm  -2.29 m    6.71 keV   1.5 keV   629 mum   629 mum   Tracker     eIoni
-    2  -18.4 cm  -17.9 cm  -2.29 m    5.14 keV  1.57 keV   526 mum  1.15 mm    Tracker     eIoni
-    3  -18.4 cm  -17.9 cm  -2.29 m    3.31 keV  1.83 keV   426 mum  1.58 mm    Tracker     eIoni
-    4  -18.4 cm  -17.9 cm  -2.29 m    2.06 keV  1.25 keV   302 mum  1.88 mm    Tracker     eIoni
-    5  -18.4 cm  -17.9 cm  -2.29 m       0 eV   2.06 keV   170 mum  2.05 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 430,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.7 mum -2.54 mm   -2.4 m    1.21 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -903 mum -4.64 mm   -2.4 m    1.21 MeV     0 eV   2.83 mm   2.83 mm    TrackerTransportation
-    2  -1.01 m    -2.4 m     -48 cm   1.21 MeV     0 eV   3.23 m    3.24 m     WorldPVTransportation
-    3  -1.23 m   -2.91 m   -7.09 cm   1.21 MeV     0 eV   68.8 cm   3.92 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 429,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -14.1 mum -2.54 mm   -2.4 m     316 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -126 mum -2.83 mm   -2.4 m     247 keV  69.2 keV   393 mum   393 mum  TargetPV     compt
-    2    257 mum -3.69 mm   -2.4 m       0 eV    247 keV   939 mum  1.33 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 428,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.17 mum -2.44 mm   -2.4 m    11.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -618 mum -4.42 mm   -2.4 m    11.5 MeV     0 eV   2.71 mm   2.71 mm    TrackerTransportation
-    2  -75.9 cm   -2.4 m   -27.1 cm   11.5 MeV     0 eV   3.29 m     3.3 m     WorldPVTransportation
-    3    -92 cm  -2.91 m    18.2 cm   11.5 MeV     0 eV   70.1 cm      4 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 427,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    113 mum  -1.9 mm   -2.4 m     293 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -259 mum -3.22 mm   -2.4 m     224 keV  69.7 keV  2.13 mm   2.13 mm   TargetPV     compt
-    2  -1.37 mm  -3.24 mm   -2.4 m       0 eV    224 keV  1.19 mm   3.33 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 426,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    164 mum -1.68 mm   -2.4 m    3.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -573 mum -3.68 mm   -2.4 m    3.38 MeV     0 eV   3.27 mm   3.27 mm    TrackerTransportation
-    2  -88.3 cm   -2.4 m    57.1 cm   3.38 MeV     0 eV   3.92 m    3.92 m     WorldPVTransportation
-    3  -1.07 m   -2.91 m     1.2 m    3.38 MeV     0 eV   83.4 cm   4.75 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 425,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    182 mum -1.63 mm   -2.4 m     885 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -410 mum -3.64 mm   -2.4 m     885 keV     0 eV    3.3 mm    3.3 mm    TrackerTransportation
-    2  -70.8 cm   -2.4 m    64.3 cm    885 keV     0 eV   3.94 m    3.94 m     WorldPVTransportation
-    3  -85.8 cm  -2.91 m    1.29 m     885 keV     0 eV   83.8 cm   4.78 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 424,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    191 mum -1.47 mm   -2.4 m    9.95 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -268 mum -4.33 mm   -2.4 m    9.95 MeV     0 eV   3.95 mm   3.95 mm    TrackerTransportation
-    2  -38.5 cm   -2.4 m   -13.7 cm   9.95 MeV     0 eV   3.32 m    3.32 m     WorldPVTransportation
-    3  -46.7 cm  -2.91 m    34.5 cm   9.95 MeV     0 eV   70.6 cm   4.03 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 423,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    195 mum -1.44 mm   -2.4 m    2.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -256 mum -4.37 mm   -2.4 m    2.04 MeV     0 eV   4.02 mm   4.02 mm    TrackerTransportation
-    2    -37 cm   -2.4 m   -16.4 cm   2.04 MeV     0 eV    3.3 m     3.3 m     WorldPVTransportation
-    3  -44.8 cm  -2.91 m    31.1 cm   2.04 MeV     0 eV   70.2 cm      4 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 422,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    528 mum -1.08 mm  -2.41 m    4.75 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    616 mum -2.44 mm   -2.4 m    4.75 MeV     0 eV   5.48 mm   5.48 mm    TrackerTransportation
-    2   1.39 cm  -20.8 cm   -1.6 m    4.75 MeV     0 eV   82.6 cm   83.1 cm    ChamberTransportation
-    3    1.6 cm    -24 cm  -1.47 m    4.75 MeV     0 eV     13 cm   96.2 cm    TrackerTransportation
-    4   2.72 cm  -41.3 cm    -80 cm   4.75 MeV     0 eV   69.6 cm   1.66 m     ChamberTransportation
-    5   3.05 cm  -46.4 cm    -60 cm   4.75 MeV     0 eV   20.6 cm   1.86 m     TrackerTransportation
-    6   4.05 cm  -61.8 cm      0 fm   4.75 MeV     0 eV   61.9 cm   2.48 m     ChamberTransportation
-    7   4.38 cm  -66.9 cm     20 cm   4.75 MeV     0 eV   20.6 cm   2.69 m     TrackerTransportation
-    8   5.37 cm  -82.3 cm     80 cm   4.75 MeV     0 eV   61.9 cm   3.31 m     ChamberTransportation
-    9   5.71 cm  -87.4 cm      1 m    4.75 MeV     0 eV   20.6 cm   3.52 m     TrackerTransportation
-   10    6.7 cm  -1.03 m     1.6 m    4.75 MeV     0 eV   61.9 cm   4.14 m     ChamberTransportation
-   11   7.03 cm  -1.08 m     1.8 m    4.75 MeV     0 eV   20.6 cm   4.34 m     TrackerTransportation
-   12   8.03 cm  -1.23 m     2.4 m    4.75 MeV     0 eV   61.9 cm   4.96 m     WorldPVTransportation
-   13   8.88 cm  -1.36 m    2.91 m    4.75 MeV     0 eV   52.7 cm   5.49 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 421,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    218 mum  -118 mum -2.41 m    13.4 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    646 mum -1.64 mm   -2.4 m    13.4 MeV     0 eV   8.19 mm   8.19 mm    TrackerTransportation
-    2   4.33 cm  -15.3 cm   -1.6 m    13.4 MeV     0 eV   81.5 cm   82.4 cm    ChamberTransportation
-    3   5.39 cm  -19.1 cm   -1.4 m    13.4 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4   8.59 cm  -30.5 cm    -80 cm   13.4 MeV     0 eV   61.2 cm   1.64 m     ChamberTransportation
-    5   9.65 cm  -34.3 cm    -60 cm   13.4 MeV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6   12.8 cm  -45.6 cm      0 fm   13.4 MeV     0 eV   61.2 cm   2.45 m     ChamberTransportation
-    7   13.9 cm  -49.4 cm     20 cm   13.4 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   17.1 cm  -60.8 cm     80 cm   13.4 MeV     0 eV   61.2 cm   3.27 m     ChamberTransportation
-    9   18.2 cm  -64.6 cm      1 m    13.4 MeV     0 eV   20.4 cm   3.47 m     TrackerTransportation
-   10   21.4 cm  -75.9 cm    1.6 m    13.4 MeV     0 eV   61.2 cm   4.08 m     ChamberTransportation
-   11   22.4 cm  -79.7 cm    1.8 m    13.4 MeV     0 eV   20.4 cm   4.29 m     TrackerTransportation
-   12   25.6 cm  -91.1 cm    2.4 m    13.4 MeV     0 eV   61.2 cm    4.9 m     WorldPVTransportation
-   13   28.3 cm  -1.01 m    2.91 m    13.4 MeV     0 eV     52 cm   5.42 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 420,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    183 mum   144 mum -2.41 m    2.34 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   73.8 mum  -1.6 mm   -2.4 m    2.34 MeV     0 eV   9.23 mm   9.23 mm    TrackerTransportation
-    2  -9.58 mm  -15.5 cm   -1.6 m    2.34 MeV     0 eV   81.5 cm   82.4 cm    ChamberTransportation
-    3   -1.2 cm  -19.4 cm   -1.4 m    2.34 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4  -1.92 cm  -30.9 cm    -80 cm   2.34 MeV     0 eV   61.1 cm   1.64 m     ChamberTransportation
-    5  -2.16 cm  -34.8 cm    -60 cm   2.34 MeV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6  -2.89 cm  -46.3 cm  0.114 fm   2.34 MeV     0 eV   61.1 cm   2.45 m     ChamberTransportation
-    7  -2.99 cm  -47.8 cm   8.12 cm    1.6 MeV     0 eV   8.27 cm   2.54 m     Chamber     compt
-    8   2.35 cm  -48.5 cm     20 cm    1.6 MeV     0 eV     13 cm   2.67 m     TrackerTransportation
-    9   29.3 cm    -52 cm     80 cm    1.6 MeV     0 eV   65.9 cm   3.33 m     ChamberTransportation
-   10   38.3 cm  -53.1 cm      1 m     1.6 MeV     0 eV     22 cm   3.54 m     TrackerTransportation
-   11   65.2 cm  -56.6 cm    1.6 m     1.6 MeV     0 eV   65.9 cm    4.2 m     ChamberTransportation
-   12   74.2 cm  -57.8 cm    1.8 m     1.6 MeV     0 eV     22 cm   4.42 m     TrackerTransportation
-   13   1.01 m   -61.2 cm    2.4 m     1.6 MeV     0 eV   65.9 cm   5.08 m     WorldPVTransportation
-   14   1.24 m   -64.2 cm   2.91 m     1.6 MeV     0 eV     56 cm   5.64 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 437,   Parent ID = 420
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.99 cm  -47.8 cm   8.12 cm    737 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -12.6 cm    -51 cm     14 cm    632 keV   106 keV  21.7 cm   21.7 cm    Chamber     eIoni
-    2  -8.78 cm  -50.2 cm     20 cm    581 keV  50.9 keV  11.5 cm   33.2 cm    TrackerTransportation
-    3   12.3 cm  -19.2 cm   38.9 cm    498 keV  82.9 keV    46 cm   79.2 cm    Tracker     eIoni
-    4   10.6 cm  -10.1 cm   56.3 cm    434 keV  33.2 keV  20.2 cm   99.4 cm    Tracker     eIoni
-    5   10.8 cm  -4.87 cm   60.8 cm    374 keV  10.3 keV  6.94 cm   1.06 m     Tracker     eIoni
-    6   21.4 cm    5.4 cm   77.2 cm    326 keV  47.3 keV  24.3 cm   1.31 m     Tracker     eIoni
-    7   24.6 cm   6.77 cm     80 cm    319 keV  7.85 keV  4.56 cm   1.35 m     ChamberTransportation
-    8   27.5 cm   5.96 cm   82.3 cm    297 keV  21.6 keV  6.62 cm   1.42 m     Chamber     eIoni
-    9   26.4 cm   5.68 cm   81.2 cm    248 keV   7.2 keV  1.66 cm   1.44 m     Chamber     eIoni
-   10   25.1 cm   5.24 cm     80 cm    181 keV  66.6 keV  3.06 cm   1.47 m     TrackerTransportation
-   11   18.3 cm   3.08 cm   79.8 cm    160 keV  21.2 keV  7.72 cm   1.54 m     Tracker     eIoni
-   12   17.4 cm   2.82 cm   79.3 cm    141 keV  1.63 keV  1.05 cm   1.55 m     Tracker     eIoni
-   13   12.6 cm   3.47 cm   78.8 cm    130 keV  11.3 keV  5.06 cm    1.6 m     Tracker     eIoni
-   14   8.85 cm   2.12 cm   79.6 cm    115 keV  14.6 keV  4.38 cm   1.65 m     Tracker     eIoni
-   15   8.03 cm   2.45 cm     80 cm    111 keV  3.71 keV  1.01 cm   1.66 m     ChamberTransportation
-   16   7.44 cm   2.76 cm     80 cm    101 keV    10 keV  1.26 cm   1.67 m     Chamber     eIoni
-   17   7.28 cm   2.21 cm     80 cm   93.4 keV  7.91 keV  1.08 cm   1.68 m     Chamber     eIoni
-   18   7.25 cm   1.73 cm     80 cm   80.6 keV  12.7 keV  9.49 mm   1.69 m     Chamber     eIoni
-   19   7.53 cm   1.75 cm   80.2 cm   66.8 keV  3.38 keV  5.11 mm    1.7 m     Chamber     eBrem
-   20   7.64 cm   1.72 cm     80 cm   59.7 keV  7.11 keV  3.12 mm    1.7 m     TrackerTransportation
-   21   7.99 cm   1.23 cm   79.1 cm   52.4 keV  7.29 keV  1.15 cm   1.71 m     Tracker     eIoni
-   22   7.94 cm   1.08 cm   78.3 cm   45.8 keV  6.63 keV   9.1 mm   1.72 m     Tracker     eIoni
-   23   7.59 cm   6.18 mm   77.9 cm     41 keV  4.76 keV  7.23 mm   1.73 m     Tracker     eIoni
-   24   7.25 cm   2.32 mm   77.6 cm   34.9 keV  6.11 keV     6 mm   1.73 m     Tracker     eIoni
-   25   7.14 cm   -1.9 mm   77.6 cm   32.2 keV  2.71 keV  4.55 mm   1.74 m     Tracker     eIoni
-   26   7.36 cm  -4.51 mm   77.8 cm   29.5 keV   2.7 keV  3.99 mm   1.74 m     Tracker     eIoni
-   27   7.56 cm  -2.96 mm     78 cm   26.2 keV  3.29 keV  3.44 mm   1.75 m     Tracker     eIoni
-   28   7.62 cm   -294 mum    78 cm   23.4 keV  2.77 keV  2.85 mm   1.75 m     Tracker     eIoni
-   29   7.65 cm  -2.45 mm   78.1 cm   21.8 keV  1.67 keV  2.39 mm   1.75 m     Tracker     eIoni
-   30    7.5 cm  -2.93 mm   77.9 cm   19.1 keV  2.62 keV  2.13 mm   1.75 m     Tracker     eIoni
-   31   7.34 cm  -3.22 mm   77.9 cm   15.3 keV  3.85 keV  1.76 mm   1.75 m     Tracker     eIoni
-   32   7.27 cm  -3.05 mm   77.8 cm   14.4 keV   924 eV   1.28 mm   1.76 m     Tracker     eIoni
-   33   7.21 cm  -3.53 mm   77.7 cm   13.5 keV   843 eV   1.18 mm   1.76 m     Tracker     eIoni
-   34   7.15 cm  -3.79 mm   77.6 cm   11.9 keV  1.62 keV  1.09 mm   1.76 m     Tracker     eIoni
-   35   7.12 cm  -4.32 mm   77.5 cm   7.68 keV  4.21 keV   933 mum  1.76 m     Tracker     eIoni
-   36   7.11 cm  -4.45 mm   77.5 cm   5.26 keV  2.42 keV   592 mum  1.76 m     Tracker     eIoni
-   37   7.09 cm  -4.56 mm   77.4 cm   3.32 keV  1.94 keV   433 mum  1.76 m     Tracker     eIoni
-   38   7.08 cm  -4.61 mm   77.4 cm   1.24 keV  2.08 keV   303 mum  1.76 m     Tracker     eIoni
-   39   7.08 cm  -4.63 mm   77.4 cm      0 eV   1.24 keV  81.4 mum  1.76 m     Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 442,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   7.53 cm   1.75 cm   80.2 cm   10.5 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   7.41 cm   1.56 cm   80.3 cm      0 eV   10.5 keV  2.76 mm   2.76 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 441,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   17.4 cm   2.82 cm   79.3 cm   17.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   17.5 cm   2.71 cm   79.2 cm   16.2 keV  1.42 keV  1.56 mm   1.56 mm    Tracker     eIoni
-    2   17.5 cm   2.58 cm   79.2 cm   15.3 keV   984 eV   1.39 mm   2.96 mm    Tracker     eIoni
-    3   17.4 cm   2.46 cm   79.2 cm   13.8 keV   1.5 keV  1.28 mm   4.24 mm    Tracker     eIoni
-    4   17.4 cm   2.37 cm   79.2 cm   12.6 keV  1.14 keV  1.12 mm   5.36 mm    Tracker     eIoni
-    5   17.4 cm   2.29 cm   79.2 cm   10.5 keV  2.11 keV     1 mm   6.36 mm    Tracker     eIoni
-    6   17.4 cm   2.23 cm   79.1 cm   6.92 keV  3.59 keV   812 mum  7.18 mm    Tracker     eIoni
-    7   17.4 cm   2.22 cm   79.1 cm   5.36 keV  1.56 keV   539 mum  7.71 mm    Tracker     eIoni
-    8   17.4 cm    2.2 cm     79 cm   3.05 keV  2.31 keV   439 mum  8.15 mm    Tracker     eIoni
-    9   17.4 cm   2.19 cm     79 cm   1.42 keV  1.63 keV   282 mum  8.44 mm    Tracker     eIoni
-   10   17.4 cm   2.18 cm     79 cm      0 eV   1.42 keV  98.7 mum  8.53 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 440,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   26.4 cm   5.68 cm   81.2 cm   41.9 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   26.5 cm   5.49 cm   81.2 cm   38.3 keV  3.65 keV  2.75 mm   2.75 mm    Chamber     eIoni
-    2   26.6 cm   5.46 cm   81.2 cm   32.3 keV  5.94 keV  2.41 mm   5.16 mm    Chamber     eIoni
-    3   26.7 cm   5.49 cm   81.1 cm   29.9 keV  2.41 keV   1.9 mm   7.06 mm    Chamber     eIoni
-    4   26.8 cm   5.37 cm   81.1 cm   24.4 keV   5.5 keV   1.7 mm   8.77 mm    Chamber     eIoni
-    5   26.8 cm   5.31 cm   81.1 cm   20.1 keV  4.36 keV  1.31 mm   1.01 cm    Chamber     eIoni
-    6   26.8 cm   5.32 cm   81.1 cm   14.3 keV   5.8 keV  1.03 mm   1.11 cm    Chamber     eIoni
-    7   26.8 cm   5.34 cm   81.1 cm   10.4 keV  3.82 keV   720 mum  1.18 cm    Chamber     eIoni
-    8   26.8 cm   5.37 cm   81.1 cm   7.69 keV  2.75 keV   550 mum  1.24 cm    Chamber     eIoni
-    9   26.9 cm   5.36 cm   81.1 cm   4.99 keV   2.7 keV   439 mum  1.28 cm    Chamber     eIoni
-   10   26.9 cm   5.35 cm   81.1 cm   1.45 keV  3.54 keV   328 mum  1.31 cm    Chamber     eIoni
-   11   26.9 cm   5.35 cm   81.1 cm      0 eV   1.45 keV  75.8 mum  1.32 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 439,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   10.8 cm  -4.87 cm   60.8 cm   50.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   10.1 cm  -4.52 cm   60.8 cm   46.8 keV  3.42 keV  8.49 mm   8.49 mm    Tracker     eIoni
-    2   10.1 cm  -3.85 cm   61.1 cm     43 keV  3.83 keV  7.53 mm    1.6 cm    Tracker     eIoni
-    3   9.98 cm  -3.84 cm   61.7 cm   37.8 keV  5.21 keV  6.48 mm   2.25 cm    Tracker     eIoni
-    4   9.79 cm  -3.59 cm   62.1 cm   33.5 keV  4.28 keV  5.21 mm   2.77 cm    Tracker     eIoni
-    5   9.44 cm  -3.46 cm   62.3 cm   30.3 keV  3.24 keV  4.26 mm    3.2 cm    Tracker     eIoni
-    6   9.41 cm  -3.15 cm   62.1 cm   27.2 keV  3.09 keV  3.58 mm   3.56 cm    Tracker     eIoni
-    7   9.32 cm  -2.88 cm   62.1 cm   23.8 keV  3.35 keV  3.02 mm   3.86 cm    Tracker     eIoni
-    8    9.1 cm   -2.8 cm   62.1 cm   19.1 keV  4.76 keV  2.45 mm    4.1 cm    Tracker     eIoni
-    9   8.94 cm  -2.77 cm   62.1 cm   15.4 keV  3.62 keV  1.75 mm   4.28 cm    Tracker     eIoni
-   10   8.89 cm  -2.82 cm     62 cm   9.76 keV  5.68 keV   1.3 mm   4.41 cm    Tracker     eIoni
-   11   8.81 cm  -2.82 cm     62 cm   7.49 keV  2.27 keV   748 mum  4.48 cm    Tracker     eIoni
-   12   8.77 cm  -2.84 cm     62 cm   6.11 keV  1.37 keV   579 mum  4.54 cm    Tracker     eIoni
-   13   8.73 cm  -2.86 cm     62 cm   5.06 keV  1.05 keV   487 mum  4.59 cm    Tracker     eIoni
-   14   8.74 cm  -2.83 cm     62 cm   3.74 keV  1.32 keV   421 mum  4.63 cm    Tracker     eIoni
-   15   8.73 cm   -2.8 cm     62 cm   2.22 keV  1.52 keV   335 mum  4.66 cm    Tracker     eIoni
-   16   8.73 cm  -2.81 cm     62 cm      0 eV   2.22 keV   191 mum  4.68 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 438,   Parent ID = 437
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   10.6 cm  -10.1 cm   56.3 cm   30.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   10.4 cm  -10.2 cm   56.7 cm   27.7 keV  2.53 keV  3.59 mm   3.59 mm    Tracker     eIoni
-    2   10.5 cm  -10.2 cm     57 cm   23.8 keV  3.95 keV  3.13 mm   6.71 mm    Tracker     eIoni
-    3   10.5 cm  -10.3 cm   57.2 cm   21.7 keV  2.09 keV  2.45 mm   9.16 mm    Tracker     eIoni
-    4   10.4 cm  -10.4 cm   57.3 cm   20.3 keV  1.37 keV  2.12 mm   1.13 cm    Tracker     eIoni
-    5   10.2 cm  -10.4 cm   57.4 cm   16.6 keV   3.7 keV  1.92 mm   1.32 cm    Tracker     eIoni
-    6   10.2 cm  -10.3 cm   57.5 cm   15.1 keV  1.56 keV  1.44 mm   1.46 cm    Tracker     eIoni
-    7   10.1 cm  -10.4 cm   57.5 cm   13.3 keV  1.77 keV  1.26 mm   1.59 cm    Tracker     eIoni
-    8   10.1 cm  -10.5 cm   57.4 cm   11.5 keV  1.76 keV  1.07 mm    1.7 cm    Tracker     eIoni
-    9     10 cm  -10.6 cm   57.4 cm   10.1 keV  1.39 keV   903 mum  1.79 cm    Tracker     eIoni
-   10     10 cm  -10.6 cm   57.3 cm   7.67 keV  2.48 keV   780 mum  1.87 cm    Tracker     eIoni
-   11     10 cm  -10.6 cm   57.3 cm   5.92 keV  1.75 keV   591 mum  1.92 cm    Tracker     eIoni
-   12   9.97 cm  -10.7 cm   57.3 cm   4.57 keV  1.35 keV   474 mum  1.97 cm    Tracker     eIoni
-   13   9.96 cm  -10.6 cm   57.3 cm   3.17 keV   1.4 keV   389 mum  2.01 cm    Tracker     eIoni
-   14   9.94 cm  -10.6 cm   57.3 cm    710 eV   2.46 keV   291 mum  2.04 cm    Tracker     eIoni
-   15   9.94 cm  -10.6 cm   57.3 cm      0 eV    710 eV   40.4 mum  2.04 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 419,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    183 mum   152 mum -2.41 m    2.97 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    284 mum -1.68 mm   -2.4 m    2.97 MeV     0 eV   9.29 mm   9.29 mm    TrackerTransportation
-    2   9.18 mm  -16.2 cm   -1.6 m    2.97 MeV     0 eV   81.6 cm   82.5 cm    ChamberTransportation
-    3   1.14 cm  -20.3 cm   -1.4 m    2.97 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4   1.81 cm  -32.3 cm    -80 cm   2.97 MeV     0 eV   61.2 cm   1.64 m     ChamberTransportation
-    5   2.03 cm  -36.3 cm    -60 cm   2.97 MeV     0 eV   20.4 cm   1.85 m     TrackerTransportation
-    6    2.7 cm  -48.4 cm -0.114 fm   2.97 MeV     0 eV   61.2 cm   2.46 m     ChamberTransportation
-    7   2.92 cm  -52.4 cm     20 cm   2.97 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   3.59 cm  -64.5 cm     80 cm   2.97 MeV     0 eV   61.2 cm   3.27 m     ChamberTransportation
-    9   3.81 cm  -68.5 cm      1 m    2.97 MeV     0 eV   20.4 cm   3.48 m     TrackerTransportation
-   10   4.47 cm  -80.6 cm    1.6 m    2.97 MeV     0 eV   61.2 cm   4.09 m     ChamberTransportation
-   11    4.7 cm  -84.6 cm    1.8 m    2.97 MeV     0 eV   20.4 cm   4.29 m     TrackerTransportation
-   12   5.36 cm  -96.6 cm    2.4 m    2.97 MeV     0 eV   61.2 cm   4.91 m     WorldPVTransportation
-   13   5.68 cm  -1.02 m    2.69 m     743 keV     0 eV   29.5 cm    5.2 m     WorldPV     compt
-   14   48.4 cm   -1.1 m    2.91 m     743 keV     0 eV   48.6 cm   5.69 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 443,   Parent ID = 419
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   5.68 cm  -1.02 m    2.69 m    2.22 MeV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   3.52 mm  -1.07 m    2.91 m    2.18 MeV  42.6 keV  23.3 cm   23.3 cm OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 418,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    184 mum   164 mum -2.41 m    3.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    189 mum -1.72 mm   -2.4 m    3.09 MeV     0 eV   9.35 mm   9.35 mm    TrackerTransportation
-    2    609 mum -16.6 cm   -1.6 m    3.09 MeV     0 eV   81.7 cm   82.6 cm    ChamberTransportation
-    3    714 mum -20.7 cm   -1.4 m    3.09 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4   1.03 mm    -33 cm    -80 cm   3.09 MeV     0 eV   61.2 cm   1.64 m     ChamberTransportation
-    5   1.13 mm  -37.1 cm    -60 cm   3.09 MeV     0 eV   20.4 cm   1.85 m     TrackerTransportation
-    6   1.45 mm  -49.4 cm      0 fm   3.09 MeV     0 eV   61.2 cm   2.46 m     ChamberTransportation
-    7   1.55 mm  -53.5 cm     20 cm   3.09 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   1.87 mm  -65.8 cm     80 cm   3.09 MeV     0 eV   61.2 cm   3.28 m     ChamberTransportation
-    9   1.97 mm  -69.9 cm      1 m    3.09 MeV     0 eV   20.4 cm   3.48 m     TrackerTransportation
-   10   2.29 mm  -82.2 cm    1.6 m    3.09 MeV     0 eV   61.2 cm   4.09 m     ChamberTransportation
-   11   2.39 mm  -86.3 cm    1.8 m    3.09 MeV     0 eV   20.4 cm    4.3 m     TrackerTransportation
-   12   2.71 mm  -98.6 cm    2.4 m    3.09 MeV     0 eV   61.2 cm   4.91 m     WorldPVTransportation
-   13   2.98 mm  -1.09 m    2.91 m    3.09 MeV     0 eV   52.1 cm   5.43 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 417,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    164 mum   199 mum -2.41 m     390 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    380 mum  -825 mum  -2.4 m       0 eV    390 keV  6.12 mm   6.12 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 416,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    160 mum   212 mum -2.41 m     334 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    386 mum  -454 mum  -2.4 m       0 eV    334 keV  5.59 mm   5.59 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 415,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    159 mum   215 mum -2.41 m    13.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    608 mum -1.09 mm   -2.4 m    13.9 MeV     0 eV   9.63 mm   9.63 mm    TrackerTransportation
-    2   3.83 cm  -11.1 cm   -1.6 m    13.9 MeV     0 eV   80.8 cm   81.8 cm    ChamberTransportation
-    3   4.78 cm  -13.9 cm   -1.4 m    13.9 MeV     0 eV   20.2 cm   1.02 m     TrackerTransportation
-    4   7.61 cm  -22.1 cm    -80 cm   13.9 MeV     0 eV   60.6 cm   1.63 m     ChamberTransportation
-    5   8.55 cm  -24.8 cm    -60 cm   13.9 MeV     0 eV   20.2 cm   1.83 m     TrackerTransportation
-    6   11.4 cm  -33.1 cm      0 fm   13.9 MeV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   12.3 cm  -35.8 cm     20 cm   13.9 MeV     0 eV   20.2 cm   2.64 m     TrackerTransportation
-    8   15.2 cm  -44.1 cm     80 cm   13.9 MeV     0 eV   60.6 cm   3.24 m     ChamberTransportation
-    9   16.1 cm  -46.8 cm      1 m    13.9 MeV     0 eV   20.2 cm   3.45 m     TrackerTransportation
-   10   18.9 cm  -55.1 cm    1.6 m    13.9 MeV     0 eV   60.6 cm   4.05 m     ChamberTransportation
-   11   19.9 cm  -57.8 cm    1.8 m    13.9 MeV     0 eV   20.2 cm   4.25 m     TrackerTransportation
-   12   22.7 cm  -66.1 cm    2.4 m    13.9 MeV     0 eV   60.6 cm   4.86 m     WorldPVTransportation
-   13   25.1 cm  -73.1 cm   2.91 m    13.9 MeV     0 eV   51.5 cm   5.38 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 414,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    140 mum   240 mum -2.41 m    9.65 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    142 mum   232 mum -2.41 m       0 eV   8.63 MeV   155 mum   155 mum  TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 444,   Parent ID = 414
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    142 mum   232 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   initStep
-    1    142 mum   232 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 446,   Parent ID = 444
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    142 mum   232 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -586 mum -6.22 mm  -2.42 m       0 eV    511 keV  1.42 cm   1.42 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 445,   Parent ID = 444
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    142 mum   232 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    706 mum  5.23 mm   -2.4 m     511 keV     0 eV    1.1 cm    1.1 cm    TrackerTransportation
-    2   27.1 cm    2.4 m    2.29 m     511 keV     0 eV   5.28 m    5.29 m     WorldPVTransportation
-    3   30.6 cm   2.71 m    2.91 m     511 keV     0 eV   69.3 cm   5.98 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 413,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.04 mum   269 mum -2.41 m     319 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    193 mum   201 mum -2.41 m       0 eV    319 keV  3.59 mm   3.59 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 412,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -38.9 mum   248 mum -2.41 m    2.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    391 mum -93.8 mum  -2.4 m    2.08 MeV     0 eV   1.23 cm   1.23 cm    TrackerTransportation
-    2   2.84 cm  -2.24 cm   -1.6 m    2.08 MeV     0 eV   80.1 cm   81.3 cm    ChamberTransportation
-    3   3.54 cm   -2.8 cm   -1.4 m    2.08 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   5.65 cm  -4.47 cm    -80 cm   2.08 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   6.35 cm  -5.03 cm    -60 cm   2.08 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   8.45 cm   -6.7 cm      0 fm   2.08 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   9.15 cm  -7.26 cm     20 cm   2.08 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   11.3 cm  -8.93 cm     80 cm   2.08 MeV     0 eV   60.1 cm   3.22 m     ChamberTransportation
-    9     12 cm  -9.49 cm      1 m    2.08 MeV     0 eV     20 cm   3.42 m     TrackerTransportation
-   10   14.1 cm  -11.2 cm    1.6 m    2.08 MeV     0 eV   60.1 cm   4.02 m     ChamberTransportation
-   11   14.8 cm  -11.7 cm    1.8 m    2.08 MeV     0 eV     20 cm   4.22 m     TrackerTransportation
-   12   16.9 cm  -13.4 cm    2.4 m    2.08 MeV     0 eV   60.1 cm   4.82 m     WorldPVTransportation
-   13   18.6 cm  -14.8 cm   2.91 m    2.08 MeV     0 eV   51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 411,   Parent ID = 397
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -48 mum   242 mum -2.41 m     431 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   31.6 mum   309 mum -2.41 m     421 keV  9.96 keV  2.74 mm   2.74 mm   TargetPV     compt
-    2   64.8 mum   288 mum -2.41 m       0 eV    421 keV   161 mum   2.9 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 386,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -7.71 mum  19.8 mum -2.42 m    15.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -74.2 mum   645 mum  -2.4 m       0 eV    4.5 MeV  1.45 cm   1.45 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 447,   Parent ID = 386
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -74.2 mum   645 mum  -2.4 m    10.2 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -298 mum  1.59 mm   -2.4 m    7.62 MeV  2.53 MeV  1.82 mm   1.82 mm   TargetPV     eIoni
-    2    291 mum  2.05 mm   -2.4 m    6.08 MeV   1.1 MeV   807 mum  2.62 mm   TargetPV     eBrem
-    3    330 mum  1.95 mm   -2.4 m    3.29 MeV  1.41 MeV  1.04 mm   3.66 mm   TargetPV     eBrem
-    4    383 mum  1.47 mm   -2.4 m    2.32 MeV   969 keV   825 mum  4.49 mm   TargetPV     eIoni
-    5    284 mum  1.39 mm   -2.4 m    1.75 MeV   173 keV   151 mum  4.64 mm   TargetPV     eBrem
-    6   38.8 mum   1.5 mm   -2.4 m    1.06 MeV   684 keV   566 mum  5.21 mm   TargetPV     eIoni
-    7    238 mum  1.48 mm   -2.4 m     690 keV   373 keV   433 mum  5.64 mm   TargetPV     eIoni
-    8    230 mum  1.44 mm   -2.4 m       0 eV    690 keV   340 mum  5.98 mm   TargetPV     eIoni
-    9    230 mum  1.44 mm   -2.4 m       0 eV      0 eV      0 fm   5.98 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 452,   Parent ID = 447
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    230 mum  1.44 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.29 mm   -565 mum  -2.4 m     435 keV  75.9 keV  3.66 mm   3.66 mm   TargetPV     compt
-    2   4.51 mm   -665 mum  -2.4 m     357 keV  78.5 keV  1.29 mm   4.95 mm   TargetPV     compt
-    3   5.08 mm   -369 mum  -2.4 m       0 eV    357 keV  1.02 mm   5.97 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 451,   Parent ID = 447
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    230 mum  1.44 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -1.8 cm   1.34 cm   -2.4 m       0 eV    511 keV  2.18 cm   2.18 cm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 450,   Parent ID = 447
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    284 mum  1.39 mm   -2.4 m     400 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.61 mm    1.8 mm   -2.4 m       0 eV    400 keV  1.98 mm   1.98 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 449,   Parent ID = 447
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    330 mum  1.95 mm   -2.4 m    1.38 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    308 mum  1.98 mm   -2.4 m    1.38 MeV     0 eV   1.37 mm   1.37 mm    TrackerTransportation
-    2  -1.25 cm   2.16 cm   -1.6 m    1.38 MeV     0 eV     80 cm   80.2 cm    ChamberTransportation
-    3  -1.57 cm   2.65 cm   -1.4 m    1.38 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -2.54 cm   4.12 cm    -80 cm   1.38 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -2.86 cm   4.61 cm    -60 cm   1.38 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -3.82 cm   6.08 cm      0 fm   1.38 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7  -4.14 cm   6.57 cm     20 cm   1.38 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -5.11 cm   8.05 cm     80 cm   1.38 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -5.43 cm   8.54 cm      1 m    1.38 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10  -6.39 cm     10 cm    1.6 m    1.38 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11  -6.71 cm   10.5 cm    1.8 m    1.38 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12  -7.67 cm     12 cm    2.4 m    1.38 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13  -8.49 cm   13.2 cm   2.91 m    1.38 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 448,   Parent ID = 447
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    291 mum  2.05 mm   -2.4 m     447 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.58 mm    795 mum  -2.4 m     447 keV     0 eV   2.93 mm   2.93 mm    TrackerTransportation
-    2    2.4 m   -2.34 m    1.89 m     447 keV     0 eV   5.44 m    5.45 m     WorldPVTransportation
-    3   2.91 m   -2.84 m     2.8 m     447 keV     0 eV   1.16 m     6.6 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 385,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.83 mum  13.8 mum -2.42 m     203 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -42.3 mum   502 mum -2.41 m       0 eV      0 eV   1.15 cm   1.15 cm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 454,   Parent ID = 385
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.3 mum   502 mum -2.41 m    52.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -64.3 mum   513 mum -2.41 m    28.8 MeV   405 keV   398 mum   398 mum  TargetPV     eBrem
-    2    198 mum   427 mum  -2.4 m    25.2 MeV  2.93 MeV   2.2 mm    2.6 mm   TargetPV     eBrem
-    3    161 mum   414 mum  -2.4 m    23.1 MeV  1.82 MeV   987 mum  3.59 mm   TargetPV     eBrem
-    4    164 mum   415 mum  -2.4 m    8.44 MeV  12.9 keV  15.3 mum   3.6 mm   TargetPV     eBrem
-    5    690 mum   864 mum  -2.4 m    5.49 MeV  1.37 MeV   1.2 mm    4.8 mm   TargetPV     eBrem
-    6    973 mum  1.17 mm   -2.4 m     612 keV  4.88 MeV  1.16 mm   5.96 mm   TargetPV     eIoni
-    7   1.01 mm   1.21 mm   -2.4 m     228 keV   384 keV   316 mum  6.28 mm   TargetPV     eIoni
-    8   1.03 mm   1.21 mm   -2.4 m       0 eV    228 keV  95.5 mum  6.37 mm   TargetPV     eIoni
-    9   1.03 mm   1.21 mm   -2.4 m       0 eV      0 eV      0 fm   6.37 mm   TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 461,   Parent ID = 454
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.03 mm   1.21 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.59 mm   3.91 mm  -2.41 m     251 keV   260 keV  7.02 mm   7.02 mm   TargetPV     compt
-    2  -1.93 mm   4.01 mm  -2.41 m       0 eV    251 keV   410 mum  7.43 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 460,   Parent ID = 454
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.03 mm   1.21 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.68 mm    537 mum  -2.4 m     511 keV     0 eV   1.76 mm   1.76 mm    TrackerTransportation
-    2   1.06 m   -1.09 m       0 fm    511 keV     0 eV   2.84 m    2.84 m     ChamberTransportation
-    3   1.07 m    -1.1 m    2.39 cm    511 keV     0 eV   2.84 cm   2.87 m     TrackerTransportation
-    4   1.42 m   -1.46 m      80 cm    511 keV     0 eV   91.9 cm   3.79 m     ChamberTransportation
-    5   1.49 m   -1.54 m    97.2 cm    511 keV     0 eV   20.4 cm      4 m     TrackerTransportation
-    6   1.77 m   -1.82 m     1.6 m     511 keV     0 eV   74.4 cm   4.74 m     ChamberTransportation
-    7   1.86 m   -1.91 m     1.8 m     511 keV     0 eV   23.7 cm   4.98 m     TrackerTransportation
-    8   2.12 m   -2.19 m     2.4 m     511 keV     0 eV   71.1 cm   5.69 m     WorldPVTransportation
-    9   2.35 m   -2.42 m    2.91 m     511 keV     0 eV   60.4 cm   6.29 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 459,   Parent ID = 454
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    690 mum   864 mum  -2.4 m    1.57 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    952 mum  1.27 mm   -2.4 m       0 eV     88 keV  2.28 mm   2.28 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 462,   Parent ID = 459
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    952 mum  1.27 mm   -2.4 m    1.48 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    960 mum  1.28 mm   -2.4 m    1.21 MeV   274 keV  98.9 mum  98.9 mum   TrackerTransportation
-    2   1.03 m    14.6 cm  -2.02 m    1.01 MeV   198 keV   1.2 m     1.2 m     Tracker     eIoni
-    3   1.78 m   -18.8 cm   -1.6 m     843 keV   164 keV  95.9 cm   2.16 m     Tracker     eIoni
-    4   2.37 m    8.63 cm  -1.37 m     698 keV   135 keV  75.4 cm   2.91 m     Tracker     eIoni
-    5    2.4 m    7.96 cm  -1.36 m     693 keV  5.12 keV  3.05 cm   2.94 m     WorldPVTransportation
-    6   2.72 m       3 cm  -1.28 m     533 keV  52.5 keV  33.6 cm   3.28 m     WorldPV     eIoni
-    7   2.85 m   -3.49 cm  -1.17 m     492 keV  31.2 keV  19.7 cm   3.47 m     WorldPV     eIoni
-    8   2.86 m   -3.79 cm  -1.16 m     477 keV  4.06 keV  1.32 cm   3.49 m     WorldPV     eIoni
-    9   2.91 m   -3.55 cm   -1.1 m     457 keV  19.3 keV  8.37 cm   3.57 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 466,   Parent ID = 462
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.86 m   -3.79 cm  -1.16 m      11 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.86 m   -3.84 cm  -1.16 m    7.51 keV  3.45 keV   852 mum   852 mum   WorldPV     eIoni
-    2   2.86 m   -3.85 cm  -1.16 m    6.54 keV   971 eV    580 mum  1.43 mm    WorldPV     eIoni
-    3   2.86 m   -3.83 cm  -1.16 m    5.62 keV   919 eV    514 mum  1.95 mm    WorldPV     eIoni
-    4   2.86 m   -3.83 cm  -1.16 m       0 eV   5.62 keV   455 mum   2.4 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 465,   Parent ID = 462
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.85 m   -3.49 cm  -1.17 m    10.1 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.85 m   -3.54 cm  -1.17 m    8.09 keV     2 keV   776 mum   776 mum   WorldPV     eIoni
-    2   2.85 m   -3.58 cm  -1.17 m    6.96 keV  1.13 keV   621 mum   1.4 mm    WorldPV     eIoni
-    3   2.85 m   -3.53 cm  -1.17 m    5.96 keV   999 eV    542 mum  1.94 mm    WorldPV     eIoni
-    4   2.85 m   -3.49 cm  -1.17 m    4.08 keV  1.89 keV   477 mum  2.42 mm    WorldPV     eIoni
-    5   2.85 m   -3.46 cm  -1.17 m    1.38 keV   2.7 keV   357 mum  2.77 mm    WorldPV     eIoni
-    6   2.85 m   -3.46 cm  -1.17 m       0 eV   1.38 keV  94.7 mum  2.87 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 464,   Parent ID = 462
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.72 m       3 cm  -1.28 m     107 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.72 m     2.8 cm  -1.29 m    94.4 keV  1.29 keV  4.88 mm   4.88 mm    WorldPV     eIoni
-    2   2.72 m     4.2 mm  -1.29 m    82.2 keV  12.1 keV  2.54 cm   3.03 cm    WorldPV     eIoni
-    3   2.72 m    -6.8 mm  -1.31 m    73.3 keV  8.94 keV     2 cm   5.04 cm    WorldPV     eIoni
-    4   2.72 m   -1.12 cm  -1.32 m    66.3 keV  6.96 keV  1.64 cm   6.67 cm    WorldPV     eIoni
-    5   2.72 m   -9.17 mm  -1.34 m    55.3 keV    11 keV  1.38 cm   8.05 cm    WorldPV     eIoni
-    6   2.71 m   -6.68 mm  -1.34 m    48.3 keV  7.01 keV     1 cm   9.06 cm    WorldPV     eIoni
-    7    2.7 m    -7.6 mm  -1.34 m      39 keV   9.3 keV  7.95 mm   9.85 cm    WorldPV     eIoni
-    8    2.7 m   -5.06 mm  -1.35 m    32.1 keV  6.92 keV  5.51 mm   10.4 cm    WorldPV     eIoni
-    9    2.7 m   -3.97 mm  -1.35 m    29.6 keV  2.47 keV  3.97 mm   10.8 cm    WorldPV     eIoni
-   10   2.69 m    -3.4 mm  -1.34 m    24.4 keV  5.25 keV  3.47 mm   11.1 cm    WorldPV     eIoni
-   11   2.69 m   -3.37 mm  -1.35 m    21.7 keV  2.69 keV  2.54 mm   11.4 cm    WorldPV     eIoni
-   12   2.69 m   -3.87 mm  -1.34 m    20.5 keV  1.14 keV  2.12 mm   11.6 cm    WorldPV     eIoni
-   13   2.69 m   -4.75 mm  -1.34 m    17.1 keV  3.42 keV  1.95 mm   11.8 cm    WorldPV     eIoni
-   14   2.69 m   -5.62 mm  -1.34 m    14.8 keV  2.36 keV   1.5 mm     12 cm    WorldPV     eIoni
-   15   2.69 m    -6.6 mm  -1.34 m    12.5 keV  2.28 keV  1.22 mm   12.1 cm    WorldPV     eIoni
-   16   2.69 m   -7.18 mm  -1.34 m    11.3 keV  1.23 keV   991 mum  12.2 cm    WorldPV     eIoni
-   17   2.69 m   -7.66 mm  -1.34 m    8.55 keV   2.7 keV   878 mum  12.3 cm    WorldPV     eIoni
-   18   2.69 m   -7.63 mm  -1.34 m    6.68 keV  1.87 keV   655 mum  12.3 cm    WorldPV     eIoni
-   19   2.69 m   -7.81 mm  -1.34 m    4.58 keV  2.11 keV   524 mum  12.4 cm    WorldPV     eIoni
-   20   2.69 m   -7.68 mm  -1.34 m       3 keV  1.57 keV   390 mum  12.4 cm    WorldPV     eIoni
-   21   2.69 m   -7.48 mm  -1.34 m     892 eV   2.11 keV   277 mum  12.4 cm    WorldPV     eIoni
-   22   2.69 m    -7.5 mm  -1.34 m       0 eV    892 eV   52.9 mum  12.5 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 467,   Parent ID = 464
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.72 m     2.8 cm  -1.29 m    11.5 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   2.72 m    2.81 cm  -1.29 m    10.1 keV  1.36 keV   897 mum   897 mum   WorldPV     eIoni
-    2   2.72 m    2.86 cm  -1.29 m    6.31 keV   3.8 keV   777 mum  1.67 mm    WorldPV     eIoni
-    3   2.72 m    2.84 cm  -1.29 m    4.01 keV  2.29 keV   500 mum  2.17 mm    WorldPV     eIoni
-    4   2.72 m    2.83 cm  -1.29 m       0 eV   4.01 keV   353 mum  2.53 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 463,   Parent ID = 462
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.37 m    8.63 cm  -1.37 m    9.81 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.37 m    8.65 cm  -1.37 m    6.58 keV  3.23 keV   753 mum   753 mum   Tracker     eIoni
-    2   2.37 m    8.67 cm  -1.37 m    6.01 keV   568 eV    517 mum  1.27 mm    Tracker     eIoni
-    3   2.37 m    8.66 cm  -1.37 m    4.87 keV  1.14 keV   480 mum  1.75 mm    Tracker     eIoni
-    4   2.37 m    8.69 cm  -1.37 m    3.23 keV  1.64 keV   408 mum  2.16 mm    Tracker     eIoni
-    5   2.37 m    8.68 cm  -1.37 m    2.28 keV   944 eV    296 mum  2.45 mm    Tracker     eIoni
-    6   2.37 m    8.68 cm  -1.37 m       0 eV   2.28 keV   199 mum  2.65 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 458,   Parent ID = 454
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    164 mum   415 mum  -2.4 m    14.6 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    778 mum   676 mum  -2.4 m    14.6 MeV     0 eV   3.24 mm   3.24 mm    TrackerTransportation
-    2   15.6 cm   6.64 cm   -1.6 m    14.6 MeV     0 eV   81.7 cm   82.1 cm    ChamberTransportation
-    3   19.4 cm   8.29 cm   -1.4 m    14.6 MeV     0 eV   20.4 cm   1.03 m     TrackerTransportation
-    4     31 cm   13.2 cm    -80 cm   14.6 MeV     0 eV   61.3 cm   1.64 m     ChamberTransportation
-    5   34.9 cm   14.9 cm    -60 cm   14.6 MeV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6   46.5 cm   19.8 cm      0 fm   14.6 MeV     0 eV   61.3 cm   2.46 m     ChamberTransportation
-    7   50.4 cm   21.4 cm     20 cm   14.6 MeV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8     62 cm   26.4 cm     80 cm   14.6 MeV     0 eV   61.3 cm   3.27 m     ChamberTransportation
-    9   65.9 cm     28 cm      1 m    14.6 MeV     0 eV   20.4 cm   3.48 m     TrackerTransportation
-   10   77.5 cm   32.9 cm    1.6 m    14.6 MeV     0 eV   61.3 cm   4.09 m     ChamberTransportation
-   11   81.3 cm   34.6 cm    1.8 m    14.6 MeV     0 eV   20.4 cm    4.3 m     TrackerTransportation
-   12   92.9 cm   39.5 cm    2.4 m    14.6 MeV     0 eV   61.3 cm   4.91 m     WorldPVTransportation
-   13   1.03 m    43.7 cm   2.91 m    14.6 MeV     0 eV   52.1 cm   5.43 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 457,   Parent ID = 454
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    161 mum   414 mum  -2.4 m     303 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    831 mum   774 mum  -2.4 m     303 keV     0 eV   3.28 mm   3.28 mm    TrackerTransportation
-    2   16.9 cm    9.1 cm   -1.6 m     303 keV     0 eV   82.2 cm   82.6 cm    ChamberTransportation
-    3   21.1 cm   11.4 cm   -1.4 m     303 keV     0 eV   20.6 cm   1.03 m     TrackerTransportation
-    4   33.7 cm   18.1 cm    -80 cm    303 keV     0 eV   61.7 cm   1.65 m     ChamberTransportation
-    5     38 cm   20.4 cm    -60 cm    303 keV     0 eV   20.6 cm   1.85 m     TrackerTransportation
-    6   50.6 cm   27.2 cm      0 fm    303 keV     0 eV   61.7 cm   2.47 m     ChamberTransportation
-    7   54.8 cm   29.4 cm     20 cm    303 keV     0 eV   20.6 cm   2.68 m     TrackerTransportation
-    8   67.4 cm   36.2 cm     80 cm    303 keV     0 eV   61.7 cm   3.29 m     ChamberTransportation
-    9   71.6 cm   38.4 cm      1 m     303 keV     0 eV   20.6 cm    3.5 m     TrackerTransportation
-   10   84.2 cm   45.2 cm    1.6 m     303 keV     0 eV   61.7 cm   4.12 m     ChamberTransportation
-   11   88.4 cm   47.5 cm    1.8 m     303 keV     0 eV   20.6 cm   4.32 m     TrackerTransportation
-   12   1.01 m    54.2 cm    2.4 m     303 keV     0 eV   61.7 cm   4.94 m     WorldPVTransportation
-   13   1.12 m      60 cm   2.91 m     303 keV     0 eV   52.4 cm   5.46 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 456,   Parent ID = 454
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    198 mum   427 mum  -2.4 m     724 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    718 mum   175 mum  -2.4 m     724 keV     0 eV    4.2 mm    4.2 mm    TrackerTransportation
-    2   10.1 cm  -4.82 cm   -1.6 m     724 keV     0 eV   80.8 cm   81.2 cm    ChamberTransportation
-    3   12.6 cm  -6.04 cm   -1.4 m     724 keV     0 eV   20.2 cm   1.01 m     TrackerTransportation
-    4     20 cm  -9.67 cm    -80 cm    724 keV     0 eV   60.6 cm   1.62 m     ChamberTransportation
-    5   22.5 cm  -10.9 cm    -60 cm    724 keV     0 eV   20.2 cm   1.82 m     TrackerTransportation
-    6     30 cm  -14.5 cm      0 fm    724 keV     0 eV   60.6 cm   2.43 m     ChamberTransportation
-    7   32.5 cm  -15.7 cm     20 cm    724 keV     0 eV   20.2 cm   2.63 m     TrackerTransportation
-    8     40 cm  -19.4 cm     80 cm    724 keV     0 eV   60.6 cm   3.23 m     ChamberTransportation
-    9   42.5 cm  -20.6 cm      1 m     724 keV     0 eV   20.2 cm   3.44 m     TrackerTransportation
-   10     50 cm  -24.2 cm    1.6 m     724 keV     0 eV   60.6 cm   4.04 m     ChamberTransportation
-   11   52.5 cm  -25.4 cm    1.8 m     724 keV     0 eV   20.2 cm   4.24 m     TrackerTransportation
-   12     60 cm    -29 cm    2.4 m     724 keV     0 eV   60.6 cm   4.85 m     WorldPVTransportation
-   13   66.3 cm  -32.1 cm   2.91 m     724 keV     0 eV   51.5 cm   5.37 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 455,   Parent ID = 454
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -64.3 mum   513 mum -2.41 m    23.5 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    269 mum   1.5 mm   -2.4 m       0 eV      0 eV   4.84 mm   4.84 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 469,   Parent ID = 455
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    269 mum   1.5 mm   -2.4 m    9.77 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    514 mum   1.7 mm   -2.4 m    7.58 MeV   2.2 MeV  1.76 mm   1.76 mm   TargetPV     eIoni
-    2    557 mum  1.72 mm   -2.4 m    5.44 MeV  48.1 keV  48.5 mum  1.81 mm   TargetPV     eBrem
-    3    681 mum  1.78 mm   -2.4 m     4.8 MeV   195 keV   207 mum  2.02 mm   TargetPV     eBrem
-    4    741 mum  1.77 mm   -2.4 m    4.72 MeV  81.4 keV  73.7 mum  2.09 mm    TrackerTransportation
-    5   13.9 cm    878 mum -2.34 m    4.66 MeV  28.8 keV  15.1 cm   15.3 cm    Tracker     eIoni
-    6    1.9 m   -11.7 cm  -1.23 m    4.28 MeV   369 keV  2.11 m    2.26 m     Tracker     eIoni
-    7   2.15 m   -10.7 cm  -1.01 m    4.21 MeV  64.5 keV  33.2 cm   2.59 m     Tracker     eIoni
-    8    2.4 m   -9.05 cm  -80.9 cm   4.16 MeV  47.3 keV  32.1 cm   2.91 m     WorldPVTransportation
-    9   2.91 m   -6.52 cm  -27.5 cm   4.03 MeV   127 keV  74.4 cm   3.66 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 474,   Parent ID = 469
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.15 m   -10.7 cm  -1.01 m    8.45 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.15 m   -10.6 cm  -1.01 m    7.15 keV   1.3 keV   647 mum   647 mum   Tracker     eIoni
-    2   2.15 m   -10.7 cm  -1.01 m    5.49 keV  1.66 keV   555 mum   1.2 mm    Tracker     eIoni
-    3   2.15 m   -10.7 cm  -1.01 m    4.42 keV  1.07 keV   447 mum  1.65 mm    Tracker     eIoni
-    4   2.15 m   -10.7 cm  -1.01 m    3.08 keV  1.34 keV   380 mum  2.03 mm    Tracker     eIoni
-    5   2.15 m   -10.6 cm  -1.01 m     834 eV   2.25 keV   284 mum  2.31 mm    Tracker     eIoni
-    6   2.15 m   -10.6 cm  -1.01 m       0 eV    834 eV   48.9 mum  2.36 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 473,   Parent ID = 469
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    1.9 m   -11.7 cm  -1.23 m    11.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1    1.9 m   -11.8 cm  -1.23 m    10.6 keV   1.1 keV   917 mum   917 mum   Tracker     eIoni
-    2    1.9 m   -11.9 cm  -1.23 m    9.26 keV  1.34 keV   821 mum  1.74 mm    Tracker     eIoni
-    3    1.9 m   -11.9 cm  -1.23 m    4.53 keV  4.73 keV   710 mum  2.45 mm    Tracker     eIoni
-    4    1.9 m   -11.9 cm  -1.23 m    1.85 keV  2.68 keV   387 mum  2.84 mm    Tracker     eIoni
-    5    1.9 m   -11.9 cm  -1.23 m       0 eV   1.85 keV   144 mum  2.98 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 472,   Parent ID = 469
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   13.9 cm    878 mum -2.34 m    24.9 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1     14 cm    2.9 mm  -2.34 m    22.6 keV  2.33 keV  2.62 mm   2.62 mm    Tracker     eIoni
-    2     14 cm   5.07 mm  -2.34 m    20.8 keV  1.72 keV  2.26 mm   4.87 mm    Tracker     eIoni
-    3   14.1 cm   6.22 mm  -2.34 m    16.6 keV  4.29 keV  1.99 mm   6.86 mm    Tracker     eIoni
-    4   14.2 cm   7.58 mm  -2.34 m    12.7 keV  3.88 keV  1.43 mm   8.29 mm    Tracker     eIoni
-    5   14.1 cm   7.68 mm  -2.34 m    11.3 keV  1.36 keV  1.01 mm    9.3 mm    Tracker     eIoni
-    6   14.1 cm   8.38 mm  -2.34 m    10.3 keV  1.04 keV   884 mum  1.02 cm    Tracker     eIoni
-    7   14.1 cm   8.89 mm  -2.34 m    7.71 keV  2.57 keV   792 mum   1.1 cm    Tracker     eIoni
-    8   14.2 cm   8.69 mm  -2.34 m    6.54 keV  1.16 keV   594 mum  1.16 cm    Tracker     eIoni
-    9   14.2 cm   8.24 mm  -2.34 m     5.4 keV  1.15 keV   515 mum  1.21 cm    Tracker     eIoni
-   10   14.2 cm   7.91 mm  -2.34 m    3.95 keV  1.44 keV   442 mum  1.25 cm    Tracker     eIoni
-   11   14.2 cm   7.72 mm  -2.34 m    1.95 keV     2 keV   349 mum  1.29 cm    Tracker     eIoni
-   12   14.2 cm   7.69 mm  -2.34 m       0 eV   1.95 keV   157 mum   1.3 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 471,   Parent ID = 469
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    681 mum  1.78 mm   -2.4 m     449 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    764 mum  1.79 mm   -2.4 m     449 keV     0 eV   91.7 mum  91.7 mum   TrackerTransportation
-    2    2.4 m    23.8 cm   -1.3 m     449 keV     0 eV   2.65 m    2.65 m     WorldPVTransportation
-    3   2.91 m    28.8 cm  -1.07 m     449 keV     0 eV   56.3 cm   3.21 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 470,   Parent ID = 469
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    557 mum  1.72 mm   -2.4 m    2.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    824 mum   1.8 mm   -2.4 m    2.09 MeV     0 eV    336 mum   336 mum   TrackerTransportation
-    2    2.4 m    77.9 cm    -76 cm   2.09 MeV     0 eV   3.01 m    3.01 m     WorldPVTransportation
-    3   2.91 m    94.4 cm  -41.1 cm   2.09 MeV     0 eV     64 cm   3.65 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 468,   Parent ID = 455
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    269 mum   1.5 mm   -2.4 m    12.7 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    330 mum  1.58 mm   -2.4 m    11.9 MeV   411 keV   261 mum   261 mum  TargetPV     eBrem
-    2    338 mum  1.39 mm   -2.4 m    9.19 MeV   640 keV   580 mum   840 mum  TargetPV     eBrem
-    3   7.39 mum   637 mum  -2.4 m    6.48 MeV  2.71 MeV  1.56 mm    2.4 mm    TrackerTransportation
-    4   66.6 cm  -43.7 cm  -2.19 m    6.33 MeV   141 keV  82.5 cm   82.7 cm    Tracker     eIoni
-    5   70.8 cm  -46.2 cm  -2.16 m     6.3 MeV  7.11 keV   6.2 cm   88.9 cm    Tracker     eIoni
-    6   1.28 m   -82.7 cm  -1.58 m    6.14 MeV   158 keV  89.4 cm   1.78 m     Tracker     eIoni
-    7   1.65 m   -1.03 m   -1.21 m    6.03 MeV  99.7 keV  55.8 cm   2.34 m     Tracker     eIoni
-    8   2.37 m   -1.45 m   -56.3 cm   5.82 MeV   187 keV  1.06 m     3.4 m     Tracker     eIoni
-    9    2.4 m   -1.47 m     -53 cm   5.81 MeV  7.33 keV  5.37 cm   3.45 m     WorldPVTransportation
-   10   2.91 m   -1.86 m   -1.33 cm   5.66 MeV   148 keV  82.4 cm   4.28 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 481,   Parent ID = 468
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   2.37 m   -1.45 m   -56.3 cm   23.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   2.36 m   -1.45 m   -56.2 cm   20.8 keV  2.65 keV  2.39 mm   2.39 mm    Tracker     eIoni
-    2   2.36 m   -1.45 m     -56 cm     19 keV   1.8 keV  1.98 mm   4.37 mm    Tracker     eIoni
-    3   2.36 m   -1.45 m   -55.9 cm     17 keV     2 keV  1.74 mm   6.11 mm    Tracker     eIoni
-    4   2.36 m   -1.45 m   -55.8 cm     15 keV  1.98 keV  1.48 mm   7.59 mm    Tracker     eIoni
-    5   2.36 m   -1.45 m   -55.7 cm     12 keV  2.99 keV  1.25 mm   8.84 mm    Tracker     eIoni
-    6   2.36 m   -1.45 m   -55.6 cm   9.38 keV  2.62 keV   943 mum  9.78 mm    Tracker     eIoni
-    7   2.36 m   -1.45 m   -55.6 cm   7.84 keV  1.54 keV   720 mum  1.05 cm    Tracker     eIoni
-    8   2.36 m   -1.45 m   -55.5 cm   7.17 keV   673 eV    604 mum  1.11 cm    Tracker     eIoni
-    9   2.36 m   -1.45 m   -55.5 cm    5.7 keV  1.47 keV   557 mum  1.17 cm    Tracker     eIoni
-   10   2.36 m   -1.45 m   -55.5 cm   4.92 keV   781 eV    460 mum  1.21 cm    Tracker     eIoni
-   11   2.36 m   -1.45 m   -55.5 cm   3.16 keV  1.76 keV   412 mum  1.25 cm    Tracker     eIoni
-   12   2.36 m   -1.45 m   -55.5 cm   2.08 keV  1.08 keV   291 mum  1.28 cm    Tracker     eIoni
-   13   2.36 m   -1.45 m   -55.5 cm      0 eV   2.08 keV   174 mum   1.3 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 480,   Parent ID = 468
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.65 m   -1.03 m   -1.21 m    8.16 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.65 m   -1.03 m   -1.21 m    5.94 keV  2.22 keV   625 mum   625 mum   Tracker     eIoni
-    2   1.65 m   -1.03 m   -1.21 m    4.43 keV  1.51 keV   475 mum   1.1 mm    Tracker     eIoni
-    3   1.65 m   -1.03 m   -1.21 m    2.64 keV  1.79 keV   381 mum  1.48 mm    Tracker     eIoni
-    4   1.65 m   -1.03 m   -1.21 m    1.28 keV  1.35 keV   242 mum  1.72 mm    Tracker     eIoni
-    5   1.65 m   -1.03 m   -1.21 m       0 eV   1.28 keV  85.4 mum  1.81 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 479,   Parent ID = 468
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.28 m   -82.7 cm  -1.58 m    8.67 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.28 m   -82.7 cm  -1.58 m    6.28 keV  2.38 keV   664 mum   664 mum   Tracker     eIoni
-    2   1.28 m   -82.6 cm  -1.58 m    4.49 keV  1.79 keV   498 mum  1.16 mm    Tracker     eIoni
-    3   1.28 m   -82.6 cm  -1.58 m    2.28 keV  2.21 keV   384 mum  1.55 mm    Tracker     eIoni
-    4   1.28 m   -82.6 cm  -1.58 m       0 eV   2.28 keV   198 mum  1.74 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 478,   Parent ID = 468
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   70.8 cm  -46.2 cm  -2.16 m    15.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   70.9 cm  -46.2 cm  -2.16 m    14.2 keV  1.48 keV  1.33 mm   1.33 mm    Tracker     eIoni
-    2     71 cm  -46.2 cm  -2.16 m    12.9 keV   1.3 keV  1.17 mm    2.5 mm    Tracker     eIoni
-    3   71.1 cm  -46.2 cm  -2.16 m    10.3 keV  2.59 keV  1.04 mm   3.53 mm    Tracker     eIoni
-    4   71.1 cm  -46.2 cm  -2.16 m    8.41 keV  1.92 keV   797 mum  4.33 mm    Tracker     eIoni
-    5   71.2 cm  -46.2 cm  -2.16 m    6.78 keV  1.64 keV   644 mum  4.97 mm    Tracker     eIoni
-    6   71.2 cm  -46.2 cm  -2.16 m    5.93 keV   842 eV    530 mum   5.5 mm    Tracker     eIoni
-    7   71.2 cm  -46.1 cm  -2.16 m    4.62 keV  1.31 keV   475 mum  5.98 mm    Tracker     eIoni
-    8   71.2 cm  -46.1 cm  -2.16 m    3.14 keV  1.48 keV   393 mum  6.37 mm    Tracker     eIoni
-    9   71.2 cm  -46.1 cm  -2.16 m    2.27 keV   870 eV    289 mum  6.66 mm    Tracker     eIoni
-   10   71.2 cm  -46.1 cm  -2.16 m       0 eV   2.27 keV   197 mum  6.86 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 477,   Parent ID = 468
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   66.6 cm  -43.7 cm  -2.19 m    8.75 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   66.6 cm  -43.7 cm  -2.19 m    6.29 keV  2.45 keV   670 mum   670 mum   Tracker     eIoni
-    2   66.6 cm  -43.6 cm  -2.19 m       5 keV  1.29 keV   499 mum  1.17 mm    Tracker     eIoni
-    3   66.6 cm  -43.6 cm  -2.19 m    3.68 keV  1.33 keV   417 mum  1.59 mm    Tracker     eIoni
-    4   66.6 cm  -43.6 cm  -2.19 m    1.92 keV  1.75 keV   330 mum  1.92 mm    Tracker     eIoni
-    5   66.6 cm  -43.6 cm  -2.19 m       0 eV   1.92 keV   153 mum  2.07 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 476,   Parent ID = 468
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    338 mum  1.39 mm   -2.4 m    2.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   22.2 mum   634 mum  -2.4 m    2.04 MeV     0 eV   1.16 mm   1.16 mm    TrackerTransportation
-    2  -99.9 cm   -2.4 m    21.2 cm   2.04 MeV     0 eV   3.69 m    3.69 m     WorldPVTransportation
-    3  -1.21 m   -2.91 m    76.7 cm   2.04 MeV     0 eV   78.3 cm   4.47 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 475,   Parent ID = 468
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    330 mum  1.58 mm   -2.4 m     396 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    579 mum  1.45 mm   -2.4 m     396 keV     0 eV   1.39 mm   1.39 mm    TrackerTransportation
-    2   14.7 cm  -7.76 cm   -1.6 m     396 keV     0 eV   81.7 cm   81.9 cm    ChamberTransportation
-    3   18.4 cm  -9.73 cm   -1.4 m     396 keV     0 eV   20.4 cm   1.02 m     TrackerTransportation
-    4   29.4 cm  -15.7 cm    -80 cm    396 keV     0 eV   61.3 cm   1.64 m     ChamberTransportation
-    5   33.1 cm  -17.6 cm    -60 cm    396 keV     0 eV   20.4 cm   1.84 m     TrackerTransportation
-    6   44.1 cm  -23.6 cm      0 fm    396 keV     0 eV   61.3 cm   2.45 m     ChamberTransportation
-    7   47.8 cm  -25.5 cm     20 cm    396 keV     0 eV   20.4 cm   2.66 m     TrackerTransportation
-    8   58.8 cm  -31.5 cm     80 cm    396 keV     0 eV   61.3 cm   3.27 m     ChamberTransportation
-    9   62.5 cm  -33.4 cm      1 m     396 keV     0 eV   20.4 cm   3.47 m     TrackerTransportation
-   10   73.5 cm  -39.4 cm    1.6 m     396 keV     0 eV   61.3 cm   4.09 m     ChamberTransportation
-   11   77.1 cm  -41.3 cm    1.8 m     396 keV     0 eV   20.4 cm   4.29 m     TrackerTransportation
-   12   88.1 cm  -47.3 cm    2.4 m     396 keV     0 eV   61.3 cm    4.9 m     WorldPVTransportation
-   13   97.5 cm  -52.3 cm   2.91 m     396 keV     0 eV   52.1 cm   5.43 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 453,   Parent ID = 385
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.3 mum   502 mum -2.41 m     149 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -42.3 mum   503 mum -2.41 m     147 MeV  31.8 keV  27.9 mum  27.9 mum  TargetPV     eBrem
-    2  -73.2 mum   565 mum -2.41 m     130 MeV    16 MeV   887 mum   915 mum  TargetPV     eBrem
-    3   -107 mum   543 mum  -2.4 m     119 MeV  1.06 MeV   829 mum  1.74 mm   TargetPV     eBrem
-    4    -95 mum   534 mum  -2.4 m    78.3 MeV  1.84 MeV  1.12 mm   2.86 mm   TargetPV     eBrem
-    5  -94.6 mum   535 mum  -2.4 m    76.3 MeV  6.29 keV   4.9 mum  2.86 mm   TargetPV     eBrem
-    6  -5.08 mum   604 mum  -2.4 m    67.5 MeV  1.22 MeV   721 mum  3.59 mm   TargetPV     eBrem
-    7  -26.8 mum   566 mum  -2.4 m    61.8 MeV  2.12 MeV  1.43 mm   5.01 mm   TargetPV     eBrem
-    8    -86 mum   585 mum  -2.4 m    49.9 MeV  6.74 MeV   1.3 mm   6.31 mm   TargetPV     eBrem
-    9  -30.4 mum   724 mum  -2.4 m    49.3 MeV   572 keV   457 mum  6.77 mm    TrackerTransportation
-   10   15.4 cm   36.5 cm  -1.46 m    49.1 MeV   226 keV  1.02 m    1.02 m     Tracker     eIoni
-   11   15.5 cm   36.7 cm  -1.46 m    49.1 MeV   601 eV   5.57 mm   1.03 m     Tracker     eIoni
-   12   25.4 cm     58 cm    -90 cm   48.9 MeV   130 keV  60.6 cm   1.63 m     Tracker     eIoni
-   13   26.3 cm     60 cm  -84.6 cm   48.9 MeV  10.6 keV  5.85 cm   1.69 m     Tracker     eIoni
-   14     27 cm   61.7 cm    -80 cm   48.9 MeV  13.9 keV  4.94 cm   1.74 m     ChamberTransportation
-   15   29.4 cm   67.2 cm  -65.1 cm   48.8 MeV   119 keV  16.1 cm    1.9 m     TrackerTransportation
-   16   37.7 cm   86.8 cm      0 fm   48.6 MeV   146 keV  68.5 cm   2.59 m     ChamberTransportation
-   17   40.2 cm   92.9 cm     20 cm   48.4 MeV   146 keV  21.1 cm    2.8 m     TrackerTransportation
-   18   42.1 cm   98.1 cm   35.9 cm   48.4 MeV  39.5 keV  16.8 cm   2.97 m     Tracker     eIoni
-   19   47.4 cm   1.13 m      80 cm   48.3 MeV  99.7 keV  46.9 cm   3.44 m     ChamberTransportation
-   20     50 cm    1.2 m       1 m    48.1 MeV   143 keV  21.4 cm   3.65 m     TrackerTransportation
-   21   56.9 cm   1.41 m     1.6 m      48 MeV   140 keV    64 cm   4.29 m     ChamberTransportation
-   22     59 cm   1.48 m     1.8 m    47.8 MeV   130 keV  21.2 cm    4.5 m     TrackerTransportation
-   23   61.1 cm   1.72 m     2.4 m    47.7 MeV   141 keV  64.7 cm   5.15 m     WorldPVTransportation
-   24   61.9 cm   1.82 m    2.65 m    47.6 MeV    57 keV  27.2 cm   5.42 m     WorldPV     eIoni
-   25   62.9 cm   1.93 m    2.91 m    47.5 MeV  68.3 keV  27.9 cm    5.7 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 499,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   61.9 cm   1.82 m    2.65 m    25.6 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   62.1 cm   1.82 m    2.65 m    22.4 keV  3.18 keV  2.74 mm   2.74 mm    WorldPV     eIoni
-    2   62.3 cm   1.82 m    2.65 m    20.1 keV  2.29 keV  2.23 mm   4.97 mm    WorldPV     eIoni
-    3   62.5 cm   1.82 m    2.66 m    18.8 keV  1.35 keV  1.89 mm   6.86 mm    WorldPV     eIoni
-    4   62.6 cm   1.82 m    2.65 m    17.5 keV  1.24 keV  1.71 mm   8.57 mm    WorldPV     eIoni
-    5   62.8 cm   1.82 m    2.66 m    16.1 keV  1.45 keV  1.55 mm   1.01 cm    WorldPV     eIoni
-    6   62.8 cm   1.82 m    2.66 m    14.4 keV  1.68 keV  1.38 mm   1.15 cm    WorldPV     eIoni
-    7   62.8 cm   1.82 m    2.66 m    11.8 keV  2.55 keV  1.18 mm   1.27 cm    WorldPV     eIoni
-    8   62.7 cm   1.82 m    2.65 m    8.98 keV  2.87 keV   929 mum  1.36 cm    WorldPV     eIoni
-    9   62.7 cm   1.82 m    2.65 m    7.59 keV  1.38 keV   688 mum  1.43 cm    WorldPV     eIoni
-   10   62.7 cm   1.82 m    2.65 m    5.48 keV  2.11 keV   586 mum  1.49 cm    WorldPV     eIoni
-   11   62.7 cm   1.82 m    2.65 m    1.72 keV  3.76 keV   447 mum  1.53 cm    WorldPV     eIoni
-   12   62.7 cm   1.82 m    2.65 m       0 eV   1.72 keV   130 mum  1.55 cm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 498,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   58.7 cm   1.47 m    1.77 m    22.2 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   58.7 cm   1.47 m    1.77 m    17.6 keV  4.56 keV  1.17 mm   1.17 mm    Chamber     eIoni
-    2   58.6 cm   1.47 m    1.77 m    13.8 keV  3.89 keV   894 mum  2.06 mm    Chamber     eIoni
-    3   58.6 cm   1.47 m    1.77 m      12 keV  1.79 keV   697 mum  2.76 mm    Chamber     eIoni
-    4   58.6 cm   1.47 m    1.77 m    8.58 keV  3.39 keV   614 mum  3.37 mm    Chamber     eIoni
-    5   58.6 cm   1.47 m    1.77 m    6.22 keV  2.37 keV   474 mum  3.85 mm    Chamber     eIoni
-    6   58.6 cm   1.47 m    1.77 m    4.98 keV  1.24 keV   381 mum  4.23 mm    Chamber     eIoni
-    7   58.6 cm   1.47 m    1.77 m    2.09 keV  2.89 keV   327 mum  4.55 mm    Chamber     eIoni
-    8   58.6 cm   1.47 m    1.77 m       0 eV   2.09 keV   125 mum  4.68 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 497,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   47.5 cm   1.13 m    81.4 cm   14.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   47.5 cm   1.13 m    81.4 cm   12.6 keV  1.71 keV   723 mum   723 mum   Chamber     eIoni
-    2   47.5 cm   1.13 m    81.4 cm   10.1 keV  2.56 keV   644 mum  1.37 mm    Chamber     eIoni
-    3   47.5 cm   1.13 m    81.4 cm   6.93 keV  3.13 keV   533 mum   1.9 mm    Chamber     eIoni
-    4   47.5 cm   1.13 m    81.4 cm   4.43 keV   2.5 keV   409 mum  2.31 mm    Chamber     eIoni
-    5   47.5 cm   1.13 m    81.4 cm   1.87 keV  2.56 keV   301 mum  2.61 mm    Chamber     eIoni
-    6   47.5 cm   1.13 m    81.4 cm      0 eV   1.87 keV   107 mum  2.72 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 496,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   42.1 cm   98.1 cm   35.9 cm   12.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   42.2 cm     98 cm   35.9 cm   9.86 keV  2.32 keV   961 mum   961 mum   Tracker     eIoni
-    2   42.2 cm     98 cm   35.9 cm   8.38 keV  1.48 keV   757 mum  1.72 mm    Tracker     eIoni
-    3   42.3 cm     98 cm     36 cm   6.44 keV  1.94 keV   641 mum  2.36 mm    Tracker     eIoni
-    4   42.3 cm   98.1 cm     36 cm   4.87 keV  1.57 keV   508 mum  2.87 mm    Tracker     eIoni
-    5   42.3 cm   98.1 cm     36 cm   3.81 keV  1.06 keV   408 mum  3.28 mm    Tracker     eIoni
-    6   42.3 cm   98.1 cm     36 cm   2.12 keV  1.69 keV   339 mum  3.61 mm    Tracker     eIoni
-    7   42.3 cm   98.1 cm     36 cm      0 eV   2.12 keV   178 mum  3.79 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 495,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   39.8 cm   91.9 cm   16.7 cm   37.6 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   39.9 cm   91.8 cm   16.7 cm   28.7 keV  8.88 keV  2.35 mm   2.35 mm    Chamber     eIoni
-    2   39.9 cm   91.8 cm   16.8 cm   23.8 keV  4.96 keV  1.62 mm   3.97 mm    Chamber     eIoni
-    3   39.8 cm   91.8 cm   16.7 cm   19.1 keV  4.74 keV  1.27 mm   5.24 mm    Chamber     eIoni
-    4   39.8 cm   91.8 cm   16.8 cm   14.2 keV  4.83 keV   975 mum  6.21 mm    Chamber     eIoni
-    5   39.8 cm   91.7 cm   16.8 cm   9.85 keV  4.37 keV   718 mum  6.93 mm    Chamber     eIoni
-    6   39.8 cm   91.7 cm   16.8 cm   8.75 keV  1.09 keV   525 mum  7.45 mm    Chamber     eIoni
-    7   39.8 cm   91.7 cm   16.7 cm   7.62 keV  1.14 keV   481 mum  7.94 mm    Chamber     eIoni
-    8   39.8 cm   91.7 cm   16.8 cm   5.66 keV  1.95 keV   436 mum  8.37 mm    Chamber     eIoni
-    9   39.8 cm   91.7 cm   16.8 cm   2.73 keV  2.93 keV   357 mum  8.73 mm    Chamber     eIoni
-   10   39.8 cm   91.7 cm   16.8 cm      0 eV   2.73 keV   180 mum  8.91 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 494,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   29.2 cm   66.8 cm  -66.2 cm   11.1 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   29.2 cm   66.8 cm  -66.1 cm   8.07 keV  3.01 keV   577 mum   577 mum   Chamber     eIoni
-    2   29.2 cm   66.8 cm  -66.1 cm   5.45 keV  2.62 keV   454 mum  1.03 mm    Chamber     eIoni
-    3   29.2 cm   66.8 cm  -66.2 cm   3.19 keV  2.26 keV   349 mum  1.38 mm    Chamber     eIoni
-    4   29.2 cm   66.8 cm  -66.2 cm      0 eV   3.19 keV   222 mum   1.6 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 493,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   26.3 cm     60 cm  -84.6 cm   29.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   26.4 cm   60.3 cm  -84.7 cm   27.5 keV  2.38 keV  3.51 mm   3.51 mm    Tracker     eIoni
-    2   26.7 cm   60.4 cm  -84.8 cm   23.9 keV  3.54 keV  3.08 mm   6.58 mm    Tracker     eIoni
-    3   26.9 cm   60.5 cm  -84.8 cm   21.8 keV  2.08 keV  2.47 mm   9.05 mm    Tracker     eIoni
-    4     27 cm   60.7 cm  -84.9 cm   19.2 keV  2.66 keV  2.14 mm   1.12 cm    Tracker     eIoni
-    5   27.1 cm   60.8 cm  -84.9 cm   17.9 keV  1.27 keV  1.77 mm    1.3 cm    Tracker     eIoni
-    6   27.1 cm   60.9 cm    -85 cm   12.9 keV  5.02 keV   1.6 mm   1.46 cm    Tracker     eIoni
-    7   27.1 cm   60.9 cm  -85.1 cm    9.9 keV     3 keV  1.03 mm   1.56 cm    Tracker     eIoni
-    8     27 cm   60.9 cm  -85.1 cm   7.15 keV  2.74 keV   759 mum  1.63 cm    Tracker     eIoni
-    9     27 cm   60.9 cm  -85.2 cm   6.04 keV  1.11 keV   555 mum  1.69 cm    Tracker     eIoni
-   10     27 cm   60.9 cm  -85.2 cm   4.14 keV   1.9 keV   482 mum  1.74 cm    Tracker     eIoni
-   11     27 cm   60.9 cm  -85.2 cm   1.32 keV  2.83 keV   362 mum  1.77 cm    Tracker     eIoni
-   12     27 cm   60.9 cm  -85.2 cm      0 eV   1.32 keV  88.3 mum  1.78 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 492,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   25.4 cm     58 cm    -90 cm    9.4 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   25.4 cm     58 cm    -90 cm    6.8 keV   2.6 keV   721 mum   721 mum   Tracker     eIoni
-    2   25.4 cm   57.9 cm  -89.9 cm   4.86 keV  1.94 keV   531 mum  1.25 mm    Tracker     eIoni
-    3   25.4 cm     58 cm    -90 cm   3.92 keV   949 eV    408 mum  1.66 mm    Tracker     eIoni
-    4   25.4 cm     58 cm    -90 cm    2.2 keV  1.71 keV   346 mum  2.01 mm    Tracker     eIoni
-    5   25.4 cm     58 cm    -90 cm      0 eV    2.2 keV   188 mum  2.19 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 491,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   15.5 cm   36.7 cm  -1.46 m    10.1 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   15.4 cm   36.8 cm  -1.46 m    6.57 keV  3.52 keV   775 mum   775 mum   Tracker     eIoni
-    2   15.4 cm   36.8 cm  -1.46 m    1.69 keV  4.88 keV   517 mum  1.29 mm    Tracker     eIoni
-    3   15.4 cm   36.8 cm  -1.46 m       0 eV   1.69 keV   127 mum  1.42 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 490,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   15.4 cm   36.5 cm  -1.46 m    12.6 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   15.4 cm   36.4 cm  -1.46 m    10.9 keV  1.64 keV   999 mum   999 mum   Tracker     eIoni
-    2   15.4 cm   36.4 cm  -1.46 m     8.9 keV  2.02 keV   848 mum  1.85 mm    Tracker     eIoni
-    3   15.4 cm   36.4 cm  -1.46 m    7.85 keV  1.05 keV   682 mum  2.53 mm    Tracker     eIoni
-    4   15.3 cm   36.4 cm  -1.46 m    5.79 keV  2.06 keV   604 mum  3.13 mm    Tracker     eIoni
-    5   15.3 cm   36.3 cm  -1.46 m    4.04 keV  1.75 keV   466 mum   3.6 mm    Tracker     eIoni
-    6   15.3 cm   36.4 cm  -1.46 m    1.48 keV  2.56 keV   355 mum  3.95 mm    Tracker     eIoni
-    7   15.3 cm   36.3 cm  -1.46 m       0 eV   1.48 keV   105 mum  4.06 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 489,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -86 mum   585 mum  -2.4 m    5.14 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -78.5 mum   601 mum  -2.4 m       0 eV      0 eV   54.3 mum  54.3 mum  TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 501,   Parent ID = 489
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.5 mum   601 mum  -2.4 m    1.24 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   3.73 mum   652 mum  -2.4 m       0 eV   1.24 MeV   470 mum   470 mum  TargetPV     eIoni
-    2   3.73 mum   652 mum  -2.4 m       0 eV      0 eV      0 fm    470 mum  TargetPV   annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 503,   Parent ID = 501
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.73 mum   652 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   2.69 mm   -119 mum -2.41 m     510 keV  1.19 keV  5.72 mm   5.72 mm   TargetPV     compt
-    2   3.01 mm   -204 mum -2.41 m     403 keV   107 keV   606 mum  6.33 mm   TargetPV     compt
-    3   2.99 mm   -158 mum -2.41 m       0 eV    403 keV   200 mum  6.53 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 502,   Parent ID = 501
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   3.73 mum   652 mum  -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -145 mum   695 mum  -2.4 m     511 keV     0 eV    318 mum   318 mum   TrackerTransportation
-    2   -2.4 m      69 cm   2.06 m     511 keV     0 eV   5.11 m    5.11 m     WorldPVTransportation
-    3  -2.86 m    82.1 cm   2.91 m     511 keV     0 eV   97.2 cm   6.09 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 500,   Parent ID = 489
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -78.5 mum   601 mum  -2.4 m    2.87 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -142 mum   555 mum  -2.4 m     888 keV   770 keV   574 mum   574 mum  TargetPV     eBrem
-    2   -116 mum   585 mum  -2.4 m     474 keV   415 keV   388 mum   962 mum  TargetPV     eIoni
-    3   -117 mum   599 mum  -2.4 m       0 eV    474 keV   257 mum  1.22 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 504,   Parent ID = 500
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -142 mum   555 mum  -2.4 m    1.22 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -586 mum  1.59 mm   -2.4 m     237 keV   979 keV   2.6 mm    2.6 mm   TargetPV     compt
-    2   -757 mum  1.36 mm   -2.4 m     127 keV   110 keV   372 mum  2.97 mm   TargetPV     compt
-    3   -697 mum  1.38 mm   -2.4 m       0 eV    127 keV  70.7 mum  3.04 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 488,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -26.8 mum   566 mum  -2.4 m    3.55 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   10.8 mum   721 mum  -2.4 m    3.55 MeV     0 eV   1.73 mm   1.73 mm    TrackerTransportation
-    2   1.74 cm   7.25 cm   -1.6 m    3.55 MeV     0 eV   80.3 cm   80.5 cm    ChamberTransportation
-    3   2.18 cm   9.05 cm   -1.4 m    3.55 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   3.49 cm   14.4 cm    -80 cm   3.55 MeV     0 eV   60.3 cm   1.61 m     ChamberTransportation
-    5   3.92 cm   16.2 cm    -60 cm   3.55 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   5.23 cm   21.6 cm      0 fm   3.55 MeV     0 eV   60.3 cm   2.41 m     ChamberTransportation
-    7   5.67 cm   23.4 cm     20 cm   3.55 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   6.97 cm   28.8 cm     80 cm   3.55 MeV     0 eV   60.3 cm   3.22 m     ChamberTransportation
-    9   7.41 cm   30.6 cm      1 m    3.55 MeV     0 eV   20.1 cm   3.42 m     TrackerTransportation
-   10   8.72 cm     36 cm    1.6 m    3.55 MeV     0 eV   60.3 cm   4.02 m     ChamberTransportation
-   11   9.15 cm   37.8 cm    1.8 m    3.55 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   10.5 cm   43.2 cm    2.4 m    3.55 MeV     0 eV   60.3 cm   4.82 m     WorldPVTransportation
-   13   11.6 cm   47.7 cm   2.91 m    3.55 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 487,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -5.08 mum   604 mum  -2.4 m    7.65 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   64.2 mum   797 mum  -2.4 m    7.65 MeV     0 eV   3.15 mm   3.15 mm    TrackerTransportation
-    2   1.77 cm   4.99 cm   -1.6 m    7.65 MeV     0 eV   80.2 cm   80.5 cm    ChamberTransportation
-    3   2.21 cm   6.21 cm   -1.4 m    7.65 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4   3.53 cm   9.89 cm    -80 cm   7.65 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5   3.97 cm   11.1 cm    -60 cm   7.65 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6   5.29 cm   14.8 cm      0 fm   7.65 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7   5.74 cm     16 cm     20 cm   7.65 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8   7.06 cm   19.7 cm     80 cm   7.65 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9    7.5 cm   20.9 cm      1 m    7.65 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10   8.82 cm   24.6 cm    1.6 m    7.65 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   9.26 cm   25.8 cm    1.8 m    7.65 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12   10.6 cm   29.5 cm    2.4 m    7.65 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13   11.7 cm   32.7 cm   2.91 m    7.65 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 486,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -94.6 mum   535 mum  -2.4 m    1.93 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    173 mum   694 mum  -2.4 m    1.93 MeV     0 eV   3.87 mm   3.87 mm    TrackerTransportation
-    2   5.56 cm   3.37 cm   -1.6 m    1.93 MeV     0 eV   80.3 cm   80.6 cm    ChamberTransportation
-    3   6.95 cm   4.19 cm   -1.4 m    1.93 MeV     0 eV   20.1 cm   1.01 m     TrackerTransportation
-    4   11.1 cm   6.66 cm    -80 cm   1.93 MeV     0 eV   60.2 cm   1.61 m     ChamberTransportation
-    5   12.5 cm   7.49 cm    -60 cm   1.93 MeV     0 eV   20.1 cm   1.81 m     TrackerTransportation
-    6   16.6 cm   9.96 cm  0.114 fm   1.93 MeV     0 eV   60.2 cm   2.41 m     ChamberTransportation
-    7     18 cm   10.8 cm     20 cm   1.93 MeV     0 eV   20.1 cm   2.61 m     TrackerTransportation
-    8   22.2 cm   13.3 cm     80 cm   1.93 MeV     0 eV   60.2 cm   3.21 m     ChamberTransportation
-    9   23.6 cm   14.1 cm      1 m    1.93 MeV     0 eV   20.1 cm   3.41 m     TrackerTransportation
-   10   27.7 cm   16.6 cm    1.6 m    1.93 MeV     0 eV   60.2 cm   4.02 m     ChamberTransportation
-   11   29.1 cm   17.4 cm    1.8 m    1.93 MeV     0 eV   20.1 cm   4.22 m     TrackerTransportation
-   12   33.3 cm   19.9 cm    2.4 m    1.93 MeV     0 eV   60.2 cm   4.82 m     WorldPVTransportation
-   13   36.8 cm     22 cm   2.91 m    1.93 MeV     0 eV   51.2 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 485,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    -95 mum   534 mum  -2.4 m    39.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    122 mum   707 mum  -2.4 m       0 eV      0 eV   2.76 mm   2.76 mm   TargetPV      conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 506,   Parent ID = 485
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    122 mum   707 mum  -2.4 m    20.9 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    206 mum   775 mum  -2.4 m    18.7 MeV  2.25 MeV  1.16 mm   1.16 mm    TrackerTransportation
-    2  -3.59 mm   -204 mum -2.28 m    18.6 MeV    21 keV    12 cm   12.1 cm    Tracker     eIoni
-    3  -2.44 cm  -7.99 mm   -1.6 m    18.5 MeV   131 keV  68.1 cm   80.2 cm    ChamberTransportation
-    4  -2.23 cm  -1.38 cm   -1.4 m    18.3 MeV   166 keV  20.1 cm      1 m     TrackerTransportation
-    5   4.06 cm  -4.64 cm    -80 cm   18.2 MeV   120 keV  60.4 cm   1.61 m     ChamberTransportation
-    6   6.35 cm  -5.47 cm    -60 cm   18.1 MeV    95 keV  20.2 cm   1.81 m     TrackerTransportation
-    7   8.79 cm  -2.63 cm      0 fm   17.9 MeV   123 keV  60.1 cm   2.41 m     ChamberTransportation
-    8   9.41 cm   -1.8 cm     20 cm   17.8 MeV   130 keV  20.1 cm   2.61 m     TrackerTransportation
-    9   11.2 cm  -1.53 cm   44.6 cm   17.7 MeV  52.6 keV  24.7 cm   2.86 m     Tracker     eIoni
-   10   13.9 cm  -2.64 cm     80 cm   17.6 MeV  60.3 keV  35.5 cm   3.21 m     ChamberTransportation
-   11   14.3 cm  -2.74 cm   91.1 cm   17.5 MeV  83.2 keV  11.2 cm   3.33 m     Chamber     eIoni
-   12   15.1 cm   -2.9 cm   97.2 cm   17.3 MeV  39.5 keV  6.14 cm   3.39 m     Chamber     eIoni
-   13   15.5 cm  -2.89 cm      1 m    17.3 MeV  10.3 keV   2.8 cm   3.41 m     TrackerTransportation
-   14   22.1 cm  -1.49 cm    1.6 m    17.2 MeV   118 keV  60.4 cm   4.02 m     ChamberTransportation
-   15   24.3 cm  -7.13 mm    1.8 m    17.1 MeV  88.5 keV  20.2 cm   4.22 m     TrackerTransportation
-   16   25.4 cm  -6.41 mm   1.95 m      17 MeV  27.1 keV  15.2 cm   4.37 m     Tracker     eIoni
-   17     28 cm    4.1 mm    2.4 m    16.9 MeV  88.3 keV  44.9 cm   4.82 m     WorldPVTransportation
-   18   30.9 cm   2.32 cm   2.91 m    16.8 MeV  99.9 keV  51.1 cm   5.33 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 515,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   25.4 cm  -6.41 mm   1.95 m    22.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   25.3 cm  -7.44 mm   1.95 m    17.8 keV  4.42 keV   2.2 mm    2.2 mm    Tracker     eIoni
-    2   25.1 cm  -7.58 mm   1.95 m    15.7 keV  2.08 keV  1.58 mm   3.79 mm    Tracker     eIoni
-    3   25.1 cm  -8.79 mm   1.95 m    10.6 keV  5.13 keV  1.34 mm   5.12 mm    Tracker     eIoni
-    4   25.1 cm  -9.61 mm   1.95 m    5.11 keV  5.49 keV   820 mum  5.94 mm    Tracker     eIoni
-    5   25.1 cm  -9.53 mm   1.95 m     841 eV   4.27 keV   424 mum  6.37 mm    Tracker     eIoni
-    6   25.1 cm  -9.53 mm   1.95 m       0 eV    841 eV   49.3 mum  6.41 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 514,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   23.3 cm  -1.08 cm    1.7 m    14.7 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   23.3 cm  -1.11 cm   1.71 m    5.34 keV  5.78 keV   708 mum   708 mum   Chamber     eBrem
-    2   23.3 cm  -1.12 cm    1.7 m    3.27 keV  2.07 keV   344 mum  1.05 mm    Chamber     eIoni
-    3   23.3 cm  -1.12 cm    1.7 m     190 eV   3.08 keV   228 mum  1.28 mm    Chamber     eIoni
-    4   23.3 cm  -1.12 cm    1.7 m       0 eV    190 eV   10.6 mum  1.29 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 516,   Parent ID = 514
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   23.3 cm  -1.11 cm   1.71 m    3.56 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   23.3 cm  -8.02 mm    1.7 m       0 eV   3.56 keV  3.72 mm   3.72 mm    Chamber      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 513,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   15.1 cm   -2.9 cm   97.2 cm    109 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   15.4 cm   -3.7 cm   97.4 cm   99.8 keV  9.71 keV  1.22 cm   1.22 cm    Chamber     eIoni
-    2     16 cm  -3.33 cm     97 cm   84.4 keV  15.3 keV  1.06 cm   2.28 cm    Chamber     eIoni
-    3     16 cm  -3.84 cm   96.7 cm   75.1 keV  9.35 keV   8.1 mm   3.09 cm    Chamber     eIoni
-    4     16 cm  -4.28 cm   96.9 cm   66.4 keV  8.65 keV   6.7 mm   3.76 cm    Chamber     eIoni
-    5     16 cm  -4.65 cm   96.7 cm   59.1 keV  7.35 keV  5.55 mm   4.32 cm    Chamber     eIoni
-    6   16.1 cm   -4.9 cm   96.5 cm     55 keV   4.1 keV  4.63 mm   4.78 cm    Chamber     eIoni
-    7   16.2 cm  -5.15 cm   96.6 cm   48.9 keV  6.05 keV  4.14 mm   5.19 cm    Chamber     eIoni
-    8   16.3 cm  -5.08 cm   96.8 cm   41.7 keV  7.17 keV  3.47 mm   5.54 cm    Chamber     eIoni
-    9   16.4 cm     -5 cm   96.7 cm     37 keV  4.77 keV  2.73 mm   5.81 cm    Chamber     eIoni
-   10   16.5 cm  -4.85 cm   96.6 cm     34 keV  2.96 keV  2.29 mm   6.04 cm    Chamber     eIoni
-   11   16.4 cm  -4.97 cm   96.5 cm   29.6 keV  4.37 keV  2.04 mm   6.25 cm    Chamber     eIoni
-   12   16.5 cm  -5.07 cm   96.5 cm   26.5 keV  3.12 keV  1.68 mm   6.41 cm    Chamber     eIoni
-   13   16.5 cm  -5.14 cm   96.5 cm   23.2 keV  3.29 keV  1.46 mm   6.56 cm    Chamber     eIoni
-   14   16.5 cm  -5.14 cm   96.6 cm   16.7 keV  6.51 keV  1.23 mm   6.68 cm    Chamber     eIoni
-   15   16.5 cm   -5.1 cm   96.5 cm   13.3 keV  3.38 keV   846 mum  6.77 cm    Chamber     eIoni
-   16   16.5 cm  -5.09 cm   96.5 cm   9.56 keV  3.78 keV   678 mum  6.83 cm    Chamber     eIoni
-   17   16.5 cm  -5.06 cm   96.5 cm   7.72 keV  1.84 keV   513 mum  6.89 cm    Chamber     eIoni
-   18   16.5 cm  -5.06 cm   96.5 cm   4.12 keV  3.61 keV   441 mum  6.93 cm    Chamber     eIoni
-   19   16.5 cm  -5.06 cm   96.5 cm    256 eV   3.86 keV   284 mum  6.96 cm    Chamber     eIoni
-   20   16.5 cm  -5.06 cm   96.5 cm      0 eV    256 eV   12.5 mum  6.96 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 512,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   14.3 cm  -2.74 cm   91.1 cm   95.8 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   13.9 cm  -3.16 cm   91.5 cm   63.4 keV  32.4 keV  9.91 mm   9.91 mm    Chamber     eIoni
-    2   13.9 cm  -2.97 cm   91.9 cm   55.3 keV   8.1 keV  5.15 mm   1.51 cm    Chamber     eIoni
-    3   13.9 cm   -2.7 cm   91.7 cm     50 keV  5.35 keV  4.18 mm   1.92 cm    Chamber     eIoni
-    4   13.9 cm  -2.56 cm   91.5 cm   35.3 keV  14.6 keV  3.58 mm   2.28 cm    Chamber     eIoni
-    5   13.9 cm  -2.43 cm   91.6 cm   30.1 keV  5.24 keV  2.15 mm    2.5 cm    Chamber     eIoni
-    6   13.9 cm  -2.51 cm   91.5 cm   9.74 keV  20.3 keV  1.72 mm   2.67 cm    Chamber     eIoni
-    7   13.9 cm  -2.49 cm   91.6 cm   8.33 keV  1.42 keV   521 mum  2.72 cm    Chamber     eIoni
-    8   13.9 cm  -2.46 cm   91.6 cm   6.91 keV  1.42 keV   463 mum  2.77 cm    Chamber     eIoni
-    9   13.9 cm  -2.45 cm   91.6 cm   5.46 keV  1.44 keV   408 mum  2.81 cm    Chamber     eIoni
-   10   13.9 cm  -2.45 cm   91.6 cm    832 eV   4.63 keV   349 mum  2.84 cm    Chamber     eIoni
-   11   13.9 cm  -2.45 cm   91.6 cm      0 eV    832 eV   37.1 mum  2.85 cm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 511,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   11.2 cm  -1.53 cm   44.6 cm   51.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   11.8 cm  -9.11 mm   44.6 cm   40.5 keV  10.8 keV  8.79 mm   8.79 mm    Tracker     eIoni
-    2   12.2 cm  -7.62 mm   45.1 cm   37.4 keV  3.19 keV  5.88 mm   1.47 cm    Tracker     eIoni
-    3   12.3 cm  -3.35 mm   45.2 cm   33.1 keV  4.21 keV  5.11 mm   1.98 cm    Tracker     eIoni
-    4   12.4 cm  -1.17 mm   45.6 cm   30.9 keV  2.26 keV  4.19 mm    2.4 cm    Tracker     eIoni
-    5   12.3 cm   1.83 mm   45.7 cm   27.9 keV  3.03 keV  3.71 mm   2.77 cm    Tracker     eIoni
-    6   12.2 cm   4.41 mm   45.8 cm   24.7 keV  3.16 keV  3.15 mm   3.08 cm    Tracker     eIoni
-    7   12.2 cm   6.72 mm   45.9 cm   22.2 keV  2.47 keV  2.59 mm   3.34 cm    Tracker     eIoni
-    8   12.2 cm   8.26 mm     46 cm   18.7 keV  3.49 keV   2.2 mm   3.56 cm    Tracker     eIoni
-    9   12.1 cm   9.41 mm     46 cm   12.8 keV  5.99 keV  1.71 mm   3.73 cm    Tracker     eIoni
-   10   12.1 cm   1.01 cm   45.9 cm   11.4 keV  1.32 keV  1.02 mm   3.83 cm    Tracker     eIoni
-   11     12 cm    9.7 mm   45.9 cm   8.85 keV  2.58 keV   893 mum  3.92 cm    Tracker     eIoni
-   12     12 cm   1.03 cm     46 cm   6.66 keV  2.19 keV   678 mum  3.99 cm    Tracker     eIoni
-   13   12.1 cm   1.07 cm     46 cm   4.26 keV   2.4 keV   522 mum  4.04 cm    Tracker     eIoni
-   14     12 cm   1.07 cm   45.9 cm   2.08 keV  2.18 keV   370 mum  4.08 cm    Tracker     eIoni
-   15     12 cm   1.08 cm   45.9 cm      0 eV   2.08 keV   173 mum   4.1 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 510,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   8.84 cm  -2.57 cm   1.42 cm   12.3 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1    8.8 cm  -2.58 cm    1.4 cm   9.92 keV  2.33 keV   627 mum   627 mum   Chamber     eIoni
-    2    8.8 cm   -2.6 cm    1.4 cm      0 eV   9.92 keV   528 mum  1.15 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 509,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   6.12 cm  -5.39 cm  -61.9 cm     18 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1   6.08 cm  -5.43 cm  -61.9 cm   17.3 keV   648 eV    913 mum   913 mum   Chamber     eIoni
-    2   6.05 cm  -5.44 cm    -62 cm   16.4 keV   953 eV    876 mum  1.79 mm    Chamber     eIoni
-    3   6.04 cm  -5.42 cm    -62 cm   12.7 keV  3.63 keV   827 mum  2.62 mm    Chamber     eIoni
-    4   6.03 cm  -5.41 cm  -62.1 cm     11 keV  1.73 keV   650 mum  3.27 mm    Chamber     eIoni
-    5   6.04 cm  -5.42 cm    -62 cm   7.98 keV  3.02 keV   574 mum  3.84 mm    Chamber     eIoni
-    6   6.06 cm  -5.43 cm    -62 cm   3.56 keV  4.43 keV   451 mum  4.29 mm    Chamber     eIoni
-    7   6.06 cm  -5.42 cm    -62 cm    786 eV   2.77 keV   249 mum  4.54 mm    Chamber     eIoni
-    8   6.06 cm  -5.42 cm    -62 cm      0 eV    786 eV   34.7 mum  4.57 mm    Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 508,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -2.27 cm  -1.26 cm  -1.44 m    9.83 keV     0 eV      0 fm      0 fm    Chamber   initStep
-    1  -2.27 cm  -1.28 cm  -1.44 m       0 eV   9.83 keV   524 mum   524 mum   Chamber     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 507,   Parent ID = 506
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.59 mm   -204 mum -2.28 m    22.3 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   -5.2 mm   1.18 mm  -2.28 m    17.3 keV  5.01 keV  2.22 mm   2.22 mm    Tracker     eIoni
-    2  -5.61 mm   2.54 mm  -2.28 m    14.3 keV  3.04 keV  1.52 mm   3.74 mm    Tracker     eIoni
-    3  -6.53 mm   2.63 mm  -2.28 m    12.3 keV  1.93 keV  1.17 mm   4.91 mm    Tracker     eIoni
-    4   -7.2 mm   2.37 mm  -2.28 m    10.8 keV  1.56 keV   977 mum  5.88 mm    Tracker     eIoni
-    5  -7.91 mm    2.4 mm  -2.28 m    9.77 keV  1.01 keV   836 mum  6.72 mm    Tracker     eIoni
-    6  -8.28 mm   1.81 mm  -2.28 m    7.43 keV  2.34 keV   749 mum  7.47 mm    Tracker     eIoni
-    7  -8.53 mm   1.43 mm  -2.28 m    4.57 keV  2.86 keV   575 mum  8.04 mm    Tracker     eIoni
-    8  -8.38 mm   1.48 mm  -2.28 m    2.84 keV  1.73 keV   389 mum  8.43 mm    Tracker     eIoni
-    9  -8.33 mm   1.67 mm  -2.28 m     902 eV   1.94 keV   262 mum   8.7 mm    Tracker     eIoni
-   10  -8.34 mm   1.68 mm  -2.28 m       0 eV    902 eV   53.6 mum  8.75 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 505,   Parent ID = 485
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    122 mum   707 mum  -2.4 m    17.3 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    115 mum   657 mum  -2.4 m    10.9 MeV   563 keV   505 mum   505 mum  TargetPV     eBrem
-    2    114 mum   657 mum  -2.4 m    9.83 MeV   151 eV   4.49 mum   509 mum  TargetPV     eBrem
-    3    220 mum   663 mum  -2.4 m    8.84 MeV   629 keV   550 mum  1.06 mm   TargetPV     eBrem
-    4    250 mum   721 mum  -2.4 m    8.69 MeV   146 keV   133 mum  1.19 mm    TrackerTransportation
-    5   9.67 mm   5.96 cm  -2.29 m    8.65 MeV  24.4 keV  12.3 cm   12.5 cm    Tracker     eIoni
-    6    7.2 cm   48.5 cm  -1.34 m    8.44 MeV   200 keV  1.05 m    1.17 m     Tracker     eIoni
-    7   20.7 cm     84 cm  -57.7 cm   8.27 MeV   159 keV    85 cm   2.02 m     Tracker     eIoni
-    8   24.7 cm   93.3 cm  -40.3 cm   8.21 MeV  45.9 keV  20.2 cm   2.23 m     Tracker     eIoni
-    9   26.2 cm   96.5 cm  -34.5 cm   8.19 MeV  10.9 keV   6.8 cm   2.29 m     Tracker     eIoni
-   10   48.2 cm   1.39 m    44.2 cm   7.99 MeV   165 keV  92.3 cm   3.22 m     Tracker     eIoni
-   11   59.5 cm   1.56 m    74.2 cm   7.91 MeV  76.9 keV  36.2 cm   3.58 m     Tracker     eIoni
-   12   70.7 cm   1.79 m    1.09 m    7.82 MeV  76.5 keV  43.1 cm   4.01 m     Tracker     eIoni
-   13     97 cm    2.4 m     1.9 m    7.63 MeV   188 keV  1.06 m    5.07 m     WorldPVTransportation
-   14   1.21 m     2.8 m    2.73 m    7.44 MeV   174 keV  94.9 cm   6.01 m     WorldPV     eIoni
-   15   1.27 m    2.88 m    2.88 m     7.4 MeV  28.4 keV  17.6 cm   6.19 m     WorldPV     eIoni
-   16   1.28 m    2.89 m    2.91 m    7.39 MeV  7.77 keV  3.96 cm   6.23 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 529,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.27 m    2.88 m    2.88 m    8.38 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   1.27 m    2.88 m    2.88 m     6.9 keV  1.48 keV   641 mum   641 mum   WorldPV     eIoni
-    2   1.27 m    2.88 m    2.88 m    5.16 keV  1.74 keV   537 mum  1.18 mm    WorldPV     eIoni
-    3   1.27 m    2.88 m    2.88 m    2.97 keV  2.19 keV   427 mum  1.61 mm    WorldPV     eIoni
-    4   1.27 m    2.88 m    2.88 m     357 eV   2.61 keV   274 mum  1.88 mm    WorldPV     eIoni
-    5   1.27 m    2.88 m    2.88 m       0 eV    357 eV   20.6 mum   1.9 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 528,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   1.21 m     2.8 m    2.73 m      24 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1   1.21 m    2.81 m    2.72 m    21.5 keV  2.49 keV  2.48 mm   2.48 mm    WorldPV     eIoni
-    2   1.21 m    2.81 m    2.72 m    17.6 keV   3.9 keV   2.1 mm   4.58 mm    WorldPV     eIoni
-    3   1.21 m    2.81 m    2.72 m    13.8 keV  3.81 keV  1.56 mm   6.14 mm    WorldPV     eIoni
-    4   1.21 m    2.81 m    2.72 m    12.2 keV  1.66 keV  1.13 mm   7.26 mm    WorldPV     eIoni
-    5   1.21 m    2.81 m    2.72 m    7.83 keV  4.33 keV   960 mum  8.22 mm    WorldPV     eIoni
-    6   1.21 m    2.81 m    2.72 m       0 eV   7.83 keV   603 mum  8.83 mm    WorldPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 527,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   70.7 cm   1.79 m    1.09 m    10.2 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   70.8 cm   1.79 m    1.09 m    7.09 keV  3.07 keV   781 mum   781 mum   Tracker     eIoni
-    2   70.8 cm   1.79 m    1.09 m     5.1 keV  1.99 keV   551 mum  1.33 mm    Tracker     eIoni
-    3   70.8 cm   1.79 m    1.09 m    4.01 keV  1.09 keV   423 mum  1.75 mm    Tracker     eIoni
-    4   70.8 cm   1.79 m    1.09 m    1.82 keV  2.19 keV   353 mum  2.11 mm    Tracker     eIoni
-    5   70.8 cm   1.79 m    1.09 m       0 eV   1.82 keV   141 mum  2.25 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 526,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   59.5 cm   1.56 m    74.2 cm   8.29 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   59.5 cm   1.56 m    74.2 cm   6.09 keV   2.2 keV   635 mum   635 mum   Tracker     eIoni
-    2   59.5 cm   1.56 m    74.2 cm   3.84 keV  2.25 keV   486 mum  1.12 mm    Tracker     eIoni
-    3   59.5 cm   1.56 m    74.3 cm   1.22 keV  2.62 keV   341 mum  1.46 mm    Tracker     eIoni
-    4   59.5 cm   1.56 m    74.3 cm      0 eV   1.22 keV  79.6 mum  1.54 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 525,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   48.2 cm   1.39 m    44.2 cm   26.8 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   48.3 cm   1.39 m    44.3 cm   22.8 keV  4.04 keV  2.96 mm   2.96 mm    Tracker     eIoni
-    2   48.4 cm   1.39 m    44.4 cm   19.5 keV  3.31 keV  2.29 mm   5.25 mm    Tracker     eIoni
-    3   48.5 cm   1.38 m    44.4 cm   16.9 keV  2.54 keV   1.8 mm   7.05 mm    Tracker     eIoni
-    4   48.4 cm   1.38 m    44.3 cm   11.3 keV  5.62 keV  1.47 mm   8.52 mm    Tracker     eIoni
-    5   48.5 cm   1.38 m    44.3 cm   9.68 keV  1.63 keV   882 mum   9.4 mm    Tracker     eIoni
-    6   48.5 cm   1.38 m    44.3 cm   6.87 keV  2.81 keV   742 mum  1.01 cm    Tracker     eIoni
-    7   48.4 cm   1.38 m    44.4 cm   3.91 keV  2.96 keV   535 mum  1.07 cm    Tracker     eIoni
-    8   48.4 cm   1.38 m    44.4 cm   2.12 keV  1.79 keV   346 mum   1.1 cm    Tracker     eIoni
-    9   48.4 cm   1.38 m    44.4 cm      0 eV   2.12 keV   178 mum  1.12 cm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 524,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   26.2 cm   96.5 cm  -34.5 cm     13 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   26.2 cm   96.4 cm  -34.4 cm   9.85 keV  3.18 keV  1.05 mm   1.05 mm    Tracker     eIoni
-    2   26.2 cm   96.4 cm  -34.4 cm   7.83 keV  2.03 keV   756 mum   1.8 mm    Tracker     eIoni
-    3   26.1 cm   96.3 cm  -34.4 cm   5.81 keV  2.01 keV   603 mum  2.41 mm    Tracker     eIoni
-    4   26.1 cm   96.3 cm  -34.3 cm   4.53 keV  1.29 keV   467 mum  2.87 mm    Tracker     eIoni
-    5   26.1 cm   96.3 cm  -34.3 cm   3.12 keV  1.41 keV   387 mum  3.26 mm    Tracker     eIoni
-    6   26.1 cm   96.3 cm  -34.3 cm   1.53 keV  1.59 keV   287 mum  3.55 mm    Tracker     eIoni
-    7   26.1 cm   96.3 cm  -34.3 cm      0 eV   1.53 keV   109 mum  3.66 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 523,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   24.7 cm   93.3 cm  -40.3 cm   16.5 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   24.8 cm   93.2 cm  -40.3 cm   15.6 keV   968 eV   1.43 mm   1.43 mm    Tracker     eIoni
-    2   24.9 cm   93.1 cm  -40.2 cm   12.1 keV   3.5 keV  1.32 mm   2.74 mm    Tracker     eIoni
-    3   24.9 cm   93.1 cm  -40.2 cm   10.4 keV  1.68 keV   949 mum  3.69 mm    Tracker     eIoni
-    4   24.9 cm     93 cm  -40.2 cm   7.48 keV   2.9 keV   801 mum   4.5 mm    Tracker     eIoni
-    5   24.9 cm   92.9 cm  -40.1 cm   6.28 keV   1.2 keV   578 mum  5.07 mm    Tracker     eIoni
-    6   24.9 cm   92.9 cm  -40.1 cm   4.96 keV  1.32 keV   498 mum  5.57 mm    Tracker     eIoni
-    7   24.9 cm   92.9 cm  -40.2 cm      0 eV   4.96 keV   414 mum  5.99 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 522,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   20.7 cm     84 cm  -57.7 cm   8.93 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   20.7 cm   84.1 cm  -57.7 cm   6.84 keV  2.09 keV   684 mum   684 mum   Tracker     eIoni
-    2   20.7 cm   84.1 cm  -57.7 cm   5.84 keV   996 eV    533 mum  1.22 mm    Tracker     eIoni
-    3   20.6 cm   84.1 cm  -57.7 cm   4.65 keV  1.19 keV   469 mum  1.69 mm    Tracker     eIoni
-    4   20.6 cm   84.1 cm  -57.8 cm   3.46 keV  1.19 keV   394 mum  2.08 mm    Tracker     eIoni
-    5   20.6 cm   84.1 cm  -57.8 cm   2.42 keV  1.05 keV   314 mum   2.4 mm    Tracker     eIoni
-    6   20.6 cm   84.1 cm  -57.8 cm      0 eV   2.42 keV   217 mum  2.61 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 521,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    7.2 cm   48.5 cm  -1.34 m    8.37 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   7.25 cm   48.5 cm  -1.34 m    6.11 keV  2.26 keV   641 mum   641 mum   Tracker     eIoni
-    2   7.26 cm   48.5 cm  -1.34 m    4.11 keV     2 keV   487 mum  1.13 mm    Tracker     eIoni
-    3   7.23 cm   48.5 cm  -1.34 m     168 eV   3.94 keV   360 mum  1.49 mm    Tracker     eIoni
-    4   7.23 cm   48.5 cm  -1.34 m       0 eV    168 eV     13 mum   1.5 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 520,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   9.67 mm   5.96 cm  -2.29 m    20.7 keV     0 eV      0 fm      0 fm    Tracker   initStep
-    1   1.09 cm   5.85 cm  -2.29 m    18.1 keV  2.59 keV  1.97 mm   1.97 mm    Tracker     eIoni
-    2   1.18 cm   5.79 cm  -2.29 m    15.6 keV  2.53 keV  1.62 mm   3.59 mm    Tracker     eIoni
-    3   1.29 cm   5.84 cm  -2.29 m    14.1 keV  1.51 keV  1.32 mm   4.91 mm    Tracker     eIoni
-    4   1.33 cm   5.86 cm  -2.29 m    11.5 keV  2.53 keV  1.15 mm   6.06 mm    Tracker     eIoni
-    5   1.38 cm   5.83 cm  -2.29 m    9.45 keV  2.08 keV   902 mum  6.96 mm    Tracker     eIoni
-    6   1.43 cm   5.87 cm  -2.29 m    6.28 keV  3.17 keV   725 mum  7.68 mm    Tracker     eIoni
-    7   1.47 cm   5.87 cm  -2.29 m    1.73 keV  4.55 keV   498 mum  8.18 mm    Tracker     eIoni
-    8   1.47 cm   5.87 cm  -2.29 m       0 eV   1.73 keV   131 mum  8.31 mm    Tracker     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 519,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    220 mum   663 mum  -2.4 m     362 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    257 mum   725 mum  -2.4 m     362 keV     0 eV    133 mum   133 mum   TrackerTransportation
-    2   1.42 m     2.4 m    1.93 m     362 keV     0 eV   5.15 m    5.15 m     WorldPVTransportation
-    3   1.73 m    2.91 m    2.85 m     362 keV     0 eV    1.1 m    6.25 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 518,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    114 mum   657 mum  -2.4 m    1.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    104 mum   656 mum  -2.4 m    1.09 MeV     0 eV    614 mum   614 mum   TrackerTransportation
-    2  -1.38 cm  -1.12 mm   -1.6 m    1.09 MeV     0 eV     80 cm   80.1 cm    ChamberTransportation
-    3  -1.72 cm  -1.56 mm   -1.4 m    1.09 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4  -2.76 cm   -2.9 mm    -80 cm   1.09 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5  -3.11 cm  -3.34 mm    -60 cm   1.09 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6  -4.15 cm  -4.67 mm  0.114 fm   1.09 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7   -4.5 cm  -5.11 mm     20 cm   1.09 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8  -5.54 cm  -6.45 mm     80 cm   1.09 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9  -5.89 cm  -6.89 mm      1 m    1.09 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10  -6.93 cm  -8.22 mm    1.6 m    1.09 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11  -7.27 cm  -8.66 mm    1.8 m    1.09 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12  -8.32 cm    -10 mm    2.4 m    1.09 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13   -9.2 cm  -1.11 cm   2.91 m    1.09 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 517,   Parent ID = 505
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0    115 mum   657 mum  -2.4 m    5.86 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1    120 mum   648 mum  -2.4 m    5.86 MeV     0 eV    618 mum   618 mum   TrackerTransportation
-    2   7.46 mm  -1.14 cm   -1.6 m    5.86 MeV     0 eV     80 cm   80.1 cm    ChamberTransportation
-    3    9.3 mm  -1.45 cm   -1.4 m    5.86 MeV     0 eV     20 cm      1 m     TrackerTransportation
-    4   1.48 cm  -2.35 cm    -80 cm   5.86 MeV     0 eV     60 cm    1.6 m     ChamberTransportation
-    5   1.66 cm  -2.66 cm    -60 cm   5.86 MeV     0 eV     20 cm    1.8 m     TrackerTransportation
-    6   2.21 cm  -3.56 cm      0 fm   5.86 MeV     0 eV     60 cm    2.4 m     ChamberTransportation
-    7    2.4 cm  -3.87 cm     20 cm   5.86 MeV     0 eV     20 cm    2.6 m     TrackerTransportation
-    8   2.95 cm  -4.77 cm     80 cm   5.86 MeV     0 eV     60 cm    3.2 m     ChamberTransportation
-    9   3.13 cm  -5.08 cm      1 m    5.86 MeV     0 eV     20 cm    3.4 m     TrackerTransportation
-   10   3.68 cm  -5.98 cm    1.6 m    5.86 MeV     0 eV     60 cm      4 m     ChamberTransportation
-   11   3.87 cm  -6.28 cm    1.8 m    5.86 MeV     0 eV     20 cm    4.2 m     TrackerTransportation
-   12   4.42 cm  -7.19 cm    2.4 m    5.86 MeV     0 eV     60 cm    4.8 m     WorldPVTransportation
-   13   4.88 cm  -7.96 cm   2.91 m    5.86 MeV     0 eV     51 cm   5.31 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 484,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -107 mum   543 mum  -2.4 m    9.78 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -120 mum   607 mum  -2.4 m    3.68 MeV     0 eV   1.14 mm   1.14 mm   TargetPV     compt
-    2    408 mum  2.48 mm   -2.4 m    3.68 MeV     0 eV    4.3 mm   5.44 mm    TrackerTransportation
-    3   55.1 cm   1.95 m     1.6 m    3.68 MeV     0 eV   4.48 m    4.49 m     ChamberTransportation
-    4   55.5 cm   1.97 m    1.63 m    3.68 MeV     0 eV   3.42 cm   4.52 m     TrackerTransportation
-    5   66.1 cm   2.34 m     2.4 m    3.68 MeV     0 eV   86.3 cm   5.39 m     WorldPVTransportation
-    6   73.1 cm   2.59 m    2.91 m    3.68 MeV     0 eV   57.2 cm   5.96 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 530,   Parent ID = 484
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -120 mum   607 mum  -2.4 m    6.09 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -503 mum -61.8 mum  -2.4 m    4.73 MeV  1.36 MeV  1.22 mm   1.22 mm   TargetPV     eIoni
-    2   -207 mum   623 mum  -2.4 m    3.01 MeV  1.06 MeV   949 mum  2.17 mm   TargetPV     eBrem
-    3   -153 mum   312 mum  -2.4 m    1.56 MeV   414 keV   388 mum  2.56 mm   TargetPV     eBrem
-    4  -22.9 mum   324 mum  -2.4 m     330 keV   145 keV   178 mum  2.73 mm   TargetPV     eBrem
-    5  -16.6 mum   328 mum  -2.4 m       0 eV    330 keV   166 mum   2.9 mm   TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 533,   Parent ID = 530
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -22.9 mum   324 mum  -2.4 m    1.08 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.61 mm   1.41 mm   -2.4 m       0 eV     88 keV  3.48 mm   3.48 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 534,   Parent ID = 533
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -1.61 mm   1.41 mm   -2.4 m     995 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -1.74 mm   1.46 mm   -2.4 m     538 keV   457 keV   412 mum   412 mum  TargetPV     eIoni
-    2  -1.75 mm   1.48 mm   -2.4 m       0 eV    538 keV   285 mum   697 mum  TargetPV     eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 532,   Parent ID = 530
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -153 mum   312 mum  -2.4 m    1.04 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   8.42 mm   1.11 cm   -2.4 m     889 keV   150 keV  1.39 cm   1.39 cm   TargetPV     compt
-    2   9.73 mm   1.45 cm   -2.4 m     889 keV     0 eV   3.99 mm   1.79 cm    TrackerTransportation
-    3     92 cm    2.4 m   -1.31 m     889 keV     0 eV   2.78 m     2.8 m     WorldPVTransportation
-    4   1.11 m    2.91 m   -1.07 m     889 keV     0 eV   59.4 cm   3.39 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 531,   Parent ID = 530
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0   -207 mum   623 mum  -2.4 m     660 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   1.52 mm  -3.26 mm   -2.4 m     660 keV     0 eV   5.33 mm   5.33 mm    TrackerTransportation
-    2   1.07 m    -2.4 m     -41 cm    660 keV     0 eV   3.29 m     3.3 m     WorldPVTransportation
-    3   1.29 m   -2.91 m     1.3 cm    660 keV     0 eV   70.1 cm      4 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 483,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -73.2 mum   565 mum -2.41 m     845 keV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -228 mum   614 mum  -2.4 m     268 keV   577 keV  4.87 mm   4.87 mm   TargetPV     compt
-    2   -653 mum   751 mum  -2.4 m       0 eV    268 keV   474 mum  5.34 mm   TargetPV      phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 482,   Parent ID = 453
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -42.3 mum   503 mum -2.41 m    1.93 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1   -139 mum   818 mum  -2.4 m    1.93 MeV     0 eV    6.7 mm    6.7 mm    TrackerTransportation
-    2  -1.17 cm   3.86 cm   -1.6 m    1.93 MeV     0 eV   80.1 cm   80.8 cm    ChamberTransportation
-    3  -1.46 cm    4.8 cm   -1.4 m    1.93 MeV     0 eV     20 cm   1.01 m     TrackerTransportation
-    4  -2.33 cm   7.63 cm    -80 cm   1.93 MeV     0 eV   60.1 cm   1.61 m     ChamberTransportation
-    5  -2.62 cm   8.58 cm    -60 cm   1.93 MeV     0 eV     20 cm   1.81 m     TrackerTransportation
-    6  -3.49 cm   11.4 cm      0 fm   1.93 MeV     0 eV   60.1 cm   2.41 m     ChamberTransportation
-    7  -3.78 cm   12.4 cm     20 cm   1.93 MeV     0 eV     20 cm   2.61 m     TrackerTransportation
-    8  -4.65 cm   15.2 cm     80 cm   1.93 MeV     0 eV   60.1 cm   3.21 m     ChamberTransportation
-    9  -4.94 cm   16.1 cm      1 m    1.93 MeV     0 eV     20 cm   3.41 m     TrackerTransportation
-   10  -5.81 cm     19 cm    1.6 m    1.93 MeV     0 eV   60.1 cm   4.01 m     ChamberTransportation
-   11   -6.1 cm   19.9 cm    1.8 m    1.93 MeV     0 eV     20 cm   4.21 m     TrackerTransportation
-   12  -6.97 cm   22.7 cm    2.4 m    1.93 MeV     0 eV   60.1 cm   4.81 m     WorldPVTransportation
-   13  -7.71 cm   25.1 cm   2.91 m    1.93 MeV     0 eV   51.1 cm   5.32 m  OutOfWorldTransportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 384,   Parent ID = 3
+* G4Track Information:   Particle = e-,   Track ID = 3,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -4.04 mum  8.08 mum -2.42 m    1.37 MeV     0 eV      0 fm      0 fm   TargetPV   initStep
-    1  -50.1 mum   147 mum -2.42 m    1.31 MeV    57 keV  3.04 mm   3.04 mm   TargetPV     compt
-    2   2.16 mm   1.53 mm   -2.4 m     214 keV   1.1 MeV  1.41 cm   1.71 cm   TargetPV     compt
-    3   2.13 mm   1.49 mm   -2.4 m       0 eV    214 keV   364 mum  1.75 cm   TargetPV      phot
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.26 mum  1.98 mum -1.16 m     106 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   1.98 cm  -1.54 cm  -1.14 m    84.9 keV  20.8 keV  3.04 cm   3.04 cm    Tracker       eIoni
+    2   3.72 cm  -2.49 cm  -1.14 m    76.7 keV  8.13 keV  2.08 cm   5.12 cm    Tracker       eIoni
+    3   4.11 cm  -4.06 cm  -1.13 m    69.4 keV  7.33 keV  1.74 cm   6.85 cm    Tracker       eIoni
+    4   5.02 cm  -5.12 cm  -1.14 m    60.3 keV  9.12 keV  1.47 cm   8.32 cm    Tracker       eIoni
+    5   4.98 cm   -5.6 cm  -1.13 m    46.2 keV  14.1 keV  1.14 cm   9.47 cm    Tracker       eIoni
+    6   5.23 cm  -5.91 cm  -1.12 m    41.1 keV  5.09 keV  7.22 mm   10.2 cm    Tracker       eIoni
+    7   4.96 cm  -6.29 cm  -1.12 m    38.7 keV  2.39 keV  5.91 mm   10.8 cm    Tracker       eIoni
+    8   4.95 cm   -6.8 cm  -1.12 m    32.8 keV  5.97 keV  5.34 mm   11.3 cm    Tracker       eIoni
+    9   4.89 cm  -7.16 cm  -1.12 m    27.5 keV  5.29 keV  4.03 mm   11.7 cm    Tracker       eIoni
+   10   4.95 cm     -7 cm  -1.12 m    19.7 keV  7.79 keV  3.02 mm     12 cm    Tracker       eIoni
+   11   5.01 cm  -7.03 cm  -1.12 m    17.5 keV  2.17 keV   1.8 mm   12.2 cm    Tracker       eIoni
+   12   5.09 cm  -7.09 cm  -1.12 m    15.5 keV  1.97 keV  1.51 mm   12.3 cm    Tracker       eIoni
+   13    5.1 cm  -7.18 cm  -1.12 m    11.6 keV  3.94 keV  1.29 mm   12.5 cm    Tracker       eIoni
+   14   5.07 cm  -7.24 cm  -1.12 m    9.14 keV  2.46 keV   893 mum  12.6 cm    Tracker       eIoni
+   15   5.05 cm  -7.18 cm  -1.12 m    7.68 keV  1.46 keV   690 mum  12.6 cm    Tracker       eIoni
+   16      5 cm  -7.17 cm  -1.12 m    4.95 keV  2.73 keV   584 mum  12.7 cm    Tracker       eIoni
+   17   4.98 cm  -7.17 cm  -1.12 m    3.45 keV   1.5 keV   408 mum  12.7 cm    Tracker       eIoni
+   18   4.98 cm  -7.17 cm  -1.12 m     406 eV   3.04 keV   308 mum  12.8 cm    Tracker       eIoni
+   19   4.98 cm  -7.17 cm  -1.12 m       0 eV    406 eV   21.8 mum  12.8 cm    Tracker       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
 *********************************************************************************************************
 
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng  NextVolu   Process
-    0  -3.88 Ang -8.52 Ang  -2.9 m    9.39 keV     0 eV      0 fm      0 fm    WorldPV   initStep
-    1    148 mum  -670 mum  -2.9 m    7.47 keV  1.93 keV   720 mum   720 mum   WorldPV     eIoni
-    2    637 mum  -680 mum  -2.9 m    6.39 keV  1.07 keV   577 mum   1.3 mm    WorldPV     eIoni
-    3    861 mum  -614 mum  -2.9 m    5.08 keV  1.32 keV   505 mum   1.8 mm    WorldPV     eIoni
-    4    658 mum  -355 mum  -2.9 m    3.21 keV  1.87 keV   422 mum  2.22 mm    WorldPV     eIoni
-    5    624 mum  -181 mum  -2.9 m     299 eV   2.91 keV   294 mum  2.52 mm    WorldPV     eIoni
-    6    620 mum  -186 mum  -2.9 m       0 eV    299 eV     18 mum  2.54 mm    WorldPV     eIoni
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.05 mum  1.74 mum -1.27 m    28.6 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   2.78 mm   -1.3 mm  -1.27 m    24.1 keV  4.55 keV  3.23 mm   3.23 mm    Tracker       eIoni
+    2   4.69 mm  -2.61 mm  -1.27 m    21.6 keV  2.54 keV  2.45 mm   5.67 mm    Tracker       eIoni
+    3   6.58 mm  -2.31 mm  -1.27 m    19.5 keV  2.01 keV  2.06 mm   7.73 mm    Tracker       eIoni
+    4    7.5 mm   -957 mum -1.27 m    17.5 keV  2.04 keV  1.78 mm   9.51 mm    Tracker       eIoni
+    5   7.27 mm    520 mum -1.27 m    11.1 keV  6.37 keV  1.51 mm    1.1 cm    Tracker       eIoni
+    6    7.2 mm    1.2 mm  -1.27 m    9.23 keV   1.9 keV   853 mum  1.19 cm    Tracker       eIoni
+    7   6.74 mm   1.22 mm  -1.27 m    7.77 keV  1.46 keV   697 mum  1.26 cm    Tracker       eIoni
+    8   6.95 mm    1.4 mm  -1.27 m    5.98 keV  1.79 keV   590 mum  1.32 cm    Tracker       eIoni
+    9    7.2 mm   1.65 mm  -1.27 m    1.46 keV  4.53 keV   472 mum  1.36 cm    Tracker       eIoni
+   10   7.23 mm    1.7 mm  -1.27 m  6.51e-13 eV   1.46 keV  97.7 mum  1.37 cm    Tracker       eIoni
 >>> Event 0
     0 trajectories stored in this event.
 ### Run 2 start.
diff --git a/examples/novice/N02/include/ExN02ChamberParameterisation.hh b/examples/novice/N02/include/ExN02ChamberParameterisation.hh
index 75e35d79a0d509bbb3beb3ca40d53cd6e82c6a64..5af7079665d2c4f075a144c9d716a40da7aa0d36 100644
--- a/examples/novice/N02/include/ExN02ChamberParameterisation.hh
+++ b/examples/novice/N02/include/ExN02ChamberParameterisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02ChamberParameterisation.hh,v 1.3 2000/12/04 16:24:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f65d106fdb20f99ecbf977f91e55149f1bb5b66d..fbad5e88eff89761a2881254d55c918e5d200149 100644
--- a/examples/novice/N02/include/ExN02DetectorConstruction.hh
+++ b/examples/novice/N02/include/ExN02DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02DetectorConstruction.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/novice/N02/include/ExN02DetectorMessenger.hh b/examples/novice/N02/include/ExN02DetectorMessenger.hh
index 719f462cc97f76d617cfc0cc837f00150b611e25..b625301253cc18d2d0afe25f62d1285bcbcd100d 100644
--- a/examples/novice/N02/include/ExN02DetectorMessenger.hh
+++ b/examples/novice/N02/include/ExN02DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02DetectorMessenger.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02EventAction.hh b/examples/novice/N02/include/ExN02EventAction.hh
index a805f787593246f8cf01c066911ac39571af1208..3d22096313e07a9172b7838e6195fb4dd2993d5c 100644
--- a/examples/novice/N02/include/ExN02EventAction.hh
+++ b/examples/novice/N02/include/ExN02EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02EventAction.hh,v 1.4 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02MagneticField.hh b/examples/novice/N02/include/ExN02MagneticField.hh
index 4427226ac6b0350df817cba37a98b500342ea76f..471d716a880ebfce4e1fa0d5adc9ed6ff8f6b3f9 100644
--- a/examples/novice/N02/include/ExN02MagneticField.hh
+++ b/examples/novice/N02/include/ExN02MagneticField.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02MagneticField.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c7c89e48e10f78d05ae69fac3c140a8c89f37832..5fd26d7ce2a21b2f7f155eddc053da11f8d16aeb 100644
--- a/examples/novice/N02/include/ExN02PhysicsList.hh
+++ b/examples/novice/N02/include/ExN02PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02PhysicsList.hh,v 1.7 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
index 3074987065d3959171afde3c3a958918502add39..e056494f96278b5f050524d17a558b27e1b541ad 100644
--- a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
+++ b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02PrimaryGeneratorAction.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02RunAction.hh b/examples/novice/N02/include/ExN02RunAction.hh
index 014a1fe0bc327e308d4afc39e10badcb960f2091..05f14259074cc0451c8cb4c39d080be13a0113d1 100644
--- a/examples/novice/N02/include/ExN02RunAction.hh
+++ b/examples/novice/N02/include/ExN02RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02RunAction.hh,v 1.4 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02SteppingAction.hh b/examples/novice/N02/include/ExN02SteppingAction.hh
index 182e85dbf05c755c8ba19548c91f29bff3cd4567..42110829d61aa433a1085571ff5f1b686d66cd11 100644
--- a/examples/novice/N02/include/ExN02SteppingAction.hh
+++ b/examples/novice/N02/include/ExN02SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02SteppingAction.hh,v 1.4 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02SteppingVerbose.hh b/examples/novice/N02/include/ExN02SteppingVerbose.hh
index da33f808f9034650994fe5403f539bc7e3e0e788..169d18ecd5cc7e233b979fa541f6ee92209745ba 100644
--- a/examples/novice/N02/include/ExN02SteppingVerbose.hh
+++ b/examples/novice/N02/include/ExN02SteppingVerbose.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02SteppingVerbose.hh,v 1.4 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
diff --git a/examples/novice/N02/include/ExN02TrackerHit.hh b/examples/novice/N02/include/ExN02TrackerHit.hh
index 60822a29e3255a46bd98a33e2c7b9e085027a0de..85fb2b7489677c4cf4754f2a49dd6aebbde29f54 100644
--- a/examples/novice/N02/include/ExN02TrackerHit.hh
+++ b/examples/novice/N02/include/ExN02TrackerHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02TrackerHit.hh,v 1.3 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02TrackerSD.hh b/examples/novice/N02/include/ExN02TrackerSD.hh
index 6ce0148b5b900ec2c14454d58d3ef39c92955813..486114a1b6ef52a13180699a3673fec5f5d885d3 100644
--- a/examples/novice/N02/include/ExN02TrackerSD.hh
+++ b/examples/novice/N02/include/ExN02TrackerSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02TrackerSD.hh,v 1.3 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02VisManager.hh b/examples/novice/N02/include/ExN02VisManager.hh
index c93dcec9d1e3f246aba94d885e6e9fa260dc1499..185b00bfd5401839b7d5a7a6d6646568ce0df625 100644
--- a/examples/novice/N02/include/ExN02VisManager.hh
+++ b/examples/novice/N02/include/ExN02VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02VisManager.hh,v 1.3 1999/12/15 14:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N02/src/ExN02ChamberParameterisation.cc b/examples/novice/N02/src/ExN02ChamberParameterisation.cc
index cb061a8aaee7eb9cf2bef3ff5c5650339667f62b..d062e3d59b8063cf18a080f3115444c7175a507e 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.3 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: ExN02ChamberParameterisation.cc,v 1.4 2001/01/31 18:05:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -33,8 +33,8 @@ ExN02ChamberParameterisation::ExN02ChamberParameterisation(
    fSpacing    =  spacingZ;
    fHalfLengthFirst = 0.5 * lengthInitial; 
    // fHalfLengthLast = lengthFinal;
-   if( NoChambers > 1 ){
-      fHalfLengthIncr =  0.5 * (lengthFinal-lengthInitial)/(NoChambers-1);
+   if( NoChambers > 0 ){
+      fHalfLengthIncr =  0.5 * (lengthFinal-lengthInitial)/NoChambers;
 
       if( spacingZ < widthChamber ) {
          G4Exception( "ExN02ChamberParameterisation construction: Width > Spacing" );
@@ -51,9 +51,9 @@ ExN02ChamberParameterisation::~ExN02ChamberParameterisation()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 void ExN02ChamberParameterisation::ComputeTransformation
-(const G4int copyNo,G4VPhysicalVolume *physVol) const
+(const G4int copyNo, G4VPhysicalVolume* physVol) const
 {
-  G4double      Zposition= fStartZ + copyNo * fSpacing;
+  G4double      Zposition= fStartZ + (copyNo+1) * fSpacing;
   G4ThreeVector origin(0,0,Zposition);
   physVol->SetTranslation(origin);
   physVol->SetRotation(0);
@@ -62,10 +62,10 @@ void ExN02ChamberParameterisation::ComputeTransformation
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 void ExN02ChamberParameterisation::ComputeDimensions
-(G4Box & trackerChamber, const G4int copyNo,
- const G4VPhysicalVolume * physVol) const
+(G4Box& trackerChamber, const G4int copyNo,
+ const G4VPhysicalVolume* physVol) const
 {
-  G4double  halfLength= fHalfLengthFirst + (copyNo-1) * fHalfLengthIncr;
+  G4double  halfLength= fHalfLengthFirst + copyNo * fHalfLengthIncr;
   trackerChamber.SetXHalfLength(halfLength);
   trackerChamber.SetYHalfLength(halfLength);
   trackerChamber.SetZHalfLength(fHalfWidth);
diff --git a/examples/novice/N02/src/ExN02DetectorConstruction.cc b/examples/novice/N02/src/ExN02DetectorConstruction.cc
index bbb9384e400353a7d43fc17d90be403ffe6ea0a4..b3bcc4cc167b887e4e9bed369b3dec9381fd5abf 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.5 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: ExN02DetectorConstruction.cc,v 1.6 2001/01/31 18:05:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -99,12 +99,12 @@ G4VPhysicalVolume* ExN02DetectorConstruction::Construct()
 
 //--------- Sizes of the principal geometrical components (solids)  ---------
   
-  NbOfChambers = 6;
+  NbOfChambers = 5;
   ChamberWidth = 20*cm;
   ChamberSpacing = 80*cm;
   
-  fTrackerLength = NbOfChambers*ChamberSpacing;  // Full length of the Tracker
-  fTargetLength  = 5.0 * cm;                     // Full length of the Target
+  fTrackerLength = (NbOfChambers+1)*ChamberSpacing; // Full length of the Tracker
+  fTargetLength  = 5.0 * cm;                        // Full length of the Target
   
   TargetMater  = Pb;
   ChamberMater = Xenon;
diff --git a/examples/novice/N02/src/ExN02DetectorMessenger.cc b/examples/novice/N02/src/ExN02DetectorMessenger.cc
index c9495efaaa35ec98f8ba4183ee3a3ed1e7b1a42c..a421a601fcf0168c97b3be0cfe0e6b0be7369498 100644
--- a/examples/novice/N02/src/ExN02DetectorMessenger.cc
+++ b/examples/novice/N02/src/ExN02DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02DetectorMessenger.cc,v 1.3 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02EventAction.cc b/examples/novice/N02/src/ExN02EventAction.cc
index a93b16396397b68e7e91480ddae16be3cd0936f5..397ab28f999512449466fc7077576471bca72555 100644
--- a/examples/novice/N02/src/ExN02EventAction.cc
+++ b/examples/novice/N02/src/ExN02EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02EventAction.cc,v 1.5 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02MagneticField.cc b/examples/novice/N02/src/ExN02MagneticField.cc
index 4a0cdcfefde9b5966bc42bf984bab28a2d744258..cc4ec968215e23ced32945efc2565cd58ba2f130 100644
--- a/examples/novice/N02/src/ExN02MagneticField.cc
+++ b/examples/novice/N02/src/ExN02MagneticField.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02MagneticField.cc,v 1.4 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //  
 //   User Field class implementation.
 //
diff --git a/examples/novice/N02/src/ExN02PhysicsList.cc b/examples/novice/N02/src/ExN02PhysicsList.cc
index 4552495a8663522bc799cd5a70bc06cfddf08c99..402466b414a4b07102a1ea610667e9ee54612663 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.8 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: ExN02PhysicsList.cc,v 1.9 2001/01/09 14:34:34 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -235,20 +235,14 @@ void ExN02PhysicsList::ConstructEM()
 	       (particle->GetParticleName() != "chargedgeantino")) {
      // all others charged particles except geantino
      G4VProcess* aMultipleScattering = new G4MultipleScattering();
-     G4VProcess* anIonisation        = new G4hIonisation();
-     
+     G4VProcess* anIonisation        = new G4hIonisation();     
      ////G4VProcess*  theUserCuts = new G4UserSpecialCuts();
      
      //
      // add processes
      pmanager->AddProcess(anIonisation);
-     pmanager->AddProcess(aMultipleScattering);
-     
-     /// pmanager->AddProcess(theUserCuts);
-     
-     //
-     // set ordering for AtRestDoIt
-     ////pmanager->SetProcessOrderingToFirst(theUserCuts,idxAtRest);
+     pmanager->AddProcess(aMultipleScattering);    
+     ////pmanager->AddProcess(theUserCuts);
      
      //
      // set ordering for AlongStepDoIt
diff --git a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
index eaff21a17fd56be6ef3fe1c8ec615e586e884be0..a60bbbe285961b30f2d5057e244ee86b60398959 100644
--- a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
+++ b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02PrimaryGeneratorAction.cc,v 1.3 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02RunAction.cc b/examples/novice/N02/src/ExN02RunAction.cc
index 9d99578bee0d8fa2222da13f3f0c57de4e47685c..6430473fe55f6ab8d328c9c5c7582e7ff9302035 100644
--- a/examples/novice/N02/src/ExN02RunAction.cc
+++ b/examples/novice/N02/src/ExN02RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02RunAction.cc,v 1.4 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02SteppingAction.cc b/examples/novice/N02/src/ExN02SteppingAction.cc
index 4fdd2dea197c8aab643ca575c9002156ed1dac89..7ba95745b0033d91840c1226f704afa98c7c164a 100644
--- a/examples/novice/N02/src/ExN02SteppingAction.cc
+++ b/examples/novice/N02/src/ExN02SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02SteppingAction.cc,v 1.4 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02SteppingVerbose.cc b/examples/novice/N02/src/ExN02SteppingVerbose.cc
index f85bf9488feb468a0167fc0d004d42d5ebad1271..ccbc7c4aa24d8054e38d8f1e0abf293c1556521d 100644
--- a/examples/novice/N02/src/ExN02SteppingVerbose.cc
+++ b/examples/novice/N02/src/ExN02SteppingVerbose.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN02SteppingVerbose.cc,v 1.4 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: ExN02SteppingVerbose.cc,v 1.6 2001/02/08 08:33:31 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
@@ -46,7 +46,7 @@ void ExN02SteppingVerbose::StepInfo()
 	     << G4std::setw( 9) << "dEStep"     << " "  
 	     << G4std::setw(10) << "StepLeng"     
 	     << G4std::setw(10) << "TrakLeng" 
-	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Volume"    << "  "
 	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
@@ -61,16 +61,17 @@ void ExN02SteppingVerbose::StepInfo()
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
       G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	->GetProcessName();
+      G4cout << "  " 
+             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                ->GetProcessName();
     } else {
-      G4cout << "User Limit";
+      G4cout << "   UserLimit";
     }
 
     G4cout << G4endl;
@@ -86,12 +87,12 @@ void ExN02SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -134,7 +135,7 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 9) << "dEStep"     << " "  
 	   << G4std::setw(10) << "StepLeng"  
 	   << G4std::setw(10) << "TrakLeng"
-	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     
 
     G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
@@ -147,11 +148,11 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
-      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+      G4cout << G4std::setw(10) << "OutOfWorld";
     }
-    G4cout << G4std::setw(10) << "initStep" << G4endl;
+    G4cout  << "    initStep" << G4endl;
   }
   G4cout.precision(prec);
 }
diff --git a/examples/novice/N02/src/ExN02TrackerHit.cc b/examples/novice/N02/src/ExN02TrackerHit.cc
index 3d6f5521b68422c83d392d8b901172855595ea71..4e9efc75af44bd5ba377192f8b02edf86ff555cf 100644
--- a/examples/novice/N02/src/ExN02TrackerHit.cc
+++ b/examples/novice/N02/src/ExN02TrackerHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02TrackerHit.cc,v 1.4 2000/12/06 07:54:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02TrackerSD.cc b/examples/novice/N02/src/ExN02TrackerSD.cc
index d9d3ceb20814754e293b361b03b8cd5d7241c1db..c8fb58f46a9ab97894fad18a695f2e9097da8ffd 100644
--- a/examples/novice/N02/src/ExN02TrackerSD.cc
+++ b/examples/novice/N02/src/ExN02TrackerSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02TrackerSD.cc,v 1.3 2000/12/04 16:24:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02VisManager.cc b/examples/novice/N02/src/ExN02VisManager.cc
index 036b9cda7fa9fe126edaac8a983ec5f895c26b30..2f4b3598bf698d6f2b7df109474932a992d6e8be 100644
--- a/examples/novice/N02/src/ExN02VisManager.cc
+++ b/examples/novice/N02/src/ExN02VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN02VisManager.cc,v 1.3 1999/12/15 14:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/novice/N03/History b/examples/novice/N03/History
index a2c29691b386c212ce3a3a5341b494556f1f2ce8..2676f5eace3f4d2b7ea233d7f56d41a0ca145476 100644
--- a/examples/novice/N03/History
+++ b/examples/novice/N03/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.32 2000/11/27 02:58:04 stanaka Exp $
+$Id: History,v 1.35 2001/02/09 01:17:54 asaim Exp $
 --------------------------------------------------
 
      =========================================================
@@ -15,6 +15,12 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+06-02-01 M.Asai (exampleN03-V03-00-01)
+- Migration to STL vector classes
+ affected : ExN03SteppingVerbose.cc
+
+4th February 2001 Steve O'Neale (tagset254)
+
 21-11-27, Satoshi Tanake (exampleN03-V02-00-04)
 - The macro initInter.mac (by Michel) is revised.
   1) The command "/vis/scene/create" is removed, 
diff --git a/examples/novice/N03/exampleN03.cc b/examples/novice/N03/exampleN03.cc
index c7b3e4739810c631c9009540a21a246c487edaf8..4b7b4800408adbe78c99aed7e124ee585caf69e0 100644
--- a/examples/novice/N03/exampleN03.cc
+++ b/examples/novice/N03/exampleN03.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: exampleN03.cc,v 1.13 2000/11/21 10:59:41 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N03/exampleN03.out b/examples/novice/N03/exampleN03.out
index 0cf07fbbaa18e57594e7ee377d5cd265facca30b..152066146803364c81d0351599659a3bc145b80d 100644
--- a/examples/novice/N03/exampleN03.out
+++ b/examples/novice/N03/exampleN03.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -48,7 +48,7 @@
    --->  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: 6317232936888469291008.000 km 
+ Material: Galactic     density:  0.000 mg/cm3  temperature:   2.73 K  pressure:   0.00 atm  RadLength: 204727576.737 pc 
    --->  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 
@@ -87,16 +87,16 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-           Aluminium         125.06
-         liquidArgon         78.362
-              Copper         238.25
-                Lead         229.55
-               Water         81.507
-        Scintillator         82.859
-              quartz         115.29
+           Aluminium         125.02
+         liquidArgon         79.954
+              Copper         239.08
+                Lead         228.53
+               Water         81.851
+        Scintillator         83.337
+              quartz         116.29
                  Air           0.99
-             Aerogel         30.097
-         CarbonicGas          9.427
+             Aerogel         30.338
+         CarbonicGas         9.5961
           WaterSteam           0.99
             Galactic           0.99
                 Beam           0.99
@@ -115,16 +115,16 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 
            material        min.delta energy(keV) 
 
-           Aluminium         125.06
-         liquidArgon         78.362
-              Copper         238.25
-                Lead         229.55
-               Water         81.507
-        Scintillator         82.859
-              quartz         115.29
+           Aluminium         125.02
+         liquidArgon         79.954
+              Copper         239.08
+                Lead         228.53
+               Water         81.851
+        Scintillator         83.337
+              quartz         116.29
                  Air           0.99
-             Aerogel         30.097
-         CarbonicGas          9.427
+             Aerogel         30.338
+         CarbonicGas         9.5961
           WaterSteam           0.99
             Galactic           0.99
                 Beam           0.99
@@ -184,8 +184,8 @@ Cut in energy
  Current couple of seeds = 9876, 54321
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy:  273.44 MeV       total track length:  16.757 cm 
-        Gap: total energy:  17.368 MeV       total track length:  9.3656 cm 
+   Absorber: total energy:   275.7 MeV       total track length:  15.744 cm 
+        Gap: total energy:   15.91 MeV       total track length:  8.5146 cm 
 
      8 hits are stored in ExN03CalorHitsCollection.
 #
@@ -202,11 +202,11 @@ Cut in energy
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1102932771, 1917444181
+ Current couple of seeds = 977297571, 951316126
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy:  271.92 MeV       total track length:  15.041 cm 
-        Gap: total energy:  19.422 MeV       total track length:  9.2045 cm 
+   Absorber: total energy:  281.73 MeV       total track length:  15.949 cm 
+        Gap: total energy:  13.208 MeV       total track length:  7.3282 cm 
 
      10 hits are stored in ExN03CalorHitsCollection.
 #
@@ -231,10 +231,10 @@ Cut in energy
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1963963117, 1351553931
+ Current couple of seeds = 627130152, 879601547
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy:  337.86 MeV       total track length:  77.616 cm 
-        Gap: total energy:  64.609 MeV       total track length:   1.801 m  
+   Absorber: total energy:  393.49 MeV       total track length:  90.749 cm 
+        Gap: total energy:  100.38 MeV       total track length:  2.7952 m  
 
-     21 hits are stored in ExN03CalorHitsCollection.
+     28 hits are stored in ExN03CalorHitsCollection.
diff --git a/examples/novice/N03/include/ExN03CalorHit.hh b/examples/novice/N03/include/ExN03CalorHit.hh
index 7fa8eebe17160ccc36d72bc8aeb471b3f1fe62db..25bf257d6b0551ef084b59dc1f1faf3c33066924 100644
--- a/examples/novice/N03/include/ExN03CalorHit.hh
+++ b/examples/novice/N03/include/ExN03CalorHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03CalorHit.hh,v 1.2 1999/12/15 14:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03CalorimeterSD.hh b/examples/novice/N03/include/ExN03CalorimeterSD.hh
index a1a0f9217b6dfef759ba05b22ad500a7fa66652d..43734a03dbd8c58561a2caf45e387e5b8a2748db 100644
--- a/examples/novice/N03/include/ExN03CalorimeterSD.hh
+++ b/examples/novice/N03/include/ExN03CalorimeterSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03CalorimeterSD.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03DetectorConstruction.hh b/examples/novice/N03/include/ExN03DetectorConstruction.hh
index 5a19aec47384951e02f3320dc86c34355854290c..c4234ddead38e10cef812433dfc2edc57a7e5834 100644
--- a/examples/novice/N03/include/ExN03DetectorConstruction.hh
+++ b/examples/novice/N03/include/ExN03DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03DetectorConstruction.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03DetectorMessenger.hh b/examples/novice/N03/include/ExN03DetectorMessenger.hh
index 2aa2726436d94cc1630cb70841ac6aab3859c29d..d676f2da175aa8d70eee3538c33633923379703b 100644
--- a/examples/novice/N03/include/ExN03DetectorMessenger.hh
+++ b/examples/novice/N03/include/ExN03DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03DetectorMessenger.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03EventAction.hh b/examples/novice/N03/include/ExN03EventAction.hh
index 8947f75c90e6f6e9bb20d7b9b8b124c903ab380e..db2fdc0af6ad32f1dbf84094251503a237c7e921 100644
--- a/examples/novice/N03/include/ExN03EventAction.hh
+++ b/examples/novice/N03/include/ExN03EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03EventAction.hh,v 1.4 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03EventActionMessenger.hh b/examples/novice/N03/include/ExN03EventActionMessenger.hh
index 9331110c4a26cf9fcf698c840853894aea326a6e..f246dbb34d668b83790f11840b55d280741b5d71 100644
--- a/examples/novice/N03/include/ExN03EventActionMessenger.hh
+++ b/examples/novice/N03/include/ExN03EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03EventActionMessenger.hh,v 1.3 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PhysicsList.hh b/examples/novice/N03/include/ExN03PhysicsList.hh
index c860f5b1556e9b54869864f1bbd757b15f48cf26..8f42c99430c46cd4c0fd4e50ae9e7c903d3bb451 100644
--- a/examples/novice/N03/include/ExN03PhysicsList.hh
+++ b/examples/novice/N03/include/ExN03PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03PhysicsList.hh,v 1.6 2000/06/05 09:54:37 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
index 8eb76952a9a7a347b6968b41da2175fa9c5ac627..82aeedb0ac6ecac7f0b6ddcc91a70499e416d26b 100644
--- a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
+++ b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
index dd2c7967a0db8ae8f61f868dcceb2dbafad69962..61a0792a98dcaa4a4604f47dfc4de8bea15c1408 100644
--- a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
+++ b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03RunAction.hh b/examples/novice/N03/include/ExN03RunAction.hh
index 84dc62fe45832d2cda2f411ec51985e4a4fc4eda..85c58e4bf329b47703f925cfe9babd0eabe6b221 100644
--- a/examples/novice/N03/include/ExN03RunAction.hh
+++ b/examples/novice/N03/include/ExN03RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03RunAction.hh,v 1.4 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03SteppingAction.hh b/examples/novice/N03/include/ExN03SteppingAction.hh
index 65d7345d52173f5990b07c8d6d006d767cc4bf5e..a80a58b428625e9d75e25a7ef99a10de15632091 100644
--- a/examples/novice/N03/include/ExN03SteppingAction.hh
+++ b/examples/novice/N03/include/ExN03SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03SteppingAction.hh,v 1.4 2000/12/05 14:52:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03SteppingVerbose.hh b/examples/novice/N03/include/ExN03SteppingVerbose.hh
index 2e8ce0ec545eac5c95d38b4f253f966d78a7c55a..23ea6cc81099c09865be655608d15c33f38cf0b3 100644
--- a/examples/novice/N03/include/ExN03SteppingVerbose.hh
+++ b/examples/novice/N03/include/ExN03SteppingVerbose.hh
@@ -5,19 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03SteppingVerbose.hh,v 1.3 2000/02/28 18:09:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: ExN03SteppingVerbose.hh,v 1.4 2001/01/22 17:04:46 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-//  
-//---------------------------------------------------------------
 //
-// ExN03SteppingVerbose.hh
-//
-// Description:
-//   This class manages the verbose outputs in G4SteppingManager. 
-//   It inherits from G4SteppingVerbose   
-//
-//---------------------------------------------------------------
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 class ExN03SteppingVerbose;
 
@@ -26,16 +19,17 @@ class ExN03SteppingVerbose;
 
 #include "G4SteppingVerbose.hh"
 
-class ExN03SteppingVerbose : public G4SteppingVerbose {
-public:   
-// Constructor/Destructor
-  ExN03SteppingVerbose();
- ~ExN03SteppingVerbose();
-//
-  void StepInfo();
-  void TrackingStarted();
-//
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+class ExN03SteppingVerbose : public G4SteppingVerbose
+{
+ public:   
+
+   ExN03SteppingVerbose();
+  ~ExN03SteppingVerbose();
 
+   void StepInfo();
+   void TrackingStarted();
 
 };
 
diff --git a/examples/novice/N03/include/ExN03VisManager.hh b/examples/novice/N03/include/ExN03VisManager.hh
index ebe61909a7e9d3ce2e42a64afad48d08edd16350..21a15f630f0fbcaad696cdea6521e30366f65ece 100644
--- a/examples/novice/N03/include/ExN03VisManager.hh
+++ b/examples/novice/N03/include/ExN03VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03VisManager.hh,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03CalorHit.cc b/examples/novice/N03/src/ExN03CalorHit.cc
index 73a8254dd30ca97346315eb7969a07d8e0c55409..73d0009ebbb40d47299a024fb063415e0692c6bb 100644
--- a/examples/novice/N03/src/ExN03CalorHit.cc
+++ b/examples/novice/N03/src/ExN03CalorHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03CalorHit.cc,v 1.2 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03CalorimeterSD.cc b/examples/novice/N03/src/ExN03CalorimeterSD.cc
index 5e81e08708f172bef56a7d44d1a259e640ef7da0..abf9c081531dd087d3e4043c17e2998eb2694c9d 100644
--- a/examples/novice/N03/src/ExN03CalorimeterSD.cc
+++ b/examples/novice/N03/src/ExN03CalorimeterSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03CalorimeterSD.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03DetectorConstruction.cc b/examples/novice/N03/src/ExN03DetectorConstruction.cc
index 49823b16b98e8cbd1945ac76f3be06204ac8b907..73e23fa43c91653af11d28d10d82c25fe16a4677 100644
--- a/examples/novice/N03/src/ExN03DetectorConstruction.cc
+++ b/examples/novice/N03/src/ExN03DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03DetectorConstruction.cc,v 1.4 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03DetectorMessenger.cc b/examples/novice/N03/src/ExN03DetectorMessenger.cc
index 703af420c92cc9c0ceee89fe463a450f6fc50d23..8723cd67a2679113d9a4692bff525df4ba1f8d1d 100644
--- a/examples/novice/N03/src/ExN03DetectorMessenger.cc
+++ b/examples/novice/N03/src/ExN03DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03DetectorMessenger.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03EventAction.cc b/examples/novice/N03/src/ExN03EventAction.cc
index 426a676e085dc2c5895ebe2ae3fd472894e3b1fa..766e9a20bd67eaebd1d9bb8376989fdca5e7fc21 100644
--- a/examples/novice/N03/src/ExN03EventAction.cc
+++ b/examples/novice/N03/src/ExN03EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03EventAction.cc,v 1.11 2000/11/21 10:59:44 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03EventActionMessenger.cc b/examples/novice/N03/src/ExN03EventActionMessenger.cc
index 9d211f7ee3b8eed4efe61c57a47de3df9f3b33c2..176c4358f2eb09b151555261258e06e52c56af39 100644
--- a/examples/novice/N03/src/ExN03EventActionMessenger.cc
+++ b/examples/novice/N03/src/ExN03EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03EventActionMessenger.cc,v 1.4 2000/11/21 10:59:44 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PhysicsList.cc b/examples/novice/N03/src/ExN03PhysicsList.cc
index 888e64e6d44ba16aeb39cb1308520925eeb8fe03..f6b303ad188c1fc8706a172a72bcc6545ce1abf9 100644
--- a/examples/novice/N03/src/ExN03PhysicsList.cc
+++ b/examples/novice/N03/src/ExN03PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03PhysicsList.cc,v 1.9 2000/11/10 19:41:01 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
index 92cd3b0dc0ca9b0c51f00d4d29cdb65e983c9855..fa0d707c8d3186b7baecd4c31ee42cc701750168 100644
--- a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
+++ b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03PrimaryGeneratorAction.cc,v 1.3 2000/11/21 10:59:45 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
index 12c6de34cc6ef4c0e3a1e622594ab52270e05246..96d936fac34f3c2025c0c1d448d994d6a62d07ef 100644
--- a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
+++ b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03RunAction.cc b/examples/novice/N03/src/ExN03RunAction.cc
index aa8674ca9ec74ad7ec9196dae003bd98d1633401..22224771c5275094bf3ec50d61bae0860be32c62 100644
--- a/examples/novice/N03/src/ExN03RunAction.cc
+++ b/examples/novice/N03/src/ExN03RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03RunAction.cc,v 1.7 1999/12/15 14:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03SteppingAction.cc b/examples/novice/N03/src/ExN03SteppingAction.cc
index cef2110566f4a58851b877511464411f5771389a..798fb295184129d8112a749aac8cfc7d757e273e 100644
--- a/examples/novice/N03/src/ExN03SteppingAction.cc
+++ b/examples/novice/N03/src/ExN03SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03SteppingAction.cc,v 1.3 1999/12/15 14:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03SteppingVerbose.cc b/examples/novice/N03/src/ExN03SteppingVerbose.cc
index 8ae353e8f5e898db54d1e2b53cf8aec18931bcff..31edaf923ba92bb50e78123c5adb26b2f81918d8 100644
--- a/examples/novice/N03/src/ExN03SteppingVerbose.cc
+++ b/examples/novice/N03/src/ExN03SteppingVerbose.cc
@@ -5,39 +5,30 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: ExN03SteppingVerbose.cc,v 1.3 2000/02/28 18:10:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: ExN03SteppingVerbose.cc,v 1.5 2001/02/08 08:33:01 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-//
-//---------------------------------------------------------------
-//
-// ExN03SteppingVerbose.cc
-//
-// Description:
-//    Implementation of  the ExN03SteppingVerbose class
-//
-//---------------------------------------------------------------
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
 #include "ExN03SteppingVerbose.hh"
-#include "G4SteppingManager.hh"
 
+#include "G4SteppingManager.hh"
 #include "G4UnitsTable.hh"
 
-////////////////////////////////////////////////
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+
 ExN03SteppingVerbose::ExN03SteppingVerbose()
-////////////////////////////////////////////////
-{
-}
+{}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-//////////////////////////////////////////////////
 ExN03SteppingVerbose::~ExN03SteppingVerbose()
-//////////////////////////////////////////////////
-{
-}
+{}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-/////////////////////////////////////////
 void ExN03SteppingVerbose::StepInfo()
-/////////////////////////////////////////
 {
   CopyState();
   
@@ -55,7 +46,7 @@ void ExN03SteppingVerbose::StepInfo()
 	     << G4std::setw( 9) << "dEStep"     << " "  
 	     << G4std::setw(10) << "StepLeng"     
 	     << G4std::setw(10) << "TrakLeng" 
-	     << G4std::setw(10) << "NextVolu" 
+	     << G4std::setw(10) << "Volume"    << "  "
 	     << G4std::setw(10) << "Process"   << G4endl;	          
     }
 
@@ -70,16 +61,17 @@ void ExN03SteppingVerbose::StepInfo()
 
     // if( fStepStatus != fWorldBoundary){ 
     if( fTrack->GetNextVolume() != 0 ) { 
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName();
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
       G4cout << G4std::setw(10) << "OutOfWorld";
     }
 
     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
-      G4cout << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-	->GetProcessName();
+      G4cout << "  "
+             << G4std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
+	                                ->GetProcessName();
     } else {
-      G4cout << "User Limit";
+      G4cout << "   UserLimit";
     }
 
     G4cout << G4endl;
@@ -95,12 +87,12 @@ void ExN03SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -126,9 +118,9 @@ void ExN03SteppingVerbose::StepInfo()
   G4cout.precision(prec);
 }
 
-////////////////////////////////////////////////
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+
 void ExN03SteppingVerbose::TrackingStarted()
-////////////////////////////////////////////////
 {
 
   CopyState();
@@ -143,7 +135,7 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 9) << "dEStep"     << " "  
 	   << G4std::setw(10) << "StepLeng"  
 	   << G4std::setw(10) << "TrakLeng"
-	   << G4std::setw(10) << "NextVolu"
+	   << G4std::setw(10) << "Volume"     << "  "
 	   << G4std::setw(10) << "Process"    << G4endl;	     
 
     G4cout << G4std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
@@ -156,11 +148,13 @@ G4int prec = G4cout.precision(3);
 	   << G4std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length");
 
     if(fTrack->GetNextVolume()){
-      G4cout << G4std::setw(10) << fTrack->GetNextVolume()->GetName() << " ";
+      G4cout << G4std::setw(10) << fTrack->GetVolume()->GetName();
     } else {
-      G4cout << G4std::setw(10) << "OutOfWorld" << " ";
+      G4cout << "OutOfWorld";
     }
-    G4cout << G4std::setw(10) << "initStep" << G4endl;
+    G4cout << "    initStep" << G4endl;
   }
   G4cout.precision(prec);
 }
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N03/src/ExN03VisManager.cc b/examples/novice/N03/src/ExN03VisManager.cc
index 4fe265ea6dd17aa5e588ea6a4eb44ebce6bd621a..c43ca00d1a39d11a3558341d0c584568c894a1ff 100644
--- a/examples/novice/N03/src/ExN03VisManager.cc
+++ b/examples/novice/N03/src/ExN03VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN03VisManager.cc,v 1.4 2000/06/29 07:16:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/novice/N04/GNUmakefile b/examples/novice/N04/GNUmakefile
index b3cc7db8089a1d9067c94be5d9c8b2c49b604907..cf07cb7c05dec11e9e5bd62dff869b66ae0eb7dc 100644
--- a/examples/novice/N04/GNUmakefile
+++ b/examples/novice/N04/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 1999/07/06 18:15:43 johna Exp $
+# $Id: GNUmakefile,v 1.5 2001/01/06 06:56:13 kurasige Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
 # --------------------------------------------------------------
@@ -22,15 +22,15 @@ CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O))
 ifeq ($(G4SYSTEM),HP-aCC)
 COMPILER := $(shell aCC -V 2>&1)
 ifeq ($(COMPILER), aCC: HP ANSI C++ B3910B A.01.15)
-$(G4TMP)/$(G4SYSTEM)/$(name)/ExN04PhysicsList.o: src/ExN04PhysicsList.cc
-	$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/ExN04PhysicsList.cc
+$(G4TMP)/$(G4SYSTEM)/$(name)/ExN04HadronPhysics.o: src/ExN04HadronPhysics.cc
+	$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/ExN04HadronPhysics.cc
 endif
 endif
 
 ifeq ($(G4SYSTEM),Linux-g++)
 COMPILER := $(shell g++ -v 2>&1 | grep version | grep egcs)
 ifeq ($(findstring 1.1,$(COMPILER)),1.1)
-$(G4TMP)/$(G4SYSTEM)/$(name)/ExN04PhysicsList.o: src/ExN04PhysicsList.cc
-	$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/ExN04PhysicsList.cc
+$(G4TMP)/$(G4SYSTEM)/$(name)/ExN04HadronPhysics.o: src/ExN04HadronPhysics.cc
+	$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/ExN04HadronPhysics.cc
 endif
 endif
diff --git a/examples/novice/N04/History b/examples/novice/N04/History
index cd53a1a532df56c51b0e564cdd8149686f8cc6ae..3a1eb0487d8ce5875a440687132b99359341e519 100644
--- a/examples/novice/N04/History
+++ b/examples/novice/N04/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.10 2000/11/24 09:54:52 stesting Exp $
+$Id: History,v 1.18 2001/03/06 10:11:20 kurasige Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -14,6 +14,21 @@ track of all tags.
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+March 07 2001 H.Kurashige (exampleN04-V03-00-07)
+-  Add G4MuonMinusCaptureAtRest in G4MuonPhysics 
+
+February 25 2001 S.W.O'Neale (exampleN04-V03-00-06)
+- Add exampleN04.EMtest.large_N.out reference output and remove
+  some empty "reference" .err files
+
+February 20 2001 S.W.O'Neale (exampleN04-V03-00-05)
+- Update reference outputs following materials-V03-00-04  
+
+February 9 2001 S.W.O'Neale (exampleN04-V03-00-04)
+- Update SUN CC reference outouts for test104 and test104.EMtest
+
+February 9 2001 H.Kurashige (exampleN04-V03-00-03)
+- Introduce Modular Physics List
 
 25th November 2000 Steve O'Neale (tagset210)
 - Update test outputs for min.delta energy cut
diff --git a/examples/novice/N04/exampleN04.EMtest.err b/examples/novice/N04/exampleN04.EMtest.err
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/examples/novice/N04/exampleN04.EMtest.large_N.out b/examples/novice/N04/exampleN04.EMtest.large_N.out
new file mode 100644
index 0000000000000000000000000000000000000000..b5b90b495ca7173c42890cf5dcd01f6a9c890340
--- /dev/null
+++ b/examples/novice/N04/exampleN04.EMtest.large_N.out
@@ -0,0 +1,237 @@
+**********************************************
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
+             Copyright : Geant4 Collaboration
+**********************************************
+
+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 100 GeV in 100 bins. 
+
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
+
+eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
+ Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
+        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+
+ eIoni   Minimum Delta cut in range=0.1  mm.
+
+           material       min.delta energy(keV) 
+
+                 Air           0.99
+                Lead         228.53
+            ArgonGas           0.99
+             Silicon         116.88
+        Scintillator         83.337
+            dummyMat         126.97
+
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+
+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. 
+
+annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
+        gamma energies sampled according Heitler
+        PhysicsTables from 10 keV to 10 TeV in 100 bins. 
+
+ hIoni    Minimum Delta cut in range=0.1  mm.
+
+           material        min.delta energy(keV) 
+
+                 Air           0.99
+                Lead         228.53
+            ArgonGas           0.99
+             Silicon         116.88
+        Scintillator         83.337
+            dummyMat         126.97
+
+hIoni:    Knock-on electron cross sections . 
+         Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+
+MuIoni:  knock-on electron cross sections .
+          Good description above the mean excitation energy.
+         delta ray energy sampled from  differential Xsection.
+      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+
+MuBrems:  theoretical cross section 
+          Good description up to 1000 PeV.
+    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+
+MuPairProd:  theoretical cross sections 
+          Good description up to 1000 PeV.
+    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+Stage 0->1 : 1 hits found in the muon chamber.
+Stage 1->2 : 1 isolated muon found.
+>>> Event 0
+     35 hits are stored in ExN04TrackerHitsCollection.
+     4 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.29811 (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
+     18 hits are stored in ExN04TrackerHitsCollection.
+     17 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 4.9242 (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
+     11 hits are stored in ExN04TrackerHitsCollection.
+     11 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 4.8511 (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
+     12 hits are stored in ExN04TrackerHitsCollection.
+     23 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 2.8904 (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
+     24 hits are stored in ExN04TrackerHitsCollection.
+     17 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 4.9962 (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
+     6 hits are stored in ExN04TrackerHitsCollection.
+     12 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 2.6983 (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
+     10 hits are stored in ExN04TrackerHitsCollection.
+     19 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 26.952 (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
+     17 hits are stored in ExN04TrackerHitsCollection.
+     12 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 3.9798 (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
+     16 hits are stored in ExN04TrackerHitsCollection.
+     30 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 4.464 (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
+     27 hits are stored in ExN04TrackerHitsCollection.
+     27 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 14.589 (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
+     6 hits are stored in ExN04TrackerHitsCollection.
+     15 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 8.6695 (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 10
+     22 hits are stored in ExN04TrackerHitsCollection.
+     14 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 2.8606 (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 11
+     56 hits are stored in ExN04TrackerHitsCollection.
+     34 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 334.9 (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 12
+     16 hits are stored in ExN04TrackerHitsCollection.
+     18 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 2.2829 (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 13
+     14 hits are stored in ExN04TrackerHitsCollection.
+     25 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 10.367 (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 14
+     5 hits are stored in ExN04TrackerHitsCollection.
+     27 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 6.7872 (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 15
+     5 hits are stored in ExN04TrackerHitsCollection.
+     45 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 10.928 (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 16
+     5 hits are stored in ExN04TrackerHitsCollection.
+     14 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 2.9975 (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 17
+     16 hits are stored in ExN04TrackerHitsCollection.
+     16 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 4.9347 (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 18
+     5 hits are stored in ExN04TrackerHitsCollection.
+     14 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 3.752 (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 19
+     15 hits are stored in ExN04TrackerHitsCollection.
+     16 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 6.2639 (GeV)
+     1 hits are stored in ExN04MuonHitsCollection.
diff --git a/examples/novice/N04/exampleN04.EMtest.out b/examples/novice/N04/exampleN04.EMtest.out
index b10913a67f200a9e136a431e18433244022d9277..cbf5910a4d5c1e7d0d4174798c8b9b2b532a6333 100644
--- a/examples/novice/N04/exampleN04.EMtest.out
+++ b/examples/novice/N04/exampleN04.EMtest.out
@@ -1,28 +1,26 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
+MuonMinusCaptureAtRest is created 
 
-conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
-        e+e- energies according Bethe-Heitler
-        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
+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 100 GeV in 100 bins. 
 
-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. 
-
-msc:   Tables of transport mean free paths.
-          New model of MSC , computes the lateral 
-          displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
 
-eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
-        delta ray energy sampled from  differential Xsection.
+eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
+ Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
  eIoni   Minimum Delta cut in range=0.1  mm.
@@ -30,18 +28,25 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
            material       min.delta energy(keV) 
 
                  Air           0.99
-                Lead         229.54
+                Lead         228.53
             ArgonGas           0.99
-             Silicon         116.06
-        Scintillator         82.859
-            dummyMat         129.45
+             Silicon         116.88
+        Scintillator         83.337
+            dummyMat         126.97
 
-eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
- Good description from 1 KeV to 100 GeV.
-        log scale extrapolation above 100 GeV 
-        Gamma energy sampled from a parametrised formula.
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+
+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. 
+
 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. 
@@ -51,11 +56,11 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
            material        min.delta energy(keV) 
 
                  Air           0.99
-                Lead         229.54
+                Lead         228.53
             ArgonGas           0.99
-             Silicon         116.06
-        Scintillator         82.859
-            dummyMat         129.45
+             Silicon         116.88
+        Scintillator         83.337
+            dummyMat         126.97
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -72,11 +77,6 @@ MuIoni:  knock-on electron cross sections .
          delta ray energy sampled from  differential Xsection.
       PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
 
-msc:   Tables of transport mean free paths.
-          New model of MSC , computes the lateral 
-          displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
     PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
@@ -84,24 +84,29 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
     PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
 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.
-     4 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.29801 (GeV)
+     36 hits are stored in ExN04TrackerHitsCollection.
+     5 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.26878 (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
-     21 hits are stored in ExN04TrackerHitsCollection.
-     19 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 10.856 (GeV)
+     5 hits are stored in ExN04TrackerHitsCollection.
+     22 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 23.425 (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.
-     17 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 11.4 (GeV)
+     12 hits are stored in ExN04TrackerHitsCollection.
+     21 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 10.138 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
diff --git a/examples/novice/N04/exampleN04.cc b/examples/novice/N04/exampleN04.cc
index 1823c54400c4d42a0c0cbda205b3b578dfba8299..55ed497cd8a4cfa5d9b3054728d1b818573ceb45 100644
--- a/examples/novice/N04/exampleN04.cc
+++ b/examples/novice/N04/exampleN04.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: exampleN04.cc,v 1.2 1999/12/15 14:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N04/exampleN04.err b/examples/novice/N04/exampleN04.err
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/examples/novice/N04/exampleN04.out b/examples/novice/N04/exampleN04.out
index 3f3f37802413628dcf4f68bd53af46b325fdcf54..09077242555417d62b8661160a4ab113516aefce 100644
--- a/examples/novice/N04/exampleN04.out
+++ b/examples/novice/N04/exampleN04.out
@@ -1,28 +1,26 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
+MuonMinusCaptureAtRest is created 
 
-conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
-        e+e- energies according Bethe-Heitler
-        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
+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 100 GeV in 100 bins. 
 
-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. 
-
-msc:   Tables of transport mean free paths.
-          New model of MSC , computes the lateral 
-          displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
+        e+e- energies according Bethe-Heitler
+        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
 
-eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
-        delta ray energy sampled from  differential Xsection.
+eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
+ Good description from 1 KeV to 100 GeV.
+        log scale extrapolation above 100 GeV 
+        Gamma energy sampled from a parametrised formula.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
  eIoni   Minimum Delta cut in range=0.1  mm.
@@ -30,18 +28,25 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
            material       min.delta energy(keV) 
 
                  Air           0.99
-                Lead         229.55
+                Lead         228.53
             ArgonGas           0.99
-             Silicon         116.06
-        Scintillator         82.859
-            dummyMat         129.45
+             Silicon         116.88
+        Scintillator         83.337
+            dummyMat         126.97
 
-eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
- Good description from 1 KeV to 100 GeV.
-        log scale extrapolation above 100 GeV 
-        Gamma energy sampled from a parametrised formula.
+eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
+        delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+
+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. 
+
 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. 
@@ -51,11 +56,11 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
            material        min.delta energy(keV) 
 
                  Air           0.99
-                Lead         229.55
+                Lead         228.53
             ArgonGas           0.99
-             Silicon         116.06
-        Scintillator         82.859
-            dummyMat         129.45
+             Silicon         116.88
+        Scintillator         83.337
+            dummyMat         126.97
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -72,11 +77,6 @@ MuIoni:  knock-on electron cross sections .
          delta ray energy sampled from  differential Xsection.
       PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
 
-msc:   Tables of transport mean free paths.
-          New model of MSC , computes the lateral 
-          displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
     PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
@@ -84,13 +84,18 @@ MuBrems:  theoretical cross section
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
     PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+
+msc:   Tables of transport mean free paths.
+          New model of MSC , computes the lateral 
+          displacement of the particle , too.
+        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
 #
 Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
-     144 hits are stored in ExN04TrackerHitsCollection.
-     53 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.66269 (GeV)
+     117 hits are stored in ExN04TrackerHitsCollection.
+     58 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.77854 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 0 hits found in the muon chamber.
 ++++++++ event aborted
@@ -103,8 +108,8 @@ Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 0 isolated muon found.
 ++++++++ event aborted
 >>> Event 2
-     85 hits are stored in ExN04TrackerHitsCollection.
+     99 hits are stored in ExN04TrackerHitsCollection.
      13 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.34233 (GeV)
+     Total energy deposition in calorimeter : 0.34399 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 #
diff --git a/examples/novice/N04/include/ExN04EMPhysics.hh b/examples/novice/N04/include/ExN04EMPhysics.hh
new file mode 100644
index 0000000000000000000000000000000000000000..bee3e2b112594bd29cffb4542c4645658f6cdee5
--- /dev/null
+++ b/examples/novice/N04/include/ExN04EMPhysics.hh
@@ -0,0 +1,77 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04EMPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// ------------------------------------------------------------
+//	GEANT 4 class header file 
+// Class Description:
+//      This class is an derived class of G4VPhysicsConstructor
+//
+// ------------------------------------------- 
+//	History
+//        first version                   12 Nov. 2000 by H.Kurashige 
+// ------------------------------------------------------------
+#ifndef ExN04EMPhysics_h
+#define ExN04EMPhysics_h 1
+
+#include "globals.hh"
+#include "G4ios.hh"
+
+#include "G4VPhysicsConstructor.hh"
+
+#include "G4PhotoElectricEffect.hh"
+#include "G4ComptonScattering.hh"
+#include "G4GammaConversion.hh"
+#include "G4MultipleScattering.hh"
+#include "G4eIonisation.hh"
+#include "G4eBremsstrahlung.hh"
+#include "G4eplusAnnihilation.hh"
+
+class ExN04EMPhysics : public G4VPhysicsConstructor
+{
+  public: 
+    ExN04EMPhysics(const G4String& name ="EM");
+    virtual ~ExN04EMPhysics();
+
+  public: 
+    // This method will be invoked in the Construct() method. 
+    // each particle type will be instantiated
+    virtual void ConstructParticle();
+ 
+    // This method will be invoked in the Construct() method.
+    // each physics process will be instantiated and
+    // registered to the process manager of each particle type 
+    virtual void ConstructProcess();
+
+  protected:
+   // Gamma physics
+    G4PhotoElectricEffect thePhotoEffect;
+    G4ComptonScattering theComptonEffect;
+    G4GammaConversion thePairProduction;
+  
+    // Electron physics
+    G4MultipleScattering theElectronMultipleScattering;
+    G4eIonisation theElectronIonisation;
+    G4eBremsstrahlung theElectronBremsStrahlung;
+  
+    //Positron physics
+    G4MultipleScattering thePositronMultipleScattering;
+    G4eIonisation thePositronIonisation; 
+    G4eBremsstrahlung thePositronBremsStrahlung;  
+    G4eplusAnnihilation theAnnihilation;
+};
+
+
+#endif
+
+
+
+
+
diff --git a/examples/novice/N04/include/ExN04GeneralPhysics.hh b/examples/novice/N04/include/ExN04GeneralPhysics.hh
new file mode 100644
index 0000000000000000000000000000000000000000..d1140b65cb747addf8f564a4f462e2b2b6bf1664
--- /dev/null
+++ b/examples/novice/N04/include/ExN04GeneralPhysics.hh
@@ -0,0 +1,61 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04GeneralPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// ------------------------------------------------------------
+//	GEANT 4 class header file 
+// Class Description:
+//      This class is an derived class of G4VPhysicsConstructor
+//
+// ------------------------------------------- 
+//	History
+//        first version                   12 Nov. 2000 by H.Kurashige 
+// ------------------------------------------------------------
+#ifndef ExN04GeneralPhysics_h
+#define ExN04GeneralPhysics_h 1
+
+#include "globals.hh"
+#include "G4ios.hh"
+
+#include "G4VPhysicsConstructor.hh"
+
+
+#include "G4Decay.hh"
+
+class ExN04GeneralPhysics : public G4VPhysicsConstructor
+{
+  public: 
+    ExN04GeneralPhysics(const G4String& name = "general");
+    virtual ~ExN04GeneralPhysics();
+
+  public: 
+    // This method will be invoked in the Construct() method. 
+    // each particle type will be instantiated
+    virtual void ConstructParticle();
+ 
+    // This method will be invoked in the Construct() method.
+    // each physics process will be instantiated and
+    // registered to the process manager of each particle type 
+    virtual void ConstructProcess();
+
+  protected:
+    G4Decay fDecayProcess;
+};
+
+
+#endif
+
+
+
+
+
+
+
+
diff --git a/examples/novice/N04/include/ExN04HadronPhysics.hh b/examples/novice/N04/include/ExN04HadronPhysics.hh
new file mode 100644
index 0000000000000000000000000000000000000000..91fa9a771cff4995c5832246b25ed04f2a9e42a8
--- /dev/null
+++ b/examples/novice/N04/include/ExN04HadronPhysics.hh
@@ -0,0 +1,315 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04HadronPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// ------------------------------------------------------------
+//	GEANT 4 class header file 
+// Class Description:
+//      This class is an derived class of G4VPhysicsConstructor
+//
+// ------------------------------------------- 
+//	History
+//        first version                   12 Nov. 2000 by H.Kurashige 
+// ------------------------------------------------------------
+#ifndef ExN04HadronPhysics_h
+#define ExN04HadronPhysics_h 1
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "g4std/vector"
+
+#include "G4VPhysicsConstructor.hh"
+
+#include "G4MultipleScattering.hh"
+#include "G4hIonisation.hh"
+
+#include "G4HadronElasticProcess.hh"
+#include "G4HadronFissionProcess.hh"
+#include "G4HadronCaptureProcess.hh"
+
+#include "G4PionPlusInelasticProcess.hh"
+#include "G4PionMinusInelasticProcess.hh"
+#include "G4KaonPlusInelasticProcess.hh"
+#include "G4KaonZeroSInelasticProcess.hh"
+#include "G4KaonZeroLInelasticProcess.hh"
+#include "G4KaonMinusInelasticProcess.hh"
+#include "G4ProtonInelasticProcess.hh"
+#include "G4AntiProtonInelasticProcess.hh"
+#include "G4NeutronInelasticProcess.hh"
+#include "G4AntiNeutronInelasticProcess.hh"
+#include "G4LambdaInelasticProcess.hh"
+#include "G4AntiLambdaInelasticProcess.hh"
+#include "G4SigmaPlusInelasticProcess.hh"
+#include "G4SigmaMinusInelasticProcess.hh"
+#include "G4AntiSigmaPlusInelasticProcess.hh"
+#include "G4AntiSigmaMinusInelasticProcess.hh"
+#include "G4XiZeroInelasticProcess.hh"
+#include "G4XiMinusInelasticProcess.hh"
+#include "G4AntiXiZeroInelasticProcess.hh"
+#include "G4AntiXiMinusInelasticProcess.hh"
+#include "G4DeuteronInelasticProcess.hh"
+#include "G4TritonInelasticProcess.hh"
+#include "G4AlphaInelasticProcess.hh"
+#include "G4OmegaMinusInelasticProcess.hh"
+#include "G4AntiOmegaMinusInelasticProcess.hh"
+
+// Low-energy Models
+#include "G4LElastic.hh"   
+#include "G4LFission.hh"
+#include "G4LCapture.hh"
+
+#include "G4LEPionPlusInelastic.hh"
+#include "G4LEPionMinusInelastic.hh"
+#include "G4LEKaonPlusInelastic.hh"
+#include "G4LEKaonZeroSInelastic.hh"
+#include "G4LEKaonZeroLInelastic.hh"
+#include "G4LEKaonMinusInelastic.hh"
+#include "G4LEProtonInelastic.hh"
+#include "G4LEAntiProtonInelastic.hh"
+#include "G4LENeutronInelastic.hh"
+#include "G4LEAntiNeutronInelastic.hh"
+#include "G4LELambdaInelastic.hh"
+#include "G4LEAntiLambdaInelastic.hh"
+#include "G4LESigmaPlusInelastic.hh"
+#include "G4LESigmaMinusInelastic.hh"
+#include "G4LEAntiSigmaPlusInelastic.hh"
+#include "G4LEAntiSigmaMinusInelastic.hh"
+#include "G4LEXiZeroInelastic.hh"
+#include "G4LEXiMinusInelastic.hh"
+#include "G4LEAntiXiZeroInelastic.hh"
+#include "G4LEAntiXiMinusInelastic.hh"
+#include "G4LEDeuteronInelastic.hh"
+#include "G4LETritonInelastic.hh"
+#include "G4LEAlphaInelastic.hh"
+#include "G4LEOmegaMinusInelastic.hh"
+#include "G4LEAntiOmegaMinusInelastic.hh"
+
+// High-energy Models
+
+#include "G4HEPionPlusInelastic.hh"
+#include "G4HEPionMinusInelastic.hh"
+#include "G4HEKaonPlusInelastic.hh"
+#include "G4HEKaonZeroInelastic.hh"
+#include "G4HEKaonZeroInelastic.hh"
+#include "G4HEKaonMinusInelastic.hh"
+#include "G4HEProtonInelastic.hh"
+#include "G4HEAntiProtonInelastic.hh"
+#include "G4HENeutronInelastic.hh"
+#include "G4HEAntiNeutronInelastic.hh"
+#include "G4HELambdaInelastic.hh"
+#include "G4HEAntiLambdaInelastic.hh"
+#include "G4HESigmaPlusInelastic.hh"
+#include "G4HESigmaMinusInelastic.hh"
+#include "G4HEAntiSigmaPlusInelastic.hh"
+#include "G4HEAntiSigmaMinusInelastic.hh"
+#include "G4HEXiZeroInelastic.hh"
+#include "G4HEXiMinusInelastic.hh"
+#include "G4HEAntiXiZeroInelastic.hh"
+#include "G4HEAntiXiMinusInelastic.hh"
+#include "G4HEOmegaMinusInelastic.hh"
+#include "G4HEAntiOmegaMinusInelastic.hh"
+
+// Stopping processes
+#include "G4AntiProtonAnnihilationAtRest.hh"
+#include "G4AntiNeutronAnnihilationAtRest.hh"
+
+#ifdef TRIUMF_STOP_PIMINUS
+#include "G4PionMinusAbsorptionAtRest.hh"
+#else
+#include "G4PiMinusAbsorptionAtRest.hh"
+#endif
+#ifdef TRIUMF_STOP_KMINUS
+#include "G4KaonMinusAbsorption.hh"
+#else
+#include "G4KaonMinusAbsorptionAtRest.hh"
+#endif
+
+class ExN04HadronPhysics : public G4VPhysicsConstructor
+{
+  public: 
+    ExN04HadronPhysics(const G4String& name ="hadron");
+    virtual ~ExN04HadronPhysics();
+
+  public: 
+    // This method will be invoked in the Construct() method. 
+    // each particle type will be instantiated
+    virtual void ConstructParticle();
+ 
+    // This method will be invoked in the Construct() method.
+    // each physics process will be instantiated and
+    // registered to the process manager of each particle type 
+    virtual void ConstructProcess();
+
+  protected:
+   // Elastic Process
+   G4HadronElasticProcess theElasticProcess;
+   G4LElastic*            theElasticModel;
+  
+   // Pi + 
+   G4PionPlusInelasticProcess thePionPlusInelastic;
+   G4LEPionPlusInelastic* theLEPionPlusModel;
+   G4HEPionPlusInelastic* theHEPionPlusModel;
+   G4MultipleScattering thePionPlusMult;
+   G4hIonisation thePionPlusIonisation;
+
+   // Pi -
+   G4PionMinusInelasticProcess thePionMinusInelastic;
+   G4LEPionMinusInelastic* theLEPionMinusModel;
+   G4HEPionMinusInelastic* theHEPionMinusModel;
+   G4MultipleScattering thePionMinusMult;
+   G4hIonisation thePionMinusIonisation;
+#ifdef TRIUMF_STOP_PIMINUS
+   G4PionMinusAbsorptionAtRest thePionMinusAbsorption;
+#else
+   G4PiMinusAbsorptionAtRest thePionMinusAbsorption;
+#endif
+
+   // K + 
+   G4KaonPlusInelasticProcess theKaonPlusInelastic;
+   G4LEKaonPlusInelastic* theLEKaonPlusModel;
+   G4HEKaonPlusInelastic* theHEKaonPlusModel;
+   G4MultipleScattering theKaonPlusMult;
+   G4hIonisation theKaonPlusIonisation;
+
+   // K -
+   G4KaonMinusInelasticProcess theKaonMinusInelastic;
+   G4LEKaonMinusInelastic* theLEKaonMinusModel;
+   G4HEKaonMinusInelastic* theHEKaonMinusModel;
+   G4MultipleScattering theKaonMinusMult;
+   G4hIonisation theKaonMinusIonisation;
+#ifdef TRIUMF_STOP_KMINUS
+   G4KaonMinusAbsorption theKaonMinusAbsorption;
+#else
+   G4PiMinusAbsorptionAtRest theKaonMinusAbsorption;
+#endif
+
+   // K0L
+   G4KaonZeroLInelasticProcess theKaonZeroLInelastic;
+   G4LEKaonZeroLInelastic* theLEKaonZeroLModel;
+   G4HEKaonZeroInelastic* theHEKaonZeroLModel;
+
+   // K0S
+   G4KaonZeroSInelasticProcess theKaonZeroSInelastic;
+   G4LEKaonZeroSInelastic* theLEKaonZeroSModel;
+   G4HEKaonZeroInelastic* theHEKaonZeroSModel;
+
+   // Proton
+   G4ProtonInelasticProcess theProtonInelastic;
+   G4LEProtonInelastic* theLEProtonModel;
+   G4HEProtonInelastic* theHEProtonModel;
+   G4MultipleScattering theProtonMult;
+   G4hIonisation theProtonIonisation;
+ 
+   // anti-proton
+   G4AntiProtonInelasticProcess theAntiProtonInelastic;
+   G4LEAntiProtonInelastic* theLEAntiProtonModel;
+   G4HEAntiProtonInelastic* theHEAntiProtonModel;
+   G4MultipleScattering theAntiProtonMult;
+   G4hIonisation theAntiProtonIonisation;
+   G4AntiProtonAnnihilationAtRest  theAntiProtonAnnihilation;
+    
+   // neutron
+   G4NeutronInelasticProcess  theNeutronInelastic;
+   G4LENeutronInelastic* theLENeutronModel;
+   G4HENeutronInelastic* theHENeutronModel;
+   G4HadronFissionProcess theNeutronFission;
+   G4LFission* theNeutronFissionModel;
+   G4HadronCaptureProcess  theNeutronCapture;
+   G4LCapture* theNeutronCaptureModel;
+
+
+   // anti-neutron
+   G4AntiNeutronInelasticProcess  theAntiNeutronInelastic;
+   G4LEAntiNeutronInelastic* theLEAntiNeutronModel;
+   G4HEAntiNeutronInelastic* theHEAntiNeutronModel;
+   G4AntiNeutronAnnihilationAtRest  theAntiNeutronAnnihilation;
+   
+   // Lambda
+   G4LambdaInelasticProcess  theLambdaInelastic;
+   G4LELambdaInelastic*  theLELambdaModel;
+   G4HELambdaInelastic*  theHELambdaModel;
+  
+   // AntiLambda
+   G4AntiLambdaInelasticProcess  theAntiLambdaInelastic;
+   G4LEAntiLambdaInelastic*  theLEAntiLambdaModel;
+   G4HEAntiLambdaInelastic*  theHEAntiLambdaModel;
+  
+   // SigmaMinus
+   G4SigmaMinusInelasticProcess  theSigmaMinusInelastic;
+   G4LESigmaMinusInelastic*  theLESigmaMinusModel;
+   G4HESigmaMinusInelastic*  theHESigmaMinusModel;
+   G4MultipleScattering theSigmaMinusMult;
+   G4hIonisation theSigmaMinusIonisation;
+  
+   // AntiSigmaMinus
+   G4AntiSigmaMinusInelasticProcess  theAntiSigmaMinusInelastic;
+   G4LEAntiSigmaMinusInelastic*  theLEAntiSigmaMinusModel;
+   G4HEAntiSigmaMinusInelastic*  theHEAntiSigmaMinusModel;
+   G4MultipleScattering theAntiSigmaMinusMult;
+   G4hIonisation theAntiSigmaMinusIonisation;
+   
+   // SigmaPlus
+   G4SigmaPlusInelasticProcess  theSigmaPlusInelastic;
+   G4LESigmaPlusInelastic*  theLESigmaPlusModel;
+   G4HESigmaPlusInelastic*  theHESigmaPlusModel;
+   G4MultipleScattering theSigmaPlusMult;
+   G4hIonisation theSigmaPlusIonisation;
+  
+   // AntiSigmaPlus
+   G4AntiSigmaPlusInelasticProcess  theAntiSigmaPlusInelastic;
+   G4LEAntiSigmaPlusInelastic*  theLEAntiSigmaPlusModel;
+   G4HEAntiSigmaPlusInelastic*  theHEAntiSigmaPlusModel;
+   G4MultipleScattering theAntiSigmaPlusMult;
+   G4hIonisation theAntiSigmaPlusIonisation;
+  
+   // XiZero
+   G4XiZeroInelasticProcess  theXiZeroInelastic;
+   G4LEXiZeroInelastic*  theLEXiZeroModel;
+   G4HEXiZeroInelastic*  theHEXiZeroModel;
+  
+   // AntiXiZero
+   G4AntiXiZeroInelasticProcess  theAntiXiZeroInelastic;
+   G4LEAntiXiZeroInelastic*  theLEAntiXiZeroModel;
+   G4HEAntiXiZeroInelastic*  theHEAntiXiZeroModel;
+  
+   // XiMinus
+   G4XiMinusInelasticProcess  theXiMinusInelastic;
+   G4LEXiMinusInelastic*  theLEXiMinusModel;
+   G4HEXiMinusInelastic*  theHEXiMinusModel;
+   G4MultipleScattering theXiMinusMult;
+   G4hIonisation theXiMinusIonisation;
+
+   // AntiXiMinus
+   G4AntiXiMinusInelasticProcess  theAntiXiMinusInelastic;
+   G4LEAntiXiMinusInelastic*  theLEAntiXiMinusModel;
+   G4HEAntiXiMinusInelastic*  theHEAntiXiMinusModel;
+   G4MultipleScattering theAntiXiMinusMult;
+   G4hIonisation theAntiXiMinusIonisation;
+  
+   // OmegaMinus
+   G4OmegaMinusInelasticProcess  theOmegaMinusInelastic;
+   G4LEOmegaMinusInelastic*  theLEOmegaMinusModel;
+   G4HEOmegaMinusInelastic*  theHEOmegaMinusModel;
+   G4MultipleScattering theOmegaMinusMult;
+   G4hIonisation theOmegaMinusIonisation;
+   
+   // AntiOmegaMinus
+   G4AntiOmegaMinusInelasticProcess  theAntiOmegaMinusInelastic;
+   G4LEAntiOmegaMinusInelastic*  theLEAntiOmegaMinusModel;
+   G4HEAntiOmegaMinusInelastic*  theHEAntiOmegaMinusModel;
+   G4MultipleScattering theAntiOmegaMinusMult;
+   G4hIonisation theAntiOmegaMinusIonisation;
+
+   
+};
+
+
+#endif
+
diff --git a/examples/novice/N04/include/ExN04IonPhysics.hh b/examples/novice/N04/include/ExN04IonPhysics.hh
new file mode 100644
index 0000000000000000000000000000000000000000..2cee1564bace38ea6bbba947c24db482f8c5bcb3
--- /dev/null
+++ b/examples/novice/N04/include/ExN04IonPhysics.hh
@@ -0,0 +1,95 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04IonPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// ------------------------------------------------------------
+//	GEANT 4 class header file 
+// Class Description:
+//      This class is an derived class of G4VPhysicsConstructor
+//
+// ------------------------------------------- 
+//	History
+//        first version                   12 Nov. 2000 by H.Kurashige 
+// ------------------------------------------------------------
+#ifndef ExN04IonPhysics_h
+#define ExN04IonPhysics_h 1
+
+#include "globals.hh"
+#include "G4ios.hh"
+
+#include "G4VPhysicsConstructor.hh"
+
+#include "G4HadronElasticProcess.hh"
+#include "G4LElastic.hh"
+
+#include "G4DeuteronInelasticProcess.hh"
+#include "G4LEDeuteronInelastic.hh"
+
+#include "G4TritonInelasticProcess.hh"
+#include "G4LETritonInelastic.hh"
+
+#include "G4AlphaInelasticProcess.hh"
+#include "G4LEAlphaInelastic.hh"
+
+#include "G4hIonisation.hh"
+#include "G4MultipleScattering.hh"
+
+class ExN04IonPhysics : public G4VPhysicsConstructor
+{
+  public: 
+    ExN04IonPhysics(const G4String& name="ion");
+    virtual ~ExN04IonPhysics();
+
+  public: 
+    // This method will be invoked in the Construct() method. 
+    // each particle type will be instantiated
+    virtual void ConstructParticle();
+ 
+    // This method will be invoked in the Construct() method.
+    // each physics process will be instantiated and
+    // registered to the process manager of each particle type 
+    virtual void ConstructProcess();
+
+  protected:
+   // Elastic Process
+   G4HadronElasticProcess theElasticProcess;
+   G4LElastic*            theElasticModel;
+
+   // Generic Ion physics
+   G4MultipleScattering   fIonMultipleScattering;
+   G4hIonisation          fIonIonisation;
+
+   // Deuteron physics
+   G4MultipleScattering        fDeuteronMultipleScattering;
+   G4hIonisation               fDeuteronIonisation;
+   G4DeuteronInelasticProcess  fDeuteronProcess;
+   G4LEDeuteronInelastic*      fDeuteronModel;
+
+   // Triton physics
+   G4MultipleScattering        fTritonMultipleScattering;
+   G4hIonisation               fTritonIonisation;
+   G4TritonInelasticProcess    fTritonProcess;
+   G4LETritonInelastic*        fTritonModel;
+  
+   // Alpha physics
+   G4MultipleScattering        fAlphaMultipleScattering;
+   G4hIonisation               fAlphaIonisation;
+   G4AlphaInelasticProcess     fAlphaProcess;
+   G4LEAlphaInelastic*         fAlphaModel;
+
+   // He3 physics
+   G4MultipleScattering        fHe3MultipleScattering;
+   G4hIonisation               fHe3Ionisation;
+
+};
+
+
+#endif
+
diff --git a/examples/novice/N04/include/ExN04MuonPhysics.hh b/examples/novice/N04/include/ExN04MuonPhysics.hh
new file mode 100644
index 0000000000000000000000000000000000000000..2489f87eb746a86ac4c584ce684018c22bec5438
--- /dev/null
+++ b/examples/novice/N04/include/ExN04MuonPhysics.hh
@@ -0,0 +1,77 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04MuonPhysics.hh,v 1.2 2001/03/06 10:11:21 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// ------------------------------------------------------------
+//	GEANT 4 class header file 
+// Class Description:
+//      This class is an derived class of G4VPhysicsConstructor
+//
+// ------------------------------------------- 
+//	History
+//        first version                   12 Nov. 2000 by H.Kurashige 
+// ------------------------------------------------------------
+#ifndef ExN04MuonPhysics_h
+#define ExN04MuonPhysics_h 1
+
+#include "globals.hh"
+#include "G4ios.hh"
+
+#include "G4VPhysicsConstructor.hh"
+#include "G4MultipleScattering.hh"
+#include "G4MuBremsstrahlung.hh"
+#include "G4MuPairProduction.hh"
+#include "G4MuIonisation.hh"
+#include "G4hIonisation.hh"
+
+#include "G4MuonMinusCaptureAtRest.hh"
+
+class ExN04MuonPhysics : public G4VPhysicsConstructor
+{
+  public: 
+    ExN04MuonPhysics(const G4String& name="muon");
+    virtual ~ExN04MuonPhysics();
+
+  public: 
+    // This method will be invoked in the Construct() method. 
+    // each particle type will be instantiated
+    virtual void ConstructParticle();
+ 
+    // This method will be invoked in the Construct() method.
+    // each physics process will be instantiated and
+    // registered to the process manager of each particle type 
+    virtual void ConstructProcess();
+
+  protected:
+   // Muon physics
+   G4MultipleScattering   fMuPlusMultipleScattering;
+   G4MuBremsstrahlung     fMuPlusBremsstrahlung ;
+   G4MuPairProduction     fMuPlusPairProduction;
+   G4MuIonisation         fMuPlusIonisation;
+
+   G4MultipleScattering   fMuMinusMultipleScattering;
+   G4MuBremsstrahlung     fMuMinusBremsstrahlung ;
+   G4MuPairProduction     fMuMinusPairProduction;
+   G4MuIonisation         fMuMinusIonisation;
+
+   G4MuonMinusCaptureAtRest fMuMinusCaptureAtRest;
+
+   // Tau physics
+   G4MultipleScattering   fTauPlusMultipleScattering;
+   G4hIonisation          fTauPlusIonisation;
+
+   G4MultipleScattering   fTauMinusMultipleScattering;
+   G4hIonisation          fTauMinusIonisation;
+
+};
+
+
+#endif
+
diff --git a/examples/novice/N04/include/ExN04PhysicsList.hh b/examples/novice/N04/include/ExN04PhysicsList.hh
index c32e3ed09e61bba42fd4f78b841f0af241b2e61f..fefc2ca58207448a22513b9bde3c573d4f758f6d 100644
--- a/examples/novice/N04/include/ExN04PhysicsList.hh
+++ b/examples/novice/N04/include/ExN04PhysicsList.hh
@@ -1,38 +1,23 @@
 #ifndef ExN04PhysicsList_h
 #define ExN04PhysicsList_h 1
 
-#include "G4VUserPhysicsList.hh"
+#include "G4VModularPhysicsList.hh"
 #include "globals.hh"
 
-class ExN04PhysicsList: public G4VUserPhysicsList
+class ExN04PhysicsList: public G4VModularPhysicsList
 {
 public:
   ExN04PhysicsList();
   virtual ~ExN04PhysicsList();
   
-protected:
-  // Construct particle and physics
-  virtual void ConstructParticle();
-  virtual void ConstructProcess();
-  
-  // 
+public:
+  // SetCuts() 
   virtual void SetCuts();
-  
-protected:
-  // these methods Construct physics processes and register them
-  virtual void ConstructGeneral();
-  virtual void ConstructEM();
-  virtual void ConstructHad();
-
-  // these methods Construct all particles in each category
-  virtual void ConstructAllBosons();
-  virtual void ConstructAllLeptons();
-  virtual void ConstructAllMesons();
-  virtual void ConstructAllBaryons();
-  virtual void ConstructAllIons();
-  virtual void ConstructAllShortLiveds();
+
+
 };
 
+
 #endif
 
 
diff --git a/examples/novice/N04/src/ExN04EMPhysics.cc b/examples/novice/N04/src/ExN04EMPhysics.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f5b8dfe008525ee510e700affc93ba451ea820d1
--- /dev/null
+++ b/examples/novice/N04/src/ExN04EMPhysics.cc
@@ -0,0 +1,95 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04EMPhysics.cc,v 1.1 2001/01/06 06:56:17 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+
+#include "ExN04EMPhysics.hh"
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "g4std/iomanip"   
+
+
+ExN04EMPhysics::ExN04EMPhysics(const G4String& name)
+               :  G4VPhysicsConstructor(name)
+{
+}
+
+ExN04EMPhysics::~ExN04EMPhysics()
+{
+}
+
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+
+#include "G4Gamma.hh"
+
+#include "G4Electron.hh"
+#include "G4Positron.hh"
+
+#include "G4NeutrinoE.hh"
+#include "G4AntiNeutrinoE.hh"
+
+void ExN04EMPhysics::ConstructParticle()
+{
+  // gamma
+  G4Gamma::GammaDefinition();
+ 
+  // electron
+  G4Electron::ElectronDefinition();
+  G4Positron::PositronDefinition();
+  G4NeutrinoE::NeutrinoEDefinition();
+  G4AntiNeutrinoE::AntiNeutrinoEDefinition();
+}
+
+
+#include "G4ProcessManager.hh"
+
+
+void ExN04EMPhysics::ConstructProcess()
+{
+  G4ProcessManager * pManager = 0;
+  
+  // Gamma Physics
+  pManager = G4Gamma::Gamma()->GetProcessManager();
+  pManager->AddDiscreteProcess(&thePhotoEffect);
+  pManager->AddDiscreteProcess(&theComptonEffect);
+  pManager->AddDiscreteProcess(&thePairProduction);
+
+  // Electron Physics
+  pManager = G4Electron::Electron()->GetProcessManager();
+   // add processes
+  pManager->AddDiscreteProcess(&theElectronBremsStrahlung);  
+
+  pManager->AddProcess(&theElectronIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theElectronMultipleScattering);
+  pManager->SetProcessOrdering(&theElectronMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&theElectronMultipleScattering, idxPostStep,  1);
+
+  //Positron Physics
+  pManager = G4Positron::Positron()->GetProcessManager();
+  // add processes
+  pManager->AddDiscreteProcess(&thePositronBremsStrahlung);
+
+  pManager->AddDiscreteProcess(&theAnnihilation);
+
+  pManager->AddRestProcess(&theAnnihilation);
+
+  pManager->AddProcess(&thePositronIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&thePositronMultipleScattering);
+  pManager->SetProcessOrdering(&thePositronMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&thePositronMultipleScattering, idxPostStep,  1);
+
+}
+
+
+
diff --git a/examples/novice/N04/src/ExN04GeneralPhysics.cc b/examples/novice/N04/src/ExN04GeneralPhysics.cc
new file mode 100644
index 0000000000000000000000000000000000000000..15390578380dbe546295d1d1f7170959ab601eb9
--- /dev/null
+++ b/examples/novice/N04/src/ExN04GeneralPhysics.cc
@@ -0,0 +1,57 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04GeneralPhysics.cc,v 1.1 2001/01/06 06:56:17 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+
+#include "ExN04GeneralPhysics.hh"
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "g4std/iomanip"   
+
+ExN04GeneralPhysics::ExN04GeneralPhysics(const G4String& name)
+                     :  G4VPhysicsConstructor(name)
+{
+}
+
+ExN04GeneralPhysics::~ExN04GeneralPhysics()
+{
+}
+
+#include "G4ParticleDefinition.hh"
+#include "G4ProcessManager.hh"
+// Bosons
+#include "G4ChargedGeantino.hh"
+#include "G4Geantino.hh"
+
+void ExN04GeneralPhysics::ConstructParticle()
+{
+  // pseudo-particles
+  G4Geantino::GeantinoDefinition();
+  G4ChargedGeantino::ChargedGeantinoDefinition();  
+}
+
+void ExN04GeneralPhysics::ConstructProcess()
+{
+  // Add Decay Process
+  theParticleIterator->reset();
+  while( (*theParticleIterator)() ){
+    G4ParticleDefinition* particle = theParticleIterator->value();
+    G4ProcessManager* pmanager = particle->GetProcessManager();
+    if (fDecayProcess.IsApplicable(*particle)) { 
+      pmanager ->AddProcess(&fDecayProcess);
+      // set ordering for PostStepDoIt and AtRestDoIt
+      pmanager ->SetProcessOrdering(&fDecayProcess, idxPostStep);
+      pmanager ->SetProcessOrdering(&fDecayProcess, idxAtRest);
+    }
+  }
+}
+
+
diff --git a/examples/novice/N04/src/ExN04HadronPhysics.cc b/examples/novice/N04/src/ExN04HadronPhysics.cc
new file mode 100644
index 0000000000000000000000000000000000000000..213e2f18f43c1f891f144e1206b53a5337cce3cf
--- /dev/null
+++ b/examples/novice/N04/src/ExN04HadronPhysics.cc
@@ -0,0 +1,412 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04HadronPhysics.cc,v 1.1 2001/01/06 06:56:18 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+
+#include "ExN04HadronPhysics.hh"
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "g4std/iomanip"   
+
+
+ExN04HadronPhysics::ExN04HadronPhysics(const G4String& name)
+                    :  G4VPhysicsConstructor(name)
+{
+}
+
+ExN04HadronPhysics::~ExN04HadronPhysics()
+{
+}
+
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+
+// Nuclei
+#include "G4MesonConstructor.hh"
+#include "G4BaryonConstructor.hh"
+#include "G4ShortLivedConstructor.hh"
+
+void ExN04HadronPhysics::ConstructParticle()
+{
+  //  Construct all mesons
+  G4MesonConstructor pMesonConstructor;
+  pMesonConstructor.ConstructParticle();
+
+  //  Construct all barions
+  G4BaryonConstructor pBaryonConstructor;
+  pBaryonConstructor.ConstructParticle();
+
+  //  Construct  resonaces and quarks
+  G4ShortLivedConstructor pShortLivedConstructor;
+  pShortLivedConstructor.ConstructParticle();  
+
+}
+
+
+#include "G4ProcessManager.hh"
+
+
+void ExN04HadronPhysics::ConstructProcess()
+{
+  G4ProcessManager * pManager = 0;
+  
+  // Elastic Process
+  theElasticModel = new G4LElastic();
+  theElasticProcess.RegisterMe(theElasticModel);
+
+  // PionPlus
+  pManager = G4PionPlus::PionPlus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEPionPlusModel = new G4LEPionPlusInelastic();
+  theHEPionPlusModel = new G4HEPionPlusInelastic();
+  thePionPlusInelastic.RegisterMe(theLEPionPlusModel);
+  thePionPlusInelastic.RegisterMe(theHEPionPlusModel);
+  pManager->AddDiscreteProcess(&thePionPlusInelastic);
+
+  pManager->AddProcess(&thePionPlusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&thePionPlusMult);
+  pManager->SetProcessOrdering(&thePionPlusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&thePionPlusMult, idxPostStep, 1);
+
+  // PionMinus
+  pManager = G4PionMinus::PionMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEPionMinusModel = new G4LEPionMinusInelastic();
+  theHEPionMinusModel = new G4HEPionMinusInelastic();
+  thePionMinusInelastic.RegisterMe(theLEPionMinusModel);
+  thePionMinusInelastic.RegisterMe(theHEPionMinusModel);
+  pManager->AddDiscreteProcess(&thePionMinusInelastic);
+
+  pManager->AddProcess(&thePionMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&thePionMinusMult);
+  pManager->SetProcessOrdering(&thePionMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&thePionMinusMult, idxPostStep, 1);
+
+  pManager->AddRestProcess(&thePionMinusAbsorption, ordDefault);
+
+  // KaonPlus
+  pManager = G4KaonPlus::KaonPlus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEKaonPlusModel = new G4LEKaonPlusInelastic();
+  theHEKaonPlusModel = new G4HEKaonPlusInelastic();
+  theKaonPlusInelastic.RegisterMe(theLEKaonPlusModel);
+  theKaonPlusInelastic.RegisterMe(theHEKaonPlusModel);
+  pManager->AddDiscreteProcess(&theKaonPlusInelastic);
+
+  pManager->AddProcess(&theKaonPlusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theKaonPlusMult);
+  pManager->SetProcessOrdering(&theKaonPlusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theKaonPlusMult, idxPostStep, 1);
+
+  // KaonMinus
+  pManager = G4KaonMinus::KaonMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEKaonMinusModel = new G4LEKaonMinusInelastic();
+  theHEKaonMinusModel = new G4HEKaonMinusInelastic();
+  theKaonMinusInelastic.RegisterMe(theLEKaonMinusModel);
+  theKaonMinusInelastic.RegisterMe(theHEKaonMinusModel);
+  pManager->AddDiscreteProcess(&theKaonMinusInelastic);
+
+  pManager->AddProcess(&theKaonMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theKaonMinusMult);
+  pManager->SetProcessOrdering(&theKaonMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theKaonMinusMult, idxPostStep, 1);
+
+  pManager->AddRestProcess(&theKaonMinusAbsorption, ordDefault);
+
+  // KaonZeroL
+  pManager = G4KaonZeroLong::KaonZeroLong()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEKaonZeroLModel = new G4LEKaonZeroLInelastic();
+  theHEKaonZeroLModel = new G4HEKaonZeroInelastic();
+  theKaonZeroLInelastic.RegisterMe(theLEKaonZeroLModel);
+  theKaonZeroLInelastic.RegisterMe(theHEKaonZeroLModel);
+  pManager->AddDiscreteProcess(&theKaonZeroLInelastic);
+ 
+  // KaonZeroS
+  pManager = G4KaonZeroShort::KaonZeroShort()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEKaonZeroSModel = new G4LEKaonZeroSInelastic();
+  theHEKaonZeroSModel = new G4HEKaonZeroInelastic();
+  theKaonZeroSInelastic.RegisterMe(theLEKaonZeroSModel);
+  theKaonZeroSInelastic.RegisterMe(theHEKaonZeroSModel);
+  pManager->AddDiscreteProcess(&theKaonZeroSInelastic);
+
+  // Proton
+  pManager = G4Proton::Proton()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEProtonModel = new G4LEProtonInelastic();
+  theHEProtonModel = new G4HEProtonInelastic();
+  theProtonInelastic.RegisterMe(theLEProtonModel);
+  theProtonInelastic.RegisterMe(theHEProtonModel);
+  pManager->AddDiscreteProcess(&theProtonInelastic);
+
+  pManager->AddProcess(&theProtonIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theProtonMult);
+  pManager->SetProcessOrdering(&theProtonMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theProtonMult, idxPostStep, 1);
+
+  // anti-Proton
+  pManager = G4AntiProton::AntiProton()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiProtonModel = new G4LEAntiProtonInelastic();
+  theHEAntiProtonModel = new G4HEAntiProtonInelastic();
+  theAntiProtonInelastic.RegisterMe(theLEAntiProtonModel);
+  theAntiProtonInelastic.RegisterMe(theHEAntiProtonModel);
+  pManager->AddDiscreteProcess(&theAntiProtonInelastic);
+
+  pManager->AddProcess(&theAntiProtonIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theAntiProtonMult);
+  pManager->SetProcessOrdering(&theAntiProtonMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theAntiProtonMult, idxPostStep, 1);
+
+  pManager->AddRestProcess(&theAntiProtonAnnihilation);
+
+  // Neutron
+  pManager = G4Neutron::Neutron()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLENeutronModel = new G4LENeutronInelastic();
+  theHENeutronModel = new G4HENeutronInelastic();
+  theNeutronInelastic.RegisterMe(theLENeutronModel);
+  theNeutronInelastic.RegisterMe(theHENeutronModel);
+  pManager->AddDiscreteProcess(&theNeutronInelastic);
+  
+  //theNeutronFissionModel = new G4LFission();
+  //theNeutronFission.RegisterMe(theNeutronFissionModel);
+  //pManager->AddDiscreteProcess(&NeutronFission);
+
+  //theNeutronCaptureModel = new G4LCapture();
+  //theNeutronCapture.RegisterMe(theNeutronCaptureModel);
+  //pManager->AddDiscreteProcess(&theNeutronCapture);
+
+  // AntiNeutron
+  pManager = G4AntiNeutron::AntiNeutron()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiNeutronModel = new G4LEAntiNeutronInelastic();
+  theHEAntiNeutronModel = new G4HEAntiNeutronInelastic();
+  theAntiNeutronInelastic.RegisterMe(theLEAntiNeutronModel);
+  theAntiNeutronInelastic.RegisterMe(theHEAntiNeutronModel);
+  pManager->AddDiscreteProcess(&theAntiNeutronInelastic);
+    
+  pManager->AddRestProcess(&theAntiNeutronAnnihilation);
+
+  // Lambda
+  pManager = G4Lambda::Lambda()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLELambdaModel = new G4LELambdaInelastic();
+  theHELambdaModel = new G4HELambdaInelastic();
+  theLambdaInelastic.RegisterMe(theLELambdaModel);
+  theLambdaInelastic.RegisterMe(theHELambdaModel);
+  pManager->AddDiscreteProcess(&theLambdaInelastic);
+  
+  // AntiLambda
+  pManager = G4AntiLambda::AntiLambda()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiLambdaModel = new G4LEAntiLambdaInelastic();
+  theHEAntiLambdaModel = new G4HEAntiLambdaInelastic();
+  theAntiLambdaInelastic.RegisterMe(theLEAntiLambdaModel);
+  theAntiLambdaInelastic.RegisterMe(theHEAntiLambdaModel);
+  pManager->AddDiscreteProcess(&theAntiLambdaInelastic);
+    
+  // SigmaMinus
+  pManager = G4SigmaMinus::SigmaMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLESigmaMinusModel = new G4LESigmaMinusInelastic();
+  theHESigmaMinusModel = new G4HESigmaMinusInelastic();
+  theSigmaMinusInelastic.RegisterMe(theLESigmaMinusModel);
+  theSigmaMinusInelastic.RegisterMe(theHESigmaMinusModel);
+  pManager->AddDiscreteProcess(&theSigmaMinusInelastic);
+
+  pManager->AddProcess(&theSigmaMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theSigmaMinusMult);
+  pManager->SetProcessOrdering(&theSigmaMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theSigmaMinusMult, idxPostStep, 1);
+
+  // anti-SigmaMinus
+  pManager = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiSigmaMinusModel = new G4LEAntiSigmaMinusInelastic();
+  theHEAntiSigmaMinusModel = new G4HEAntiSigmaMinusInelastic();
+  theAntiSigmaMinusInelastic.RegisterMe(theLEAntiSigmaMinusModel);
+  theAntiSigmaMinusInelastic.RegisterMe(theHEAntiSigmaMinusModel);
+  pManager->AddDiscreteProcess(&theAntiSigmaMinusInelastic);
+
+  pManager->AddProcess(&theAntiSigmaMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theAntiSigmaMinusMult);
+  pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxPostStep, 1);
+
+  // SigmaPlus
+  pManager = G4SigmaPlus::SigmaPlus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLESigmaPlusModel = new G4LESigmaPlusInelastic();
+  theHESigmaPlusModel = new G4HESigmaPlusInelastic();
+  theSigmaPlusInelastic.RegisterMe(theLESigmaPlusModel);
+  theSigmaPlusInelastic.RegisterMe(theHESigmaPlusModel);
+  pManager->AddDiscreteProcess(&theSigmaPlusInelastic);
+
+  pManager->AddProcess(&theSigmaPlusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theSigmaPlusMult);
+  pManager->SetProcessOrdering(&theSigmaPlusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theSigmaPlusMult, idxPostStep, 1);
+
+  // anti-SigmaPlus
+  pManager = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiSigmaPlusModel = new G4LEAntiSigmaPlusInelastic();
+  theHEAntiSigmaPlusModel = new G4HEAntiSigmaPlusInelastic();
+  theAntiSigmaPlusInelastic.RegisterMe(theLEAntiSigmaPlusModel);
+  theAntiSigmaPlusInelastic.RegisterMe(theHEAntiSigmaPlusModel);
+  pManager->AddDiscreteProcess(&theAntiSigmaPlusInelastic);
+
+  pManager->AddProcess(&theAntiSigmaPlusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theAntiSigmaPlusMult);
+  pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxPostStep, 1);
+
+  // XiMinus
+  pManager = G4XiMinus::XiMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEXiMinusModel = new G4LEXiMinusInelastic();
+  theHEXiMinusModel = new G4HEXiMinusInelastic();
+  theXiMinusInelastic.RegisterMe(theLEXiMinusModel);
+  theXiMinusInelastic.RegisterMe(theHEXiMinusModel);
+  pManager->AddDiscreteProcess(&theXiMinusInelastic);
+
+  pManager->AddProcess(&theXiMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theXiMinusMult);
+  pManager->SetProcessOrdering(&theXiMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theXiMinusMult, idxPostStep, 1);
+
+  // anti-XiMinus
+  pManager = G4AntiXiMinus::AntiXiMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiXiMinusModel = new G4LEAntiXiMinusInelastic();
+  theHEAntiXiMinusModel = new G4HEAntiXiMinusInelastic();
+  theAntiXiMinusInelastic.RegisterMe(theLEAntiXiMinusModel);
+  theAntiXiMinusInelastic.RegisterMe(theHEAntiXiMinusModel);
+  pManager->AddDiscreteProcess(&theAntiXiMinusInelastic);
+
+  pManager->AddProcess(&theAntiXiMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theAntiXiMinusMult);
+  pManager->SetProcessOrdering(&theAntiXiMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theAntiXiMinusMult, idxPostStep, 1);
+
+  // XiZero
+  pManager = G4XiZero::XiZero()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEXiZeroModel = new G4LEXiZeroInelastic();
+  theHEXiZeroModel = new G4HEXiZeroInelastic();
+  theXiZeroInelastic.RegisterMe(theLEXiZeroModel);
+  theXiZeroInelastic.RegisterMe(theHEXiZeroModel);
+  pManager->AddDiscreteProcess(&theXiZeroInelastic);
+
+  // anti-XiZero
+  pManager = G4AntiXiZero::AntiXiZero()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiXiZeroModel = new G4LEAntiXiZeroInelastic();
+  theHEAntiXiZeroModel = new G4HEAntiXiZeroInelastic();
+  theAntiXiZeroInelastic.RegisterMe(theLEAntiXiZeroModel);
+  theAntiXiZeroInelastic.RegisterMe(theHEAntiXiZeroModel);
+  pManager->AddDiscreteProcess(&theAntiXiZeroInelastic);
+
+  // OmegaMinus
+  pManager = G4OmegaMinus::OmegaMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEOmegaMinusModel = new G4LEOmegaMinusInelastic();
+  theHEOmegaMinusModel = new G4HEOmegaMinusInelastic();
+  theOmegaMinusInelastic.RegisterMe(theLEOmegaMinusModel);
+  theOmegaMinusInelastic.RegisterMe(theHEOmegaMinusModel);
+  pManager->AddDiscreteProcess(&theOmegaMinusInelastic);
+
+  pManager->AddProcess(&theOmegaMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theOmegaMinusMult);
+  pManager->SetProcessOrdering(&theOmegaMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theOmegaMinusMult, idxPostStep, 1);
+
+  // anti-OmegaMinus
+  pManager = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  theLEAntiOmegaMinusModel = new G4LEAntiOmegaMinusInelastic();
+  theHEAntiOmegaMinusModel = new G4HEAntiOmegaMinusInelastic();
+  theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel);
+  theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel);
+  pManager->AddDiscreteProcess(&theAntiOmegaMinusInelastic);
+
+  pManager->AddProcess(&theAntiOmegaMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&theAntiOmegaMinusMult);
+  pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxAlongStep, 1);
+  pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxPostStep, 1);
+
+}
+
+
+
+
+
diff --git a/examples/novice/N04/src/ExN04IonPhysics.cc b/examples/novice/N04/src/ExN04IonPhysics.cc
new file mode 100644
index 0000000000000000000000000000000000000000..60a380acbd10d05033c33b60937194f6daedda0e
--- /dev/null
+++ b/examples/novice/N04/src/ExN04IonPhysics.cc
@@ -0,0 +1,124 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04IonPhysics.cc,v 1.1 2001/01/06 06:56:18 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+
+#include "ExN04IonPhysics.hh"
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "g4std/iomanip"   
+
+
+ExN04IonPhysics::ExN04IonPhysics(const G4String& name)
+                 :  G4VPhysicsConstructor(name)
+{
+}
+
+ExN04IonPhysics::~ExN04IonPhysics()
+{
+}
+
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+
+// Nuclei
+#include "G4IonConstructor.hh"
+
+void ExN04IonPhysics::ConstructParticle()
+{
+  //  Construct light ions
+  G4IonConstructor pConstructor;
+  pConstructor.ConstructParticle();  
+}
+
+
+#include "G4ProcessManager.hh"
+
+
+void ExN04IonPhysics::ConstructProcess()
+{
+  G4ProcessManager * pManager = 0;
+  
+  // Elastic Process
+  theElasticModel = new G4LElastic();
+  theElasticProcess.RegisterMe(theElasticModel);
+
+  // Generic Ion
+  pManager = G4GenericIon::GenericIon()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  pManager->AddProcess(&fIonIonisation, ordInActive, 2, 2);
+
+  pManager->AddProcess(&fIonMultipleScattering);
+  pManager->SetProcessOrdering(&fIonMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fIonMultipleScattering, idxPostStep,  1);
+
+  // Deuteron 
+  pManager = G4Deuteron::Deuteron()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  fDeuteronModel = new G4LEDeuteronInelastic();
+  fDeuteronProcess.RegisterMe(fDeuteronModel);
+  pManager->AddDiscreteProcess(&fDeuteronProcess);
+
+  pManager->AddProcess(&fDeuteronIonisation, ordInActive, 2, 2);
+
+  pManager->AddProcess(&fDeuteronMultipleScattering);
+  pManager->SetProcessOrdering(&fDeuteronMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fDeuteronMultipleScattering, idxPostStep,  1);
+ 
+  // Triton 
+  pManager = G4Triton::Triton()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  fTritonModel = new G4LETritonInelastic();
+  fTritonProcess.RegisterMe(fTritonModel);
+  pManager->AddDiscreteProcess(&fTritonProcess);
+
+  pManager->AddProcess(&fTritonIonisation, ordInActive, 2, 2);
+
+  pManager->AddProcess(&fTritonMultipleScattering);
+  pManager->SetProcessOrdering(&fTritonMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fTritonMultipleScattering, idxPostStep,  1);
+ 
+  // Alpha 
+  pManager = G4Alpha::Alpha()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  fAlphaModel = new G4LEAlphaInelastic();
+  fAlphaProcess.RegisterMe(fAlphaModel);
+  pManager->AddDiscreteProcess(&fAlphaProcess);
+
+  pManager->AddProcess(&fAlphaIonisation, ordInActive, 2, 2);
+
+  pManager->AddProcess(&fAlphaMultipleScattering);
+  pManager->SetProcessOrdering(&fAlphaMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fAlphaMultipleScattering, idxPostStep,  1);
+ 
+  // He3
+  pManager = G4He3::He3()->GetProcessManager();
+  // add process
+  pManager->AddDiscreteProcess(&theElasticProcess);
+
+  pManager->AddProcess(&fHe3Ionisation, ordInActive, 2, 2);
+
+  pManager->AddProcess(&fHe3MultipleScattering);
+  pManager->SetProcessOrdering(&fHe3MultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fHe3MultipleScattering, idxPostStep,  1);
+   
+}
+
+
+
diff --git a/examples/novice/N04/src/ExN04MuonPhysics.cc b/examples/novice/N04/src/ExN04MuonPhysics.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b72dce58c22dd923f32b60f29f567c8f12678024
--- /dev/null
+++ b/examples/novice/N04/src/ExN04MuonPhysics.cc
@@ -0,0 +1,112 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: ExN04MuonPhysics.cc,v 1.2 2001/03/06 10:11:21 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+
+#include "ExN04MuonPhysics.hh"
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "g4std/iomanip"   
+
+
+ExN04MuonPhysics::ExN04MuonPhysics(const G4String& name)
+                   :  G4VPhysicsConstructor(name)
+{
+}
+
+ExN04MuonPhysics::~ExN04MuonPhysics()
+{
+}
+
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+
+#include "G4MuonPlus.hh"
+#include "G4MuonMinus.hh"
+#include "G4TauMinus.hh"
+#include "G4TauPlus.hh"
+#include "G4NeutrinoTau.hh"
+#include "G4AntiNeutrinoTau.hh"
+#include "G4NeutrinoMu.hh"
+#include "G4AntiNeutrinoMu.hh"
+
+void ExN04MuonPhysics::ConstructParticle()
+{
+  // Mu
+  G4MuonPlus::MuonPlusDefinition();
+  G4MuonMinus::MuonMinusDefinition();
+  G4NeutrinoMu::NeutrinoMuDefinition();
+  G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
+
+  // Tau
+  G4TauMinus::TauMinusDefinition();
+  G4TauPlus::TauPlusDefinition();
+  G4NeutrinoTau::NeutrinoTauDefinition();
+  G4AntiNeutrinoTau::AntiNeutrinoTauDefinition();
+
+}
+
+
+#include "G4ProcessManager.hh"
+
+void ExN04MuonPhysics::ConstructProcess()
+{
+  G4ProcessManager * pManager = 0;
+
+  // Muon Plus Physics
+  pManager = G4MuonPlus::MuonPlus()->GetProcessManager();
+   // add processes
+  pManager->AddProcess(&fMuPlusIonisation, ordInActive,2, 2);
+
+  pManager->AddDiscreteProcess(&fMuPlusBremsstrahlung);
+
+  pManager->AddDiscreteProcess(&fMuPlusPairProduction);
+
+  pManager->AddProcess(&fMuPlusMultipleScattering);
+  pManager->SetProcessOrdering(&fMuPlusMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fMuPlusMultipleScattering, idxPostStep,  1);
+
+  // Muon Minus Physics
+  pManager = G4MuonMinus::MuonMinus()->GetProcessManager();
+   // add processes
+  pManager->AddProcess(&fMuMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddDiscreteProcess(&fMuMinusBremsstrahlung);
+
+  pManager->AddDiscreteProcess(&fMuMinusPairProduction);
+
+  pManager->AddProcess(&fMuMinusMultipleScattering);
+  pManager->SetProcessOrdering(&fMuMinusMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fMuMinusMultipleScattering, idxPostStep,  1);
+  pManager->AddRestProcess(&fMuMinusCaptureAtRest);
+
+  // Tau Plus Physics
+  pManager = G4TauPlus::TauPlus()->GetProcessManager();
+   // add processes
+  pManager->AddProcess(&fTauPlusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&fTauPlusMultipleScattering);
+  pManager->SetProcessOrdering(&fTauPlusMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fTauPlusMultipleScattering, idxPostStep,  1);
+
+  // Tau Minus Physics
+  pManager = G4TauMinus::TauMinus()->GetProcessManager();
+   // add processes
+  pManager->AddProcess(&fTauMinusIonisation, ordInActive,2, 2);
+
+  pManager->AddProcess(&fTauMinusMultipleScattering);
+  pManager->SetProcessOrdering(&fTauMinusMultipleScattering, idxAlongStep,  1);
+  pManager->SetProcessOrdering(&fTauMinusMultipleScattering, idxPostStep,  1);
+
+}
+
+
+
diff --git a/examples/novice/N04/src/ExN04PhysicsList.cc b/examples/novice/N04/src/ExN04PhysicsList.cc
index 89a28a96424b6944f89358ed2813091d75c10457..2425a6e8719267ee3655675e5759e46ab0f547a6 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.8 2000/08/16 11:35:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: ExN04PhysicsList.cc,v 1.9 2001/01/06 06:56:18 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -19,625 +19,44 @@
 #include "G4ProcessVector.hh"
 #include "G4ParticleTypes.hh"
 #include "G4ParticleTable.hh"
-#include "G4BosonConstructor.hh"
-#include "G4LeptonConstructor.hh"
-#include "G4MesonConstructor.hh"
-#include "G4BaryonConstructor.hh"
-#include "G4IonConstructor.hh"
-#include "G4ShortLivedConstructor.hh"
+
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
 #include "G4ios.hh"
 #include "g4std/iomanip"   
 
-#include "G4FastSimulationManagerProcess.hh"
-
+#include "ExN04GeneralPhysics.hh"
+#include "ExN04EMPhysics.hh"
+#include "ExN04MuonPhysics.hh"
+#include "ExN04HadronPhysics.hh"
+#include "ExN04IonPhysics.hh"
 
-ExN04PhysicsList::ExN04PhysicsList():  G4VUserPhysicsList()
+ExN04PhysicsList::ExN04PhysicsList():  G4VModularPhysicsList()
 {
   // default cut value  (1.0mm) 
   defaultCutValue = 1.0*mm;
-
   SetVerboseLevel(1);
-}
-
-ExN04PhysicsList::~ExN04PhysicsList()
-{
-}
-
-void ExN04PhysicsList::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. 
-
-  // create all particles
-  ConstructAllBosons();
-  ConstructAllLeptons();
-  ConstructAllMesons();
-  ConstructAllBaryons();
-  ConstructAllIons();
-  ConstructAllShortLiveds();
-}
-
-void ExN04PhysicsList::ConstructProcess()
-{
-  AddTransportation();
-
-  ConstructEM();
-  ConstructHad();
-  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"
-
-void ExN04PhysicsList::ConstructEM()
-{
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
-    G4String particleName = particle->GetParticleName();
-     
-    if (particleName == "gamma") {
-    // gamma
-      // Construct processes for gamma
-      pmanager->AddDiscreteProcess(new G4GammaConversion());
-      pmanager->AddDiscreteProcess(new G4ComptonScattering());      
-      pmanager->AddDiscreteProcess(new G4PhotoElectricEffect());
-
-    } else if (particleName == "e-") {
-    //electron
-      // Construct processes for electron
-      G4VProcess* theeminusMultipleScattering = new G4MultipleScattering();
-      G4VProcess* theeminusIonisation = new G4eIonisation();
-      G4VProcess* theeminusBremsstrahlung = new G4eBremsstrahlung();
-      // add processes
-      pmanager->AddProcess(theeminusMultipleScattering);
-      pmanager->AddProcess(theeminusIonisation);
-      pmanager->AddProcess(theeminusBremsstrahlung);      
-      // set ordering for AlongStepDoIt
-      pmanager->SetProcessOrdering(theeminusMultipleScattering, idxAlongStep,  1);
-      pmanager->SetProcessOrdering(theeminusIonisation, idxAlongStep,  2);
-      // set ordering for PostStepDoIt
-      pmanager->SetProcessOrdering(theeminusMultipleScattering, idxPostStep, 1);
-      pmanager->SetProcessOrdering(theeminusIonisation, idxPostStep, 2);
-      pmanager->SetProcessOrdering(theeminusBremsstrahlung, idxPostStep, 3);
-
-    } else if (particleName == "e+") {
-    //positron
-      // Construct processes for positron
-      G4VProcess* theeplusMultipleScattering = new G4MultipleScattering();
-      G4VProcess* theeplusIonisation = new G4eIonisation();
-      G4VProcess* theeplusBremsstrahlung = new G4eBremsstrahlung();
-      G4VProcess* theeplusAnnihilation = new G4eplusAnnihilation();
-      // add processes
-      pmanager->AddProcess(theeplusMultipleScattering);
-      pmanager->AddProcess(theeplusIonisation);
-      pmanager->AddProcess(theeplusBremsstrahlung);
-      pmanager->AddProcess(theeplusAnnihilation);
-      // set ordering for AtRestDoIt
-      pmanager->SetProcessOrderingToFirst(theeplusAnnihilation, idxAtRest);
-      // set ordering for AlongStepDoIt
-      pmanager->SetProcessOrdering(theeplusMultipleScattering, idxAlongStep,  1);
-      pmanager->SetProcessOrdering(theeplusIonisation, idxAlongStep,  2);
-      // set ordering for PostStepDoIt
-      pmanager->SetProcessOrdering(theeplusMultipleScattering, idxPostStep, 1);
-      pmanager->SetProcessOrdering(theeplusIonisation, idxPostStep, 2);
-      pmanager->SetProcessOrdering(theeplusBremsstrahlung, idxPostStep, 3);
-      pmanager->SetProcessOrdering(theeplusAnnihilation, idxPostStep, 4);
-  
-    } else if( particleName == "mu+" || 
-               particleName == "mu-"    ) {
-    //muon  
-     // Construct processes for muon+
-     G4VProcess* aMultipleScattering = new G4MultipleScattering();
-     G4VProcess* aBremsstrahlung = new G4MuBremsstrahlung();
-     G4VProcess* aPairProduction = new G4MuPairProduction();
-     G4VProcess* anIonisation = new G4MuIonisation();
-      // add processes
-     pmanager->AddProcess(anIonisation);
-     pmanager->AddProcess(aMultipleScattering);
-     pmanager->AddProcess(aBremsstrahlung);
-     pmanager->AddProcess(aPairProduction);
-     // set ordering for AlongStepDoIt
-     pmanager->SetProcessOrdering(aMultipleScattering, idxAlongStep,  1);
-     pmanager->SetProcessOrdering(anIonisation, idxAlongStep,  2);
-     // set ordering for PostStepDoIt
-     pmanager->SetProcessOrdering(aMultipleScattering, idxPostStep, 1);
-     pmanager->SetProcessOrdering(anIonisation, idxPostStep, 2);
-     pmanager->SetProcessOrdering(aBremsstrahlung, idxPostStep, 3);
-     pmanager->SetProcessOrdering(aPairProduction, idxPostStep, 4);
-     
-    } else if( particleName == "GenericIon" ) {
-     G4VProcess* aionIonization = new G4hIonisation;
-     G4VProcess* aMultipleScattering = new G4MultipleScattering();
-     pmanager->AddProcess(aionIonization);
-     pmanager->AddProcess(aMultipleScattering);
-     // set ordering for AlongStepDoIt
-     pmanager->SetProcessOrdering(aMultipleScattering, idxAlongStep,  1);
-     pmanager->SetProcessOrdering(aionIonization, idxAlongStep,  2);
-     // set ordering for PostStepDoIt
-     pmanager->SetProcessOrdering(aMultipleScattering, idxPostStep, 1);
-     pmanager->SetProcessOrdering(aionIonization, idxPostStep, 2);
-
-   } else if ((!particle->IsShortLived()) &&
-	      (particle->GetPDGCharge() != 0.0) && 
-	      (particle->GetParticleName() != "chargedgeantino")) {
-     // all others charged particles except geantino
-     G4VProcess* aMultipleScattering = new G4MultipleScattering();
-     G4VProcess* anIonisation = new G4hIonisation();
-     // add processes
-     pmanager->AddProcess(anIonisation);
-     pmanager->AddProcess(aMultipleScattering);
-     // set ordering for AlongStepDoIt
-     pmanager->SetProcessOrdering(aMultipleScattering, idxAlongStep,  1);
-     pmanager->SetProcessOrdering(anIonisation, idxAlongStep,  2);
-     // set ordering for PostStepDoIt
-     pmanager->SetProcessOrdering(aMultipleScattering, idxPostStep, 1);
-     pmanager->SetProcessOrdering(anIonisation, idxPostStep, 2);
-    }
-  }
-}
-
 
-// Hadron Processes
+  // General Physics
+  RegisterPhysics( new ExN04GeneralPhysics("general") );
 
-#include "G4HadronElasticProcess.hh"
+  // EM Physics
+  RegisterPhysics( new ExN04EMPhysics("standard EM"));
 
-#include "G4PionPlusInelasticProcess.hh"
-#include "G4PionMinusInelasticProcess.hh"
-#include "G4KaonPlusInelasticProcess.hh"
-#include "G4KaonZeroSInelasticProcess.hh"
-#include "G4KaonZeroLInelasticProcess.hh"
-#include "G4KaonMinusInelasticProcess.hh"
-#include "G4ProtonInelasticProcess.hh"
-#include "G4AntiProtonInelasticProcess.hh"
-#include "G4NeutronInelasticProcess.hh"
-#include "G4AntiNeutronInelasticProcess.hh"
-#include "G4LambdaInelasticProcess.hh"
-#include "G4AntiLambdaInelasticProcess.hh"
-#include "G4SigmaPlusInelasticProcess.hh"
-#include "G4SigmaMinusInelasticProcess.hh"
-#include "G4AntiSigmaPlusInelasticProcess.hh"
-#include "G4AntiSigmaMinusInelasticProcess.hh"
-#include "G4XiZeroInelasticProcess.hh"
-#include "G4XiMinusInelasticProcess.hh"
-#include "G4AntiXiZeroInelasticProcess.hh"
-#include "G4AntiXiMinusInelasticProcess.hh"
-#include "G4DeuteronInelasticProcess.hh"
-#include "G4TritonInelasticProcess.hh"
-#include "G4AlphaInelasticProcess.hh"
-#include "G4OmegaMinusInelasticProcess.hh"
-#include "G4AntiOmegaMinusInelasticProcess.hh"
+  // Muon Physics
+  RegisterPhysics(  new ExN04MuonPhysics("muon"));
 
-// Low-energy Models
+   // Hadron Physics
+  RegisterPhysics(  new ExN04HadronPhysics("hadron"));
 
-#include "G4LElastic.hh"
+  // Ion Physics
+  RegisterPhysics( new ExN04IonPhysics("ion"));
 
-#include "G4LEPionPlusInelastic.hh"
-#include "G4LEPionMinusInelastic.hh"
-#include "G4LEKaonPlusInelastic.hh"
-#include "G4LEKaonZeroSInelastic.hh"
-#include "G4LEKaonZeroLInelastic.hh"
-#include "G4LEKaonMinusInelastic.hh"
-#include "G4LEProtonInelastic.hh"
-#include "G4LEAntiProtonInelastic.hh"
-#include "G4LENeutronInelastic.hh"
-#include "G4LEAntiNeutronInelastic.hh"
-#include "G4LELambdaInelastic.hh"
-#include "G4LEAntiLambdaInelastic.hh"
-#include "G4LESigmaPlusInelastic.hh"
-#include "G4LESigmaMinusInelastic.hh"
-#include "G4LEAntiSigmaPlusInelastic.hh"
-#include "G4LEAntiSigmaMinusInelastic.hh"
-#include "G4LEXiZeroInelastic.hh"
-#include "G4LEXiMinusInelastic.hh"
-#include "G4LEAntiXiZeroInelastic.hh"
-#include "G4LEAntiXiMinusInelastic.hh"
-#include "G4LEDeuteronInelastic.hh"
-#include "G4LETritonInelastic.hh"
-#include "G4LEAlphaInelastic.hh"
-#include "G4LEOmegaMinusInelastic.hh"
-#include "G4LEAntiOmegaMinusInelastic.hh"
 
-// High-energy Models
-
-#include "G4HEPionPlusInelastic.hh"
-#include "G4HEPionMinusInelastic.hh"
-#include "G4HEKaonPlusInelastic.hh"
-#include "G4HEKaonZeroInelastic.hh"
-#include "G4HEKaonZeroInelastic.hh"
-#include "G4HEKaonMinusInelastic.hh"
-#include "G4HEProtonInelastic.hh"
-#include "G4HEAntiProtonInelastic.hh"
-#include "G4HENeutronInelastic.hh"
-#include "G4HEAntiNeutronInelastic.hh"
-#include "G4HELambdaInelastic.hh"
-#include "G4HEAntiLambdaInelastic.hh"
-#include "G4HESigmaPlusInelastic.hh"
-#include "G4HESigmaMinusInelastic.hh"
-#include "G4HEAntiSigmaPlusInelastic.hh"
-#include "G4HEAntiSigmaMinusInelastic.hh"
-#include "G4HEXiZeroInelastic.hh"
-#include "G4HEXiMinusInelastic.hh"
-#include "G4HEAntiXiZeroInelastic.hh"
-#include "G4HEAntiXiMinusInelastic.hh"
-#include "G4HEOmegaMinusInelastic.hh"
-#include "G4HEAntiOmegaMinusInelastic.hh"
-
-// Stopping processes
-
-#ifdef TRIUMF_STOP_PIMINUS
-#include "G4PionMinusAbsorptionAtRest.hh"
-#else
-#include "G4PiMinusAbsorptionAtRest.hh"
-#endif
-#ifdef TRIUMF_STOP_KMINUS
-#include "G4KaonMinusAbsorption.hh"
-#else
-#include "G4KaonMinusAbsorptionAtRest.hh"
-#endif
-
-//
-// ConstructHad()
-//
-// Makes discrete physics processes for the hadrons, at present limited
-// to those particles with GHEISHA interactions (INTRC > 0).
-// The processes are: Elastic scattering and Inelastic scattering.
-//
-// F.W.Jones  09-JUL-1998
-//
-
-void ExN04PhysicsList::ConstructHad()
-{
-   G4HadronElasticProcess* theElasticProcess = 
-                                    new G4HadronElasticProcess;
-   G4LElastic* theElasticModel = new G4LElastic;
-   theElasticProcess->RegisterMe(theElasticModel);
-
-   theParticleIterator->reset();
-   while ((*theParticleIterator)()) {
-      G4ParticleDefinition* particle = theParticleIterator->value();
-      G4ProcessManager* pmanager = particle->GetProcessManager();
-      G4String particleName = particle->GetParticleName();
-     
-      if (particleName == "pi+") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4PionPlusInelasticProcess* theInelasticProcess = 
-                                new G4PionPlusInelasticProcess("inelastic");
-         G4LEPionPlusInelastic* theLEInelasticModel = 
-                                new G4LEPionPlusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEPionPlusInelastic* theHEInelasticModel = 
-                                new G4HEPionPlusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "pi-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4PionMinusInelasticProcess* theInelasticProcess = 
-                                new G4PionMinusInelasticProcess("inelastic");
-         G4LEPionMinusInelastic* theLEInelasticModel = 
-                                new G4LEPionMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEPionMinusInelastic* theHEInelasticModel = 
-                                new G4HEPionMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-#ifdef TRIUMF_STOP_PIMINUS
-         pmanager->AddRestProcess(new G4PionMinusAbsorptionAtRest, ordDefault);
-#else
-         G4String prcNam;
-         pmanager->AddRestProcess(
-           new G4PiMinusAbsorptionAtRest(
-                prcNam="PiMinusAbsorptionAtRest"), ordDefault);
-#endif
-      }
-      else if (particleName == "kaon+") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4KaonPlusInelasticProcess* theInelasticProcess = 
-                                  new G4KaonPlusInelasticProcess("inelastic");
-         G4LEKaonPlusInelastic* theLEInelasticModel = 
-                                  new G4LEKaonPlusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEKaonPlusInelastic* theHEInelasticModel = 
-                                  new G4HEKaonPlusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "kaon0S") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4KaonZeroSInelasticProcess* theInelasticProcess = 
-                             new G4KaonZeroSInelasticProcess("inelastic");
-         G4LEKaonZeroSInelastic* theLEInelasticModel = 
-                             new G4LEKaonZeroSInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEKaonZeroInelastic* theHEInelasticModel = 
-                             new G4HEKaonZeroInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "kaon0L") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4KaonZeroLInelasticProcess* theInelasticProcess = 
-                             new G4KaonZeroLInelasticProcess("inelastic");
-         G4LEKaonZeroLInelastic* theLEInelasticModel = 
-                             new G4LEKaonZeroLInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEKaonZeroInelastic* theHEInelasticModel = 
-                             new G4HEKaonZeroInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "kaon-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4KaonMinusInelasticProcess* theInelasticProcess = 
-                                 new G4KaonMinusInelasticProcess("inelastic");
-         G4LEKaonMinusInelastic* theLEInelasticModel = 
-                                 new G4LEKaonMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEKaonMinusInelastic* theHEInelasticModel = 
-                                 new G4HEKaonMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-#ifdef TRIUMF_STOP_KMINUS
-         pmanager->AddRestProcess(new G4KaonMinusAbsorption, ordDefault);
-#else
-         pmanager->AddRestProcess(new G4KaonMinusAbsorptionAtRest, ordDefault);
-#endif
-      }
-      else if (particleName == "proton") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4ProtonInelasticProcess* theInelasticProcess = 
-                                    new G4ProtonInelasticProcess("inelastic");
-         G4LEProtonInelastic* theLEInelasticModel = new G4LEProtonInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEProtonInelastic* theHEInelasticModel = new G4HEProtonInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "anti_proton") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiProtonInelasticProcess* theInelasticProcess = 
-                                new G4AntiProtonInelasticProcess("inelastic");
-         G4LEAntiProtonInelastic* theLEInelasticModel = 
-                                new G4LEAntiProtonInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiProtonInelastic* theHEInelasticModel = 
-                                new G4HEAntiProtonInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "neutron") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4NeutronInelasticProcess* theInelasticProcess = 
-                                    new G4NeutronInelasticProcess("inelastic");
-         G4LENeutronInelastic* theLEInelasticModel = 
-                                    new G4LENeutronInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HENeutronInelastic* theHEInelasticModel = 
-                                    new G4HENeutronInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }  
-      else if (particleName == "anti_neutron") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiNeutronInelasticProcess* theInelasticProcess = 
-                               new G4AntiNeutronInelasticProcess("inelastic");
-         G4LEAntiNeutronInelastic* theLEInelasticModel = 
-                               new G4LEAntiNeutronInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiNeutronInelastic* theHEInelasticModel = 
-                               new G4HEAntiNeutronInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "lambda") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4LambdaInelasticProcess* theInelasticProcess = 
-                                    new G4LambdaInelasticProcess("inelastic");
-         G4LELambdaInelastic* theLEInelasticModel = new G4LELambdaInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HELambdaInelastic* theHEInelasticModel = new G4HELambdaInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "anti_lambda") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiLambdaInelasticProcess* theInelasticProcess = 
-                                new G4AntiLambdaInelasticProcess("inelastic");
-         G4LEAntiLambdaInelastic* theLEInelasticModel = 
-                                new G4LEAntiLambdaInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiLambdaInelastic* theHEInelasticModel = 
-                                new G4HEAntiLambdaInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "sigma+") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4SigmaPlusInelasticProcess* theInelasticProcess = 
-                                 new G4SigmaPlusInelasticProcess("inelastic");
-         G4LESigmaPlusInelastic* theLEInelasticModel = 
-                                 new G4LESigmaPlusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HESigmaPlusInelastic* theHEInelasticModel = 
-                                 new G4HESigmaPlusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "sigma-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4SigmaMinusInelasticProcess* theInelasticProcess = 
-                                 new G4SigmaMinusInelasticProcess("inelastic");
-         G4LESigmaMinusInelastic* theLEInelasticModel = 
-                                 new G4LESigmaMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HESigmaMinusInelastic* theHEInelasticModel = 
-                                 new G4HESigmaMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "anti_sigma+") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiSigmaPlusInelasticProcess* theInelasticProcess = 
-                             new G4AntiSigmaPlusInelasticProcess("inelastic");
-         G4LEAntiSigmaPlusInelastic* theLEInelasticModel = 
-                                 new G4LEAntiSigmaPlusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiSigmaPlusInelastic* theHEInelasticModel = 
-                                 new G4HEAntiSigmaPlusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "anti_sigma-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiSigmaMinusInelasticProcess* theInelasticProcess = 
-                            new G4AntiSigmaMinusInelasticProcess("inelastic");
-         G4LEAntiSigmaMinusInelastic* theLEInelasticModel = 
-                                 new G4LEAntiSigmaMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiSigmaMinusInelastic* theHEInelasticModel = 
-                                 new G4HEAntiSigmaMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "xi0") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4XiZeroInelasticProcess* theInelasticProcess = 
-                            new G4XiZeroInelasticProcess("inelastic");
-         G4LEXiZeroInelastic* theLEInelasticModel = 
-                                 new G4LEXiZeroInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEXiZeroInelastic* theHEInelasticModel = 
-                                 new G4HEXiZeroInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "xi-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4XiMinusInelasticProcess* theInelasticProcess = 
-                            new G4XiMinusInelasticProcess("inelastic");
-         G4LEXiMinusInelastic* theLEInelasticModel = 
-                                 new G4LEXiMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEXiMinusInelastic* theHEInelasticModel = 
-                                 new G4HEXiMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "anti_xi0") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiXiZeroInelasticProcess* theInelasticProcess = 
-                            new G4AntiXiZeroInelasticProcess("inelastic");
-         G4LEAntiXiZeroInelastic* theLEInelasticModel = 
-                                 new G4LEAntiXiZeroInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiXiZeroInelastic* theHEInelasticModel = 
-                                 new G4HEAntiXiZeroInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "anti_xi-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiXiMinusInelasticProcess* theInelasticProcess = 
-                            new G4AntiXiMinusInelasticProcess("inelastic");
-         G4LEAntiXiMinusInelastic* theLEInelasticModel = 
-                                 new G4LEAntiXiMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiXiMinusInelastic* theHEInelasticModel = 
-                                 new G4HEAntiXiMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "deuteron") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4DeuteronInelasticProcess* theInelasticProcess = 
-                            new G4DeuteronInelasticProcess("inelastic");
-         G4LEDeuteronInelastic* theLEInelasticModel = 
-                                 new G4LEDeuteronInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "triton") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4TritonInelasticProcess* theInelasticProcess = 
-                            new G4TritonInelasticProcess("inelastic");
-         G4LETritonInelastic* theLEInelasticModel = 
-                                 new G4LETritonInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "alpha") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AlphaInelasticProcess* theInelasticProcess = 
-                            new G4AlphaInelasticProcess("inelastic");
-         G4LEAlphaInelastic* theLEInelasticModel = 
-                                 new G4LEAlphaInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "omega-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4OmegaMinusInelasticProcess* theInelasticProcess = 
-                            new G4OmegaMinusInelasticProcess("inelastic");
-         G4LEOmegaMinusInelastic* theLEInelasticModel = 
-                                 new G4LEOmegaMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEOmegaMinusInelastic* theHEInelasticModel = 
-                                 new G4HEOmegaMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-      else if (particleName == "anti_omega-") {
-         pmanager->AddDiscreteProcess(theElasticProcess);
-         G4AntiOmegaMinusInelasticProcess* theInelasticProcess = 
-                            new G4AntiOmegaMinusInelasticProcess("inelastic");
-         G4LEAntiOmegaMinusInelastic* theLEInelasticModel = 
-                                 new G4LEAntiOmegaMinusInelastic;
-         theInelasticProcess->RegisterMe(theLEInelasticModel);
-         G4HEAntiOmegaMinusInelastic* theHEInelasticModel = 
-                                 new G4HEAntiOmegaMinusInelastic;
-         theInelasticProcess->RegisterMe(theHEInelasticModel);
-         pmanager->AddDiscreteProcess(theInelasticProcess);
-      }
-   }
 }
 
-
-#include "G4Decay.hh"
-void ExN04PhysicsList::ConstructGeneral()
+ExN04PhysicsList::~ExN04PhysicsList()
 {
-  // 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 ExN04PhysicsList::SetCuts()
@@ -647,45 +66,5 @@ void ExN04PhysicsList::SetCuts()
   SetCutsWithDefault();   
 }
 
-void ExN04PhysicsList::ConstructAllBosons()
-{
-  // Construct all bosons
-  G4BosonConstructor pConstructor;
-  pConstructor.ConstructParticle();
-}
 
-void ExN04PhysicsList::ConstructAllLeptons()
-{
-  // Construct all leptons
-  G4LeptonConstructor pConstructor;
-  pConstructor.ConstructParticle();
-}
-
-void ExN04PhysicsList::ConstructAllMesons()
-{
-  //  Construct all mesons
-  G4MesonConstructor pConstructor;
-  pConstructor.ConstructParticle();
-}
-
-void ExN04PhysicsList::ConstructAllBaryons()
-{
-  //  Construct all barions
-  G4BaryonConstructor pConstructor;
-  pConstructor.ConstructParticle();
-}
-
-void ExN04PhysicsList::ConstructAllIons()
-{
-  //  Construct light ions
-  G4IonConstructor pConstructor;
-  pConstructor.ConstructParticle();  
-}
-
-void ExN04PhysicsList::ConstructAllShortLiveds()
-{
-  //  Construct  resonaces and quarks
-  G4ShortLivedConstructor pConstructor;
-  pConstructor.ConstructParticle();  
-}
 
diff --git a/examples/novice/N05/exampleN05.cc b/examples/novice/N05/exampleN05.cc
index 60c19bb28fd8a6bb392c22de5fc88c7fe80bfe1f..a4cd119d1cf3ea7755f332cedc179e3a89b686d8 100644
--- a/examples/novice/N05/exampleN05.cc
+++ b/examples/novice/N05/exampleN05.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: exampleN05.cc,v 1.6 2000/06/29 07:42:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N05/exampleN05.out b/examples/novice/N05/exampleN05.out
index 32429743e5ddbfe82e0af9fbd28929bfd25ed277..88b17e9da2e3258a79c19abc2078661367b17eed 100644
--- a/examples/novice/N05/exampleN05.out
+++ b/examples/novice/N05/exampleN05.out
@@ -1,7 +1,7 @@
 RunManager construction starting....
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -33,11 +33,11 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
 
            material       min.delta energy(keV) 
 
-                 CsI            136
+                 CsI         138.95
                   He           0.99
-           Aluminium         125.06
-                Lead         229.55
-                 Fer         224.07
+           Aluminium         125.02
+                Lead         228.53
+                 Fer         225.11
                  Air           0.99
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
@@ -54,11 +54,11 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 
            material        min.delta energy(keV) 
 
-                 CsI            136
+                 CsI         138.95
                   He           0.99
-           Aluminium         125.06
-                Lead         229.55
-                 Fer         224.07
+           Aluminium         125.02
+                Lead         228.53
+                 Fer         225.11
                  Air           0.99
 
 hIoni:    Knock-on electron cross sections . 
@@ -97,7 +97,7 @@ Closing FastSimulation
 ### Run 0 start.
 >>> Event 0
      10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98988 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.9899 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
@@ -106,18 +106,18 @@ Closing FastSimulation
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     13 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.9999 (GeV)
+     10 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99988 (GeV)
+     10 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99989 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98989 (GeV)
+     12 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.98992 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
@@ -125,27 +125,27 @@ number of event = 5
 ### Run 1 start.
 >>> Event 0
      9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.9999 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     7 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99991 (GeV)
+     8 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
+     7 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99984 (GeV)
+     10 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
      8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.9999 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
@@ -153,7 +153,7 @@ number of event = 5
 ### Run 2 start.
 >>> Event 0
      9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.99991 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
@@ -162,41 +162,41 @@ number of event = 5
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     7 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
+     8 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     11 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
 #
 ### Run 3 start.
 >>> Event 0
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99991 (GeV)
+     10 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99988 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     12 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98988 (GeV)
+     9 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99988 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99991 (GeV)
+     8 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.98991 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
      10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98988 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.9998 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
@@ -212,113 +212,113 @@ number of event = 5
 ### Run 4 start.
 >>> Event 0
      8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.19999 (GeV)
-     11 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.41997 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.21998 (GeV)
+     8 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.39997 (GeV)
 >>> Event 1
      17 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.39998 (GeV)
-     14 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.97994 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.47997 (GeV)
+     11 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.87994 (GeV)
 >>> Event 2
-     23 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.55997 (GeV)
-     17 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 1.5599 (GeV)
+     24 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.69996 (GeV)
+     14 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 1.4199 (GeV)
 >>> Event 3
-     26 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.71996 (GeV)
-     18 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 2.1199 (GeV)
+     7 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.26502 (GeV)
+     3 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.4873 (GeV)
 >>> Event 4
-     29 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.91995 (GeV)
-     20 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 2.5599 (GeV)
+     27 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.89995 (GeV)
+     16 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 1.9199 (GeV)
 number of event = 5
 #
 ### Run 5 start.
 >>> Event 0
-     30 hits are stored in EM ExN05CalorimeterHitsCollection.
+     29 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.93995 (GeV)
-     33 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 3.4398 (GeV)
+     30 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 2.8199 (GeV)
 >>> Event 1
-     33 hits are stored in EM ExN05CalorimeterHitsCollection.
+     31 hits are stored in EM ExN05CalorimeterHitsCollection.
      Total energy deposition in EM calorimeter crytals : 0.99994 (GeV)
-     34 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 4.1798 (GeV)
+     33 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 3.5998 (GeV)
 >>> Event 2
-     34 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.0599 (GeV)
-     34 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 4.9797 (GeV)
+     32 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.0399 (GeV)
+     36 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 4.5197 (GeV)
 >>> Event 3
-     7 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.25271 (GeV)
-     3 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.48247 (GeV)
+     33 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.0799 (GeV)
+     37 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 5.3397 (GeV)
 >>> Event 4
-     34 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.0599 (GeV)
-     36 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 5.8397 (GeV)
+     33 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.1199 (GeV)
+     38 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 6.1196 (GeV)
 number of event = 5
 #
 ### Run 6 start.
 >>> Event 0
-     35 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.0799 (GeV)
-     47 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 6.7396 (GeV)
->>> Event 1
-     36 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.0999 (GeV)
+     34 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.1399 (GeV)
      50 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 7.6796 (GeV)
+     Total energy deposition in HAD calorimeter towers : 6.9795 (GeV)
+>>> Event 1
+     35 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.1599 (GeV)
+     51 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 7.7795 (GeV)
 >>> Event 2
+     35 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.1599 (GeV)
+     53 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 8.5994 (GeV)
+>>> Event 3
      38 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.1399 (GeV)
+     Total energy deposition in EM calorimeter crytals : 1.2199 (GeV)
      55 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 8.5595 (GeV)
->>> Event 3
-     39 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.1599 (GeV)
-     57 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 9.4595 (GeV)
+     Total energy deposition in HAD calorimeter towers : 9.4794 (GeV)
 >>> Event 4
-     43 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.2399 (GeV)
-     57 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 10.259 (GeV)
+     41 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.2799 (GeV)
+     56 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 10.319 (GeV)
 number of event = 5
 #
 ### Run 7 start.
 >>> Event 0
-     51 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.4599 (GeV)
-     64 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 10.659 (GeV)
->>> Event 1
-     59 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.7199 (GeV)
+     53 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.5399 (GeV)
      66 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 11.059 (GeV)
+     Total energy deposition in HAD calorimeter towers : 10.819 (GeV)
+>>> Event 1
+     56 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.6999 (GeV)
+     67 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 11.379 (GeV)
 >>> Event 2
-     66 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.9599 (GeV)
-     68 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 11.559 (GeV)
+     62 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.8799 (GeV)
+     69 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 11.759 (GeV)
 >>> Event 3
-     69 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 2.0999 (GeV)
-     71 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 12.019 (GeV)
+     65 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 2.0598 (GeV)
+     70 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 12.139 (GeV)
 >>> Event 4
-     70 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 2.2399 (GeV)
-     71 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 12.479 (GeV)
+     68 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 2.2398 (GeV)
+     70 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 12.679 (GeV)
 number of event = 5
 #
 #
@@ -330,59 +330,59 @@ number of event = 5
 #
 ### Run 8 start.
 >>> Event 0
-     30 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99941 (GeV)
-     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0 (GeV)
+     32 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99043 (GeV)
+     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.002653 (GeV)
 >>> Event 1
-     37 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99508 (GeV)
-     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.0016043 (GeV)
+     28 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99125 (GeV)
+     3 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.0060463 (GeV)
 >>> Event 2
-     35 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98933 (GeV)
-     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.001435 (GeV)
+     41 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99558 (GeV)
+     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.00089997 (GeV)
 >>> Event 3
-     36 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99741 (GeV)
-     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0 (GeV)
->>> Event 4
      38 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99374 (GeV)
-     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.002585 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.98576 (GeV)
+     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.0040621 (GeV)
+>>> Event 4
+     28 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.97926 (GeV)
+     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.0070271 (GeV)
 number of event = 5
 #
 #   switch on UserLimits
 #
 ### Run 9 start.
 >>> Event 0
-     22 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99842 (GeV)
-     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0 (GeV)
+     24 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.9875 (GeV)
+     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.0043757 (GeV)
 >>> Event 1
-     22 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99586 (GeV)
+     26 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99858 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     19 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98875 (GeV)
-     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.0013276 (GeV)
->>> Event 3
-     16 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98984 (GeV)
+     21 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.98943 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
+>>> Event 3
+     18 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99623 (GeV)
+     3 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.003691 (GeV)
 >>> Event 4
-     31 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99074 (GeV)
-     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0 (GeV)
+     28 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99103 (GeV)
+     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.0018768 (GeV)
 number of event = 5
 #
diff --git a/examples/novice/N05/include/ExN05CalorimeterHit.hh b/examples/novice/N05/include/ExN05CalorimeterHit.hh
index 7602efe01d3f1dc42ab64ffb10394824c70da70f..89fff6c9d255cb2f92fc0aeb779a9cbd0241951c 100644
--- a/examples/novice/N05/include/ExN05CalorimeterHit.hh
+++ b/examples/novice/N05/include/ExN05CalorimeterHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05CalorimeterHit.hh,v 1.3 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05CalorimeterHit_h
diff --git a/examples/novice/N05/include/ExN05CalorimeterSD.hh b/examples/novice/N05/include/ExN05CalorimeterSD.hh
index dd47814bc8a3e1c92d8e8353640b5b9dc7f4c382..4d20916ea3ed8895607c189f94ab8e9099591d87 100644
--- a/examples/novice/N05/include/ExN05CalorimeterSD.hh
+++ b/examples/novice/N05/include/ExN05CalorimeterSD.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05CalorimeterSD.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05CalorimeterSD_h
diff --git a/examples/novice/N05/include/ExN05DetectorConstruction.hh b/examples/novice/N05/include/ExN05DetectorConstruction.hh
index de2eb032c1a3dae58cae15048f42b5b588cb0d7b..106e75c613fa5363d3a76bd9119d115d597e933d 100644
--- a/examples/novice/N05/include/ExN05DetectorConstruction.hh
+++ b/examples/novice/N05/include/ExN05DetectorConstruction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05DetectorConstruction.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 231bb56825c7d55311262aacedb2adb53d743d68..d1fc74e1f536a56e0e843cd5b9d2797a9637900c 100644
--- a/examples/novice/N05/include/ExN05DetectorMessenger.hh
+++ b/examples/novice/N05/include/ExN05DetectorMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05DetectorMessenger.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N05/include/ExN05EMShowerModel.hh b/examples/novice/N05/include/ExN05EMShowerModel.hh
index 8a2941e3ef9a317791c88244682437105307e9d1..07ef44e31f9e5f96f596d600ad098d1e2f5cf27d 100644
--- a/examples/novice/N05/include/ExN05EMShowerModel.hh
+++ b/examples/novice/N05/include/ExN05EMShowerModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EMShowerModel.hh,v 1.3 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //----------------------------------------------
diff --git a/examples/novice/N05/include/ExN05EnergySpot.hh b/examples/novice/N05/include/ExN05EnergySpot.hh
index 48a4baa47020158c4ce7be84c1c4c320f1ab86e5..c3de384c24d221e9fcc40476c98f3dd3d02c9ac5 100644
--- a/examples/novice/N05/include/ExN05EnergySpot.hh
+++ b/examples/novice/N05/include/ExN05EnergySpot.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EnergySpot.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef ExN05EnergySpot_h
 #define ExN05EnergySpot_h
diff --git a/examples/novice/N05/include/ExN05EventAction.hh b/examples/novice/N05/include/ExN05EventAction.hh
index 9b025952fdd5a54e71ab761f93d93f91e09a7de3..3faf3f072121645553ebac5519dcfa95bef7f17c 100644
--- a/examples/novice/N05/include/ExN05EventAction.hh
+++ b/examples/novice/N05/include/ExN05EventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EventAction.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05EventAction_h
diff --git a/examples/novice/N05/include/ExN05EventActionMessenger.hh b/examples/novice/N05/include/ExN05EventActionMessenger.hh
index 220206be73202b9ca9db66b299855adc23aba273..b8a9ce377b6734af3376860595ef2bb5181faa52 100644
--- a/examples/novice/N05/include/ExN05EventActionMessenger.hh
+++ b/examples/novice/N05/include/ExN05EventActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EventActionMessenger.hh,v 1.2 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05EventActionMessenger_h
diff --git a/examples/novice/N05/include/ExN05MaxTimeCuts.hh b/examples/novice/N05/include/ExN05MaxTimeCuts.hh
index 14dffc99cf746820bac492e4dced33a9886c6c64..2e7e7ab841016b842a0bd99369bc6d99f1240cc1 100644
--- a/examples/novice/N05/include/ExN05MaxTimeCuts.hh
+++ b/examples/novice/N05/include/ExN05MaxTimeCuts.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05MaxTimeCuts.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05MinEkineCuts.hh b/examples/novice/N05/include/ExN05MinEkineCuts.hh
index b5a8809c68bceb4de0bbf3386e83c1794a0c96ee..a3796bf91050845c9a5a099a0f71668f89af20da 100644
--- a/examples/novice/N05/include/ExN05MinEkineCuts.hh
+++ b/examples/novice/N05/include/ExN05MinEkineCuts.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05MinEkineCuts.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05MinRangeCuts.hh b/examples/novice/N05/include/ExN05MinRangeCuts.hh
index 48a8b23b26955f352bd47a3a0ddb040a9c60a751..e67db4c5cb7a0a4f72c280c687309f5fe78c153e 100644
--- a/examples/novice/N05/include/ExN05MinRangeCuts.hh
+++ b/examples/novice/N05/include/ExN05MinRangeCuts.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05MinRangeCuts.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05PhysicsList.hh b/examples/novice/N05/include/ExN05PhysicsList.hh
index 9e220c91526545537180722b4e79db50ff9889cf..38132090e48c4f1c17220724e971f6acf00c9297 100644
--- a/examples/novice/N05/include/ExN05PhysicsList.hh
+++ b/examples/novice/N05/include/ExN05PhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PhysicsList.hh,v 1.5 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 #ifndef ExN05PhysicsList_h
diff --git a/examples/novice/N05/include/ExN05PiModel.hh b/examples/novice/N05/include/ExN05PiModel.hh
index e17c4a53fc7c48bc3f0b51e83d92d6be1627185c..c4a5f954011d4855e847911a9e480361c24fe8f8 100644
--- a/examples/novice/N05/include/ExN05PiModel.hh
+++ b/examples/novice/N05/include/ExN05PiModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PiModel.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //----------------------------------------
diff --git a/examples/novice/N05/include/ExN05PionShowerModel.hh b/examples/novice/N05/include/ExN05PionShowerModel.hh
index 95c93cf6a887281aeb406c650ea5b8c8c4ae2a2d..1ac7afcb96d765fc17b282fcf0feaa3d698b6cae 100644
--- a/examples/novice/N05/include/ExN05PionShowerModel.hh
+++ b/examples/novice/N05/include/ExN05PionShowerModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PionShowerModel.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //----------------------------------------------
diff --git a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
index bcef82120ea6283daefaedd6f4f782576ce8db09..dec71f48003f1457160fb5b533a55d44f8522f07 100644
--- a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
+++ b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05PrimaryGeneratorAction_h
diff --git a/examples/novice/N05/include/ExN05RunAction.hh b/examples/novice/N05/include/ExN05RunAction.hh
index 2fda4debd19e31dd6e20dfd34f9fa39522eefd92..ee93ca343d58246b0134e8c9d5777472fe133294 100644
--- a/examples/novice/N05/include/ExN05RunAction.hh
+++ b/examples/novice/N05/include/ExN05RunAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05RunAction.hh,v 1.6 2000/01/06 15:06:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05RunAction_h
diff --git a/examples/novice/N05/include/ExN05SpecialCuts.hh b/examples/novice/N05/include/ExN05SpecialCuts.hh
index 5bda1382e02d26fdd04987413db8a89f75acac5c..55da2b2be0b352fc402b0a7e1c68e0d5b9df71a7 100644
--- a/examples/novice/N05/include/ExN05SpecialCuts.hh
+++ b/examples/novice/N05/include/ExN05SpecialCuts.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05SpecialCuts.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05SteppingAction.hh b/examples/novice/N05/include/ExN05SteppingAction.hh
index d5180cbc7be082623234686625fd8f37e7e1fc39..a181a5043e2718963e181e3b1f23638beab52f01 100644
--- a/examples/novice/N05/include/ExN05SteppingAction.hh
+++ b/examples/novice/N05/include/ExN05SteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05SteppingAction.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05SteppingAction_h
diff --git a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
index 0d135e92f1bf4b0f296ba4c3ffb06b440ed1b0ed..7ad40eb5d16c4c91bffaacbc2653742396256c7f 100644
--- a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
+++ b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05SteppingActionMessenger.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef ExN05SteppingActionMessenger_h
diff --git a/examples/novice/N05/include/ExN05VisManager.hh b/examples/novice/N05/include/ExN05VisManager.hh
index 32892c850a43ad01a6157316e8d145db6554a878..121b7749d8a3c6507a977b6e2b3a004a7f445245 100644
--- a/examples/novice/N05/include/ExN05VisManager.hh
+++ b/examples/novice/N05/include/ExN05VisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05VisManager.hh,v 1.1 2000/06/29 07:42:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N05/src/ExN05CalorimeterHit.cc b/examples/novice/N05/src/ExN05CalorimeterHit.cc
index 4fa218dd8e01a8eec2e7f6c6d8e09022a686b834..fc61cacbecd77f091fca9b3cc2a8ffe66193147d 100644
--- a/examples/novice/N05/src/ExN05CalorimeterHit.cc
+++ b/examples/novice/N05/src/ExN05CalorimeterHit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05CalorimeterHit.cc,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN05CalorimeterHit.hh"
diff --git a/examples/novice/N05/src/ExN05CalorimeterSD.cc b/examples/novice/N05/src/ExN05CalorimeterSD.cc
index 0624d773d7c59a6fdc7ca1d49c6b4bc849e83625..14b22816bed53ef15b3a0640cffb0adbe5c12f58 100644
--- a/examples/novice/N05/src/ExN05CalorimeterSD.cc
+++ b/examples/novice/N05/src/ExN05CalorimeterSD.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05CalorimeterSD.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN05CalorimeterSD.hh"
diff --git a/examples/novice/N05/src/ExN05DetectorConstruction.cc b/examples/novice/N05/src/ExN05DetectorConstruction.cc
index 5e2289be7c2bbaaab997192db25f2332fbedab0f..7722c2bddb280fb999954088467e43a6cd6f5460 100644
--- a/examples/novice/N05/src/ExN05DetectorConstruction.cc
+++ b/examples/novice/N05/src/ExN05DetectorConstruction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05DetectorConstruction.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "ExN05DetectorConstruction.hh"
 #include "ExN05CalorimeterSD.hh"
diff --git a/examples/novice/N05/src/ExN05DetectorMessenger.cc b/examples/novice/N05/src/ExN05DetectorMessenger.cc
index b29ead9d6001d5df1370d07af4e210bf646e5ac6..f8b55930cb581fc0027814a7cec44dae8b540dbf 100644
--- a/examples/novice/N05/src/ExN05DetectorMessenger.cc
+++ b/examples/novice/N05/src/ExN05DetectorMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05DetectorMessenger.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N05/src/ExN05EMShowerModel.cc b/examples/novice/N05/src/ExN05EMShowerModel.cc
index dabf657ca6fd4d7c3e7591baf23454c998dc2e46..190bbb527ad28a64d9e3d2e8216827ce2def1260 100644
--- a/examples/novice/N05/src/ExN05EMShowerModel.cc
+++ b/examples/novice/N05/src/ExN05EMShowerModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EMShowerModel.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "ExN05EMShowerModel.hh"
 #include "ExN05EnergySpot.hh"
diff --git a/examples/novice/N05/src/ExN05EnergySpot.cc b/examples/novice/N05/src/ExN05EnergySpot.cc
index a70f37238908be4d0538e50c09ed354b5b54b221..a471f4afc2e25e6dc9925282ad408ccdd86a9339 100644
--- a/examples/novice/N05/src/ExN05EnergySpot.cc
+++ b/examples/novice/N05/src/ExN05EnergySpot.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EnergySpot.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "ExN05EnergySpot.hh"
 
diff --git a/examples/novice/N05/src/ExN05EventAction.cc b/examples/novice/N05/src/ExN05EventAction.cc
index 3b72f1d8562407acfcca672731aa048e91e39702..aefc8e291d206e2331e83de023de4b7c47dd75f6 100644
--- a/examples/novice/N05/src/ExN05EventAction.cc
+++ b/examples/novice/N05/src/ExN05EventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EventAction.cc,v 1.4 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN05EventAction.hh"
diff --git a/examples/novice/N05/src/ExN05EventActionMessenger.cc b/examples/novice/N05/src/ExN05EventActionMessenger.cc
index 7ae68adb967c05bfdcf3c51256ee14d7b3a63ead..f8601db7eeb00b203d5ad94dfd282936ccebc8e3 100644
--- a/examples/novice/N05/src/ExN05EventActionMessenger.cc
+++ b/examples/novice/N05/src/ExN05EventActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05EventActionMessenger.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN05EventActionMessenger.hh"
diff --git a/examples/novice/N05/src/ExN05MaxTimeCuts.cc b/examples/novice/N05/src/ExN05MaxTimeCuts.cc
index e719d0bcd45f4e064f6d14beee07b1d4acebc908..8477e22745bdeb7bad17c6bd7918e48249aef0d6 100644
--- a/examples/novice/N05/src/ExN05MaxTimeCuts.cc
+++ b/examples/novice/N05/src/ExN05MaxTimeCuts.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05MaxTimeCuts.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05MinEkineCuts.cc b/examples/novice/N05/src/ExN05MinEkineCuts.cc
index 97ae5f0ddfbf7dda297a77f47d78c62283a3693e..e3bee56d81cbe0dd8724d455ebe509d1a10893fc 100644
--- a/examples/novice/N05/src/ExN05MinEkineCuts.cc
+++ b/examples/novice/N05/src/ExN05MinEkineCuts.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05MinEkineCuts.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05MinRangeCuts.cc b/examples/novice/N05/src/ExN05MinRangeCuts.cc
index 074a37f8abadb78aba26319b3e97e83aefc12155..1efed7afe4f086c6d65a196132ca349deeba4492 100644
--- a/examples/novice/N05/src/ExN05MinRangeCuts.cc
+++ b/examples/novice/N05/src/ExN05MinRangeCuts.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05MinRangeCuts.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05PhysicsList.cc b/examples/novice/N05/src/ExN05PhysicsList.cc
index 050d6c09aa42e0c56f3fe4a366f9541c37bbf6a7..9ca139673ccc15ce967b59cd3ae22498129248d4 100644
--- a/examples/novice/N05/src/ExN05PhysicsList.cc
+++ b/examples/novice/N05/src/ExN05PhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PhysicsList.cc,v 1.5 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/examples/novice/N05/src/ExN05PiModel.cc b/examples/novice/N05/src/ExN05PiModel.cc
index 8769c876f56f5228f6aed7d31af1123be7568ac9..540d63d4e56d34be58a89302ae6024fda30f6878 100644
--- a/examples/novice/N05/src/ExN05PiModel.cc
+++ b/examples/novice/N05/src/ExN05PiModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PiModel.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "ExN05PiModel.hh"
 
diff --git a/examples/novice/N05/src/ExN05PionShowerModel.cc b/examples/novice/N05/src/ExN05PionShowerModel.cc
index ecacb785e2331eb6770747e7f569e815bd34c186..99145bf92758e291ff26a07c28ab77c217f49c4c 100644
--- a/examples/novice/N05/src/ExN05PionShowerModel.cc
+++ b/examples/novice/N05/src/ExN05PionShowerModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PionShowerModel.cc,v 1.3 2000/08/03 09:09:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "ExN05PionShowerModel.hh"
 #include "ExN05EnergySpot.hh"
diff --git a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
index 82e33f620223e6732c869dc0f365e283175a2050..fb0b9c14c6e9360579abf0020f6cd158944b9b40 100644
--- a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
+++ b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN05PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N05/src/ExN05RunAction.cc b/examples/novice/N05/src/ExN05RunAction.cc
index 55bb012901f059f4c73ddf4849b6ac77763c6ecc..80bdb26438c9a90a034c415e05d29f72ea8896f7 100644
--- a/examples/novice/N05/src/ExN05RunAction.cc
+++ b/examples/novice/N05/src/ExN05RunAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05RunAction.cc,v 1.5 2000/01/06 15:06:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Make this appear first!
diff --git a/examples/novice/N05/src/ExN05SpecialCuts.cc b/examples/novice/N05/src/ExN05SpecialCuts.cc
index e74bb315faa5ab8c9b7f544bd61ced2c6b348d9c..1df897c01d4944980846e0a941c8c6e4b9d7a8b6 100644
--- a/examples/novice/N05/src/ExN05SpecialCuts.cc
+++ b/examples/novice/N05/src/ExN05SpecialCuts.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05SpecialCuts.cc,v 1.3 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05SteppingAction.cc b/examples/novice/N05/src/ExN05SteppingAction.cc
index e0bba6f32229cf76f14f040dc6e12c9e01e8b455..fd2288bdb591d847259894b7a4f1ff81b29d3b44 100644
--- a/examples/novice/N05/src/ExN05SteppingAction.cc
+++ b/examples/novice/N05/src/ExN05SteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05SteppingAction.cc,v 1.3 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN05SteppingAction.hh"
diff --git a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
index f961d65c38979e683b14c6ecd3004f65532f0dfd..922e13a52202863e3c52b7ab47aec4e765ab5486 100644
--- a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
+++ b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05SteppingActionMessenger.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "ExN05SteppingActionMessenger.hh"
diff --git a/examples/novice/N05/src/ExN05VisManager.cc b/examples/novice/N05/src/ExN05VisManager.cc
index 30914370b980386dce8d33b3b19c5438976e2021..92589b04cc4d8b39bd5c21bd5fe39d92ce3f6f9f 100644
--- a/examples/novice/N05/src/ExN05VisManager.cc
+++ b/examples/novice/N05/src/ExN05VisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: ExN05VisManager.cc,v 1.1 2000/06/29 07:42:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/novice/N06/History b/examples/novice/N06/History
index b37a31a8a2b36c999c8c3ae9ca0ab985a2ae638b..050267da75d58177adf8e8172fa7cd67e8d770d9 100644
--- a/examples/novice/N06/History
+++ b/examples/novice/N06/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.4 2000/11/24 10:23:43 stesting Exp $
+$Id: History,v 1.5 2001/02/06 14:19:32 stesting Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,9 +15,7 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-25th November 2000 Steve O'Neale (tagset210)
-- Updated exampleN06.out for em tags (checked with developer)
-- Changes attributed to precision and change in random sequence/decision
+06-02-2001 Update reference output for op-V03-00-05 S.W.O'Neale
 
 June 17, 2000  John Allison  (exampleN06-V01-01-00)
 - Updated exampleN06.out for geant4-01-01-ref-06.
diff --git a/examples/novice/N06/exampleN06.out b/examples/novice/N06/exampleN06.out
index 51c2071e825d3a0771b882baae21eb14c8b5c04d..0d6e5b67ac2ef5ac606ebedb544f5ba6e1430a6c 100644
--- a/examples/novice/N06/exampleN06.out
+++ b/examples/novice/N06/exampleN06.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-00 $
-                                (30-Jun-2000)
+ Geant4 version $Name: geant4-03-01 $
+                                (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
 /run/initialize
@@ -31,7 +31,7 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
            material       min.delta energy(keV) 
 
                  Air           0.99
-               Water         81.507
+               Water         81.851
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
@@ -53,7 +53,7 @@ msc:   Tables of transport mean free paths.
            material        min.delta energy(keV) 
 
                  Air           0.99
-               Water         81.507
+               Water         81.851
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
@@ -125,32 +125,52 @@ Track (trackID 299, parentID 1) is processed with stopping code 2
 Scattering Photon!
 Old Momentum Direction: (0.73743,-0.38845,-0.55254)
 Old Polarization: (-0.67542,-0.42411,-0.60327)
-New Polarization: (-0.040065,0.36918,-0.85702)
-Polarization Change: (-0.042895,0.39526,-0.91757)
-New Momentum Direction: (-0.8352,0.4465,0.23138)
-Momentum Change: (-0.85669,0.45799,0.23734)
+New Polarization: (-0.17176,-0.95925,0.22434)
+Polarization Change: (-0.17176,-0.95925,0.22434)
+New Momentum Direction: (0.66047,0.056839,0.7487)
+Momentum Change: (0.66047,0.056839,0.7487)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66047,0.056839,0.7487)
+ Old Polarization:       (-0.17176,-0.95925,0.22434)
+ New Momentum Direction: (-0.66047,0.056839,0.7487)
+ New Polarization:       (-0.17176,0.95925,-0.22434)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.85669,0.45799,0.23734)
- Old Polarization:       (-0.042895,0.39526,-0.91757)
- New Momentum Direction: (-0.71383,0.62179,0.32222)
- New Polarization:       (0.081015,0.53033,-0.84391)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (-0.66047,0.056839,0.7487)
+ Old Polarization:       (-0.17176,0.95925,-0.22434)
+ New Momentum Direction: (-0.66047,0.056839,-0.7487)
+ New Polarization:       (-0.0071378,-0.99756,-0.069435)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
 Track (trackID 298, parentID 1) is processed with stopping code 2
 ### pop requested out of 297 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 297, parentID 1) is processed with stopping code 2
 ### pop requested out of 296 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73912,0.056002,0.67124)
- Old Polarization:       (-0.67357,0.061452,0.73657)
- New Momentum Direction: (0.40933,0.075857,0.90923)
- New Polarization:       (-0.91239,0.034032,0.40791)
- *** FresnelRefraction *** 
-Track (trackID 296, parentID 1) is processed with stopping code 2
-### pop requested out of 295 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 296, parentID 1) is processed with stopping code 2
+### pop requested out of 295 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74126,0.12212,0.66002)
+ Old Polarization:       (-0.67122,0.13487,0.72888)
+ New Momentum Direction: (-0.74126,0.12212,0.66002)
+ New Polarization:       (-0.67122,-0.13487,-0.72888)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.74126,0.12212,0.66002)
+ Old Polarization:       (-0.67122,-0.13487,-0.72888)
+ New Momentum Direction: (-0.74126,0.12212,-0.66002)
+ New Polarization:       (0.67122,0.13487,-0.72888)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.74126,0.12212,-0.66002)
+ Old Polarization:       (0.67122,0.13487,-0.72888)
+ New Momentum Direction: (-0.42201,0.16495,-0.89146)
+ New Polarization:       (0.90659,0.076781,-0.41496)
+ *** FresnelRefraction *** 
 Track (trackID 295, parentID 1) is processed with stopping code 2
 ### pop requested out of 294 stacked tracks.
 
@@ -160,26 +180,8 @@ Track (trackID 294, parentID 1) is processed with stopping code 2
  Photon at Boundary! 
  Old Momentum Direction: (0.74161,0.54495,-0.39121)
  Old Polarization:       (-0.67083,0.60245,-0.43249)
- New Momentum Direction: (-0.74161,0.54495,-0.39121)
- New Polarization:       (-0.67083,-0.60245,0.43249)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74161,0.54495,-0.39121)
- Old Polarization:       (-0.67083,-0.60245,0.43249)
- New Momentum Direction: (-0.74161,-0.54495,-0.39121)
- New Polarization:       (0.67083,-0.60245,-0.43249)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74161,-0.54495,-0.39121)
- Old Polarization:       (0.67083,-0.60245,-0.43249)
- New Momentum Direction: (-0.74161,-0.54495,0.39121)
- New Polarization:       (-0.67083,0.60245,-0.43249)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74161,-0.54495,0.39121)
- Old Polarization:       (-0.67083,0.60245,-0.43249)
- New Momentum Direction: (-0.42406,-0.73569,0.52814)
- New Polarization:       (0.90563,-0.34448,0.2473)
+ New Momentum Direction: (0.42406,0.73569,-0.52814)
+ New Polarization:       (-0.90563,0.34448,-0.2473)
  *** FresnelRefraction *** 
 Track (trackID 293, parentID 1) is processed with stopping code 2
 ### pop requested out of 292 stacked tracks.
@@ -191,20 +193,12 @@ Track (trackID 293, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 292, parentID 1) is processed with stopping code 2
 ### pop requested out of 291 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74322,0.47628,0.46987)
- Old Polarization:       (-0.66905,0.52908,0.52197)
- New Momentum Direction: (0.43326,0.64159,0.63296)
- New Polarization:       (-0.90127,0.30843,0.30428)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 291, parentID 1) is processed with stopping code 2
 ### pop requested out of 290 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73693,0.57423,-0.35665)
- Old Polarization:       (-0.67597,0.62601,-0.38881)
- New Momentum Direction: (0.39571,0.78015,-0.48455)
- New Polarization:       (-0.91838,0.33615,-0.20878)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 290, parentID 1) is processed with stopping code 2
 ### pop requested out of 289 stacked tracks.
 
@@ -538,22 +532,27 @@ Track (trackID 244, parentID 1) is processed with stopping code 2
 Scattering Photon!
 Old Momentum Direction: (0.73597,0.47867,0.47877)
 Old Polarization: (-0.67701,0.52036,0.52046)
-New Polarization: (-0.78871,0.32111,0.2426)
-Polarization Change: (-0.89074,0.36266,0.27399)
-New Momentum Direction: (-0.36186,-0.30446,-0.77343)
-Momentum Change: (-0.39916,-0.33584,-0.85316)
-Scattering Photon!
-Old Momentum Direction: (-0.39916,-0.33584,-0.85316)
-Old Polarization: (-0.89074,0.36266,0.27399)
-New Polarization: (-0.88637,0.36382,0.25555)
-Polarization Change: (-0.89386,0.36689,0.25771)
-New Momentum Direction: (0.32126,0.92474,-0.20223)
-Momentum Change: (0.32138,0.92509,-0.20231)
- Photon at Boundary! 
- Old Momentum Direction: (0.32138,0.92509,-0.20231)
- Old Polarization:       (-0.89386,0.36689,0.25771)
- New Momentum Direction: (0.4372,0.85622,-0.27521)
- New Polarization:       (0.60984,-0.50715,-0.60901)
+New Polarization: (0.20634,-0.45505,-0.86623)
+Polarization Change: (0.20634,-0.45505,-0.86623)
+New Momentum Direction: (0.90133,-0.25615,0.34926)
+Momentum Change: (0.90133,-0.25615,0.34926)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.90133,-0.25615,0.34926)
+ Old Polarization:       (0.20634,-0.45505,-0.86623)
+ New Momentum Direction: (-0.90133,-0.25615,0.34926)
+ New Polarization:       (0.10924,0.64587,0.75559)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.90133,-0.25615,0.34926)
+ Old Polarization:       (0.10924,0.64587,0.75559)
+ New Momentum Direction: (-0.90133,-0.25615,-0.34926)
+ New Polarization:       (-0.10924,-0.64587,0.75559)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.90133,-0.25615,-0.34926)
+ Old Polarization:       (-0.10924,-0.64587,0.75559)
+ New Momentum Direction: (-0.80798,-0.34845,-0.47512)
+ New Polarization:       (0.19983,-0.92065,0.33537)
  *** FresnelRefraction *** 
 Track (trackID 243, parentID 1) is processed with stopping code 2
 ### pop requested out of 242 stacked tracks.
@@ -565,16 +564,16 @@ Track (trackID 243, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 242, parentID 1) is processed with stopping code 2
 ### pop requested out of 241 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73659,-0.48991,-0.46629)
- Old Polarization:       (-0.67634,-0.53355,-0.50783)
- New Momentum Direction: (0.39356,-0.66589,-0.63379)
- New Polarization:       (-0.9193,-0.28508,-0.27133)
- *** FresnelRefraction *** 
-Track (trackID 241, parentID 1) is processed with stopping code 2
-### pop requested out of 240 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 241, parentID 1) is processed with stopping code 2
+### pop requested out of 240 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74306,0.24609,-0.62234)
+ Old Polarization:       (-0.66923,0.27324,-0.69099)
+ New Momentum Direction: (0.43235,0.33158,-0.83852)
+ New Polarization:       (-0.9017,0.15899,-0.40206)
+ *** FresnelRefraction *** 
 Track (trackID 240, parentID 1) is processed with stopping code 2
 ### pop requested out of 239 stacked tracks.
  Photon at Boundary! 
@@ -601,12 +600,8 @@ Track (trackID 238, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 237, parentID 1) is processed with stopping code 2
 ### pop requested out of 236 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74347,0.34505,-0.57288)
- Old Polarization:       (-0.66877,0.3836,-0.63687)
- New Momentum Direction: (0.43468,0.46466,-0.77146)
- New Polarization:       (-0.90058,0.22428,-0.37236)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 236, parentID 1) is processed with stopping code 2
 ### pop requested out of 235 stacked tracks.
 
@@ -621,12 +616,8 @@ Track (trackID 235, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 234, parentID 1) is processed with stopping code 2
 ### pop requested out of 233 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74496,0.20685,-0.63422)
- Old Polarization:       (-0.66711,0.231,-0.70825)
- New Momentum Direction: (0.44295,0.278,-0.85236)
- New Polarization:       (-0.89655,0.13735,-0.42111)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 233, parentID 1) is processed with stopping code 2
 ### pop requested out of 232 stacked tracks.
  Photon at Boundary! 
@@ -641,23 +632,26 @@ Track (trackID 232, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 231, parentID 1) is processed with stopping code 2
 ### pop requested out of 230 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73968,-0.55897,0.37474)
- Old Polarization:       (-0.67296,-0.61439,0.41189)
- New Momentum Direction: (0.41268,-0.75659,0.50722)
- New Polarization:       (-0.91087,-0.34278,0.2298)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 230, parentID 1) is processed with stopping code 2
 ### pop requested out of 229 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 229, parentID 1) is processed with stopping code 2
 ### pop requested out of 228 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74001,-0.27616,0.61329)
- Old Polarization:       (-0.6726,-0.30384,0.67476)
- New Momentum Direction: (0.41465,-0.37363,0.82974)
- New Polarization:       (-0.90998,-0.17025,0.37809)
+Scattering Photon!
+Old Momentum Direction: (0.74001,-0.27616,0.61329)
+Old Polarization: (-0.6726,-0.30384,0.67476)
+New Polarization: (-0.82262,-0.56812,-0.022946)
+Polarization Change: (-0.82262,-0.56812,-0.022946)
+New Momentum Direction: (-0.1253,0.14177,0.98194)
+Momentum Change: (-0.1253,0.14177,0.98194)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.1253,0.14177,0.98194)
+ Old Polarization:       (-0.82262,-0.56812,-0.022946)
+ New Momentum Direction: (-0.16952,0.19181,0.96668)
+ New Polarization:       (-0.84386,-0.53494,-0.041842)
  *** FresnelRefraction *** 
 Track (trackID 228, parentID 1) is processed with stopping code 2
 ### pop requested out of 227 stacked tracks.
@@ -677,12 +671,20 @@ Track (trackID 227, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 226, parentID 1) is processed with stopping code 2
 ### pop requested out of 225 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74434,0.58384,0.32418)
+ Old Polarization:       (-0.6678,0.65076,0.36133)
+ New Momentum Direction: (0.43952,0.7853,0.43604)
+ New Polarization:       (-0.89823,0.38426,0.21336)
+ *** FresnelRefraction *** 
 Track (trackID 225, parentID 1) is processed with stopping code 2
 ### pop requested out of 224 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74314,0.44538,-0.49938)
+ Old Polarization:       (-0.66913,0.49464,-0.55461)
+ New Momentum Direction: (0.43283,0.60003,-0.67278)
+ New Polarization:       (-0.90148,0.28809,-0.32302)
+ *** FresnelRefraction *** 
 Track (trackID 224, parentID 1) is processed with stopping code 2
 ### pop requested out of 223 stacked tracks.
  Photon at Boundary! 
@@ -709,8 +711,38 @@ Track (trackID 222, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 221, parentID 1) is processed with stopping code 2
 ### pop requested out of 220 stacked tracks.
-
-** Photon absorbed! **
+Scattering Photon!
+Old Momentum Direction: (0.73618,-0.53719,-0.41166)
+Old Polarization: (-0.67679,-0.58433,-0.44779)
+New Polarization: (-0.55258,-0.83346,0.0024185)
+Polarization Change: (-0.55258,-0.83346,0.0024185)
+New Momentum Direction: (0.39498,-0.25932,0.88133)
+Momentum Change: (0.39498,-0.25932,0.88133)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.39498,-0.25932,0.88133)
+ Old Polarization:       (-0.55258,-0.83346,0.0024185)
+ New Momentum Direction: (-0.39498,-0.25932,0.88133)
+ New Polarization:       (-0.55258,0.83346,-0.0024185)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.39498,-0.25932,0.88133)
+ Old Polarization:       (-0.55258,0.83346,-0.0024185)
+ New Momentum Direction: (-0.39498,0.25932,0.88133)
+ New Polarization:       (0.55258,0.83346,0.0024185)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.39498,0.25932,0.88133)
+Old Polarization: (0.55258,0.83346,0.0024185)
+New Polarization: (0.97455,0.03293,-0.22175)
+Polarization Change: (0.97455,0.03293,-0.22175)
+New Momentum Direction: (-0.0018745,-0.98792,-0.15495)
+Momentum Change: (-0.0018745,-0.98792,-0.15495)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.0018745,-0.98792,-0.15495)
+ Old Polarization:       (0.97455,0.03293,-0.22175)
+ New Momentum Direction: (-0.0025493,-0.97754,-0.21072)
+ New Polarization:       (0.95538,0.059858,-0.28924)
+ *** FresnelRefraction *** 
 Track (trackID 220, parentID 1) is processed with stopping code 2
 ### pop requested out of 219 stacked tracks.
  Photon at Boundary! 
@@ -725,6 +757,13 @@ Track (trackID 219, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 218, parentID 1) is processed with stopping code 2
 ### pop requested out of 217 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.73579,-0.63928,-0.22346)
+Old Polarization: (-0.67721,-0.69458,-0.24279)
+New Polarization: (0.57603,0.49861,0.64775)
+Polarization Change: (0.57603,0.49861,0.64775)
+New Momentum Direction: (0.36198,0.5549,-0.74904)
+Momentum Change: (0.36198,0.5549,-0.74904)
 
 ** Photon absorbed! **
 Track (trackID 217, parentID 1) is processed with stopping code 2
@@ -737,12 +776,15 @@ Track (trackID 217, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 216, parentID 1) is processed with stopping code 2
 ### pop requested out of 215 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7366,0.024063,-0.6759)
- Old Polarization:       (-0.67633,0.026207,-0.73613)
- New Momentum Direction: (0.39364,0.032706,-0.91868)
- New Polarization:       (-0.91927,0.014005,-0.39339)
- *** FresnelRefraction *** 
+Scattering Photon!
+Old Momentum Direction: (0.7366,0.024063,-0.6759)
+Old Polarization: (-0.67633,0.026207,-0.73613)
+New Polarization: (-0.67986,-0.14008,-0.71984)
+Polarization Change: (-0.67986,-0.14008,-0.71984)
+New Momentum Direction: (0.035831,-0.98676,0.15818)
+Momentum Change: (0.035831,-0.98676,0.15818)
+
+** Photon absorbed! **
 Track (trackID 215, parentID 1) is processed with stopping code 2
 ### pop requested out of 214 stacked tracks.
  Photon at Boundary! 
@@ -785,8 +827,12 @@ Track (trackID 211, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 210, parentID 1) is processed with stopping code 2
 ### pop requested out of 209 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73669,-0.47233,-0.48393)
+ Old Polarization:       (-0.67623,-0.51456,-0.5272)
+ New Momentum Direction: (0.39423,-0.6419,-0.65768)
+ New Polarization:       (-0.91901,-0.27536,-0.28213)
+ *** FresnelRefraction *** 
 Track (trackID 209, parentID 1) is processed with stopping code 2
 ### pop requested out of 208 stacked tracks.
 
@@ -829,39 +875,24 @@ Track (trackID 204, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 203, parentID 1) is processed with stopping code 2
 ### pop requested out of 202 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73938,0.078517,0.6687)
- Old Polarization:       (-0.67329,0.086223,0.73433)
- New Momentum Direction: (0.41085,0.10632,0.90548)
- New Polarization:       (-0.9117,0.047912,0.40805)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 202, parentID 1) is processed with stopping code 2
 ### pop requested out of 201 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73703,-0.56084,-0.37714)
-Old Polarization: (-0.67586,-0.61161,-0.41128)
-New Polarization: (-0.10931,-0.4838,-0.71251)
-Polarization Change: (-0.12591,-0.55727,-0.82073)
-New Momentum Direction: (-0.61759,0.62988,-0.33294)
-Momentum Change: (-0.65501,0.66804,-0.35311)
- Photon at Boundary! 
- Old Momentum Direction: (-0.65501,0.66804,-0.35311)
- Old Polarization:       (-0.12591,-0.55727,-0.82073)
- New Momentum Direction: (-0.65501,0.66804,0.35311)
- New Polarization:       (0.12591,0.55727,-0.82073)
- *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65501,0.66804,0.35311)
- Old Polarization:       (0.12591,0.55727,-0.82073)
- New Momentum Direction: (-0.65501,-0.66804,0.35311)
- New Polarization:       (-0.12591,0.55727,0.82073)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.73703,-0.56084,-0.37714)
+ Old Polarization:       (-0.67586,-0.61161,-0.41128)
+ New Momentum Direction: (0.3964,-0.76185,-0.51231)
+ New Polarization:       (-0.91808,-0.32894,-0.2212)
+ *** FresnelRefraction *** 
 Track (trackID 201, parentID 1) is processed with stopping code 2
 ### pop requested out of 200 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74462,0.467,0.47692)
+ Old Polarization:       (-0.66749,0.52097,0.53203)
+ New Momentum Direction: (0.44107,0.62791,0.64124)
+ New Polarization:       (-0.89747,0.30859,0.31514)
+ *** FresnelRefraction *** 
 Track (trackID 200, parentID 1) is processed with stopping code 2
 ### pop requested out of 199 stacked tracks.
  Photon at Boundary! 
@@ -892,6 +923,13 @@ Track (trackID 197, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 196, parentID 1) is processed with stopping code 2
 ### pop requested out of 195 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.73592,0.5043,0.45177)
+Old Polarization: (-0.67706,0.54814,0.49104)
+New Polarization: (0.55186,-0.46961,-0.68914)
+Polarization Change: (0.55186,-0.46961,-0.68914)
+New Momentum Direction: (0.5792,-0.3787,0.72188)
+Momentum Change: (0.5792,-0.3787,0.72188)
 
 ** Photon absorbed! **
 Track (trackID 195, parentID 1) is processed with stopping code 2
@@ -904,12 +942,8 @@ Track (trackID 195, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 194, parentID 1) is processed with stopping code 2
 ### pop requested out of 193 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73578,0.14867,-0.6607)
- Old Polarization:       (-0.67722,0.16153,-0.71783)
- New Momentum Direction: (0.38838,0.2023,-0.89902)
- New Polarization:       (-0.9215,0.085264,-0.37891)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 193, parentID 1) is processed with stopping code 2
 ### pop requested out of 192 stacked tracks.
  Photon at Boundary! 
@@ -936,16 +970,16 @@ Track (trackID 191, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 190, parentID 1) is processed with stopping code 2
 ### pop requested out of 189 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73729,-0.32041,-0.59476)
- Old Polarization:       (-0.67557,-0.34968,-0.64909)
- New Momentum Direction: (0.39803,-0.43509,-0.80763)
- New Polarization:       (-0.91737,-0.18878,-0.35041)
- *** FresnelRefraction *** 
-Track (trackID 189, parentID 1) is processed with stopping code 2
-### pop requested out of 188 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 189, parentID 1) is processed with stopping code 2
+### pop requested out of 188 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73666,0.24141,0.63171)
+ Old Polarization:       (-0.67626,0.26297,0.68812)
+ New Momentum Direction: (0.39402,0.3281,0.85854)
+ New Polarization:       (-0.9191,0.14066,0.36806)
+ *** FresnelRefraction *** 
 Track (trackID 188, parentID 1) is processed with stopping code 2
 ### pop requested out of 187 stacked tracks.
  Photon at Boundary! 
@@ -980,20 +1014,12 @@ Track (trackID 185, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 184, parentID 1) is processed with stopping code 2
 ### pop requested out of 183 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73643,-0.20231,0.64556)
- Old Polarization:       (-0.67651,-0.22022,0.70273)
- New Momentum Direction: (0.39256,-0.27504,0.87764)
- New Polarization:       (-0.91973,-0.11739,0.37459)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 183, parentID 1) is processed with stopping code 2
 ### pop requested out of 182 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74095,0.66433,0.098275)
- Old Polarization:       (-0.67156,0.73298,0.10843)
- New Momentum Direction: (0.42023,0.89765,0.13279)
- New Polarization:       (-0.90742,0.41571,0.061496)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 182, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
  Photon at Boundary! 
@@ -1012,12 +1038,8 @@ Track (trackID 181, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 180, parentID 1) is processed with stopping code 2
 ### pop requested out of 179 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73766,-0.67196,-0.065784)
- Old Polarization:       (-0.67517,-0.73415,-0.071872)
- New Momentum Direction: (0.40031,-0.91202,-0.089285)
- New Polarization:       (-0.91638,-0.39841,-0.039004)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 179, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
  Photon at Boundary! 
@@ -1036,12 +1058,8 @@ Track (trackID 178, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 177, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74161,-0.66857,-0.055088)
- Old Polarization:       (-0.67083,-0.7391,-0.0609)
- New Momentum Direction: (0.42405,-0.90258,-0.07437)
- New Polarization:       (-0.90564,-0.42262,-0.034823)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 176, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
  Photon at Boundary! 
@@ -1084,8 +1102,12 @@ Track (trackID 172, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 171, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73931,0.18208,0.64828)
+ Old Polarization:       (-0.67337,0.19991,0.71177)
+ New Momentum Direction: (0.41044,0.24657,0.87792)
+ New Polarization:       (-0.91189,0.11098,0.39515)
+ *** FresnelRefraction *** 
 Track (trackID 170, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
  Photon at Boundary! 
@@ -1096,11 +1118,18 @@ Track (trackID 170, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 169, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7388,-0.41344,-0.53221)
- Old Polarization:       (-0.67393,-0.45324,-0.58343)
- New Momentum Direction: (0.40734,-0.56028,-0.72122)
- New Polarization:       (-0.91328,-0.24989,-0.32168)
+Scattering Photon!
+Old Momentum Direction: (0.7388,-0.41344,-0.53221)
+Old Polarization: (-0.67393,-0.45324,-0.58343)
+New Polarization: (-0.79334,-0.36247,0.48911)
+Polarization Change: (-0.79334,-0.36247,0.48911)
+New Momentum Direction: (-0.37983,-0.33316,-0.86298)
+Momentum Change: (-0.37983,-0.33316,-0.86298)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.37983,-0.33316,-0.86298)
+ Old Polarization:       (-0.79334,-0.36247,0.48911)
+ New Momentum Direction: (-0.51473,-0.45148,-0.72885)
+ New Polarization:       (-0.65941,-0.33483,0.6731)
  *** FresnelRefraction *** 
 Track (trackID 168, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
@@ -1112,28 +1141,36 @@ Track (trackID 168, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 167, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73594,0.39917,0.54685)
- Old Polarization:       (-0.67704,0.4339,0.59443)
- New Momentum Direction: (0.38943,0.54304,0.74394)
- New Polarization:       (-0.92106,0.2296,0.31455)
- *** FresnelRefraction *** 
+Scattering Photon!
+Old Momentum Direction: (0.73594,0.39917,0.54685)
+Old Polarization: (-0.67704,0.4339,0.59443)
+New Polarization: (-0.47855,-0.32186,0.81694)
+Polarization Change: (-0.47855,-0.32186,0.81694)
+New Momentum Direction: (0.48011,-0.87491,-0.063456)
+Momentum Change: (0.48011,-0.87491,-0.063456)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48011,-0.87491,-0.063456)
+ Old Polarization:       (-0.47855,-0.32186,0.81694)
+ New Momentum Direction: (-0.48011,-0.87491,-0.063456)
+ New Polarization:       (-0.47855,0.32186,-0.81694)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.48011,-0.87491,-0.063456)
+Old Polarization: (-0.47855,0.32186,-0.81694)
+New Polarization: (-0.21353,-0.16874,-0.96225)
+Polarization Change: (-0.21353,-0.16874,-0.96225)
+New Momentum Direction: (-0.54454,0.83833,-0.026166)
+Momentum Change: (-0.54454,0.83833,-0.026166)
+
+** Photon absorbed! **
 Track (trackID 166, parentID 1) is processed with stopping code 2
 ### pop requested out of 165 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73581,0.66958,0.1012)
- Old Polarization:       (-0.67718,0.72755,0.10996)
- New Momentum Direction: (0.3886,0.91106,0.1377)
- New Polarization:       (-0.92141,0.38424,0.058073)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 165, parentID 1) is processed with stopping code 2
 ### pop requested out of 164 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73746,0.52581,-0.42389)
- Old Polarization:       (-0.67539,0.57413,-0.46284)
- New Momentum Direction: (0.39907,0.71384,-0.57547)
- New Polarization:       (-0.91692,0.31068,-0.25046)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 164, parentID 1) is processed with stopping code 2
 ### pop requested out of 163 stacked tracks.
  Photon at Boundary! 
@@ -1168,8 +1205,12 @@ Track (trackID 161, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 160, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74205,0.0087739,0.67028)
+ Old Polarization:       (-0.67034,0.0097125,0.74199)
+ New Momentum Direction: (0.42662,0.011838,0.90435)
+ New Polarization:       (-0.90443,0.0055839,0.42658)
+ *** FresnelRefraction *** 
 Track (trackID 159, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
@@ -1188,12 +1229,20 @@ Track (trackID 158, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 157, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73947,0.25218,-0.62417)
+ Old Polarization:       (-0.67318,0.27701,-0.68563)
+ New Momentum Direction: (0.41145,0.34142,-0.84507)
+ New Polarization:       (-0.91143,0.15413,-0.38149)
+ *** FresnelRefraction *** 
 Track (trackID 156, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.7365,0.29571,0.60838)
+ Old Polarization:       (-0.67644,0.32196,0.6624)
+ New Momentum Direction: (0.39302,0.40198,0.82701)
+ New Polarization:       (-0.91953,0.17181,0.35347)
+ *** FresnelRefraction *** 
 Track (trackID 155, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
  Photon at Boundary! 
@@ -1204,8 +1253,12 @@ Track (trackID 155, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 154, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74216,-0.31719,0.59042)
+ Old Polarization:       (-0.67022,-0.35123,0.65379)
+ New Momentum Direction: (0.42723,-0.42789,0.79648)
+ New Polarization:       (-0.90414,-0.20219,0.37636)
+ *** FresnelRefraction *** 
 Track (trackID 153, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
@@ -1328,98 +1381,20 @@ Track (trackID 138, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 137, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73603,0.51332,0.44132)
+ Old Polarization:       (-0.67695,0.55812,0.47984)
+ New Momentum Direction: (0.39001,0.69824,0.6003)
+ New Polarization:       (-0.92081,0.29574,0.25425)
+ *** FresnelRefraction *** 
 Track (trackID 136, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73589,0.6413,0.21726)
-Old Polarization: (-0.6771,0.69698,0.23612)
-New Polarization: (-0.68616,0.63405,0.096007)
-Polarization Change: (-0.7306,0.67511,0.10222)
-New Momentum Direction: (0.45144,0.58438,-0.63291)
-Momentum Change: (0.46418,0.60086,-0.65077)
- Photon at Boundary! 
- Old Momentum Direction: (0.46418,0.60086,-0.65077)
- Old Polarization:       (-0.7306,0.67511,0.10222)
- New Momentum Direction: (0.46418,-0.60086,-0.65077)
- New Polarization:       (0.7306,0.67511,-0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.46418,-0.60086,-0.65077)
- Old Polarization:       (0.7306,0.67511,-0.10222)
- New Momentum Direction: (-0.46418,-0.60086,-0.65077)
- New Polarization:       (0.7306,-0.67511,0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.46418,-0.60086,-0.65077)
- Old Polarization:       (0.7306,-0.67511,0.10222)
- New Momentum Direction: (-0.46418,-0.60086,0.65077)
- New Polarization:       (-0.7306,0.67511,0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.46418,-0.60086,0.65077)
- Old Polarization:       (-0.7306,0.67511,0.10222)
- New Momentum Direction: (-0.46418,0.60086,0.65077)
- New Polarization:       (0.7306,0.67511,-0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.46418,0.60086,0.65077)
- Old Polarization:       (0.7306,0.67511,-0.10222)
- New Momentum Direction: (-0.46418,0.60086,-0.65077)
- New Polarization:       (-0.7306,-0.67511,-0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.46418,0.60086,-0.65077)
- Old Polarization:       (-0.7306,-0.67511,-0.10222)
- New Momentum Direction: (0.46418,0.60086,-0.65077)
- New Polarization:       (-0.7306,0.67511,0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.46418,0.60086,-0.65077)
- Old Polarization:       (-0.7306,0.67511,0.10222)
- New Momentum Direction: (0.46418,-0.60086,-0.65077)
- New Polarization:       (0.7306,0.67511,-0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.46418,-0.60086,-0.65077)
- Old Polarization:       (0.7306,0.67511,-0.10222)
- New Momentum Direction: (0.46418,-0.60086,0.65077)
- New Polarization:       (-0.7306,-0.67511,-0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.46418,-0.60086,0.65077)
- Old Polarization:       (-0.7306,-0.67511,-0.10222)
- New Momentum Direction: (-0.46418,-0.60086,0.65077)
- New Polarization:       (-0.7306,0.67511,0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.46418,-0.60086,0.65077)
- Old Polarization:       (-0.7306,0.67511,0.10222)
- New Momentum Direction: (-0.46418,-0.60086,-0.65077)
- New Polarization:       (0.7306,-0.67511,0.10222)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.46418,-0.60086,-0.65077)
- Old Polarization:       (0.7306,-0.67511,0.10222)
- New Momentum Direction: (-0.46418,0.60086,-0.65077)
- New Polarization:       (-0.7306,-0.67511,-0.10222)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.46418,0.60086,-0.65077)
-Old Polarization: (-0.7306,-0.67511,-0.10222)
-New Polarization: (-0.32013,-0.72209,-0.36301)
-Polarization Change: (-0.36826,-0.83066,-0.4176)
-New Momentum Direction: (-0.86649,0.18688,0.3924)
-Momentum Change: (-0.89386,0.19278,0.40479)
  Photon at Boundary! 
- Old Momentum Direction: (-0.89386,0.19278,0.40479)
- Old Polarization:       (-0.36826,-0.83066,-0.4176)
- New Momentum Direction: (-0.89386,0.19278,-0.40479)
- New Polarization:       (0.36826,0.83066,-0.4176)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.73589,0.6413,0.21726)
+ Old Polarization:       (-0.6771,0.69698,0.23612)
+ New Momentum Direction: (0.38907,0.8725,0.29558)
+ New Polarization:       (-0.92121,0.3685,0.12484)
+ *** FresnelRefraction *** 
 Track (trackID 135, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
  Photon at Boundary! 
@@ -1609,16 +1584,36 @@ Track (trackID 107, parentID 1) is processed with stopping code 2
 Scattering Photon!
 Old Momentum Direction: (0.7358,-0.58526,-0.34068)
 Old Polarization: (-0.67719,-0.63591,-0.37016)
-New Polarization: (-0.67862,-0.45773,-0.43587)
-Polarization Change: (-0.73177,-0.49357,-0.47001)
-New Momentum Direction: (0.14299,-0.76053,0.57604)
-Momentum Change: (0.14822,-0.78835,0.59711)
-
-** Photon absorbed! **
+New Polarization: (-0.49597,-0.86556,-0.069395)
+Polarization Change: (-0.49597,-0.86556,-0.069395)
+New Momentum Direction: (0.54817,-0.37408,0.74805)
+Momentum Change: (0.54817,-0.37408,0.74805)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54817,-0.37408,0.74805)
+ Old Polarization:       (-0.49597,-0.86556,-0.069395)
+ New Momentum Direction: (-0.54817,-0.37408,0.74805)
+ New Polarization:       (-0.49597,0.86556,0.069395)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54817,-0.37408,0.74805)
+ Old Polarization:       (-0.49597,0.86556,0.069395)
+ New Momentum Direction: (-0.54817,0.37408,0.74805)
+ New Polarization:       (0.49597,0.86556,-0.069395)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54817,0.37408,0.74805)
+ Old Polarization:       (0.49597,0.86556,-0.069395)
+ New Momentum Direction: (-0.74587,0.50899,0.42965)
+ New Polarization:       (0.5025,0.85339,-0.13865)
+ *** FresnelRefraction *** 
 Track (trackID 106, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74456,0.37366,-0.55318)
+ Old Polarization:       (-0.66755,0.41677,-0.61699)
+ New Momentum Direction: (0.44075,0.50245,-0.74383)
+ New Polarization:       (-0.89763,0.24671,-0.36523)
+ *** FresnelRefraction *** 
 Track (trackID 105, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
@@ -1661,12 +1656,15 @@ Track (trackID 101, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 100, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73625,-0.11937,0.66609)
- Old Polarization:       (-0.6767,-0.12987,0.72471)
- New Momentum Direction: (0.39144,-0.16232,0.90578)
- New Polarization:       (-0.92021,-0.069049,0.3853)
- *** FresnelRefraction *** 
+Scattering Photon!
+Old Momentum Direction: (0.73625,-0.11937,0.66609)
+Old Polarization: (-0.6767,-0.12987,0.72471)
+New Polarization: (0.073341,0.83954,-0.53833)
+Polarization Change: (0.073341,0.83954,-0.53833)
+New Momentum Direction: (-0.76135,0.39579,0.51352)
+Momentum Change: (-0.76135,0.39579,0.51352)
+
+** Photon absorbed! **
 Track (trackID 99, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
@@ -1717,13 +1715,6 @@ Track (trackID 94, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 93, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73583,0.39944,-0.54682)
-Old Polarization: (-0.67717,0.43404,-0.59418)
-New Polarization: (-0.36935,0.6441,-0.47256)
-Polarization Change: (-0.41966,0.73184,-0.53693)
-New Momentum Direction: (0.67579,-0.066251,-0.61849)
-Momentum Change: (0.73577,-0.072131,-0.67338)
 
 ** Photon absorbed! **
 Track (trackID 92, parentID 1) is processed with stopping code 2
@@ -1736,16 +1727,23 @@ Track (trackID 92, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 91, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73931,-0.6211,0.2601)
- Old Polarization:       (-0.67336,-0.68193,0.28557)
- New Momentum Direction: (0.41047,-0.8411,0.35223)
- New Polarization:       (-0.91187,-0.37861,0.15855)
- *** FresnelRefraction *** 
-Track (trackID 90, parentID 1) is processed with stopping code 2
-### pop requested out of 89 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.73931,-0.6211,0.2601)
+Old Polarization: (-0.67336,-0.68193,0.28557)
+New Polarization: (-0.14163,0.827,-0.54407)
+Polarization Change: (-0.14163,0.827,-0.54407)
+New Momentum Direction: (0.97476,0.21232,0.068981)
+Momentum Change: (0.97476,0.21232,0.068981)
 
 ** Photon absorbed! **
+Track (trackID 90, parentID 1) is processed with stopping code 2
+### pop requested out of 89 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73847,-0.52619,0.42164)
+ Old Polarization:       (-0.67428,-0.57628,0.46178)
+ New Momentum Direction: (0.40537,-0.71338,0.57164)
+ New Polarization:       (-0.91415,-0.31633,0.25348)
+ *** FresnelRefraction *** 
 Track (trackID 89, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
@@ -1768,12 +1766,8 @@ Track (trackID 87, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 86, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74204,-0.29402,-0.60243)
- Old Polarization:       (-0.67035,-0.32547,-0.66686)
- New Momentum Direction: (0.42657,-0.3967,-0.81281)
- New Polarization:       (-0.90446,-0.1871,-0.38335)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 85, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
@@ -1808,12 +1802,8 @@ Track (trackID 82, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 81, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73643,-0.62783,-0.252)
- Old Polarization:       (-0.67652,-0.68343,-0.27431)
- New Momentum Direction: (0.39253,-0.85355,-0.3426)
- New Polarization:       (-0.91974,-0.36428,-0.14621)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 80, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
@@ -1832,27 +1822,16 @@ Track (trackID 79, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 78, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.74142,-0.43832,-0.50811)
-Old Polarization: (-0.67105,-0.48428,-0.5614)
-New Polarization: (-0.66709,-0.44733,-0.56776)
-Polarization Change: (-0.67821,-0.45479,-0.57723)
-New Momentum Direction: (0.2596,-0.87992,0.38825)
-Momentum Change: (0.26059,-0.88329,0.38974)
  Photon at Boundary! 
- Old Momentum Direction: (0.26059,-0.88329,0.38974)
- Old Polarization:       (-0.67821,-0.45479,-0.57723)
- New Momentum Direction: (0.3519,-0.77407,0.52629)
- New Polarization:       (0.27458,0.62288,0.73255)
+ Old Momentum Direction: (0.74142,-0.43832,-0.50811)
+ Old Polarization:       (-0.67105,-0.48428,-0.5614)
+ New Momentum Direction: (0.42293,-0.59189,-0.68614)
+ New Polarization:       (-0.90616,-0.27626,-0.32024)
  *** FresnelRefraction *** 
 Track (trackID 77, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74417,0.094503,-0.66127)
- Old Polarization:       (-0.66799,0.10528,-0.73668)
- New Momentum Direction: (0.43857,0.12714,-0.88966)
- New Polarization:       (-0.8987,0.062046,-0.43416)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 76, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
@@ -1863,28 +1842,43 @@ Track (trackID 76, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 75, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 74, parentID 1) is processed with stopping code 2
-### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74347,0.66877,-0.0016928)
- Old Polarization:       (-0.66877,0.74347,-0.0018819)
- New Momentum Direction: (0.43467,0.90059,-0.0022796)
- New Polarization:       (-0.90059,0.43467,-0.0011003)
+ Old Momentum Direction: (0.74337,-0.30117,0.59724)
+ Old Polarization:       (-0.66888,-0.33471,0.66375)
+ New Momentum Direction: (0.43412,-0.40562,0.80437)
+ New Polarization:       (-0.90086,-0.19547,0.38762)
  *** FresnelRefraction *** 
-Track (trackID 73, parentID 1) is processed with stopping code 2
-### pop requested out of 72 stacked tracks.
+Track (trackID 74, parentID 1) is processed with stopping code 2
+### pop requested out of 73 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 73, parentID 1) is processed with stopping code 2
+### pop requested out of 72 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.73593,0.026506,-0.67654)
+Old Polarization: (-0.67706,0.028811,-0.73536)
+New Polarization: (-0.70101,0.53902,-0.46696)
+Polarization Change: (-0.70101,0.53902,-0.46696)
+New Momentum Direction: (0.16788,0.7611,0.62653)
+Momentum Change: (0.16788,0.7611,0.62653)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.16788,0.7611,0.62653)
+ Old Polarization:       (-0.70101,0.53902,-0.46696)
+ New Momentum Direction: (0.22839,0.47045,0.85236)
+ New Polarization:       (-0.29137,-0.80234,0.52091)
+ *** FresnelRefraction *** 
 Track (trackID 72, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 71, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74212,0.63641,0.21035)
+ Old Polarization:       (-0.67027,0.70462,0.2329)
+ New Momentum Direction: (0.42699,0.85857,0.28378)
+ New Polarization:       (-0.90425,0.40542,0.134)
+ *** FresnelRefraction *** 
 Track (trackID 70, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
 
@@ -1915,16 +1909,16 @@ Track (trackID 67, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 66, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74429,-0.22954,0.62717)
- Old Polarization:       (-0.66785,-0.25582,0.69895)
- New Momentum Direction: (0.43926,-0.30877,0.84363)
- New Polarization:       (-0.89836,-0.15097,0.4125)
- *** FresnelRefraction *** 
-Track (trackID 65, parentID 1) is processed with stopping code 2
-### pop requested out of 64 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 65, parentID 1) is processed with stopping code 2
+### pop requested out of 64 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73764,0.48673,-0.46796)
+ Old Polarization:       (-0.6752,0.53174,-0.51124)
+ New Momentum Direction: (0.40019,0.66062,-0.63516)
+ New Polarization:       (-0.91643,0.28849,-0.27736)
+ *** FresnelRefraction *** 
 Track (trackID 64, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
@@ -1943,27 +1937,31 @@ Track (trackID 63, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 62, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73651,0.11782,0.66609)
-Old Polarization: (-0.67643,0.12829,0.72525)
-New Polarization: (-0.4707,0.57567,0.44402)
-Polarization Change: (-0.54348,0.66468,0.51267)
-New Momentum Direction: (0.50862,-0.12903,0.70647)
-Momentum Change: (0.57796,-0.14662,0.80279)
-
-** Photon absorbed! **
-Track (trackID 61, parentID 1) is processed with stopping code 2
-### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7369,-0.33657,-0.58626)
- Old Polarization:       (-0.676,-0.36689,-0.63908)
- New Momentum Direction: (0.39556,-0.45727,-0.79651)
- New Polarization:       (-0.91844,-0.19694,-0.34305)
+ Old Momentum Direction: (0.73651,0.11782,0.66609)
+ Old Polarization:       (-0.67643,0.12829,0.72525)
+ New Momentum Direction: (0.39307,0.16016,0.90545)
+ New Polarization:       (-0.91951,0.068466,0.38706)
  *** FresnelRefraction *** 
-Track (trackID 60, parentID 1) is processed with stopping code 2
-### pop requested out of 59 stacked tracks.
+Track (trackID 61, parentID 1) is processed with stopping code 2
+### pop requested out of 60 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 60, parentID 1) is processed with stopping code 2
+### pop requested out of 59 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.73633,-0.13996,-0.66198)
+Old Polarization: (-0.67662,-0.15231,-0.72041)
+New Polarization: (-0.68949,-0.48171,-0.54088)
+Polarization Change: (-0.68949,-0.48171,-0.54088)
+New Momentum Direction: (-0.096837,0.80138,-0.59027)
+Momentum Change: (-0.096837,0.80138,-0.59027)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.096837,0.80138,-0.59027)
+ Old Polarization:       (-0.68949,-0.48171,-0.54088)
+ New Momentum Direction: (-0.13167,0.58183,-0.80258)
+ New Polarization:       (-0.53609,-0.72281,-0.43606)
+ *** FresnelRefraction *** 
 Track (trackID 59, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
@@ -1986,18 +1984,6 @@ Track (trackID 57, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 56, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73804,0.033421,0.67393)
- Old Polarization:       (-0.67475,0.036556,0.73714)
- New Momentum Direction: (-0.73804,0.033421,0.67393)
- New Polarization:       (-0.67475,-0.036556,-0.73714)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73804,0.033421,0.67393)
- Old Polarization:       (-0.67475,-0.036556,-0.73714)
- New Momentum Direction: (-0.73804,0.033421,-0.67393)
- New Polarization:       (0.67475,0.036556,-0.73714)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 55, parentID 1) is processed with stopping code 2
@@ -2018,34 +2004,42 @@ Track (trackID 54, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 53, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73618,0.22771,0.63733)
- Old Polarization:       (-0.67679,0.24769,0.69326)
- New Momentum Direction: (0.39096,0.30968,0.86675)
- New Polarization:       (-0.92041,0.13154,0.36816)
+Scattering Photon!
+Old Momentum Direction: (0.73618,0.22771,0.63733)
+Old Polarization: (-0.67679,0.24769,0.69326)
+New Polarization: (0.73781,-0.49158,-0.46259)
+Polarization Change: (0.73781,-0.49158,-0.46259)
+New Momentum Direction: (-0.053765,0.64033,-0.76622)
+Momentum Change: (-0.053765,0.64033,-0.76622)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.053765,0.64033,-0.76622)
+ Old Polarization:       (0.73781,-0.49158,-0.46259)
+ New Momentum Direction: (-0.073118,0.87083,-0.48612)
+ New Polarization:       (0.51626,0.45008,0.72863)
  *** FresnelRefraction *** 
 Track (trackID 52, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73606,0.48265,-0.47462)
+ Old Polarization:       (-0.67692,0.52482,-0.51609)
+ New Momentum Direction: (0.39018,0.6565,-0.64558)
+ New Polarization:       (-0.92074,0.2782,-0.27357)
+ *** FresnelRefraction *** 
 Track (trackID 51, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73878,0.10911,0.66505)
+ Old Polarization:       (-0.67395,0.11961,0.72903)
+ New Momentum Direction: (0.40724,0.14787,0.90127)
+ New Polarization:       (-0.91332,0.065934,0.40187)
+ *** FresnelRefraction *** 
 Track (trackID 50, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.74271,-0.23481,0.62709)
-Old Polarization: (-0.66961,-0.26045,0.69555)
-New Polarization: (-0.55518,-0.22274,0.73614)
-Polarization Change: (-0.5853,-0.23482,0.77607)
-New Momentum Direction: (0.76709,-0.35906,0.46988)
-Momentum Change: (0.79198,-0.37071,0.48513)
  Photon at Boundary! 
- Old Momentum Direction: (0.79198,-0.37071,0.48513)
- Old Polarization:       (-0.5853,-0.23482,0.77607)
- New Momentum Direction: (0.568,-0.49972,0.65396)
- New Polarization:       (-0.8055,-0.17441,0.56635)
+ Old Momentum Direction: (0.74271,-0.23481,0.62709)
+ Old Polarization:       (-0.66961,-0.26045,0.69555)
+ New Momentum Direction: (0.43038,-0.31653,0.84533)
+ New Polarization:       (-0.90265,-0.15092,0.40305)
  *** FresnelRefraction *** 
 Track (trackID 49, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
@@ -2061,8 +2055,12 @@ Track (trackID 48, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 47, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73763,0.36684,0.56686)
+ Old Polarization:       (-0.6752,0.40076,0.61927)
+ New Momentum Direction: (0.40015,0.49791,0.76939)
+ New Polarization:       (-0.91645,0.21741,0.33594)
+ *** FresnelRefraction *** 
 Track (trackID 46, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
@@ -2081,8 +2079,12 @@ Track (trackID 45, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 44, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73789,0.49082,-0.46326)
+ Old Polarization:       (-0.67492,0.53662,-0.50648)
+ New Momentum Direction: (0.40177,0.66596,-0.62856)
+ New Polarization:       (-0.91574,0.29218,-0.27577)
+ *** FresnelRefraction *** 
 Track (trackID 43, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
@@ -2105,11 +2107,18 @@ Track (trackID 41, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 40, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73954,-0.37021,0.56216)
- Old Polarization:       (-0.67311,-0.40674,0.61764)
- New Momentum Direction: (0.41184,-0.50118,0.76105)
- New Polarization:       (-0.91126,-0.22651,0.34396)
+Scattering Photon!
+Old Momentum Direction: (0.73954,-0.37021,0.56216)
+Old Polarization: (-0.67311,-0.40674,0.61764)
+New Polarization: (-0.51342,0.20433,-0.83346)
+Polarization Change: (-0.51342,0.20433,-0.83346)
+New Momentum Direction: (0.82948,0.36706,-0.42098)
+Momentum Change: (0.82948,0.36706,-0.42098)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.82948,0.36706,-0.42098)
+ Old Polarization:       (-0.51342,0.20433,-0.83346)
+ New Momentum Direction: (0.65441,0.49693,-0.56992)
+ New Polarization:       (-0.72317,0.19119,-0.66368)
  *** FresnelRefraction *** 
 Track (trackID 39, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
@@ -2121,12 +2130,8 @@ Track (trackID 39, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 38, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73885,0.29365,0.60653)
- Old Polarization:       (-0.67387,0.32197,0.665)
- New Momentum Direction: (0.40764,0.39792,0.82188)
- New Polarization:       (-0.91314,0.17764,0.3669)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 37, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
@@ -2137,18 +2142,11 @@ Track (trackID 37, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 36, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73619,0.55544,-0.38667)
-Old Polarization: (-0.67677,0.6042,-0.42062)
-New Polarization: (-0.4964,-0.56477,-0.61239)
-Polarization Change: (-0.51189,-0.58239,-0.63149)
-New Momentum Direction: (0.018135,0.71003,-0.66953)
-Momentum Change: (0.01858,0.72743,-0.68593)
  Photon at Boundary! 
- Old Momentum Direction: (0.01858,0.72743,-0.68593)
- Old Polarization:       (-0.51189,-0.58239,-0.63149)
- New Momentum Direction: (0.025268,0.35943,-0.93283)
- New Polarization:       (-0.3727,-0.86247,-0.34241)
+ Old Momentum Direction: (0.73619,0.55544,-0.38667)
+ Old Polarization:       (-0.67677,0.6042,-0.42062)
+ New Momentum Direction: (0.39103,0.75537,-0.52585)
+ New Polarization:       (-0.92038,0.32092,-0.22341)
  *** FresnelRefraction *** 
 Track (trackID 35, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
@@ -2180,8 +2178,12 @@ Track (trackID 32, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 31, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74048,-0.1999,-0.64166)
+ Old Polarization:       (-0.67208,-0.22024,-0.70697)
+ New Momentum Direction: (0.41746,-0.27028,-0.86757)
+ New Polarization:       (-0.90869,-0.12417,-0.39857)
+ *** FresnelRefraction *** 
 Track (trackID 30, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
@@ -2224,8 +2226,12 @@ Track (trackID 26, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 25, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74346,0.1954,0.6396)
+ Old Polarization:       (-0.66878,0.21722,0.71102)
+ New Momentum Direction: (0.43463,0.26313,0.86131)
+ New Polarization:       (-0.90061,0.12699,0.41567)
+ *** FresnelRefraction *** 
 Track (trackID 24, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
@@ -2236,20 +2242,12 @@ Track (trackID 24, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 23, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73732,-0.64677,0.19506)
- Old Polarization:       (-0.67554,-0.70591,0.2129)
- New Momentum Direction: (0.3982,-0.87823,0.26487)
- New Polarization:       (-0.9173,-0.38124,0.11498)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 22, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7442,0.24369,-0.62191)
- Old Polarization:       (-0.66795,0.27151,-0.69291)
- New Momentum Direction: (0.43877,0.32784,-0.83666)
- New Polarization:       (-0.8986,0.16008,-0.40853)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 21, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
@@ -2276,23 +2274,16 @@ Track (trackID 19, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 18, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 17, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.74181,0.33394,-0.58155)
-Old Polarization: (-0.67061,0.36939,-0.6433)
-New Polarization: (-0.41764,0.64933,-0.40811)
-Polarization Change: (-0.47825,0.74356,-0.46734)
-New Momentum Direction: (0.76057,0.60892,0.1905)
-Momentum Change: (0.76613,0.61337,0.19189)
  Photon at Boundary! 
- Old Momentum Direction: (0.76613,0.61337,0.19189)
- Old Polarization:       (-0.47825,0.74356,-0.46734)
- New Momentum Direction: (0.4976,0.82784,0.25899)
- New Polarization:       (-0.73577,0.56096,-0.37944)
+ Old Momentum Direction: (0.73861,0.28384,0.61146)
+ Old Polarization:       (-0.67413,0.31099,0.66995)
+ New Momentum Direction: (0.40621,0.38475,0.82883)
+ New Polarization:       (-0.91378,0.17104,0.36845)
  *** FresnelRefraction *** 
+Track (trackID 17, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 16, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
@@ -2303,6 +2294,13 @@ Track (trackID 16, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 15, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.73672,-0.41983,-0.53008)
+Old Polarization: (-0.6762,-0.4574,-0.57753)
+New Polarization: (-0.68397,-0.66932,-0.29016)
+Polarization Change: (-0.68397,-0.66932,-0.29016)
+New Momentum Direction: (0.10201,-0.48159,0.87044)
+Momentum Change: (0.10201,-0.48159,0.87044)
 
 ** Photon absorbed! **
 Track (trackID 14, parentID 1) is processed with stopping code 2
@@ -2323,8 +2321,12 @@ Track (trackID 13, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 12, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74316,0.66368,0.085049)
+ Old Polarization:       (-0.66911,0.73713,0.094461)
+ New Momentum Direction: (0.43294,0.89411,0.11458)
+ New Polarization:       (-0.90142,0.42943,0.05503)
+ *** FresnelRefraction *** 
 Track (trackID 11, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
@@ -2343,12 +2345,8 @@ Track (trackID 10, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 9, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74124,-0.43407,-0.512)
- Old Polarization:       (-0.67124,-0.47934,-0.5654)
- New Momentum Direction: (0.42193,-0.58629,-0.69155)
- New Polarization:       (-0.90663,-0.27285,-0.32184)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 8, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
 
@@ -2379,643 +2377,521 @@ Track (trackID 5, parentID 1) is processed with stopping code 2
  *** FresnelRefraction *** 
 Track (trackID 4, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.7364,-0.5028,0.45266)
-Old Polarization: (-0.67655,-0.54728,0.49271)
-New Polarization: (-0.85168,-0.12819,0.092977)
-Polarization Change: (-0.98315,-0.14798,0.10733)
-New Momentum Direction: (0.17495,-0.83213,0.45523)
-Momentum Change: (0.18138,-0.86275,0.47198)
- Photon at Boundary! 
- Old Momentum Direction: (0.18138,-0.86275,0.47198)
- Old Polarization:       (-0.98315,-0.14798,0.10733)
- New Momentum Direction: (0.2466,-0.72624,0.64168)
- New Polarization:       (-0.75607,0.27004,0.59619)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 3, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
  Old Momentum Direction: (0.73775,-0.67472,-0.021988)
  Old Polarization:       (-0.67508,-0.73736,-0.024029)
- New Momentum Direction: (0.40087,-0.91565,-0.029839)
- New Polarization:       (-0.91613,-0.40066,-0.013057)
+ New Momentum Direction: (-0.73775,-0.67472,-0.021988)
+ New Polarization:       (-0.67508,0.73736,0.024029)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.73775,-0.67472,-0.021988)
+ Old Polarization:       (-0.67508,0.73736,0.024029)
+ New Momentum Direction: (-0.73775,0.67472,-0.021988)
+ New Polarization:       (0.67508,0.73736,-0.024029)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.73775,0.67472,-0.021988)
+ Old Polarization:       (0.67508,0.73736,-0.024029)
+ New Momentum Direction: (-0.40087,0.91565,-0.029839)
+ New Polarization:       (0.91613,0.40066,-0.013057)
  *** FresnelRefraction *** 
 Track (trackID 2, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 307
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 283
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 308 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73827,0.6636,0.12076)
- Old Polarization:       (-0.66351,0.7467,-0.046892)
- New Momentum Direction: (0.41034,0.8972,0.16326)
- New Polarization:       (-0.90499,0.42269,-0.048283)
- *** FresnelRefraction *** 
-Track (trackID 610, parentID 1) is processed with stopping code 2
-### pop requested out of 307 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.77742,0.58788,-0.22362)
- Old Polarization:       (-0.62061,0.65917,-0.42466)
- New Momentum Direction: (0.52233,0.79703,-0.30318)
- New Polarization:       (-0.8472,0.44458,-0.29084)
- *** FresnelRefraction *** 
-Track (trackID 609, parentID 1) is processed with stopping code 2
-### pop requested out of 306 stacked tracks.
+### pop requested out of 284 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70981,-0.65953,0.24737)
- Old Polarization:       (-0.69492,-0.71307,0.092838)
- New Momentum Direction: (0.30548,-0.89155,0.3344)
- New Polarization:       (-0.94661,-0.32233,0.0053677)
+ Old Momentum Direction: (0.77864,0.59172,-0.20878)
+ Old Polarization:       (-0.61826,0.66669,-0.41626)
+ New Momentum Direction: (0.52829,0.80069,-0.28252)
+ New Polarization:       (-0.84293,0.45465,-0.28768)
  *** FresnelRefraction *** 
-Track (trackID 608, parentID 1) is processed with stopping code 2
-### pop requested out of 305 stacked tracks.
+Track (trackID 586, parentID 1) is processed with stopping code 2
+### pop requested out of 283 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76137,0.64381,-0.076294)
- Old Polarization:       (-0.63809,0.72334,-0.26386)
- New Momentum Direction: (0.47981,0.87127,-0.10325)
- New Polarization:       (-0.87069,0.45837,-0.1783)
+ Old Momentum Direction: (0.64984,0.080704,0.75577)
+ Old Polarization:       (-0.75961,0.10358,0.64208)
+ New Momentum Direction: (0.88133,0.10945,0.45965)
+ New Polarization:       (0.43516,0.19102,-0.87986)
  *** FresnelRefraction *** 
-Track (trackID 607, parentID 1) is processed with stopping code 2
-### pop requested out of 304 stacked tracks.
+Track (trackID 585, parentID 1) is processed with stopping code 2
+### pop requested out of 282 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70071,-0.64484,0.30527)
- Old Polarization:       (-0.70472,-0.69231,0.15519)
- New Momentum Direction: (0.25374,-0.87425,0.41388)
- New Polarization:       (-0.96237,-0.27121,0.017127)
+ Old Momentum Direction: (0.69278,0.52724,0.492)
+ Old Polarization:       (-0.71327,0.60157,0.35968)
+ New Momentum Direction: (0.23708,0.71027,0.6628)
+ New Polarization:       (-0.96707,0.23754,0.091357)
  *** FresnelRefraction *** 
-Track (trackID 606, parentID 1) is processed with stopping code 2
-### pop requested out of 303 stacked tracks.
+Track (trackID 584, parentID 1) is processed with stopping code 2
+### pop requested out of 281 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75319,-0.64863,-0.10947)
- Old Polarization:       (-0.64705,-0.7006,-0.30079)
- New Momentum Direction: (0.45703,-0.87705,-0.14802)
- New Polarization:       (-0.8825,-0.42637,-0.19851)
+ Old Momentum Direction: (0.71688,-0.67771,0.16368)
+ Old Polarization:       (-0.68617,-0.72741,-0.0065496)
+ New Momentum Direction: (0.32569,-0.91905,0.22197)
+ New Polarization:       (-0.93891,-0.34201,-0.038435)
  *** FresnelRefraction *** 
-Track (trackID 605, parentID 1) is processed with stopping code 2
-### pop requested out of 302 stacked tracks.
+Track (trackID 583, parentID 1) is processed with stopping code 2
+### pop requested out of 280 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75051,0.65887,0.051279)
- Old Polarization:       (-0.64985,0.74988,-0.12402)
- New Momentum Direction: (0.458,0.88627,0.068977)
- New Polarization:       (-0.88176,0.46278,-0.091341)
+ Old Momentum Direction: (0.75689,0.65306,-0.025025)
+ Old Polarization:       (-0.64215,0.73603,-0.21426)
+ New Momentum Direction: (0.46869,0.88272,-0.033825)
+ New Polarization:       (-0.87594,0.45945,-0.14708)
  *** FresnelRefraction *** 
-Track (trackID 604, parentID 1) is processed with stopping code 2
-### pop requested out of 301 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68476,-0.58921,0.42888)
- Old Polarization:       (-0.72198,-0.62862,0.28912)
- New Momentum Direction: (-0.68476,-0.58921,0.42888)
- New Polarization:       (-0.71723,0.64917,-0.2533)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68476,-0.58921,0.42888)
- Old Polarization:       (-0.71723,0.64917,-0.2533)
- New Momentum Direction: (-0.68476,0.58921,0.42888)
- New Polarization:       (0.71723,0.64917,0.2533)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 603, parentID 1) is processed with stopping code 2
-### pop requested out of 300 stacked tracks.
+Track (trackID 582, parentID 1) is processed with stopping code 2
+### pop requested out of 279 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 602, parentID 1) is processed with stopping code 2
-### pop requested out of 299 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.75878,-0.62887,-0.16963)
- Old Polarization:       (-0.64105,-0.67489,-0.36549)
- New Momentum Direction: (0.46932,-0.85256,-0.22996)
- New Polarization:       (-0.87636,-0.41775,-0.23976)
- *** FresnelRefraction *** 
-Track (trackID 601, parentID 1) is processed with stopping code 2
-### pop requested out of 298 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.67684,0.37558,0.63311)
- Old Polarization:       (-0.73205,0.43389,0.52522)
- New Momentum Direction: (0.14019,0.50517,0.85156)
- New Polarization:       (-0.98805,0.12698,0.087334)
- *** FresnelRefraction *** 
-Track (trackID 600, parentID 1) is processed with stopping code 2
-### pop requested out of 297 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.82067,0.085425,-0.56497)
- Old Polarization:       (-0.57135,0.11034,-0.81325)
- New Momentum Direction: (0.64067,0.11479,-0.75918)
- New Polarization:       (-0.76778,0.086917,-0.63479)
- *** FresnelRefraction *** 
-Track (trackID 599, parentID 1) is processed with stopping code 2
-### pop requested out of 296 stacked tracks.
+Track (trackID 581, parentID 1) is processed with stopping code 2
+### pop requested out of 278 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67554,0.43667,0.59411)
- Old Polarization:       (-0.73218,0.49233,0.47066)
- New Momentum Direction: (-0.67554,0.43667,0.59411)
- New Polarization:       (-0.73218,-0.49233,-0.47066)
+ Old Momentum Direction: (0.65466,-0.34247,0.6739)
+ Old Polarization:       (-0.75404,-0.35875,0.5502)
+ New Momentum Direction: (0.65466,-0.34247,-0.6739)
+ New Polarization:       (0.75404,0.35875,0.5502)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67554,0.43667,0.59411)
- Old Polarization:       (-0.73218,-0.49233,-0.47066)
- New Momentum Direction: (-0.67554,0.43667,-0.59411)
- New Polarization:       (0.73218,0.49233,-0.47066)
+ Old Momentum Direction: (0.65466,-0.34247,-0.6739)
+ Old Polarization:       (0.75404,0.35875,0.5502)
+ New Momentum Direction: (-0.65466,-0.34247,-0.6739)
+ New Polarization:       (0.75404,-0.35875,-0.5502)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67554,0.43667,-0.59411)
- Old Polarization:       (0.73218,0.49233,-0.47066)
- New Momentum Direction: (-0.67554,-0.43667,-0.59411)
- New Polarization:       (-0.73218,0.49233,0.47066)
+ Old Momentum Direction: (-0.65466,-0.34247,-0.6739)
+ Old Polarization:       (0.75404,-0.35875,-0.5502)
+ New Momentum Direction: (-0.65466,0.34247,-0.6739)
+ New Polarization:       (-0.75404,-0.35875,0.5502)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 598, parentID 1) is processed with stopping code 2
-### pop requested out of 295 stacked tracks.
+Track (trackID 580, parentID 1) is processed with stopping code 2
+### pop requested out of 277 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81602,-0.02518,-0.57747)
- Old Polarization:       (-0.57787,-0.013049,-0.81602)
- New Momentum Direction: (0.62328,-0.034065,-0.78126)
- New Polarization:       (-0.7819,-0.011177,-0.6233)
+ Old Momentum Direction: (0.79179,-0.48025,-0.3774)
+ Old Polarization:       (-0.60324,-0.51805,-0.6064)
+ New Momentum Direction: (0.56762,-0.64733,-0.5087)
+ New Polarization:       (-0.81816,-0.3747,-0.43613)
  *** FresnelRefraction *** 
-Track (trackID 597, parentID 1) is processed with stopping code 2
-### pop requested out of 294 stacked tracks.
+Track (trackID 579, parentID 1) is processed with stopping code 2
+### pop requested out of 276 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 578, parentID 1) is processed with stopping code 2
+### pop requested out of 275 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81307,0.10307,-0.57297)
- Old Polarization:       (-0.58207,0.1269,-0.80317)
- New Momentum Direction: (0.61116,0.14013,-0.779)
- New Polarization:       (-0.79144,0.096201,-0.60362)
+ Old Momentum Direction: (0.81648,0.0052182,-0.57735)
+ Old Polarization:       (-0.57732,0.020846,-0.81625)
+ New Momentum Direction: (0.62066,0.0070864,-0.78405)
+ New Polarization:       (-0.78405,0.015125,-0.62052)
  *** FresnelRefraction *** 
-Track (trackID 596, parentID 1) is processed with stopping code 2
-### pop requested out of 293 stacked tracks.
+Track (trackID 577, parentID 1) is processed with stopping code 2
+### pop requested out of 274 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 595, parentID 1) is processed with stopping code 2
-### pop requested out of 292 stacked tracks.
+Track (trackID 576, parentID 1) is processed with stopping code 2
+### pop requested out of 273 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69037,0.52531,0.49743)
- Old Polarization:       (-0.71625,0.59307,0.36777)
- New Momentum Direction: (0.2042,0.71082,0.67309)
- New Polarization:       (-0.97506,0.20878,0.075326)
+ Old Momentum Direction: (0.68838,-0.59479,0.41516)
+ Old Polarization:       (-0.71776,-0.64117,0.27154)
+ New Momentum Direction: (0.19665,-0.80399,0.56118)
+ New Polarization:       (-0.97641,-0.21265,0.037499)
  *** FresnelRefraction *** 
-Track (trackID 594, parentID 1) is processed with stopping code 2
-### pop requested out of 291 stacked tracks.
+Track (trackID 575, parentID 1) is processed with stopping code 2
+### pop requested out of 272 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 574, parentID 1) is processed with stopping code 2
+### pop requested out of 271 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73578,-0.67648,0.031624)
- Old Polarization:       (-0.66626,-0.73145,-0.14521)
- New Momentum Direction: (0.40198,-0.91465,0.042758)
- New Polarization:       (-0.90876,-0.40424,-0.10369)
+ Old Momentum Direction: (0.66307,0.22549,0.71379)
+ Old Polarization:       (-0.74666,0.26713,0.60921)
+ New Momentum Direction: (0.89157,0.3032,0.33641)
+ New Polarization:       (0.18356,0.43715,-0.88046)
  *** FresnelRefraction *** 
-Track (trackID 593, parentID 1) is processed with stopping code 2
-### pop requested out of 290 stacked tracks.
+Track (trackID 573, parentID 1) is processed with stopping code 2
+### pop requested out of 270 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80664,0.31318,-0.50125)
- Old Polarization:       (-0.58903,0.35605,-0.72545)
- New Momentum Direction: (0.59552,0.42567,-0.68129)
- New Polarization:       (-0.80199,0.2658,-0.53495)
+ Old Momentum Direction: (0.77714,0.58994,-0.21914)
+ Old Polarization:       (-0.62031,0.65934,-0.42484)
+ New Momentum Direction: (0.51901,0.80127,-0.29764)
+ New Polarization:       (-0.84882,0.44214,-0.28986)
  *** FresnelRefraction *** 
-Track (trackID 592, parentID 1) is processed with stopping code 2
-### pop requested out of 289 stacked tracks.
+Track (trackID 572, parentID 1) is processed with stopping code 2
+### pop requested out of 269 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73665,-0.67413,0.05382)
- Old Polarization:       (-0.6653,-0.73668,-0.12115)
- New Momentum Direction: (0.41455,-0.90714,0.072423)
- New Polarization:       (-0.90302,-0.41991,-0.090687)
+ Old Momentum Direction: (0.81014,0.32564,-0.48747)
+ Old Polarization:       (-0.58381,0.37271,-0.72128)
+ New Momentum Direction: (0.60755,0.44121,-0.66047)
+ New Polarization:       (-0.79264,0.28333,-0.53986)
  *** FresnelRefraction *** 
-Track (trackID 591, parentID 1) is processed with stopping code 2
-### pop requested out of 288 stacked tracks.
+Track (trackID 571, parentID 1) is processed with stopping code 2
+### pop requested out of 268 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66023,-0.30434,0.68664)
- Old Polarization:       (-0.74973,-0.32153,0.57838)
- New Momentum Direction: (0.89199,-0.41117,0.18787)
- New Polarization:       (-0.02557,-0.46082,-0.88712)
+ Old Momentum Direction: (0.76244,0.63987,-0.096215)
+ Old Polarization:       (-0.63634,0.7145,-0.2908)
+ New Momentum Direction: (0.47775,0.86873,-0.13063)
+ New Polarization:       (-0.87153,0.45001,-0.19474)
  *** FresnelRefraction *** 
-Track (trackID 590, parentID 1) is processed with stopping code 2
-### pop requested out of 287 stacked tracks.
+Track (trackID 570, parentID 1) is processed with stopping code 2
+### pop requested out of 267 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 569, parentID 1) is processed with stopping code 2
+### pop requested out of 266 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65265,-0.33425,0.67994)
+ Old Polarization:       (-0.7559,-0.34839,0.5543)
+ New Momentum Direction: (0.65265,-0.33425,-0.67994)
+ New Polarization:       (-0.11337,0.84424,-0.52383)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65265,-0.33425,-0.67994)
+ Old Polarization:       (-0.11337,0.84424,-0.52383)
+ New Momentum Direction: (-0.65265,-0.33425,-0.67994)
+ New Polarization:       (-0.11337,-0.84424,0.52383)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 568, parentID 1) is processed with stopping code 2
+### pop requested out of 265 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,-0.37857,0.6467)
- Old Polarization:       (-0.74707,-0.40089,0.53026)
- New Momentum Direction: (-0.66217,-0.37857,0.6467)
- New Polarization:       (-0.74707,0.40089,-0.53026)
+ Old Momentum Direction: (0.66088,-0.38737,0.64279)
+ Old Polarization:       (-0.74789,-0.41116,0.52116)
+ New Momentum Direction: (-0.66088,-0.38737,0.64279)
+ New Polarization:       (-0.74789,0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,-0.37857,0.6467)
- Old Polarization:       (-0.74707,0.40089,-0.53026)
- New Momentum Direction: (-0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,-0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,-0.38737,0.64279)
+ Old Polarization:       (-0.74789,0.41116,-0.52116)
+ New Momentum Direction: (-0.66088,-0.38737,-0.64279)
+ New Polarization:       (0.74789,-0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,-0.37857,-0.6467)
- Old Polarization:       (0.74707,-0.40089,-0.53026)
- New Momentum Direction: (-0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,-0.40089,0.53026)
+ Old Momentum Direction: (-0.66088,-0.38737,-0.64279)
+ Old Polarization:       (0.74789,-0.41116,-0.52116)
+ New Momentum Direction: (-0.66088,0.38737,-0.64279)
+ New Polarization:       (-0.74789,-0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,-0.40089,0.53026)
- New Momentum Direction: (0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,0.38737,-0.64279)
+ Old Polarization:       (-0.74789,-0.41116,0.52116)
+ New Momentum Direction: (0.66088,0.38737,-0.64279)
+ New Polarization:       (-0.74789,0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,0.40089,-0.53026)
- New Momentum Direction: (0.66217,0.37857,0.6467)
- New Polarization:       (0.74707,-0.40089,-0.53026)
+ Old Momentum Direction: (0.66088,0.38737,-0.64279)
+ Old Polarization:       (-0.74789,0.41116,-0.52116)
+ New Momentum Direction: (0.66088,0.38737,0.64279)
+ New Polarization:       (0.74789,-0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,0.37857,0.6467)
- Old Polarization:       (0.74707,-0.40089,-0.53026)
- New Momentum Direction: (-0.66217,0.37857,0.6467)
- New Polarization:       (0.74707,0.40089,0.53026)
+ Old Momentum Direction: (0.66088,0.38737,0.64279)
+ Old Polarization:       (0.74789,-0.41116,-0.52116)
+ New Momentum Direction: (0.66088,-0.38737,0.64279)
+ New Polarization:       (-0.74789,-0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,0.37857,0.6467)
- Old Polarization:       (0.74707,0.40089,0.53026)
- New Momentum Direction: (-0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,-0.40089,0.53026)
+ Old Momentum Direction: (0.66088,-0.38737,0.64279)
+ Old Polarization:       (-0.74789,-0.41116,0.52116)
+ New Momentum Direction: (-0.66088,-0.38737,0.64279)
+ New Polarization:       (-0.74789,0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,-0.40089,0.53026)
- New Momentum Direction: (-0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,-0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,-0.38737,0.64279)
+ Old Polarization:       (-0.74789,0.41116,-0.52116)
+ New Momentum Direction: (-0.66088,-0.38737,-0.64279)
+ New Polarization:       (0.74789,-0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,-0.37857,-0.6467)
- Old Polarization:       (0.74707,-0.40089,-0.53026)
- New Momentum Direction: (-0.66217,-0.37857,0.6467)
- New Polarization:       (-0.74707,0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,-0.38737,-0.64279)
+ Old Polarization:       (0.74789,-0.41116,-0.52116)
+ New Momentum Direction: (-0.66088,0.38737,-0.64279)
+ New Polarization:       (-0.74789,-0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,-0.37857,0.6467)
- Old Polarization:       (-0.74707,0.40089,-0.53026)
- New Momentum Direction: (-0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,-0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,0.38737,-0.64279)
+ Old Polarization:       (-0.74789,-0.41116,0.52116)
+ New Momentum Direction: (0.66088,0.38737,-0.64279)
+ New Polarization:       (-0.74789,0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,-0.37857,-0.6467)
- Old Polarization:       (0.74707,-0.40089,-0.53026)
- New Momentum Direction: (0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,0.40089,0.53026)
+ Old Momentum Direction: (0.66088,0.38737,-0.64279)
+ Old Polarization:       (-0.74789,0.41116,-0.52116)
+ New Momentum Direction: (0.66088,0.38737,0.64279)
+ New Polarization:       (0.74789,-0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,-0.37857,-0.6467)
- Old Polarization:       (0.74707,0.40089,0.53026)
- New Momentum Direction: (0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,0.40089,-0.53026)
+ Old Momentum Direction: (0.66088,0.38737,0.64279)
+ Old Polarization:       (0.74789,-0.41116,-0.52116)
+ New Momentum Direction: (-0.66088,0.38737,0.64279)
+ New Polarization:       (0.74789,0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,0.40089,-0.53026)
- New Momentum Direction: (-0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,-0.40089,0.53026)
+ Old Momentum Direction: (-0.66088,0.38737,0.64279)
+ Old Polarization:       (0.74789,0.41116,0.52116)
+ New Momentum Direction: (-0.66088,0.38737,-0.64279)
+ New Polarization:       (-0.74789,-0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,-0.40089,0.53026)
- New Momentum Direction: (-0.66217,0.37857,0.6467)
- New Polarization:       (0.74707,0.40089,0.53026)
+ Old Momentum Direction: (-0.66088,0.38737,-0.64279)
+ Old Polarization:       (-0.74789,-0.41116,0.52116)
+ New Momentum Direction: (-0.66088,-0.38737,-0.64279)
+ New Polarization:       (0.74789,-0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,0.37857,0.6467)
- Old Polarization:       (0.74707,0.40089,0.53026)
- New Momentum Direction: (0.66217,0.37857,0.6467)
- New Polarization:       (0.74707,-0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,-0.38737,-0.64279)
+ Old Polarization:       (0.74789,-0.41116,-0.52116)
+ New Momentum Direction: (0.66088,-0.38737,-0.64279)
+ New Polarization:       (0.74789,0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,0.37857,0.6467)
- Old Polarization:       (0.74707,-0.40089,-0.53026)
- New Momentum Direction: (0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,0.40089,-0.53026)
+ Old Momentum Direction: (0.66088,-0.38737,-0.64279)
+ Old Polarization:       (0.74789,0.41116,0.52116)
+ New Momentum Direction: (0.66088,-0.38737,0.64279)
+ New Polarization:       (-0.74789,-0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,0.40089,-0.53026)
- New Momentum Direction: (0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,0.40089,0.53026)
+ Old Momentum Direction: (0.66088,-0.38737,0.64279)
+ Old Polarization:       (-0.74789,-0.41116,0.52116)
+ New Momentum Direction: (-0.66088,-0.38737,0.64279)
+ New Polarization:       (-0.74789,0.41116,-0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,-0.37857,-0.6467)
- Old Polarization:       (0.74707,0.40089,0.53026)
- New Momentum Direction: (-0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,-0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,-0.38737,0.64279)
+ Old Polarization:       (-0.74789,0.41116,-0.52116)
+ New Momentum Direction: (-0.66088,0.38737,0.64279)
+ New Polarization:       (0.74789,0.41116,0.52116)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,-0.37857,-0.6467)
- Old Polarization:       (0.74707,-0.40089,-0.53026)
- New Momentum Direction: (-0.66217,-0.37857,0.6467)
- New Polarization:       (-0.74707,0.40089,-0.53026)
+ Old Momentum Direction: (-0.66088,0.38737,0.64279)
+ Old Polarization:       (0.74789,0.41116,0.52116)
+ New Momentum Direction: (-0.66088,0.38737,-0.64279)
+ New Polarization:       (-0.74789,-0.41116,0.52116)
  *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.66088,0.38737,-0.64279)
+Old Polarization: (-0.74789,-0.41116,0.52116)
+New Polarization: (0.2295,-0.64309,0.73059)
+Polarization Change: (0.2295,-0.64309,0.73059)
+New Momentum Direction: (-0.97251,-0.12108,0.19892)
+Momentum Change: (-0.97251,-0.12108,0.19892)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.97251,-0.12108,0.19892)
+ Old Polarization:       (0.2295,-0.64309,0.73059)
+ New Momentum Direction: (-0.94904,-0.16386,0.2692)
+ New Polarization:       (0.31265,-0.59682,0.73896)
+ *** FresnelRefraction *** 
+Track (trackID 567, parentID 1) is processed with stopping code 2
+### pop requested out of 264 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70185,0.60728,0.3723)
+ Old Polarization:       (-0.70245,0.67678,0.22031)
+ New Momentum Direction: (0.24909,0.82567,0.50618)
+ New Polarization:       (-0.96298,0.26676,0.03875)
+ *** FresnelRefraction *** 
+Track (trackID 566, parentID 1) is processed with stopping code 2
+### pop requested out of 263 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.80571,0.35945,-0.47077)
+ Old Polarization:       (-0.58931,0.40666,-0.6981)
+ New Momentum Direction: (0.59274,0.48876,-0.64013)
+ New Polarization:       (-0.80338,0.30263,-0.51284)
+ *** FresnelRefraction *** 
+Track (trackID 565, parentID 1) is processed with stopping code 2
+### pop requested out of 262 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71452,-0.66794,0.20813)
+ Old Polarization:       (-0.68896,-0.7235,0.043344)
+ New Momentum Direction: (0.3278,-0.90197,0.28106)
+ New Polarization:       (-0.93834,-0.34541,-0.01412)
+ *** FresnelRefraction *** 
+Track (trackID 564, parentID 1) is processed with stopping code 2
+### pop requested out of 261 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 563, parentID 1) is processed with stopping code 2
+### pop requested out of 260 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.78668,0.55241,-0.27563)
+ Old Polarization:       (-0.60941,0.62342,-0.48987)
+ New Momentum Direction: (0.54968,0.74749,-0.37297)
+ New Polarization:       (-0.83004,0.43833,-0.34482)
+ *** FresnelRefraction *** 
+Track (trackID 562, parentID 1) is processed with stopping code 2
+### pop requested out of 259 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,-0.37857,0.6467)
- Old Polarization:       (-0.74707,0.40089,-0.53026)
- New Momentum Direction: (0.66217,-0.37857,0.6467)
- New Polarization:       (-0.74707,-0.40089,0.53026)
+ Old Momentum Direction: (0.66906,-0.42993,0.60623)
+ Old Polarization:       (-0.73977,-0.46358,0.48768)
+ New Momentum Direction: (-0.66906,-0.42993,0.60623)
+ New Polarization:       (-0.73977,0.46358,-0.48768)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,-0.37857,0.6467)
- Old Polarization:       (-0.74707,-0.40089,0.53026)
- New Momentum Direction: (0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,0.40089,0.53026)
+ Old Momentum Direction: (-0.66906,-0.42993,0.60623)
+ Old Polarization:       (-0.73977,0.46358,-0.48768)
+ New Momentum Direction: (-0.66906,-0.42993,-0.60623)
+ New Polarization:       (0.73977,-0.46358,-0.48768)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,-0.37857,-0.6467)
- Old Polarization:       (0.74707,0.40089,0.53026)
- New Momentum Direction: (0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,0.40089,-0.53026)
+ Old Momentum Direction: (-0.66906,-0.42993,-0.60623)
+ Old Polarization:       (0.73977,-0.46358,-0.48768)
+ New Momentum Direction: (-0.66906,0.42993,-0.60623)
+ New Polarization:       (-0.73977,-0.46358,0.48768)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,0.40089,-0.53026)
- New Momentum Direction: (-0.66217,0.37857,-0.6467)
- New Polarization:       (-0.74707,-0.40089,0.53026)
+ Old Momentum Direction: (-0.66906,0.42993,-0.60623)
+ Old Polarization:       (-0.73977,-0.46358,0.48768)
+ New Momentum Direction: (0.66906,0.42993,-0.60623)
+ New Polarization:       (-0.73977,0.46358,-0.48768)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,0.37857,-0.6467)
- Old Polarization:       (-0.74707,-0.40089,0.53026)
- New Momentum Direction: (-0.66217,0.37857,0.6467)
- New Polarization:       (0.74707,0.40089,0.53026)
+ Old Momentum Direction: (0.66906,0.42993,-0.60623)
+ Old Polarization:       (-0.73977,0.46358,-0.48768)
+ New Momentum Direction: (0.66906,0.42993,0.60623)
+ New Polarization:       (0.73977,-0.46358,-0.48768)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66217,0.37857,0.6467)
- Old Polarization:       (0.74707,0.40089,0.53026)
- New Momentum Direction: (0.66217,0.37857,0.6467)
- New Polarization:       (0.74707,-0.40089,-0.53026)
+ Old Momentum Direction: (0.66906,0.42993,0.60623)
+ Old Polarization:       (0.73977,-0.46358,-0.48768)
+ New Momentum Direction: (0.66906,-0.42993,0.60623)
+ New Polarization:       (-0.73977,-0.46358,0.48768)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,0.37857,0.6467)
- Old Polarization:       (0.74707,-0.40089,-0.53026)
- New Momentum Direction: (0.66217,-0.37857,0.6467)
- New Polarization:       (-0.74707,-0.40089,0.53026)
+ Old Momentum Direction: (0.66906,-0.42993,0.60623)
+ Old Polarization:       (-0.73977,-0.46358,0.48768)
+ New Momentum Direction: (-0.66906,-0.42993,0.60623)
+ New Polarization:       (-0.73977,0.46358,-0.48768)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66217,-0.37857,0.6467)
- Old Polarization:       (-0.74707,-0.40089,0.53026)
- New Momentum Direction: (0.66217,-0.37857,-0.6467)
- New Polarization:       (0.74707,0.40089,0.53026)
+ Old Momentum Direction: (-0.66906,-0.42993,0.60623)
+ Old Polarization:       (-0.73977,0.46358,-0.48768)
+ New Momentum Direction: (-0.66906,-0.42993,-0.60623)
+ New Polarization:       (0.73977,-0.46358,-0.48768)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 589, parentID 1) is processed with stopping code 2
-### pop requested out of 286 stacked tracks.
+Track (trackID 561, parentID 1) is processed with stopping code 2
+### pop requested out of 258 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8025,-0.32392,-0.50106)
- Old Polarization:       (-0.59304,-0.34083,-0.72948)
- New Momentum Direction: (0.58844,-0.43896,-0.67901)
- New Polarization:       (-0.80611,-0.25334,-0.5348)
- *** FresnelRefraction *** 
-Track (trackID 588, parentID 1) is processed with stopping code 2
-### pop requested out of 285 stacked tracks.
+ Old Momentum Direction: (0.65473,-0.33005,0.67999)
+ Old Polarization:       (-0.75414,-0.34594,0.55821)
+ New Momentum Direction: (0.65473,-0.33005,-0.67999)
+ New Polarization:       (-0.10131,0.85319,-0.51167)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.7641,0.63666,-0.104)
- Old Polarization:       (-0.63515,0.71425,-0.29399)
- New Momentum Direction: (0.48647,0.86227,-0.14085)
- New Polarization:       (-0.86719,0.45689,-0.19808)
- *** FresnelRefraction *** 
-Track (trackID 587, parentID 1) is processed with stopping code 2
-### pop requested out of 284 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 586, parentID 1) is processed with stopping code 2
-### pop requested out of 283 stacked tracks.
+ Old Momentum Direction: (0.65473,-0.33005,-0.67999)
+ Old Polarization:       (-0.10131,0.85319,-0.51167)
+ New Momentum Direction: (-0.65473,-0.33005,-0.67999)
+ New Polarization:       (-0.10131,-0.85319,0.51167)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.81221,-0.058768,-0.58039)
- Old Polarization:       (-0.58305,-0.049407,-0.81093)
- New Momentum Direction: (0.60884,-0.079917,-0.78926)
- New Polarization:       (-0.79309,-0.038524,-0.60789)
- *** FresnelRefraction *** 
-Track (trackID 585, parentID 1) is processed with stopping code 2
-### pop requested out of 282 stacked tracks.
+ Old Momentum Direction: (-0.65473,-0.33005,-0.67999)
+ Old Polarization:       (-0.10131,-0.85319,0.51167)
+ New Momentum Direction: (-0.65473,0.33005,-0.67999)
+ New Polarization:       (0.10131,-0.85319,-0.51167)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.81476,-0.017434,-0.57954)
- Old Polarization:       (-0.57969,-0.0044648,-0.81483)
- New Momentum Direction: (0.61811,-0.023637,-0.78574)
- New Polarization:       (-0.78601,-0.0044096,-0.61819)
- *** FresnelRefraction *** 
-Track (trackID 584, parentID 1) is processed with stopping code 2
-### pop requested out of 281 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 583, parentID 1) is processed with stopping code 2
-### pop requested out of 280 stacked tracks.
+ Old Momentum Direction: (-0.65473,0.33005,-0.67999)
+ Old Polarization:       (0.10131,-0.85319,-0.51167)
+ New Momentum Direction: (-0.65473,0.33005,0.67999)
+ New Polarization:       (0.73179,0.502,0.46095)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.78125,-0.50601,-0.36551)
- Old Polarization:       (-0.61682,-0.53597,-0.57643)
- New Momentum Direction: (0.52802,-0.68842,-0.49726)
- New Polarization:       (-0.84436,-0.36294,-0.39412)
- *** FresnelRefraction *** 
-Track (trackID 582, parentID 1) is processed with stopping code 2
-### pop requested out of 279 stacked tracks.
+ Old Momentum Direction: (-0.65473,0.33005,0.67999)
+ Old Polarization:       (0.73179,0.502,0.46095)
+ New Momentum Direction: (0.65473,0.33005,0.67999)
+ New Polarization:       (0.73179,-0.502,-0.46095)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.78902,0.54789,-0.27796)
- Old Polarization:       (-0.60696,0.62513,-0.49073)
- New Momentum Direction: (0.56226,0.73748,-0.37415)
- New Polarization:       (-0.82193,0.44855,-0.35103)
+ Old Momentum Direction: (0.65473,0.33005,0.67999)
+ Old Polarization:       (0.73179,-0.502,-0.46095)
+ New Momentum Direction: (0.8885,0.44789,0.099833)
+ New Polarization:       (0.33678,-0.48869,-0.80483)
  *** FresnelRefraction *** 
-Track (trackID 581, parentID 1) is processed with stopping code 2
-### pop requested out of 278 stacked tracks.
+Track (trackID 560, parentID 1) is processed with stopping code 2
+### pop requested out of 257 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65123,-0.04746,0.75739)
- Old Polarization:       (-0.75887,-0.037342,0.65017)
- New Momentum Direction: (0.8833,-0.064372,0.46437)
- New Polarization:       (0.45759,-0.097016,-0.88385)
- *** FresnelRefraction *** 
-Track (trackID 580, parentID 1) is processed with stopping code 2
-### pop requested out of 277 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74558,-0.66271,-0.070134)
- Old Polarization:       (-0.65555,-0.71043,-0.25602)
- New Momentum Direction: (0.4268,-0.89932,-0.095174)
- New Polarization:       (-0.89746,-0.40825,-0.16701)
- *** FresnelRefraction *** 
-Track (trackID 579, parentID 1) is processed with stopping code 2
-### pop requested out of 276 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 578, parentID 1) is processed with stopping code 2
-### pop requested out of 275 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.80873,0.31817,-0.4947)
- Old Polarization:       (-0.58606,0.36448,-0.72366)
- New Momentum Direction: (0.60476,0.43081,-0.66983)
- New Polarization:       (-0.79497,0.27595,-0.54026)
- *** FresnelRefraction *** 
-Track (trackID 577, parentID 1) is processed with stopping code 2
-### pop requested out of 274 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79317,-0.46854,-0.38904)
- Old Polarization:       (-0.60221,-0.50828,-0.61562)
- New Momentum Direction: (0.57387,-0.63006,-0.52316)
- New Polarization:       (-0.81431,-0.37115,-0.44626)
- *** FresnelRefraction *** 
-Track (trackID 576, parentID 1) is processed with stopping code 2
-### pop requested out of 273 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65268,0.019159,0.75739)
- Old Polarization:       (-0.75749,0.035693,0.65187)
- New Momentum Direction: (0.88433,0.025959,0.46614)
- New Polarization:       (0.4644,0.053461,-0.88401)
- *** FresnelRefraction *** 
-Track (trackID 575, parentID 1) is processed with stopping code 2
-### pop requested out of 272 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.81449,-0.053937,-0.57766)
- Old Polarization:       (-0.57989,-0.044531,-0.81348)
- New Momentum Direction: (0.61791,-0.073095,-0.78284)
- New Polarization:       (-0.78606,-0.03537,-0.61714)
- *** FresnelRefraction *** 
-Track (trackID 574, parentID 1) is processed with stopping code 2
-### pop requested out of 271 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74013,0.66892,0.069005)
- Old Polarization:       (-0.66156,0.74269,-0.10368)
- New Momentum Direction: (0.40414,0.90987,0.093862)
- New Polarization:       (-0.90791,0.4115,-0.079811)
- *** FresnelRefraction *** 
-Track (trackID 573, parentID 1) is processed with stopping code 2
-### pop requested out of 270 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.72361,-0.67762,0.1312)
- Old Polarization:       (-0.67968,-0.73266,-0.035379)
- New Momentum Direction: (0.35928,-0.91622,0.1774)
- New Polarization:       (-0.92678,-0.3726,-0.047374)
- *** FresnelRefraction *** 
-Track (trackID 572, parentID 1) is processed with stopping code 2
-### pop requested out of 269 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.80349,-0.31584,-0.50463)
- Old Polarization:       (-0.59186,-0.33243,-0.7343)
- New Momentum Direction: (0.59159,-0.42774,-0.68342)
- New Polarization:       (-0.80389,-0.24831,-0.54046)
- *** FresnelRefraction *** 
-Track (trackID 571, parentID 1) is processed with stopping code 2
-### pop requested out of 268 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.80367,0.37846,-0.45921)
- Old Polarization:       (-0.59192,0.4291,-0.68228)
- New Momentum Direction: (0.59031,0.51335,-0.6229)
- New Polarization:       (-0.80505,0.31846,-0.50048)
- *** FresnelRefraction *** 
-Track (trackID 570, parentID 1) is processed with stopping code 2
-### pop requested out of 267 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69112,0.52484,0.49689)
- Old Polarization:       (-0.71553,0.59374,0.36809)
- New Momentum Direction: (0.2129,0.70953,0.67174)
- New Polarization:       (-0.97316,0.21549,0.08081)
- *** FresnelRefraction *** 
-Track (trackID 569, parentID 1) is processed with stopping code 2
-### pop requested out of 266 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 568, parentID 1) is processed with stopping code 2
-### pop requested out of 265 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 567, parentID 1) is processed with stopping code 2
-### pop requested out of 264 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 566, parentID 1) is processed with stopping code 2
-### pop requested out of 263 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.8142,0.21026,-0.54118)
- Old Polarization:       (-0.57982,0.24646,-0.77658)
- New Momentum Direction: (0.61924,0.28436,-0.7319)
- New Polarization:       (-0.78467,0.19,-0.59007)
- *** FresnelRefraction *** 
-Track (trackID 565, parentID 1) is processed with stopping code 2
-### pop requested out of 262 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 564, parentID 1) is processed with stopping code 2
-### pop requested out of 261 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.75793,0.64857,-0.069981)
- Old Polarization:       (-0.64209,0.72279,-0.25551)
- New Momentum Direction: (0.46361,0.88093,-0.095053)
- New Polarization:       (-0.87944,0.44444,-0.17044)
- *** FresnelRefraction *** 
-Track (trackID 563, parentID 1) is processed with stopping code 2
-### pop requested out of 260 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7677,-0.60499,-0.21124)
- Old Polarization:       (-0.63088,-0.65577,-0.41468)
- New Momentum Direction: (0.50258,-0.81621,-0.28499)
- New Polarization:       (-0.85795,-0.43029,-0.28065)
- *** FresnelRefraction *** 
-Track (trackID 562, parentID 1) is processed with stopping code 2
-### pop requested out of 259 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79279,0.52724,-0.30577)
- Old Polarization:       (-0.60265,0.60317,-0.52249)
- New Momentum Direction: (0.57271,0.70913,-0.41126)
- New Polarization:       (-0.8151,0.43917,-0.37782)
- *** FresnelRefraction *** 
-Track (trackID 561, parentID 1) is processed with stopping code 2
-### pop requested out of 258 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65807,0.034133,0.75219)
- Old Polarization:       (-0.75276,0.052759,0.65618)
- New Momentum Direction: (0.88615,0.045964,0.46111)
- New Polarization:       (0.45627,0.087315,-0.88555)
- *** FresnelRefraction *** 
-Track (trackID 560, parentID 1) is processed with stopping code 2
-### pop requested out of 257 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.673,-0.44777,0.5887)
- Old Polarization:       (-0.7361,-0.4833,0.4739)
- New Momentum Direction: (0.086471,-0.60313,0.79294)
- New Polarization:       (-0.99458,-0.098343,0.033659)
+ Old Momentum Direction: (0.73032,-0.67535,0.10266)
+ Old Polarization:       (-0.67155,-0.73733,-0.073235)
+ New Momentum Direction: (0.39349,-0.90889,0.13816)
+ New Polarization:       (-0.91203,-0.40483,-0.065661)
  *** FresnelRefraction *** 
 Track (trackID 559, parentID 1) is processed with stopping code 2
 ### pop requested out of 256 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.79601,-0.44385,-0.41155)
+ Old Polarization:       (-0.59866,-0.47694,-0.64353)
+ New Momentum Direction: (0.57749,-0.59865,-0.55509)
+ New Polarization:       (-0.81189,-0.34976,-0.46745)
+ *** FresnelRefraction *** 
 Track (trackID 558, parentID 1) is processed with stopping code 2
 ### pop requested out of 255 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77034,0.61215,-0.17845)
- Old Polarization:       (-0.6286,0.68214,-0.37357)
- New Momentum Direction: (0.49902,0.83196,-0.24253)
- New Polarization:       (-0.86069,0.44321,-0.25055)
+ Old Momentum Direction: (0.72521,0.65915,0.19896)
+ Old Polarization:       (-0.67702,0.73528,0.031762)
+ New Momentum Direction: (0.35477,0.89507,0.27017)
+ New Polarization:       (-0.92798,0.37233,-0.01499)
  *** FresnelRefraction *** 
 Track (trackID 557, parentID 1) is processed with stopping code 2
 ### pop requested out of 254 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74778,0.6625,0.043786)
+ Old Polarization:       (-0.65222,0.74532,-0.13823)
+ New Momentum Direction: (0.43993,0.89608,0.059225)
+ New Polarization:       (-0.89051,0.44381,-0.10013)
+ *** FresnelRefraction *** 
 Track (trackID 556, parentID 1) is processed with stopping code 2
 ### pop requested out of 253 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81098,0.28031,-0.51356)
- Old Polarization:       (-0.58351,0.32316,-0.74504)
- New Momentum Direction: (0.6107,0.37938,-0.69507)
- New Polarization:       (-0.7908,0.24656,-0.56022)
+ Old Momentum Direction: (0.74932,-0.65585,-0.091533)
+ Old Polarization:       (-0.65062,-0.70341,-0.28618)
+ New Momentum Direction: (0.43991,-0.88942,-0.12413)
+ New Polarization:       (-0.89064,-0.41439,-0.18719)
  *** FresnelRefraction *** 
 Track (trackID 555, parentID 1) is processed with stopping code 2
 ### pop requested out of 252 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73077,0.66039,0.17281)
- Old Polarization:       (-0.67177,0.74069,0.010225)
- New Momentum Direction: (0.38164,0.8942,0.234)
- New Polarization:       (-0.91759,0.397,-0.020563)
+ Old Momentum Direction: (0.80495,-0.28856,-0.51845)
+ Old Polarization:       (-0.59016,-0.2991,-0.74983)
+ New Momentum Direction: (0.59067,-0.39242,-0.70506)
+ New Polarization:       (-0.80478,-0.22298,-0.5501)
  *** FresnelRefraction *** 
 Track (trackID 554, parentID 1) is processed with stopping code 2
 ### pop requested out of 251 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72389,-0.67974,0.11807)
- Old Polarization:       (-0.67933,-0.73213,-0.049986)
- New Momentum Direction: (0.35606,-0.92068,0.15992)
- New Polarization:       (-0.92801,-0.36846,-0.055047)
+ Old Momentum Direction: (0.76996,-0.59731,-0.22447)
+ Old Polarization:       (-0.62764,-0.64551,-0.43519)
+ New Momentum Direction: (0.50758,-0.80653,-0.3031)
+ New Polarization:       (-0.85466,-0.42676,-0.29568)
  *** FresnelRefraction *** 
 Track (trackID 553, parentID 1) is processed with stopping code 2
 ### pop requested out of 250 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6579,0.21863,0.72067)
+ Old Polarization:       (-0.75132,0.25631,0.60813)
+ New Momentum Direction: (0.88963,0.29564,0.34808)
+ New Polarization:       (0.20229,0.42823,-0.88074)
+ *** FresnelRefraction *** 
 Track (trackID 552, parentID 1) is processed with stopping code 2
 ### pop requested out of 249 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.80373,-0.30609,-0.51022)
+ Old Polarization:       (-0.5915,-0.3182,-0.74087)
+ New Momentum Direction: (0.58758,-0.41627,-0.69388)
+ New Polarization:       (-0.80681,-0.23609,-0.54158)
+ *** FresnelRefraction *** 
 Track (trackID 551, parentID 1) is processed with stopping code 2
 ### pop requested out of 248 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74066,-0.67186,-0.0060028)
+ Old Polarization:       (-0.66007,-0.72593,-0.19321)
+ New Momentum Direction: (0.41818,-0.90833,-0.0081155)
+ New Polarization:       (-0.90086,-0.41357,-0.13197)
+ *** FresnelRefraction *** 
 Track (trackID 550, parentID 1) is processed with stopping code 2
 ### pop requested out of 247 stacked tracks.
 
@@ -3023,434 +2899,451 @@ Track (trackID 550, parentID 1) is processed with stopping code 2
 Track (trackID 549, parentID 1) is processed with stopping code 2
 ### pop requested out of 246 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74993,-0.65482,-0.093891)
- Old Polarization:       (-0.65071,-0.70468,-0.28283)
- New Momentum Direction: (0.44399,-0.88696,-0.12718)
- New Polarization:       (-0.88911,-0.41849,-0.18533)
+ Old Momentum Direction: (0.70707,0.60195,0.37109)
+ Old Polarization:       (-0.6972,0.68111,0.22361)
+ New Momentum Direction: (0.29708,0.81281,0.50108)
+ New Polarization:       (-0.94901,0.30928,0.060951)
  *** FresnelRefraction *** 
 Track (trackID 548, parentID 1) is processed with stopping code 2
 ### pop requested out of 245 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66567,-0.45263,0.5933)
+ Old Polarization:       (-0.74244,-0.48185,0.4654)
+ New Momentum Direction: (-0.66567,-0.45263,0.5933)
+ New Polarization:       (-0.74244,0.48185,-0.4654)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 547, parentID 1) is processed with stopping code 2
 ### pop requested out of 244 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68942,-0.60311,0.4012)
- Old Polarization:       (-0.71709,-0.64653,0.26034)
- New Momentum Direction: (0.18844,-0.81769,0.54394)
- New Polarization:       (-0.97825,-0.20516,0.030494)
+ Old Momentum Direction: (0.77762,-0.54297,-0.31701)
+ Old Polarization:       (-0.61982,-0.5774,-0.53145)
+ New Momentum Direction: (0.51993,-0.73768,-0.43069)
+ New Polarization:       (-0.84832,-0.38685,-0.36151)
  *** FresnelRefraction *** 
 Track (trackID 546, parentID 1) is processed with stopping code 2
 ### pop requested out of 243 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.75415,0.655,-0.047286)
- Old Polarization:       (-0.6463,0.72751,-0.23025)
- New Momentum Direction: (0.4495,0.89096,-0.06432)
- New Polarization:       (-0.88664,0.43625,-0.15347)
+Scattering Photon!
+Old Momentum Direction: (0.6488,-0.070394,0.75769)
+Old Polarization: (-0.76096,-0.062102,0.64582)
+New Polarization: (-0.41453,-0.56799,0.71102)
+Polarization Change: (-0.41453,-0.56799,0.71102)
+New Momentum Direction: (0.72495,-0.6784,-0.11928)
+Momentum Change: (0.72495,-0.6784,-0.11928)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.72495,-0.6784,-0.11928)
+ Old Polarization:       (-0.41453,-0.56799,0.71102)
+ New Momentum Direction: (0.35931,-0.91912,-0.1616)
+ New Polarization:       (-0.69893,-0.37978,0.60602)
  *** FresnelRefraction *** 
 Track (trackID 545, parentID 1) is processed with stopping code 2
 ### pop requested out of 242 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78802,-0.46781,-0.40023)
- Old Polarization:       (-0.60907,-0.49759,-0.61761)
- New Momentum Direction: (0.55002,-0.63459,-0.54292)
- New Polarization:       (-0.83076,-0.34916,-0.4335)
- *** FresnelRefraction *** 
-Track (trackID 544, parentID 1) is processed with stopping code 2
-### pop requested out of 241 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 544, parentID 1) is processed with stopping code 2
+### pop requested out of 241 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65465,-0.31417,0.68755)
+ Old Polarization:       (-0.75441,-0.32927,0.56785)
+ New Momentum Direction: (0.88754,-0.42593,0.17566)
+ New Polarization:       (-0.048609,-0.46571,-0.8836)
+ *** FresnelRefraction *** 
 Track (trackID 543, parentID 1) is processed with stopping code 2
 ### pop requested out of 240 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65591,-0.27709,0.70214)
- Old Polarization:       (-0.75381,-0.28905,0.5901)
- New Momentum Direction: (0.65591,-0.27709,-0.70214)
- New Polarization:       (-0.12605,0.87692,-0.46381)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65591,-0.27709,-0.70214)
- Old Polarization:       (-0.12605,0.87692,-0.46381)
- New Momentum Direction: (-0.65591,-0.27709,-0.70214)
- New Polarization:       (-0.12605,-0.87692,0.46381)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.7365,0.66779,0.10777)
+ Old Polarization:       (-0.66469,0.74403,-0.067885)
+ New Momentum Direction: (0.39441,0.9072,0.1464)
+ New Polarization:       (-0.91164,0.40632,-0.06183)
+ *** FresnelRefraction *** 
 Track (trackID 542, parentID 1) is processed with stopping code 2
 ### pop requested out of 239 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.75777,-0.63483,-0.15089)
+ Old Polarization:       (-0.64131,-0.68188,-0.35179)
+ New Momentum Direction: (0.46741,-0.86008,-0.20442)
+ New Polarization:       (-0.87677,-0.4214,-0.23173)
+ *** FresnelRefraction *** 
 Track (trackID 541, parentID 1) is processed with stopping code 2
 ### pop requested out of 238 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6684,0.38744,0.63493)
- Old Polarization:       (-0.73965,0.43635,0.51237)
- New Momentum Direction: (-0.6684,0.38744,0.63493)
- New Polarization:       (-0.73965,-0.43635,-0.51237)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6684,0.38744,0.63493)
- Old Polarization:       (-0.73965,-0.43635,-0.51237)
- New Momentum Direction: (-0.6684,0.38744,-0.63493)
- New Polarization:       (0.73965,0.43635,-0.51237)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6684,0.38744,-0.63493)
- Old Polarization:       (0.73965,0.43635,-0.51237)
- New Momentum Direction: (-0.6684,-0.38744,-0.63493)
- New Polarization:       (-0.73965,0.43635,0.51237)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.79155,0.51253,-0.33282)
+ Old Polarization:       (-0.60442,0.57622,-0.55014)
+ New Momentum Direction: (0.55913,0.69534,-0.45153)
+ New Polarization:       (-0.8246,0.40985,-0.38995)
+ *** FresnelRefraction *** 
 Track (trackID 540, parentID 1) is processed with stopping code 2
 ### pop requested out of 237 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81685,0.1113,-0.56601)
- Old Polarization:       (-0.57673,0.13762,-0.80526)
- New Momentum Direction: (0.6264,0.1504,-0.76486)
- New Polarization:       (-0.77942,0.10665,-0.61735)
+ Old Momentum Direction: (0.82121,0.15627,-0.5488)
+ Old Polarization:       (-0.57024,0.18948,-0.79933)
+ New Momentum Direction: (0.64057,0.21029,-0.73855)
+ New Polarization:       (-0.76764,0.15009,-0.62306)
  *** FresnelRefraction *** 
 Track (trackID 539, parentID 1) is processed with stopping code 2
 ### pop requested out of 236 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65489,0.17251,0.73577)
- Old Polarization:       (-0.75457,0.20291,0.62406)
- New Momentum Direction: (0.88965,0.23435,0.39192)
- New Polarization:       (0.29537,0.35922,-0.88528)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.67533,-0.48797,0.553)
+ Old Polarization:       (-0.73282,-0.52846,0.42861)
+ New Momentum Direction: (-0.67533,-0.48797,0.553)
+ New Polarization:       (-0.73019,0.54781,-0.40832)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67533,-0.48797,0.553)
+ Old Polarization:       (-0.73019,0.54781,-0.40832)
+ New Momentum Direction: (-0.67533,-0.48797,-0.553)
+ New Polarization:       (0.73019,-0.54781,-0.40832)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67533,-0.48797,-0.553)
+ Old Polarization:       (0.73019,-0.54781,-0.40832)
+ New Momentum Direction: (-0.67533,0.48797,-0.553)
+ New Polarization:       (-0.73019,-0.54781,0.40832)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 538, parentID 1) is processed with stopping code 2
 ### pop requested out of 235 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.71878,-0.67885,0.15006)
-Old Polarization: (-0.68488,-0.7285,-0.015076)
-New Polarization: (0.10436,-0.72618,-0.54031)
-Polarization Change: (0.11454,-0.79701,-0.59301)
-New Momentum Direction: (0.96236,0.2311,-0.12472)
-Momentum Change: (0.96473,0.23167,-0.12503)
  Photon at Boundary! 
- Old Momentum Direction: (0.96473,0.23167,-0.12503)
- Old Polarization:       (0.11454,-0.79701,-0.59301)
- New Momentum Direction: (0.93405,0.3143,-0.16963)
- New Polarization:       (-0.19648,0.055574,-0.97893)
+ Old Momentum Direction: (0.81726,-0.031115,-0.57543)
+ Old Polarization:       (-0.57609,-0.018948,-0.81717)
+ New Momentum Direction: (0.62438,-0.042175,-0.77998)
+ New Polarization:       (-0.78099,-0.015874,-0.62434)
  *** FresnelRefraction *** 
 Track (trackID 537, parentID 1) is processed with stopping code 2
 ### pop requested out of 234 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79106,0.49177,-0.36384)
- Old Polarization:       (-0.60613,0.54979,-0.57475)
- New Momentum Direction: (0.55455,0.66896,-0.49494)
- New Polarization:       (-0.82843,0.38758,-0.40434)
- *** FresnelRefraction *** 
-Track (trackID 536, parentID 1) is processed with stopping code 2
-### pop requested out of 233 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 536, parentID 1) is processed with stopping code 2
+### pop requested out of 233 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81089,-0.1915,-0.55297)
+ Old Polarization:       (-0.58355,-0.19376,-0.78863)
+ New Momentum Direction: (0.60632,-0.26023,-0.75143)
+ New Polarization:       (-0.7941,-0.14817,-0.58945)
+ *** FresnelRefraction *** 
 Track (trackID 535, parentID 1) is processed with stopping code 2
 ### pop requested out of 232 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.80708,-0.31277,-0.50079)
- Old Polarization:       (-0.58696,-0.33311,-0.73791)
- New Momentum Direction: (0.60619,-0.4213,-0.67457)
- New Polarization:       (-0.79294,-0.25454,-0.55359)
+Scattering Photon!
+Old Momentum Direction: (0.65354,0.13374,0.74498)
+Old Polarization: (-0.75603,0.16251,0.63405)
+New Polarization: (-0.73994,0.37216,-0.56034)
+Polarization Change: (-0.73994,0.37216,-0.56034)
+New Momentum Direction: (-0.58094,0.0664,0.81124)
+Momentum Change: (-0.58094,0.0664,0.81124)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58094,0.0664,0.81124)
+ Old Polarization:       (-0.73994,0.37216,-0.56034)
+ New Momentum Direction: (-0.78599,0.089837,0.61167)
+ New Polarization:       (-0.57111,0.27335,-0.77402)
  *** FresnelRefraction *** 
 Track (trackID 534, parentID 1) is processed with stopping code 2
 ### pop requested out of 231 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.70958,-0.66536,0.23192)
- Old Polarization:       (-0.695,-0.71511,0.074832)
- New Momentum Direction: (0.29623,-0.9019,0.31437)
- New Polarization:       (-0.94951,-0.31368,-0.0052096)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 533, parentID 1) is processed with stopping code 2
 ### pop requested out of 230 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68465,-0.5484,0.48013)
- Old Polarization:       (-0.72304,-0.59418,0.35237)
- New Momentum Direction: (-0.68465,-0.5484,0.48013)
- New Polarization:       (-0.71704,0.62496,-0.30866)
+ Old Momentum Direction: (0.72274,-0.67358,0.15472)
+ Old Polarization:       (-0.67994,-0.73311,-0.015417)
+ New Momentum Direction: (-0.72274,-0.67358,0.15472)
+ New Polarization:       (-0.634,0.7353,0.23953)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68465,-0.5484,0.48013)
- Old Polarization:       (-0.71704,0.62496,-0.30866)
- New Momentum Direction: (-0.68465,0.5484,0.48013)
- New Polarization:       (0.71704,0.62496,0.30866)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68465,0.5484,0.48013)
- Old Polarization:       (0.71704,0.62496,0.30866)
- New Momentum Direction: (-0.68465,0.5484,-0.48013)
- New Polarization:       (-0.71704,-0.62496,0.30866)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (-0.72274,-0.67358,0.15472)
+ Old Polarization:       (-0.634,0.7353,0.23953)
+ New Momentum Direction: (-0.97398,-0.088778,0.20851)
+ New Polarization:       (-0.074061,0.99425,0.077374)
+ *** FresnelRefraction *** 
 Track (trackID 532, parentID 1) is processed with stopping code 2
 ### pop requested out of 229 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.8162,-0.030165,-0.57698)
+ Old Polarization:       (-0.57759,-0.017814,-0.81613)
+ New Momentum Direction: (0.62015,-0.040957,-0.78342)
+ New Polarization:       (-0.78437,-0.014856,-0.62012)
+ *** FresnelRefraction *** 
 Track (trackID 531, parentID 1) is processed with stopping code 2
 ### pop requested out of 228 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69149,-0.60191,0.39944)
- Old Polarization:       (-0.71508,-0.64878,0.26027)
- New Momentum Direction: (-0.69149,-0.60191,0.39944)
- New Polarization:       (-0.70566,0.68113,-0.19521)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69149,-0.60191,0.39944)
- Old Polarization:       (-0.70566,0.68113,-0.19521)
- New Momentum Direction: (-0.69149,0.60191,0.39944)
- New Polarization:       (0.70566,0.68113,0.19521)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69149,0.60191,0.39944)
- Old Polarization:       (0.70566,0.68113,0.19521)
- New Momentum Direction: (-0.69149,0.60191,-0.39944)
- New Polarization:       (-0.70566,-0.68113,0.19521)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.67519,-0.4866,0.55438)
+ Old Polarization:       (-0.73298,-0.52696,0.43018)
+ New Momentum Direction: (0.12038,-0.65487,0.74609)
+ New Polarization:       (-0.99042,-0.13044,0.045314)
+ *** FresnelRefraction *** 
 Track (trackID 530, parentID 1) is processed with stopping code 2
 ### pop requested out of 227 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65383,-0.22327,0.72295)
- Old Polarization:       (-0.75606,-0.23001,0.61275)
- New Momentum Direction: (0.88665,-0.30277,0.34955)
- New Polarization:       (0.20704,-0.41599,-0.88549)
+ Old Momentum Direction: (0.79617,0.49896,-0.34227)
+ Old Polarization:       (-0.59863,0.56727,-0.56555)
+ New Momentum Direction: (0.57668,0.6737,-0.46213)
+ New Polarization:       (-0.8126,0.41458,-0.40964)
  *** FresnelRefraction *** 
 Track (trackID 529, parentID 1) is processed with stopping code 2
 ### pop requested out of 226 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79971,0.45589,-0.39067)
- Old Polarization:       (-0.59549,0.51937,-0.6129)
- New Momentum Direction: (0.58581,0.6154,-0.52736)
- New Polarization:       (-0.80712,0.38409,-0.44836)
- *** FresnelRefraction *** 
-Track (trackID 528, parentID 1) is processed with stopping code 2
-### pop requested out of 225 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.65899,0.30187,0.68892)
+Old Polarization: (-0.74922,0.34429,0.56581)
+New Polarization: (0.99969,-0.019514,0.01575)
+Polarization Change: (0.99969,-0.019514,0.01575)
+New Momentum Direction: (-0.0040048,0.49577,0.86844)
+Momentum Change: (-0.0040048,0.49577,0.86844)
 
 ** Photon absorbed! **
+Track (trackID 528, parentID 1) is processed with stopping code 2
+### pop requested out of 225 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65758,0.262,0.70636)
+ Old Polarization:       (-0.75104,0.30187,0.58721)
+ New Momentum Direction: (0.65758,0.262,-0.70636)
+ New Polarization:       (-0.12948,-0.88433,-0.44855)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65758,0.262,-0.70636)
+ Old Polarization:       (-0.12948,-0.88433,-0.44855)
+ New Momentum Direction: (-0.65758,0.262,-0.70636)
+ New Polarization:       (-0.12948,0.88433,0.44855)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65758,0.262,-0.70636)
+ Old Polarization:       (-0.12948,0.88433,0.44855)
+ New Momentum Direction: (-0.65758,-0.262,-0.70636)
+ New Polarization:       (0.12948,0.88433,-0.44855)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65758,-0.262,-0.70636)
+ Old Polarization:       (0.12948,0.88433,-0.44855)
+ New Momentum Direction: (-0.89227,-0.35551,-0.27832)
+ New Polarization:       (-0.43221,0.49434,0.7542)
+ *** FresnelRefraction *** 
 Track (trackID 527, parentID 1) is processed with stopping code 2
 ### pop requested out of 224 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70862,-0.6543,0.26411)
- Old Polarization:       (-0.6963,-0.70899,0.11177)
- New Momentum Direction: (0.30362,-0.88353,0.35664)
- New Polarization:       (-0.94731,-0.32001,0.013684)
+ Old Momentum Direction: (0.81402,-0.15239,-0.56049)
+ Old Polarization:       (-0.57967,-0.15192,-0.80057)
+ New Momentum Direction: (0.61642,-0.20658,-0.75983)
+ New Polarization:       (-0.78662,-0.11821,-0.60602)
  *** FresnelRefraction *** 
 Track (trackID 526, parentID 1) is processed with stopping code 2
 ### pop requested out of 223 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.75485,-0.64702,-0.10755)
+ Old Polarization:       (-0.64434,-0.70087,-0.30596)
+ New Momentum Direction: (0.46476,-0.87345,-0.14519)
+ New Polarization:       (-0.8779,-0.43323,-0.20397)
+ *** FresnelRefraction *** 
 Track (trackID 525, parentID 1) is processed with stopping code 2
 ### pop requested out of 222 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73581,0.66337,0.13612)
- Old Polarization:       (-0.66623,0.74515,-0.03004)
- New Momentum Direction: (0.40052,0.89759,0.18417)
- New Polarization:       (-0.90941,0.41398,-0.039883)
+ Old Momentum Direction: (0.8164,0.20892,-0.53838)
+ Old Polarization:       (-0.57667,0.24529,-0.77928)
+ New Momentum Direction: (0.62407,0.28268,-0.72844)
+ New Polarization:       (-0.78081,0.19034,-0.59507)
  *** FresnelRefraction *** 
 Track (trackID 524, parentID 1) is processed with stopping code 2
 ### pop requested out of 221 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.80743,0.30078,-0.50754)
-Old Polarization: (-0.58814,0.34267,-0.73257)
-New Polarization: (-0.55454,0.38118,-0.70601)
-Polarization Change: (-0.56857,0.39082,-0.72387)
-New Momentum Direction: (0.80308,0.41384,-0.40735)
-Momentum Change: (0.81035,0.41759,-0.41104)
- Photon at Boundary! 
- Old Momentum Direction: (0.81035,0.41759,-0.41104)
- Old Polarization:       (-0.56857,0.39082,-0.72387)
- New Momentum Direction: (0.60495,0.56748,-0.55858)
- New Polarization:       (-0.78429,0.30346,-0.5411)
- *** FresnelRefraction *** 
-Track (trackID 523, parentID 1) is processed with stopping code 2
-### pop requested out of 220 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 523, parentID 1) is processed with stopping code 2
+### pop requested out of 220 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81943,0.055831,-0.57045)
+ Old Polarization:       (-0.57317,0.076812,-0.81583)
+ New Momentum Direction: (0.63204,0.075483,-0.77125)
+ New Polarization:       (-0.77494,0.059425,-0.62924)
+ *** FresnelRefraction *** 
 Track (trackID 522, parentID 1) is processed with stopping code 2
 ### pop requested out of 219 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.79819,0.4273,-0.42462)
-Old Polarization: (-0.59829,0.48013,-0.6415)
-New Polarization: (-0.45427,0.75153,0.098069)
-Polarization Change: (-0.51411,0.85051,0.11099)
-New Momentum Direction: (-0.40471,-0.14059,-0.79732)
-Momentum Change: (-0.44712,-0.15532,-0.88088)
  Photon at Boundary! 
- Old Momentum Direction: (-0.44712,-0.15532,-0.88088)
- Old Polarization:       (-0.51411,0.85051,0.11099)
- New Momentum Direction: (-0.60793,-0.21118,-0.76539)
- New Polarization:       (-0.54083,0.8159,0.20445)
+ Old Momentum Direction: (0.77227,-0.5847,-0.24846)
+ Old Polarization:       (-0.62519,-0.62995,-0.46077)
+ New Momentum Direction: (0.5123,-0.79041,-0.33587)
+ New Polarization:       (-0.8521,-0.41903,-0.31361)
  *** FresnelRefraction *** 
 Track (trackID 521, parentID 1) is processed with stopping code 2
 ### pop requested out of 218 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6712,-0.52427,0.52406)
+ Old Polarization:       (-0.73588,-0.55638,0.3859)
+ New Momentum Direction: (-0.6712,-0.52427,0.52406)
+ New Polarization:       (-0.73588,0.55638,-0.3859)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6712,-0.52427,0.52406)
+ Old Polarization:       (-0.73588,0.55638,-0.3859)
+ New Momentum Direction: (-0.6712,0.52427,0.52406)
+ New Polarization:       (0.73588,0.55638,0.3859)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6712,0.52427,0.52406)
+ Old Polarization:       (0.73588,0.55638,0.3859)
+ New Momentum Direction: (-0.6712,0.52427,-0.52406)
+ New Polarization:       (-0.73588,-0.55638,0.3859)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.6712,0.52427,-0.52406)
+Old Polarization: (-0.73588,-0.55638,0.3859)
+New Polarization: (0.86584,0.37456,-0.33172)
+Polarization Change: (0.86584,0.37456,-0.33172)
+New Momentum Direction: (-0.46866,0.83929,-0.27559)
+Momentum Change: (-0.46866,0.83929,-0.27559)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.46866,0.83929,-0.27559)
+ Old Polarization:       (0.86584,0.37456,-0.33172)
+ New Momentum Direction: (0.46866,0.83929,-0.27559)
+ New Polarization:       (0.86584,-0.37456,0.33172)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.46866,0.83929,-0.27559)
+ Old Polarization:       (0.86584,-0.37456,0.33172)
+ New Momentum Direction: (0.63704,0.67369,-0.3746)
+ New Polarization:       (0.76867,-0.5916,0.24324)
+ *** FresnelRefraction *** 
 Track (trackID 520, parentID 1) is processed with stopping code 2
 ### pop requested out of 217 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7442,-0.66785,-0.01196)
- Old Polarization:       (-0.6569,-0.72851,-0.19429)
- New Momentum Direction: (0.43695,-0.89934,-0.016106)
- New Polarization:       (-0.89235,-0.43117,-0.13345)
+ Old Momentum Direction: (0.64692,-0.1853,0.7397)
+ Old Polarization:       (-0.76221,-0.18656,0.61987)
+ New Momentum Direction: (0.87998,-0.25205,0.40262)
+ New Polarization:       (0.29716,-0.36917,-0.88058)
  *** FresnelRefraction *** 
 Track (trackID 519, parentID 1) is processed with stopping code 2
 ### pop requested out of 216 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69779,-0.62729,0.34582)
- Old Polarization:       (-0.70814,-0.67681,0.20118)
- New Momentum Direction: (0.24812,-0.84835,0.46769)
- New Polarization:       (-0.96414,-0.26318,0.034116)
- *** FresnelRefraction *** 
-Track (trackID 518, parentID 1) is processed with stopping code 2
-### pop requested out of 215 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 518, parentID 1) is processed with stopping code 2
+### pop requested out of 215 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81194,0.30357,-0.49859)
+ Old Polarization:       (-0.58168,0.3491,-0.73469)
+ New Momentum Direction: (0.61279,0.41097,-0.67498)
+ New Polarization:       (-0.78885,0.26727,-0.55343)
+ *** FresnelRefraction *** 
 Track (trackID 517, parentID 1) is processed with stopping code 2
 ### pop requested out of 214 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65169,-0.1291,0.74742)
- Old Polarization:       (-0.75839,-0.12678,0.63935)
- New Momentum Direction: (0.88385,-0.17509,0.43376)
- New Polarization:       (0.38119,-0.26784,-0.88485)
+ Old Momentum Direction: (0.80561,-0.35765,-0.47231)
+ Old Polarization:       (-0.58778,-0.38256,-0.71286)
+ New Momentum Direction: (0.6027,-0.48172,-0.63616)
+ New Polarization:       (-0.79476,-0.291,-0.53261)
  *** FresnelRefraction *** 
 Track (trackID 516, parentID 1) is processed with stopping code 2
 ### pop requested out of 213 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80538,0.42069,-0.4176)
- Old Polarization:       (-0.5886,0.48429,-0.64731)
- New Momentum Direction: (0.60367,0.5658,-0.56165)
- New Polarization:       (-0.79438,0.36732,-0.48378)
+ Old Momentum Direction: (0.79693,-0.42857,-0.42571)
+ Old Polarization:       (-0.59784,-0.45858,-0.65749)
+ New Momentum Direction: (0.57823,-0.57883,-0.57497)
+ New Polarization:       (-0.81164,-0.33644,-0.47754)
  *** FresnelRefraction *** 
 Track (trackID 515, parentID 1) is processed with stopping code 2
 ### pop requested out of 212 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 514, parentID 1) is processed with stopping code 2
-### pop requested out of 211 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72444,-0.67283,0.14997)
- Old Polarization:       (-0.67889,-0.7341,-0.014071)
- New Momentum Direction: (0.37198,-0.90601,0.20194)
- New Polarization:       (-0.92174,-0.38622,-0.034909)
+ Old Momentum Direction: (0.79753,-0.40282,-0.44909)
+ Old Polarization:       (-0.59772,-0.42674,-0.6787)
+ New Momentum Direction: (0.5757,-0.54597,-0.60868)
+ New Polarization:       (-0.81391,-0.31142,-0.49047)
  *** FresnelRefraction *** 
+Track (trackID 514, parentID 1) is processed with stopping code 2
+### pop requested out of 211 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 513, parentID 1) is processed with stopping code 2
 ### pop requested out of 210 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72819,-0.68072,0.079776)
- Old Polarization:       (-0.67459,-0.73243,-0.092042)
- New Momentum Direction: (0.37069,-0.92244,0.10811)
- New Polarization:       (-0.92213,-0.37942,-0.075562)
+ Old Momentum Direction: (0.74087,0.66794,0.070439)
+ Old Polarization:       (-0.65993,0.74344,-0.1086)
+ New Momentum Direction: (0.40829,0.90782,0.095736)
+ New Polarization:       (-0.90552,0.41604,-0.08331)
  *** FresnelRefraction *** 
 Track (trackID 512, parentID 1) is processed with stopping code 2
 ### pop requested out of 209 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.70494,-0.65402,0.27445)
- Old Polarization:       (-0.70014,-0.70356,0.12174)
- New Momentum Direction: (0.27697,-0.88602,0.37181)
- New Polarization:       (-0.95563,-0.29437,0.010397)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 511, parentID 1) is processed with stopping code 2
 ### pop requested out of 208 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70696,-0.64072,0.29946)
- Old Polarization:       (-0.69839,-0.69926,0.15261)
- New Momentum Direction: (-0.70696,-0.64072,0.29946)
- New Polarization:       (-0.67522,0.73744,-0.016223)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70696,-0.64072,0.29946)
- Old Polarization:       (-0.67522,0.73744,-0.016223)
- New Momentum Direction: (-0.70696,0.64072,0.29946)
- New Polarization:       (0.67522,0.73744,0.016223)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.79122,0.51876,-0.32383)
+ Old Polarization:       (-0.60464,0.5843,-0.54129)
+ New Momentum Direction: (0.55948,0.7031,-0.4389)
+ New Polarization:       (-0.82422,0.41607,-0.38413)
+ *** FresnelRefraction *** 
 Track (trackID 510, parentID 1) is processed with stopping code 2
 ### pop requested out of 207 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76499,-0.60067,-0.23236)
- Old Polarization:       (-0.63442,-0.64067,-0.43249)
- New Momentum Direction: (0.48387,-0.8162,-0.31573)
- New Polarization:       (-0.86889,-0.40502,-0.28458)
+ Old Momentum Direction: (0.76825,0.62822,-0.12302)
+ Old Polarization:       (-0.62969,0.70702,-0.32189)
+ New Momentum Direction: (0.4998,0.84999,-0.16646)
+ New Polarization:       (-0.85925,0.46238,-0.21886)
  *** FresnelRefraction *** 
 Track (trackID 509, parentID 1) is processed with stopping code 2
 ### pop requested out of 206 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65848,0.22744,0.71741)
- Old Polarization:       (-0.75085,0.26347,0.60564)
- New Momentum Direction: (0.89356,0.30863,0.32603)
- New Polarization:       (0.17434,0.43069,-0.8855)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.70949,-0.66181,0.24214)
+ Old Polarization:       (-0.69445,-0.71501,0.080568)
+ New Momentum Direction: (-0.70949,-0.66181,0.24214)
+ New Polarization:       (-0.66802,0.74103,0.06797)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70949,-0.66181,0.24214)
+ Old Polarization:       (-0.66802,0.74103,0.06797)
+ New Momentum Direction: (-0.70949,0.66181,0.24214)
+ New Polarization:       (0.66802,0.74103,-0.06797)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 508, parentID 1) is processed with stopping code 2
 ### pop requested out of 205 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68495,-0.59522,0.42019)
- Old Polarization:       (-0.72165,-0.63364,0.27877)
- New Momentum Direction: (0.13536,-0.80943,0.57141)
- New Polarization:       (-0.98738,-0.15806,0.0099995)
+ Old Momentum Direction: (0.74482,0.66594,0.042049)
+ Old Polarization:       (-0.65561,0.74208,-0.13962)
+ New Momentum Direction: (0.42235,0.90463,0.05712)
+ New Polarization:       (-0.89907,0.42611,-0.10051)
  *** FresnelRefraction *** 
 Track (trackID 507, parentID 1) is processed with stopping code 2
 ### pop requested out of 204 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79808,-0.36903,-0.47632)
- Old Polarization:       (-0.59809,-0.38921,-0.70057)
- New Momentum Direction: (0.5758,-0.50073,-0.64631)
- New Polarization:       (-0.81459,-0.28377,-0.50588)
- *** FresnelRefraction *** 
-Track (trackID 506, parentID 1) is processed with stopping code 2
-### pop requested out of 203 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 506, parentID 1) is processed with stopping code 2
+### pop requested out of 203 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.80175,0.44465,-0.39936)
+ Old Polarization:       (-0.5927,0.50558,-0.62697)
+ New Momentum Direction: (0.58899,0.60124,-0.54)
+ New Polarization:       (-0.80477,0.3754,-0.4598)
+ *** FresnelRefraction *** 
 Track (trackID 505, parentID 1) is processed with stopping code 2
 ### pop requested out of 202 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66062,-0.29408,0.69073)
- Old Polarization:       (-0.7495,-0.31094,0.58444)
- New Momentum Direction: (0.66062,-0.29408,-0.69073)
- New Polarization:       (-0.11558,0.86927,-0.48063)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66062,-0.29408,-0.69073)
- Old Polarization:       (-0.11558,0.86927,-0.48063)
- New Momentum Direction: (-0.66062,-0.29408,-0.69073)
- New Polarization:       (-0.11558,-0.86927,0.48063)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.69296,-0.6149,0.37644)
+ Old Polarization:       (-0.71269,-0.66315,0.2287)
+ New Momentum Direction: (0.22348,-0.8313,0.50891)
+ New Polarization:       (-0.97015,-0.24013,0.033774)
+ *** FresnelRefraction *** 
 Track (trackID 504, parentID 1) is processed with stopping code 2
 ### pop requested out of 201 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76478,0.63999,-0.07432)
- Old Polarization:       (-0.63399,0.727,-0.26368)
- New Momentum Direction: (0.4972,0.86184,-0.10008)
- New Polarization:       (-0.86081,0.47555,-0.18128)
+ Old Momentum Direction: (0.67707,-0.50523,0.53509)
+ Old Polarization:       (-0.73081,-0.54711,0.40814)
+ New Momentum Direction: (0.1346,-0.68027,0.72049)
+ New Polarization:       (-0.98833,-0.1445,0.048207)
  *** FresnelRefraction *** 
 Track (trackID 503, parentID 1) is processed with stopping code 2
 ### pop requested out of 200 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76553,0.63756,-0.086465)
- Old Polarization:       (-0.63322,0.72278,-0.27679)
- New Momentum Direction: (0.49788,0.85938,-0.11655)
- New Polarization:       (-0.86051,0.4728,-0.18969)
+ Old Momentum Direction: (0.81757,-0.098602,-0.56733)
+ Old Polarization:       (-0.5752,-0.093574,-0.81264)
+ New Momentum Direction: (0.62776,-0.13329,-0.76691)
+ New Polarization:       (-0.77797,-0.074508,-0.62386)
  *** FresnelRefraction *** 
 Track (trackID 502, parentID 1) is processed with stopping code 2
 ### pop requested out of 199 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69307,0.54316,0.47395)
- Old Polarization:       (-0.71324,0.6121,0.3415)
- New Momentum Direction: (-0.69307,0.54316,0.47395)
- New Polarization:       (-0.70297,-0.65484,-0.27752)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69307,0.54316,0.47395)
- Old Polarization:       (-0.70297,-0.65484,-0.27752)
- New Momentum Direction: (-0.69307,-0.54316,0.47395)
- New Polarization:       (0.70297,-0.65484,0.27752)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.64697,0.014951,0.76237)
+ Old Polarization:       (-0.76238,0.03145,0.64636)
+ New Momentum Direction: (0.87904,0.020315,0.47631)
+ New Polarization:       (0.47514,0.044666,-0.87878)
+ *** FresnelRefraction *** 
 Track (trackID 501, parentID 1) is processed with stopping code 2
 ### pop requested out of 198 stacked tracks.
 
@@ -3458,10 +3351,10 @@ Track (trackID 501, parentID 1) is processed with stopping code 2
 Track (trackID 500, parentID 1) is processed with stopping code 2
 ### pop requested out of 197 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70103,0.59843,0.38786)
- Old Polarization:       (-0.70416,0.66686,0.24382)
- New Momentum Direction: (0.24546,0.81349,0.52724)
- New Polarization:       (-0.96443,0.25994,0.047921)
+ Old Momentum Direction: (0.64646,-0.015056,0.7628)
+ Old Polarization:       (-0.7629,-0.0012883,0.64652)
+ New Momentum Direction: (0.87852,-0.020461,0.47726)
+ New Polarization:       (0.47679,-0.024179,-0.87869)
  *** FresnelRefraction *** 
 Track (trackID 499, parentID 1) is processed with stopping code 2
 ### pop requested out of 196 stacked tracks.
@@ -3470,10 +3363,10 @@ Track (trackID 499, parentID 1) is processed with stopping code 2
 Track (trackID 498, parentID 1) is processed with stopping code 2
 ### pop requested out of 195 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73338,-0.6755,0.076568)
- Old Polarization:       (-0.66894,-0.73712,-0.095768)
- New Momentum Direction: (0.40255,-0.90957,0.1031)
- New Polarization:       (-0.90851,-0.41077,-0.076681)
+ Old Momentum Direction: (0.78456,-0.52925,-0.32304)
+ Old Polarization:       (-0.61125,-0.57272,-0.54623)
+ New Momentum Direction: (0.54932,-0.71324,-0.43535)
+ New Polarization:       (-0.82967,-0.40352,-0.38579)
  *** FresnelRefraction *** 
 Track (trackID 497, parentID 1) is processed with stopping code 2
 ### pop requested out of 194 stacked tracks.
@@ -3481,1005 +3374,1179 @@ Track (trackID 497, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 496, parentID 1) is processed with stopping code 2
 ### pop requested out of 193 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65003,0.052577,0.75809)
- Old Polarization:       (-0.75963,0.07182,0.64637)
- New Momentum Direction: (0.88418,0.071516,0.46164)
- New Polarization:       (0.45088,0.12786,-0.88338)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 495, parentID 1) is processed with stopping code 2
 ### pop requested out of 192 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65937,0.19708,0.72553)
- Old Polarization:       (-0.75041,0.23171,0.61903)
- New Momentum Direction: (0.89215,0.26666,0.36464)
- New Polarization:       (0.24375,0.39546,-0.88555)
+ Old Momentum Direction: (0.65454,0.11829,0.74671)
+ Old Polarization:       (-0.75528,0.14606,0.63892)
+ New Momentum Direction: (0.88394,0.15974,0.43946)
+ New Polarization:       (0.38958,0.26816,-0.88109)
  *** FresnelRefraction *** 
 Track (trackID 494, parentID 1) is processed with stopping code 2
 ### pop requested out of 191 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73832,-0.67438,-0.0095867)
+ Old Polarization:       (-0.66269,-0.72273,-0.19625)
+ New Momentum Direction: (0.40296,-0.91512,-0.013009)
+ New Polarization:       (-0.90786,-0.39788,-0.13222)
+ *** FresnelRefraction *** 
 Track (trackID 493, parentID 1) is processed with stopping code 2
 ### pop requested out of 190 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80778,-0.24818,-0.53469)
- Old Polarization:       (-0.58714,-0.25804,-0.76725)
- New Momentum Direction: (0.60216,-0.33613,-0.72417)
- New Polarization:       (-0.79679,-0.19588,-0.57163)
+ Old Momentum Direction: (0.80417,0.40351,-0.43645)
+ Old Polarization:       (-0.59045,0.45775,-0.66471)
+ New Momentum Direction: (0.59232,0.54696,-0.59161)
+ New Polarization:       (-0.80303,0.34099,-0.48874)
  *** FresnelRefraction *** 
 Track (trackID 492, parentID 1) is processed with stopping code 2
 ### pop requested out of 189 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71306,0.63203,0.30345)
- Old Polarization:       (-0.69113,0.70639,0.1528)
- New Momentum Direction: (0.30843,0.85753,0.41172)
- New Polarization:       (-0.9454,0.32425,0.032874)
- *** FresnelRefraction *** 
-Track (trackID 491, parentID 1) is processed with stopping code 2
-### pop requested out of 188 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 491, parentID 1) is processed with stopping code 2
+### pop requested out of 188 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71114,0.61873,0.33383)
+ Old Polarization:       (-0.69263,0.69801,0.18177)
+ New Momentum Direction: (0.31117,0.83638,0.45127)
+ New Polarization:       (-0.94418,0.3261,0.046664)
+ *** FresnelRefraction *** 
 Track (trackID 490, parentID 1) is processed with stopping code 2
 ### pop requested out of 187 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71986,-0.67599,0.15763)
- Old Polarization:       (-0.68379,-0.72965,-0.0063532)
- New Momentum Direction: (0.34332,-0.91468,0.21329)
- New Polarization:       (-0.93297,-0.35828,-0.034708)
+ Old Momentum Direction: (0.76773,0.62244,-0.15218)
+ Old Polarization:       (-0.63074,0.69222,-0.35072)
+ New Momentum Direction: (0.48982,0.84688,-0.20706)
+ New Polarization:       (-0.8653,0.44324,-0.23408)
  *** FresnelRefraction *** 
 Track (trackID 489, parentID 1) is processed with stopping code 2
 ### pop requested out of 186 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.75311,-0.64849,-0.11083)
+ Old Polarization:       (-0.64639,-0.69801,-0.30817)
+ New Momentum Direction: (0.45466,-0.87793,-0.15005)
+ New Polarization:       (-0.88324,-0.42272,-0.20297)
+ *** FresnelRefraction *** 
 Track (trackID 488, parentID 1) is processed with stopping code 2
 ### pop requested out of 185 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65829,-0.093437,0.74694)
- Old Polarization:       (-0.75274,-0.089468,0.65221)
- New Momentum Direction: (0.88544,-0.12568,0.44743)
- New Polarization:       (0.41985,-0.19651,-0.88606)
+ Old Momentum Direction: (0.78462,0.56047,-0.26504)
+ Old Polarization:       (-0.61181,0.6308,-0.47726)
+ New Momentum Direction: (0.54284,0.75922,-0.35903)
+ New Polarization:       (-0.83438,0.43889,-0.33345)
  *** FresnelRefraction *** 
 Track (trackID 487, parentID 1) is processed with stopping code 2
 ### pop requested out of 184 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7735,-0.57215,-0.27266)
- Old Polarization:       (-0.62471,-0.61563,-0.48035)
- New Momentum Direction: (0.51466,-0.774,-0.36885)
- New Polarization:       (-0.85137,-0.41043,-0.32668)
+ Old Momentum Direction: (0.69826,-0.62495,0.3491)
+ Old Polarization:       (-0.70709,-0.6782,0.20019)
+ New Momentum Direction: (0.26134,-0.84268,0.47073)
+ New Polarization:       (-0.96024,-0.27659,0.037953)
  *** FresnelRefraction *** 
 Track (trackID 486, parentID 1) is processed with stopping code 2
 ### pop requested out of 183 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68731,0.51086,0.51636)
- Old Polarization:       (-0.71953,0.57612,0.38777)
- New Momentum Direction: (0.17997,0.69183,0.69928)
- New Polarization:       (-0.9801,0.18667,0.067562)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 485, parentID 1) is processed with stopping code 2
 ### pop requested out of 182 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81832,0.036844,-0.57358)
- Old Polarization:       (-0.57476,0.055582,-0.81643)
- New Momentum Direction: (0.63153,0.049703,-0.77376)
- New Polarization:       (-0.77535,0.042713,-0.63009)
+ Old Momentum Direction: (0.68427,0.4897,0.54034)
+ Old Polarization:       (-0.72238,0.55651,0.41045)
+ New Momentum Direction: (0.1724,0.66148,0.72988)
+ New Polarization:       (-0.98145,0.17844,0.070101)
  *** FresnelRefraction *** 
 Track (trackID 484, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.81629,-0.14411,-0.55938)
- Old Polarization:       (-0.57662,-0.1457,-0.80392)
- New Momentum Direction: (0.62867,-0.19401,-0.75309)
- New Polarization:       (-0.77697,-0.11549,-0.61885)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 483, parentID 1) is processed with stopping code 2
 ### pop requested out of 180 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69242,0.52815,0.49154)
- Old Polarization:       (-0.71418,0.59848,0.363)
- New Momentum Direction: (-0.69242,0.52815,0.49154)
- New Polarization:       (-0.70394,-0.64389,-0.29978)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69242,0.52815,0.49154)
- Old Polarization:       (-0.70394,-0.64389,-0.29978)
- New Momentum Direction: (-0.69242,-0.52815,0.49154)
- New Polarization:       (0.70394,-0.64389,0.29978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69242,-0.52815,0.49154)
- Old Polarization:       (0.70394,-0.64389,0.29978)
- New Momentum Direction: (-0.69242,-0.52815,-0.49154)
- New Polarization:       (-0.70394,0.64389,0.29978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69242,-0.52815,-0.49154)
- Old Polarization:       (-0.70394,0.64389,0.29978)
- New Momentum Direction: (-0.22407,-0.71341,-0.66396)
- New Polarization:       (0.96479,-0.066087,-0.25459)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 482, parentID 1) is processed with stopping code 2
 ### pop requested out of 179 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71083,-0.67284,0.20495)
- Old Polarization:       (-0.6935,-0.71908,0.044521)
- New Momentum Direction: (0.29354,-0.91446,0.27855)
- New Polarization:       (-0.95024,-0.31092,-0.019347)
+ Old Momentum Direction: (0.81793,0.20732,-0.53667)
+ Old Polarization:       (-0.5745,0.24476,-0.78105)
+ New Momentum Direction: (0.63001,0.27984,-0.72441)
+ New Polarization:       (-0.77603,0.19151,-0.60092)
  *** FresnelRefraction *** 
 Track (trackID 481, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.77633,-0.5603,-0.28875)
- Old Polarization:       (-0.62148,-0.60394,-0.49901)
- New Momentum Direction: (0.52382,-0.75719,-0.39023)
- New Polarization:       (-0.84594,-0.40863,-0.34264)
- *** FresnelRefraction *** 
-Track (trackID 480, parentID 1) is processed with stopping code 2
-### pop requested out of 177 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 480, parentID 1) is processed with stopping code 2
+### pop requested out of 177 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81156,0.32449,-0.48587)
+ Old Polarization:       (-0.58184,0.37321,-0.72261)
+ New Momentum Direction: (0.61326,0.43869,-0.65686)
+ New Polarization:       (-0.78823,0.2861,-0.54483)
+ *** FresnelRefraction *** 
 Track (trackID 479, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80482,-0.32721,-0.49518)
- Old Polarization:       (-0.5898,-0.34765,-0.72889)
- New Momentum Direction: (0.59865,-0.4416,-0.66828)
- New Polarization:       (-0.79847,-0.26263,-0.54173)
+ Old Momentum Direction: (0.75508,0.65476,-0.033824)
+ Old Polarization:       (-0.64435,0.73156,-0.22276)
+ New Momentum Direction: (0.45655,0.88851,-0.0459)
+ New Polarization:       (-0.88244,0.44564,-0.15069)
  *** FresnelRefraction *** 
 Track (trackID 478, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6896,0.5273,0.49639)
- Old Polarization:       (-0.71697,0.59366,0.36541)
- New Momentum Direction: (0.19331,0.71439,0.67252)
- New Polarization:       (-0.97731,0.2007,0.067714)
+ Old Momentum Direction: (0.6518,-0.082932,0.75384)
+ Old Polarization:       (-0.75838,-0.076521,0.64731)
+ New Momentum Direction: (0.87997,-0.11196,0.46165)
+ New Polarization:       (0.43964,-0.17616,-0.88073)
  *** FresnelRefraction *** 
 Track (trackID 477, parentID 1) is processed with stopping code 2
 ### pop requested out of 174 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69295,-0.6249,0.35961)
- Old Polarization:       (-0.71305,-0.66779,0.21359)
- New Momentum Direction: (-0.69295,-0.6249,0.35961)
- New Polarization:       (-0.70356,0.69508,-0.14789)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69295,-0.6249,0.35961)
- Old Polarization:       (-0.70356,0.69508,-0.14789)
- New Momentum Direction: (-0.69295,0.6249,0.35961)
- New Polarization:       (0.70356,0.69508,0.14789)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69295,0.6249,0.35961)
- Old Polarization:       (0.70356,0.69508,0.14789)
- New Momentum Direction: (-0.69295,0.6249,-0.35961)
- New Polarization:       (-0.70356,-0.69508,0.14789)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69295,0.6249,-0.35961)
- Old Polarization:       (-0.70356,-0.69508,0.14789)
- New Momentum Direction: (-0.20273,0.84873,-0.48842)
- New Polarization:       (0.96984,0.10509,-0.21994)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 476, parentID 1) is processed with stopping code 2
 ### pop requested out of 173 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7433,-0.66895,-0.0018081)
- Old Polarization:       (-0.65789,-0.73051,-0.1831)
- New Momentum Direction: (0.43506,-0.9004,-0.0024337)
- New Polarization:       (-0.89327,-0.43127,-0.12683)
+ Old Momentum Direction: (0.6821,-0.55549,0.47558)
+ Old Polarization:       (-0.72485,-0.5995,0.3394)
+ New Momentum Direction: (0.15939,-0.74992,0.64204)
+ New Polarization:       (-0.98391,-0.17381,0.041252)
  *** FresnelRefraction *** 
 Track (trackID 475, parentID 1) is processed with stopping code 2
 ### pop requested out of 172 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7744,-0.57115,-0.27219)
- Old Polarization:       (-0.62359,-0.61629,-0.48096)
- New Momentum Direction: (0.51894,-0.77166,-0.36774)
- New Polarization:       (-0.84875,-0.41403,-0.32894)
+ Old Momentum Direction: (0.68018,-0.56509,0.46693)
+ Old Polarization:       (-0.72646,-0.60482,0.32627)
+ New Momentum Direction: (0.11397,-0.76586,0.63283)
+ New Polarization:       (-0.9903,-0.13852,0.010708)
  *** FresnelRefraction *** 
 Track (trackID 474, parentID 1) is processed with stopping code 2
 ### pop requested out of 171 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7504,0.66098,-0.0019656)
- Old Polarization:       (-0.65028,0.73772,-0.18143)
- New Momentum Direction: (0.442,0.89701,-0.0026675)
- New Polarization:       (-0.89018,0.43827,-0.12448)
+ Old Momentum Direction: (0.65144,-0.017325,0.7585)
+ Old Polarization:       (-0.75866,-0.0039044,0.65148)
+ New Momentum Direction: (0.88001,-0.023404,0.47438)
+ New Polarization:       (0.47371,-0.029242,-0.8802)
  *** FresnelRefraction *** 
 Track (trackID 473, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.81288,-0.14218,-0.56481)
+Old Polarization: (-0.58138,-0.13995,-0.80151)
+New Polarization: (0.25382,0.84293,0.47439)
+Polarization Change: (0.25382,0.84293,0.47439)
+New Momentum Direction: (0.54676,-0.52961,0.64851)
+Momentum Change: (0.54676,-0.52961,0.64851)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54676,-0.52961,0.64851)
+ Old Polarization:       (0.25382,0.84293,0.47439)
+ New Momentum Direction: (-0.54676,-0.52961,0.64851)
+ New Polarization:       (0.25382,-0.84293,-0.47439)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54676,-0.52961,0.64851)
+ Old Polarization:       (0.25382,-0.84293,-0.47439)
+ New Momentum Direction: (-0.54676,0.52961,0.64851)
+ New Polarization:       (-0.25382,-0.84293,0.47439)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54676,0.52961,0.64851)
+ Old Polarization:       (-0.25382,-0.84293,0.47439)
+ New Momentum Direction: (-0.54676,0.52961,-0.64851)
+ New Polarization:       (0.25382,0.84293,0.47439)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54676,0.52961,-0.64851)
+ Old Polarization:       (0.25382,0.84293,0.47439)
+ New Momentum Direction: (0.54676,0.52961,-0.64851)
+ New Polarization:       (0.25382,-0.84293,-0.47439)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.54676,0.52961,-0.64851)
+Old Polarization: (0.25382,-0.84293,-0.47439)
+New Polarization: (-0.30336,-0.94634,0.11142)
+Polarization Change: (-0.30336,-0.94634,0.11142)
+New Momentum Direction: (-0.61322,0.28338,0.73733)
+Momentum Change: (-0.61322,0.28338,0.73733)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61322,0.28338,0.73733)
+ Old Polarization:       (-0.30336,-0.94634,0.11142)
+ New Momentum Direction: (0.61322,0.28338,0.73733)
+ New Polarization:       (-0.30336,0.94634,-0.11142)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 472, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81785,0.070706,-0.57108)
- Old Polarization:       (-0.57542,0.092989,-0.81255)
- New Momentum Direction: (0.62976,0.095447,-0.7709)
- New Polarization:       (-0.77678,0.072035,-0.62564)
+ Old Momentum Direction: (0.80429,0.38054,-0.4564)
+ Old Polarization:       (-0.59081,0.42986,-0.68276)
+ New Momentum Direction: (0.58943,0.51732,-0.62044)
+ New Polarization:       (-0.80552,0.3185,-0.49969)
  *** FresnelRefraction *** 
 Track (trackID 471, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69132,0.55151,0.4668)
- Old Polarization:       (-0.71479,0.6164,0.33033)
- New Momentum Direction: (-0.69132,0.55151,0.4668)
- New Polarization:       (-0.70641,-0.65168,-0.27624)
- *** FresnelReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.69132,0.55151,0.4668)
-Old Polarization: (-0.70641,-0.65168,-0.27624)
-New Polarization: (-0.80599,-0.24012,0.214)
-Polarization Change: (-0.92878,-0.2767,0.24659)
-New Momentum Direction: (-0.24219,0.95292,0.15707)
-Momentum Change: (-0.24324,0.95705,0.15775)
- Photon at Boundary! 
- Old Momentum Direction: (-0.24324,0.95705,0.15775)
- Old Polarization:       (-0.92878,-0.2767,0.24659)
- New Momentum Direction: (-0.33048,0.91915,0.21433)
- New Polarization:       (-0.8731,-0.38398,0.30044)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 470, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65867,-0.29618,0.69169)
- Old Polarization:       (-0.7512,-0.31155,0.58193)
- New Momentum Direction: (0.89111,-0.40071,0.21299)
- New Polarization:       (0.0038258,-0.46271,-0.8865)
+ Old Momentum Direction: (0.71151,0.61068,0.3476)
+ Old Polarization:       (-0.6924,0.69358,0.19879)
+ New Momentum Direction: (0.32103,0.82308,0.46849)
+ New Polarization:       (-0.94091,0.33353,0.058787)
  *** FresnelRefraction *** 
 Track (trackID 469, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68341,-0.56254,0.4653)
- Old Polarization:       (-0.72391,-0.60458,0.33232)
- New Momentum Direction: (0.15499,-0.76125,0.62966)
- New Polarization:       (-0.98479,-0.16968,0.037271)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 468, parentID 1) is processed with stopping code 2
 ### pop requested out of 165 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75495,-0.64747,-0.10409)
- Old Polarization:       (-0.64498,-0.70438,-0.29639)
- New Momentum Direction: (0.46768,-0.87269,-0.1403)
- New Polarization:       (-0.87683,-0.43803,-0.19826)
+ Old Momentum Direction: (0.70104,0.59997,0.38546)
+ Old Polarization:       (-0.70342,0.67062,0.23552)
+ New Momentum Direction: (0.24956,0.8147,0.52343)
+ New Polarization:       (-0.96294,0.26587,0.0453)
  *** FresnelRefraction *** 
 Track (trackID 467, parentID 1) is processed with stopping code 2
 ### pop requested out of 164 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65009,-0.15307,0.74428)
- Old Polarization:       (-0.75967,-0.15222,0.63224)
- New Momentum Direction: (0.88376,-0.20808,0.41913)
- New Polarization:       (0.34623,-0.31177,-0.88483)
- *** FresnelRefraction *** 
-Track (trackID 466, parentID 1) is processed with stopping code 2
-### pop requested out of 163 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.69404,0.56994,0.43986)
-Old Polarization: (-0.71174,0.63512,0.30009)
-New Polarization: (-0.64285,0.57729,0.39087)
-Polarization Change: (-0.67788,0.60876,0.41217)
-New Momentum Direction: (0.19077,0.669,-0.67432)
-Momentum Change: (0.19691,0.69051,-0.696)
- Photon at Boundary! 
- Old Momentum Direction: (0.19691,0.69051,-0.696)
- Old Polarization:       (-0.67788,0.60876,0.41217)
- New Momentum Direction: (0.19691,-0.69051,-0.696)
- New Polarization:       (0.50971,-0.53432,0.67431)
+ Old Momentum Direction: (0.67684,0.46241,0.57277)
+ Old Polarization:       (-0.73002,0.52167,0.44151)
+ New Momentum Direction: (-0.67684,0.46241,0.57277)
+ New Polarization:       (-0.72863,-0.53158,-0.43187)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.19691,-0.69051,-0.696)
- Old Polarization:       (0.50971,-0.53432,0.67431)
- New Momentum Direction: (0.2678,-0.93913,-0.2152)
- New Polarization:       (0.27216,-0.14053,0.95194)
+ Old Momentum Direction: (-0.67684,0.46241,0.57277)
+ Old Polarization:       (-0.72863,-0.53158,-0.43187)
+ New Momentum Direction: (-0.67684,0.46241,-0.57277)
+ New Polarization:       (0.72863,0.53158,-0.43187)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67684,0.46241,-0.57277)
+ Old Polarization:       (0.72863,0.53158,-0.43187)
+ New Momentum Direction: (-0.67684,-0.46241,-0.57277)
+ New Polarization:       (-0.72863,0.53158,0.43187)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67684,-0.46241,-0.57277)
+ Old Polarization:       (-0.72863,0.53158,0.43187)
+ New Momentum Direction: (-0.056232,-0.62717,-0.77685)
+ New Polarization:       (0.99508,0.028349,-0.094915)
  *** FresnelRefraction *** 
+Track (trackID 466, parentID 1) is processed with stopping code 2
+### pop requested out of 163 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 465, parentID 1) is processed with stopping code 2
 ### pop requested out of 162 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68677,0.51839,0.50953)
- Old Polarization:       (-0.7199,0.58193,0.37828)
- New Momentum Direction: (0.16511,0.70339,0.69136)
- New Polarization:       (-0.9827,0.17693,0.054671)
+ Old Momentum Direction: (0.65419,-0.12081,0.74662)
+ Old Polarization:       (-0.75625,-0.11914,0.64334)
+ New Momentum Direction: (0.88099,-0.1627,0.44428)
+ New Polarization:       (0.39749,-0.2548,-0.88152)
  *** FresnelRefraction *** 
 Track (trackID 464, parentID 1) is processed with stopping code 2
 ### pop requested out of 161 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7969,0.44606,-0.40741)
- Old Polarization:       (-0.59957,0.50147,-0.62373)
- New Momentum Direction: (0.57138,0.60597,-0.55346)
- New Polarization:       (-0.81764,0.36234,-0.44741)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 463, parentID 1) is processed with stopping code 2
 ### pop requested out of 160 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79678,-0.39304,-0.45897)
- Old Polarization:       (-0.5993,-0.41681,-0.68346)
- New Momentum Direction: (0.57413,-0.53256,-0.62189)
- New Polarization:       (-0.81542,-0.30333,-0.49304)
+ Old Momentum Direction: (0.79681,-0.44846,-0.40493)
+ Old Polarization:       (-0.59743,-0.48453,-0.63899)
+ New Momentum Direction: (0.58209,-0.60351,-0.54493)
+ New Polarization:       (-0.80848,-0.35804,-0.46709)
  *** FresnelRefraction *** 
 Track (trackID 462, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8174,0.099599,-0.56739)
- Old Polarization:       (-0.57599,0.12487,-0.80787)
- New Momentum Direction: (0.62835,0.1345,-0.76622)
- New Polarization:       (-0.77788,0.096926,-0.6209)
- *** FresnelRefraction *** 
-Track (trackID 461, parentID 1) is processed with stopping code 2
-### pop requested out of 158 stacked tracks.
+ Old Momentum Direction: (0.66001,-0.41581,0.62569)
+ Old Polarization:       (-0.7482,-0.43885,0.49761)
+ New Momentum Direction: (-0.66001,-0.41581,0.62569)
+ New Polarization:       (-0.7482,0.43885,-0.49761)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66001,-0.41581,0.62569)
+ Old Polarization:       (-0.7482,0.43885,-0.49761)
+ New Momentum Direction: (-0.66001,-0.41581,-0.62569)
+ New Polarization:       (0.7482,-0.43885,-0.49761)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
+Track (trackID 461, parentID 1) is processed with stopping code 2
+### pop requested out of 158 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.75445,0.65596,0.022709)
+ Old Polarization:       (-0.64463,0.74704,-0.16241)
+ New Momentum Direction: (0.46946,0.88243,0.030549)
+ New Polarization:       (-0.87525,0.46964,-0.11563)
+ *** FresnelRefraction *** 
 Track (trackID 460, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79595,0.46529,-0.38727)
- Old Polarization:       (-0.60034,0.52446,-0.60376)
- New Momentum Direction: (0.571,0.63099,-0.52518)
- New Polarization:       (-0.81758,0.37913,-0.43339)
+ Old Momentum Direction: (0.81489,-0.20995,-0.54026)
+ Old Polarization:       (-0.57766,-0.2177,-0.78671)
+ New Momentum Direction: (0.62385,-0.28309,-0.72847)
+ New Polarization:       (-0.7802,-0.17097,-0.60172)
  *** FresnelRefraction *** 
 Track (trackID 459, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78244,0.55251,-0.28728)
- Old Polarization:       (-0.6155,0.61607,-0.49155)
- New Momentum Direction: (0.5316,0.75148,-0.39074)
- New Polarization:       (-0.84222,0.4201,-0.33791)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 458, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68491,-0.58907,0.42883)
- Old Polarization:       (-0.72184,-0.62873,0.28923)
- New Momentum Direction: (0.14405,-0.80003,0.58241)
- New Polarization:       (-0.98618,-0.16473,0.017634)
+ Old Momentum Direction: (0.81609,0.12441,-0.56437)
+ Old Polarization:       (-0.57774,0.15105,-0.80212)
+ New Momentum Direction: (0.61975,0.16895,-0.7664)
+ New Polarization:       (-0.78467,0.11603,-0.60895)
  *** FresnelRefraction *** 
 Track (trackID 457, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77263,-0.56854,-0.28249)
- Old Polarization:       (-0.62593,-0.60782,-0.48864)
- New Momentum Direction: (0.50818,-0.77129,-0.38323)
- New Polarization:       (-0.85538,-0.40012,-0.32899)
+ Old Momentum Direction: (0.66374,0.35193,0.66)
+ Old Polarization:       (-0.74417,0.39955,0.53533)
+ New Momentum Direction: (-0.66374,0.35193,0.66)
+ New Polarization:       (-0.74417,-0.39955,-0.53533)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66374,0.35193,0.66)
+ Old Polarization:       (-0.74417,-0.39955,-0.53533)
+ New Momentum Direction: (-0.66374,0.35193,-0.66)
+ New Polarization:       (0.74417,0.39955,-0.53533)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66374,0.35193,-0.66)
+ Old Polarization:       (0.74417,0.39955,-0.53533)
+ New Momentum Direction: (-0.66374,-0.35193,-0.66)
+ New Polarization:       (-0.74417,0.39955,0.53533)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66374,-0.35193,-0.66)
+ Old Polarization:       (-0.74417,0.39955,0.53533)
+ New Momentum Direction: (0.66374,-0.35193,-0.66)
+ New Polarization:       (-0.74417,-0.39955,-0.53533)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66374,-0.35193,-0.66)
+ Old Polarization:       (-0.74417,-0.39955,-0.53533)
+ New Momentum Direction: (0.66374,-0.35193,0.66)
+ New Polarization:       (0.74417,0.39955,-0.53533)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.66374,-0.35193,0.66)
+Old Polarization: (0.74417,0.39955,-0.53533)
+New Polarization: (0.84906,0.50638,-0.15057)
+Polarization Change: (0.84906,0.50638,-0.15057)
+New Momentum Direction: (-0.080535,-0.15762,-0.98421)
+Momentum Change: (-0.080535,-0.15762,-0.98421)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.080535,-0.15762,-0.98421)
+ Old Polarization:       (0.84906,0.50638,-0.15057)
+ New Momentum Direction: (-0.10937,-0.21405,-0.97068)
+ New Polarization:       (-0.033971,-0.97516,0.21887)
  *** FresnelRefraction *** 
 Track (trackID 456, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74273,0.6679,0.047552)
- Old Polarization:       (-0.65873,0.74158,-0.12703)
- New Momentum Direction: (0.41288,0.90848,0.064682)
- New Polarization:       (-0.90399,0.41743,-0.092528)
+ Old Momentum Direction: (0.80046,0.44198,-0.40487)
+ Old Polarization:       (-0.59454,0.49977,-0.62988)
+ New Momentum Direction: (0.58283,0.5992,-0.54889)
+ New Polarization:       (-0.80933,0.36751,-0.45818)
  *** FresnelRefraction *** 
 Track (trackID 455, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67269,0.40861,0.61687)
- Old Polarization:       (-0.73534,0.46191,0.4959)
- New Momentum Direction: (-0.67269,0.40861,0.61687)
- New Polarization:       (-0.73534,-0.46191,-0.4959)
+ Old Momentum Direction: (0.65148,0.11322,0.75017)
+ Old Polarization:       (-0.75797,0.13944,0.63721)
+ New Momentum Direction: (0.88285,0.15344,0.44389)
+ New Polarization:       (0.39784,0.25798,-0.88044)
+ *** FresnelRefraction *** 
+Track (trackID 454, parentID 1) is processed with stopping code 2
+### pop requested out of 151 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81768,0.20698,-0.53718)
+ Old Polarization:       (-0.57487,0.24417,-0.78097)
+ New Momentum Direction: (0.62902,0.27951,-0.7254)
+ New Polarization:       (-0.77683,0.19078,-0.60011)
+ *** FresnelRefraction *** 
+Track (trackID 453, parentID 1) is processed with stopping code 2
+### pop requested out of 150 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65731,-0.3502,0.66731)
+ Old Polarization:       (-0.75161,-0.3693,0.54654)
+ New Momentum Direction: (0.65731,-0.3502,-0.66731)
+ New Polarization:       (0.75161,0.3693,0.54654)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67269,0.40861,0.61687)
- Old Polarization:       (-0.73534,-0.46191,-0.4959)
- New Momentum Direction: (-0.67269,0.40861,-0.61687)
- New Polarization:       (0.73534,0.46191,-0.4959)
+ Old Momentum Direction: (0.65731,-0.3502,-0.66731)
+ Old Polarization:       (0.75161,0.3693,0.54654)
+ New Momentum Direction: (-0.65731,-0.3502,-0.66731)
+ New Polarization:       (0.75161,-0.3693,-0.54654)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67269,0.40861,-0.61687)
- Old Polarization:       (0.73534,0.46191,-0.4959)
- New Momentum Direction: (-0.67269,-0.40861,-0.61687)
- New Polarization:       (-0.73534,0.46191,0.4959)
+ Old Momentum Direction: (-0.65731,-0.3502,-0.66731)
+ Old Polarization:       (0.75161,-0.3693,-0.54654)
+ New Momentum Direction: (-0.65731,0.3502,-0.66731)
+ New Polarization:       (-0.75161,-0.3693,0.54654)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65731,0.3502,-0.66731)
+ Old Polarization:       (-0.75161,-0.3693,0.54654)
+ New Momentum Direction: (-0.65731,0.3502,0.66731)
+ New Polarization:       (0.75161,0.3693,0.54654)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65731,0.3502,0.66731)
+ Old Polarization:       (0.75161,0.3693,0.54654)
+ New Momentum Direction: (0.65731,0.3502,0.66731)
+ New Polarization:       (0.75161,-0.3693,-0.54654)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 454, parentID 1) is processed with stopping code 2
-### pop requested out of 151 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 453, parentID 1) is processed with stopping code 2
-### pop requested out of 150 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69155,-0.58669,0.42136)
- Old Polarization:       (-0.71539,-0.63695,0.28726)
- New Momentum Direction: (0.22856,-0.79073,0.5679)
- New Polarization:       (-0.96968,-0.23673,0.060643)
- *** FresnelRefraction *** 
 Track (trackID 452, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73181,-0.68071,0.032957)
- Old Polarization:       (-0.67061,-0.72789,-0.14305)
- New Momentum Direction: (0.37728,-0.92502,0.044785)
- New Polarization:       (-0.91941,-0.37992,-0.1017)
+ Old Momentum Direction: (0.71672,-0.68186,0.14621)
+ Old Polarization:       (-0.68624,-0.72691,-0.026095)
+ New Momentum Direction: (0.31628,-0.92758,0.1989)
+ New Polarization:       (-0.94212,-0.3317,-0.048783)
  *** FresnelRefraction *** 
 Track (trackID 451, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81591,-0.15711,-0.55643)
- Old Polarization:       (-0.57702,-0.16023,-0.80086)
- New Momentum Direction: (0.6279,-0.21149,-0.74901)
- New Polarization:       (-0.77749,-0.12677,-0.61598)
+ Old Momentum Direction: (0.73223,0.66076,0.16505)
+ Old Polarization:       (-0.66936,0.74292,-0.0046412)
+ New Momentum Direction: (0.38847,0.89399,0.22332)
+ New Polarization:       (-0.91417,0.40434,-0.02843)
  *** FresnelRefraction *** 
 Track (trackID 450, parentID 1) is processed with stopping code 2
 ### pop requested out of 147 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77932,0.57974,-0.23781)
- Old Polarization:       (-0.61849,0.65072,-0.44048)
- New Momentum Direction: (0.52797,0.78573,-0.32231)
- New Polarization:       (-0.84387,0.44265,-0.30322)
+ Old Momentum Direction: (0.72416,0.6591,0.20294)
+ Old Polarization:       (-0.67816,0.73404,0.035916)
+ New Momentum Direction: (0.3489,0.89566,0.27578)
+ New Polarization:       (-0.93024,0.36669,-0.014033)
  *** FresnelRefraction *** 
 Track (trackID 449, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78176,0.57362,-0.24455)
- Old Polarization:       (-0.61556,0.64719,-0.4497)
- New Momentum Direction: (0.53755,0.77568,-0.33069)
- New Polarization:       (-0.83787,0.44719,-0.31303)
- *** FresnelRefraction *** 
-Track (trackID 448, parentID 1) is processed with stopping code 2
-### pop requested out of 145 stacked tracks.
+ Old Momentum Direction: (0.66589,-0.43158,0.60855)
+ Old Polarization:       (-0.74264,-0.46141,0.48538)
+ New Momentum Direction: (-0.66589,-0.43158,0.60855)
+ New Polarization:       (-0.74264,0.46141,-0.48538)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66564,-0.42874,0.61082)
- Old Polarization:       (-0.74316,-0.45543,0.4902)
- New Momentum Direction: (-0.66564,-0.42874,0.61082)
- New Polarization:       (-0.74316,0.45543,-0.4902)
+ Old Momentum Direction: (-0.66589,-0.43158,0.60855)
+ Old Polarization:       (-0.74264,0.46141,-0.48538)
+ New Momentum Direction: (-0.66589,-0.43158,-0.60855)
+ New Polarization:       (0.74264,-0.46141,-0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66564,-0.42874,0.61082)
- Old Polarization:       (-0.74316,0.45543,-0.4902)
- New Momentum Direction: (-0.66564,-0.42874,-0.61082)
- New Polarization:       (0.74316,-0.45543,-0.4902)
+ Old Momentum Direction: (-0.66589,-0.43158,-0.60855)
+ Old Polarization:       (0.74264,-0.46141,-0.48538)
+ New Momentum Direction: (-0.66589,0.43158,-0.60855)
+ New Polarization:       (-0.74264,-0.46141,0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66564,-0.42874,-0.61082)
- Old Polarization:       (0.74316,-0.45543,-0.4902)
- New Momentum Direction: (-0.66564,0.42874,-0.61082)
- New Polarization:       (-0.74316,-0.45543,0.4902)
+ Old Momentum Direction: (-0.66589,0.43158,-0.60855)
+ Old Polarization:       (-0.74264,-0.46141,0.48538)
+ New Momentum Direction: (0.66589,0.43158,-0.60855)
+ New Polarization:       (-0.74264,0.46141,-0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66564,0.42874,-0.61082)
- Old Polarization:       (-0.74316,-0.45543,0.4902)
- New Momentum Direction: (0.66564,0.42874,-0.61082)
- New Polarization:       (-0.74316,0.45543,-0.4902)
+ Old Momentum Direction: (0.66589,0.43158,-0.60855)
+ Old Polarization:       (-0.74264,0.46141,-0.48538)
+ New Momentum Direction: (0.66589,0.43158,0.60855)
+ New Polarization:       (0.74264,-0.46141,-0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66564,0.42874,-0.61082)
- Old Polarization:       (-0.74316,0.45543,-0.4902)
- New Momentum Direction: (0.66564,0.42874,0.61082)
- New Polarization:       (0.74316,-0.45543,-0.4902)
+ Old Momentum Direction: (0.66589,0.43158,0.60855)
+ Old Polarization:       (0.74264,-0.46141,-0.48538)
+ New Momentum Direction: (0.66589,-0.43158,0.60855)
+ New Polarization:       (-0.74264,-0.46141,0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66564,0.42874,0.61082)
- Old Polarization:       (0.74316,-0.45543,-0.4902)
- New Momentum Direction: (0.66564,-0.42874,0.61082)
- New Polarization:       (-0.74316,-0.45543,0.4902)
+ Old Momentum Direction: (0.66589,-0.43158,0.60855)
+ Old Polarization:       (-0.74264,-0.46141,0.48538)
+ New Momentum Direction: (-0.66589,-0.43158,0.60855)
+ New Polarization:       (-0.74264,0.46141,-0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66564,-0.42874,0.61082)
- Old Polarization:       (-0.74316,-0.45543,0.4902)
- New Momentum Direction: (-0.66564,-0.42874,0.61082)
- New Polarization:       (-0.74316,0.45543,-0.4902)
+ Old Momentum Direction: (-0.66589,-0.43158,0.60855)
+ Old Polarization:       (-0.74264,0.46141,-0.48538)
+ New Momentum Direction: (-0.66589,-0.43158,-0.60855)
+ New Polarization:       (0.74264,-0.46141,-0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66564,-0.42874,0.61082)
- Old Polarization:       (-0.74316,0.45543,-0.4902)
- New Momentum Direction: (-0.66564,-0.42874,-0.61082)
- New Polarization:       (0.74316,-0.45543,-0.4902)
+ Old Momentum Direction: (-0.66589,-0.43158,-0.60855)
+ Old Polarization:       (0.74264,-0.46141,-0.48538)
+ New Momentum Direction: (0.66589,-0.43158,-0.60855)
+ New Polarization:       (0.74264,0.46141,0.48538)
  *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.66564,-0.42874,-0.61082)
-Old Polarization: (0.74316,-0.45543,-0.4902)
-New Polarization: (0.61812,-0.33892,-0.59702)
-Polarization Change: (0.66912,-0.36688,-0.64628)
-New Momentum Direction: (-0.63509,-0.71823,-0.2498)
-Momentum Change: (-0.64102,-0.72493,-0.25213)
  Photon at Boundary! 
- Old Momentum Direction: (-0.64102,-0.72493,-0.25213)
- Old Polarization:       (0.66912,-0.36688,-0.64628)
- New Momentum Direction: (0.64102,-0.72493,-0.25213)
- New Polarization:       (0.66912,0.36688,0.64628)
+ Old Momentum Direction: (0.66589,-0.43158,-0.60855)
+ Old Polarization:       (0.74264,0.46141,0.48538)
+ New Momentum Direction: (0.66589,-0.43158,0.60855)
+ New Polarization:       (-0.74264,-0.46141,0.48538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.64102,-0.72493,-0.25213)
- Old Polarization:       (0.66912,0.36688,0.64628)
- New Momentum Direction: (0.86904,-0.35766,-0.34182)
- New Polarization:       (0.49464,0.64152,0.58633)
- *** FresnelRefraction *** 
-Track (trackID 447, parentID 1) is processed with stopping code 2
-### pop requested out of 144 stacked tracks.
+ Old Momentum Direction: (0.66589,-0.43158,0.60855)
+ Old Polarization:       (-0.74264,-0.46141,0.48538)
+ New Momentum Direction: (0.66589,0.43158,0.60855)
+ New Polarization:       (0.74264,-0.46141,-0.48538)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73432,0.65193,0.18911)
- Old Polarization:       (-0.66792,0.74363,0.029985)
- New Momentum Direction: (0.40963,0.87614,0.25415)
- New Polarization:       (-0.90531,0.42472,-0.0050327)
- *** FresnelRefraction *** 
-Track (trackID 446, parentID 1) is processed with stopping code 2
-### pop requested out of 143 stacked tracks.
+ Old Momentum Direction: (0.66589,0.43158,0.60855)
+ Old Polarization:       (0.74264,-0.46141,-0.48538)
+ New Momentum Direction: (-0.66589,0.43158,0.60855)
+ New Polarization:       (0.74264,0.46141,0.48538)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66589,0.43158,0.60855)
+ Old Polarization:       (0.74264,0.46141,0.48538)
+ New Momentum Direction: (-0.66589,0.43158,-0.60855)
+ New Polarization:       (-0.74264,-0.46141,0.48538)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66589,0.43158,-0.60855)
+ Old Polarization:       (-0.74264,-0.46141,0.48538)
+ New Momentum Direction: (-0.66589,-0.43158,-0.60855)
+ New Polarization:       (0.74264,-0.46141,-0.48538)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 445, parentID 1) is processed with stopping code 2
-### pop requested out of 142 stacked tracks.
+Track (trackID 448, parentID 1) is processed with stopping code 2
+### pop requested out of 145 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 444, parentID 1) is processed with stopping code 2
-### pop requested out of 141 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68928,0.53797,0.48526)
- Old Polarization:       (-0.71707,0.60223,0.3509)
- New Momentum Direction: (-0.68928,0.53797,0.48526)
- New Polarization:       (-0.7098,-0.63566,-0.30351)
- *** FresnelReflection *** 
+Track (trackID 447, parentID 1) is processed with stopping code 2
+### pop requested out of 144 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 446, parentID 1) is processed with stopping code 2
+### pop requested out of 143 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.68928,0.53797,0.48526)
- Old Polarization:       (-0.7098,-0.63566,-0.30351)
- New Momentum Direction: (-0.68928,-0.53797,0.48526)
- New Polarization:       (0.7098,-0.63566,0.30351)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.68928,-0.53797,0.48526)
-Old Polarization: (0.7098,-0.63566,0.30351)
-New Polarization: (-0.08163,-0.4804,0.76512)
-Polarization Change: (-0.089988,-0.52959,0.84346)
-New Momentum Direction: (-0.44316,0.71962,0.40455)
-Momentum Change: (-0.47297,0.76803,0.43177)
+ Old Momentum Direction: (0.81026,-0.19207,-0.5537)
+ Old Polarization:       (-0.58441,-0.19396,-0.78793)
+ New Momentum Direction: (0.60376,-0.26126,-0.75314)
+ New Polarization:       (-0.79605,-0.14771,-0.58692)
+ *** FresnelRefraction *** 
+Track (trackID 445, parentID 1) is processed with stopping code 2
+### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.47297,0.76803,0.43177)
- Old Polarization:       (-0.089988,-0.52959,0.84346)
- New Momentum Direction: (-0.64233,0.49355,0.58637)
- New Polarization:       (-0.043963,-0.78753,0.6147)
+ Old Momentum Direction: (0.74074,-0.67082,-0.036076)
+ Old Polarization:       (-0.66006,-0.71678,-0.22483)
+ New Momentum Direction: (0.40844,-0.91147,-0.049018)
+ New Polarization:       (-0.90544,-0.39778,-0.14814)
  *** FresnelRefraction *** 
+Track (trackID 444, parentID 1) is processed with stopping code 2
+### pop requested out of 141 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 443, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70166,0.57249,0.42418)
- Old Polarization:       (-0.70404,0.64861,0.2892)
- New Momentum Direction: (0.27411,0.77271,0.57253)
- New Polarization:       (-0.95681,0.27905,0.081473)
+ Old Momentum Direction: (0.76226,-0.62161,-0.18043)
+ Old Polarization:       (-0.63632,-0.66861,-0.38479)
+ New Momentum Direction: (0.48196,-0.84146,-0.24425)
+ New Polarization:       (-0.86904,-0.42351,-0.25576)
  *** FresnelRefraction *** 
 Track (trackID 442, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67636,0.43244,0.59627)
- Old Polarization:       (-0.73149,0.48931,0.47487)
- New Momentum Direction: (-0.67636,0.43244,0.59627)
- New Polarization:       (-0.7302,-0.49988,-0.46575)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.67636,0.43244,0.59627)
- Old Polarization:       (-0.7302,-0.49988,-0.46575)
- New Momentum Direction: (-0.67636,0.43244,-0.59627)
- New Polarization:       (0.7302,0.49988,-0.46575)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.67636,0.43244,-0.59627)
- Old Polarization:       (0.7302,0.49988,-0.46575)
- New Momentum Direction: (-0.67636,-0.43244,-0.59627)
- New Polarization:       (-0.7302,0.49988,0.46575)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.67636,-0.43244,-0.59627)
- Old Polarization:       (-0.7302,0.49988,0.46575)
- New Momentum Direction: (-0.061808,-0.58597,-0.80797)
- New Polarization:       (0.99523,0.025084,-0.094325)
+ Old Momentum Direction: (0.77475,0.60362,-0.18816)
+ Old Polarization:       (-0.62273,0.677,-0.39227)
+ New Momentum Direction: (0.51503,0.81834,-0.25509)
+ New Polarization:       (-0.85087,0.45206,-0.26769)
  *** FresnelRefraction *** 
 Track (trackID 441, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81529,0.074799,-0.5742)
- Old Polarization:       (-0.57903,0.09672,-0.80955)
- New Momentum Direction: (0.61975,0.10138,-0.77822)
- New Polarization:       (-0.78478,0.073971,-0.61534)
+ Old Momentum Direction: (0.81482,-0.14416,-0.5615)
+ Old Polarization:       (-0.57863,-0.14316,-0.80293)
+ New Momentum Direction: (0.61916,-0.19527,-0.7606)
+ New Polarization:       (-0.78453,-0.11192,-0.60991)
  *** FresnelRefraction *** 
 Track (trackID 440, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65125,-0.080478,0.75458)
+ Old Polarization:       (-0.75885,-0.07369,0.64708)
+ New Momentum Direction: (0.87979,-0.10872,0.46276)
+ New Polarization:       (0.44205,-0.17087,-0.88056)
+ *** FresnelRefraction *** 
 Track (trackID 439, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 438, parentID 1) is processed with stopping code 2
-### pop requested out of 135 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72047,-0.68209,0.12521)
- Old Polarization:       (-0.68299,-0.7292,-0.042428)
- New Momentum Direction: (0.33419,-0.92702,0.17017)
- New Polarization:       (-0.93624,-0.34729,-0.053261)
+ Old Momentum Direction: (0.6496,0.12479,0.74996)
+ Old Polarization:       (-0.75949,0.15127,0.63268)
+ New Momentum Direction: (0.8827,0.16957,0.43828)
+ New Polarization:       (0.38315,0.28032,-0.88012)
  *** FresnelRefraction *** 
+Track (trackID 438, parentID 1) is processed with stopping code 2
+### pop requested out of 135 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 437, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71093,0.59597,0.37337)
- Old Polarization:       (-0.69403,0.6803,0.23561)
- New Momentum Direction: (0.3253,0.80134,0.50203)
- New Polarization:       (-0.94003,0.33162,0.079783)
+ Old Momentum Direction: (0.82019,0.043844,-0.5704)
+ Old Polarization:       (-0.57208,0.063741,-0.81771)
+ New Momentum Direction: (0.63496,0.059207,-0.77027)
+ New Polarization:       (-0.77254,0.049292,-0.63305)
  *** FresnelRefraction *** 
 Track (trackID 436, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80985,-0.22619,-0.54128)
- Old Polarization:       (-0.58462,-0.23463,-0.77664)
- New Momentum Direction: (0.60869,-0.30592,-0.73206)
- New Polarization:       (-0.79203,-0.17995,-0.58336)
+ Old Momentum Direction: (0.69555,-0.62356,0.35691)
+ Old Polarization:       (-0.70986,-0.67314,0.20734)
+ New Momentum Direction: (0.23891,-0.84276,0.48237)
+ New Polarization:       (-0.96623,-0.25571,0.031813)
  *** FresnelRefraction *** 
 Track (trackID 435, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.702,0.58605,0.40464)
- Old Polarization:       (-0.70342,0.6594,0.26532)
- New Momentum Direction: (0.26579,0.79331,0.54774)
- New Polarization:       (-0.95905,0.27529,0.06666)
+ Old Momentum Direction: (0.78043,0.58595,-0.21814)
+ Old Polarization:       (-0.61618,0.66165,-0.42725)
+ New Momentum Direction: (0.53432,0.79217,-0.29491)
+ New Polarization:       (-0.83923,0.45548,-0.29704)
  *** FresnelRefraction *** 
 Track (trackID 434, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80723,-0.26308,-0.52836)
- Old Polarization:       (-0.58766,-0.27472,-0.76104)
- New Momentum Direction: (0.60133,-0.35613,-0.71524)
- New Polarization:       (-0.79726,-0.20827,-0.56657)
+ Old Momentum Direction: (0.72141,-0.68209,0.11969)
+ Old Polarization:       (-0.68117,-0.73007,-0.054836)
+ New Momentum Direction: (-0.72141,-0.68209,0.11969)
+ New Polarization:       (-0.64191,0.72349,0.25399)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.72141,-0.68209,0.11969)
+ Old Polarization:       (-0.64191,0.72349,0.25399)
+ New Momentum Direction: (-0.9796,-0.11818,0.16253)
+ New Polarization:       (-0.1019,0.98922,0.10514)
  *** FresnelRefraction *** 
 Track (trackID 433, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72,0.63861,0.27164)
- Old Polarization:       (-0.68369,0.71988,0.11975)
- New Momentum Direction: (0.34713,0.86299,0.36708)
- New Polarization:       (-0.93156,0.36244,0.028855)
+ Old Momentum Direction: (0.6823,-0.558,0.47234)
+ Old Polarization:       (-0.7246,-0.60195,0.33558)
+ New Momentum Direction: (-0.6823,-0.558,0.47234)
+ New Polarization:       (-0.71932,0.6278,-0.29741)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6823,-0.558,0.47234)
+ Old Polarization:       (-0.71932,0.6278,-0.29741)
+ New Momentum Direction: (-0.6823,0.558,0.47234)
+ New Polarization:       (0.71932,0.6278,0.29741)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6823,0.558,0.47234)
+ Old Polarization:       (0.71932,0.6278,0.29741)
+ New Momentum Direction: (-0.6823,0.558,-0.47234)
+ New Polarization:       (-0.71932,-0.6278,0.29741)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6823,0.558,-0.47234)
+ Old Polarization:       (-0.71932,-0.6278,0.29741)
+ New Momentum Direction: (-0.15949,0.75349,-0.63782)
+ New Polarization:       (0.9811,0.049292,-0.1871)
  *** FresnelRefraction *** 
 Track (trackID 432, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70594,-0.66388,0.2468)
- Old Polarization:       (-0.69884,-0.70957,0.090214)
- New Momentum Direction: (0.27143,-0.90214,0.33537)
- New Polarization:       (-0.9571,-0.28972,-0.0047192)
+ Old Momentum Direction: (0.65002,0.052977,0.75807)
+ Old Polarization:       (-0.75961,0.073355,0.64622)
+ New Momentum Direction: (0.88068,0.071775,0.46824)
+ New Polarization:       (0.4571,0.13067,-0.87976)
  *** FresnelRefraction *** 
 Track (trackID 431, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 430, parentID 1) is processed with stopping code 2
-### pop requested out of 127 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66366,0.29185,0.68875)
- Old Polarization:       (-0.74542,0.33497,0.57632)
- New Momentum Direction: (0.89932,0.39548,0.18658)
- New Polarization:       (-0.017922,0.45965,-0.88792)
+ Old Momentum Direction: (0.74679,0.664,0.037638)
+ Old Polarization:       (-0.65339,0.74306,-0.14469)
+ New Momentum Direction: (0.43234,0.90026,0.05103)
+ New Polarization:       (-0.89428,0.43534,-0.10364)
  *** FresnelRefraction *** 
+Track (trackID 430, parentID 1) is processed with stopping code 2
+### pop requested out of 127 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 429, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78727,-0.47063,-0.3984)
- Old Polarization:       (-0.60998,-0.49993,-0.61481)
- New Momentum Direction: (0.54717,-0.63886,-0.5408)
- New Polarization:       (-0.83261,-0.34915,-0.42996)
- *** FresnelRefraction *** 
-Track (trackID 428, parentID 1) is processed with stopping code 2
-### pop requested out of 125 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.80732,-0.30494,-0.50522)
-Old Polarization: (-0.58678,-0.32402,-0.74209)
-New Polarization: (-0.30045,0.10902,-0.80623)
-Polarization Change: (-0.34643,0.12571,-0.92962)
-New Momentum Direction: (-0.81228,0.07333,0.31262)
-Momentum Change: (-0.92997,0.083956,0.35791)
+ Old Momentum Direction: (0.65946,-0.398,0.63774)
+ Old Polarization:       (-0.74899,-0.42039,0.51214)
+ New Momentum Direction: (-0.65946,-0.398,0.63774)
+ New Polarization:       (-0.74899,0.42039,-0.51214)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65946,-0.398,0.63774)
+ Old Polarization:       (-0.74899,0.42039,-0.51214)
+ New Momentum Direction: (-0.65946,-0.398,-0.63774)
+ New Polarization:       (0.74899,-0.42039,-0.51214)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
+Track (trackID 428, parentID 1) is processed with stopping code 2
+### pop requested out of 125 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81412,-0.091174,-0.57349)
+ Old Polarization:       (-0.58013,-0.084211,-0.81016)
+ New Momentum Direction: (0.61371,-0.12396,-0.77974)
+ New Polarization:       (-0.78915,-0.065651,-0.61068)
+ *** FresnelRefraction *** 
 Track (trackID 427, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81351,0.13676,-0.56525)
- Old Polarization:       (-0.58133,0.16409,-0.79695)
- New Momentum Direction: (0.61366,0.18568,-0.76743)
- New Polarization:       (-0.78942,0.12512,-0.60097)
+ Old Momentum Direction: (0.64919,-0.034677,0.75984)
+ Old Polarization:       (-0.76061,-0.022911,0.6488)
+ New Momentum Direction: (0.8792,-0.046963,0.47412)
+ New Polarization:       (0.47066,-0.068944,-0.87962)
  *** FresnelRefraction *** 
 Track (trackID 426, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68302,-0.57694,0.44792)
- Old Polarization:       (-0.72395,-0.61605,0.31043)
- New Momentum Direction: (-0.68302,-0.57694,0.44792)
- New Polarization:       (-0.71995,0.63517,-0.27971)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68302,-0.57694,0.44792)
- Old Polarization:       (-0.71995,0.63517,-0.27971)
- New Momentum Direction: (-0.68302,0.57694,0.44792)
- New Polarization:       (0.71995,0.63517,0.27971)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68302,0.57694,0.44792)
- Old Polarization:       (0.71995,0.63517,0.27971)
- New Momentum Direction: (-0.68302,0.57694,-0.44792)
- New Polarization:       (-0.71995,-0.63517,0.27971)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68302,0.57694,-0.44792)
- Old Polarization:       (-0.71995,-0.63517,0.27971)
- New Momentum Direction: (0.68302,0.57694,-0.44792)
- New Polarization:       (0.71354,-0.39606,0.57792)
+ Old Momentum Direction: (0.68425,0.49485,0.53565)
+ Old Polarization:       (-0.72229,0.56111,0.4043)
+ New Momentum Direction: (-0.68425,0.49485,0.53565)
+ New Polarization:       (-0.71619,-0.59436,-0.3658)
  *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.68302,0.57694,-0.44792)
- Old Polarization:       (0.71354,-0.39606,0.57792)
- New Momentum Direction: (0.68302,-0.57694,-0.44792)
- New Polarization:       (-0.71354,-0.39606,-0.57792)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.68302,-0.57694,-0.44792)
- Old Polarization:       (-0.71354,-0.39606,-0.57792)
- New Momentum Direction: (0.68302,-0.57694,0.44792)
- New Polarization:       (0.71354,0.39606,-0.57792)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.68302,-0.57694,0.44792)
- Old Polarization:       (0.71354,0.39606,-0.57792)
- New Momentum Direction: (0.12962,-0.78323,0.60808)
- New Polarization:       (-0.98317,-0.18112,-0.023715)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 425, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80844,-0.24699,-0.53424)
- Old Polarization:       (-0.58625,-0.25729,-0.76819)
- New Momentum Direction: (0.60479,-0.3342,-0.72287)
- New Polarization:       (-0.79481,-0.19611,-0.5743)
+ Old Momentum Direction: (0.79448,0.49923,-0.34578)
+ Old Polarization:       (-0.60092,0.56403,-0.56636)
+ New Momentum Direction: (0.56904,0.676,-0.46821)
+ New Polarization:       (-0.81802,0.40725,-0.40619)
  *** FresnelRefraction *** 
 Track (trackID 424, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.67956,0.46012,0.57139)
- Old Polarization:       (-0.72795,0.51954,0.4474)
- New Momentum Direction: (0.10739,0.62357,0.77436)
- New Polarization:       (-0.99151,0.12466,0.037118)
+Scattering Photon!
+Old Momentum Direction: (0.79589,-0.44745,-0.40786)
+Old Polarization: (-0.59871,-0.4815,-0.64007)
+New Polarization: (-0.95707,-0.14201,0.25268)
+Polarization Change: (-0.95707,-0.14201,0.25268)
+New Momentum Direction: (-0.15916,-0.47112,-0.86759)
+Momentum Change: (-0.15916,-0.47112,-0.86759)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.15916,-0.47112,-0.86759)
+ Old Polarization:       (-0.95707,-0.14201,0.25268)
+ New Momentum Direction: (-0.21455,-0.6351,-0.74203)
+ New Polarization:       (-0.88469,-0.19556,0.42318)
  *** FresnelRefraction *** 
 Track (trackID 423, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70412,0.61093,0.36192)
+ Old Polarization:       (-0.70006,0.68257,0.20979)
+ New Momentum Direction: (0.26498,0.82961,0.49147)
+ New Polarization:       (-0.95858,0.28184,0.04108)
+ *** FresnelRefraction *** 
 Track (trackID 422, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65016,-0.17101,0.7403)
- Old Polarization:       (-0.75954,-0.17165,0.6274)
- New Momentum Direction: (0.88413,-0.23255,0.40525)
- New Polarization:       (0.31567,-0.34216,-0.88503)
+ Old Momentum Direction: (0.65463,-0.14902,0.74111)
+ Old Polarization:       (-0.75576,-0.15055,0.6373)
+ New Momentum Direction: (0.88154,-0.20068,0.42733)
+ New Polarization:       (0.35711,-0.3086,-0.88161)
  *** FresnelRefraction *** 
 Track (trackID 421, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71427,-0.67767,0.1749)
- Old Polarization:       (-0.68974,-0.72397,0.011699)
- New Momentum Direction: (0.30788,-0.92124,0.23776)
- New Polarization:       (-0.9455,-0.3241,-0.031433)
- *** FresnelRefraction *** 
-Track (trackID 420, parentID 1) is processed with stopping code 2
-### pop requested out of 117 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 420, parentID 1) is processed with stopping code 2
+### pop requested out of 117 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65183,-0.17981,0.73674)
+ Old Polarization:       (-0.75804,-0.18309,0.62599)
+ New Momentum Direction: (0.88134,-0.24312,0.40513)
+ New Polarization:       (0.30543,-0.36105,-0.88111)
+ *** FresnelRefraction *** 
 Track (trackID 419, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79443,-0.43992,-0.41875)
- Old Polarization:       (-0.60129,-0.47254,-0.64433)
- New Momentum Direction: (0.57291,-0.59366,-0.56509)
- New Polarization:       (-0.81551,-0.34395,-0.46545)
+ Old Momentum Direction: (0.81031,0.28718,-0.5108)
+ Old Polarization:       (-0.58423,0.32822,-0.74226)
+ New Momentum Direction: (0.60463,0.39035,-0.6943)
+ New Polarization:       (-0.79531,0.24815,-0.55309)
  *** FresnelRefraction *** 
 Track (trackID 418, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.66194,0.25157,0.70608)
- Old Polarization:       (-0.74749,0.29142,0.59693)
- New Momentum Direction: (0.89604,0.34053,0.28487)
- New Polarization:       (0.10984,0.45166,-0.8854)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 417, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81633,0.18989,-0.54548)
- Old Polarization:       (-0.57699,0.22519,-0.78509)
- New Momentum Direction: (0.6267,0.2562,-0.73594)
- New Polarization:       (-0.77885,0.17532,-0.6022)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.66482,0.34921,0.66035)
+ Old Polarization:       (-0.74324,0.39792,0.53783)
+ New Momentum Direction: (-0.66482,0.34921,0.66035)
+ New Polarization:       (-0.74324,-0.39792,-0.53783)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66482,0.34921,0.66035)
+ Old Polarization:       (-0.74324,-0.39792,-0.53783)
+ New Momentum Direction: (-0.66482,0.34921,-0.66035)
+ New Polarization:       (0.74324,0.39792,-0.53783)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66482,0.34921,-0.66035)
+ Old Polarization:       (0.74324,0.39792,-0.53783)
+ New Momentum Direction: (-0.66482,-0.34921,-0.66035)
+ New Polarization:       (-0.74324,0.39792,0.53783)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66482,-0.34921,-0.66035)
+ Old Polarization:       (-0.74324,0.39792,0.53783)
+ New Momentum Direction: (0.66482,-0.34921,-0.66035)
+ New Polarization:       (-0.74324,-0.39792,-0.53783)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66482,-0.34921,-0.66035)
+ Old Polarization:       (-0.74324,-0.39792,-0.53783)
+ New Momentum Direction: (0.66482,-0.34921,0.66035)
+ New Polarization:       (0.74324,0.39792,-0.53783)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 416, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81105,-0.16086,-0.56243)
- Old Polarization:       (-0.5838,-0.1616,-0.79565)
- New Momentum Direction: (0.60881,-0.21815,-0.76273)
- New Polarization:       (-0.79252,-0.12414,-0.59708)
+ Old Momentum Direction: (0.80656,-0.29276,-0.51357)
+ Old Polarization:       (-0.58786,-0.30576,-0.74895)
+ New Momentum Direction: (0.59801,-0.39692,-0.6963)
+ New Polarization:       (-0.79926,-0.23066,-0.55496)
  *** FresnelRefraction *** 
 Track (trackID 415, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72088,0.63206,0.2843)
- Old Polarization:       (-0.68284,0.71792,0.13534)
- New Momentum Direction: (0.35868,0.85131,0.38291)
- New Polarization:       (-0.92716,0.37247,0.0404)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.66067,-0.39209,0.64014)
+ Old Polarization:       (-0.748,-0.41575,0.51735)
+ New Momentum Direction: (-0.66067,-0.39209,0.64014)
+ New Polarization:       (-0.748,0.41575,-0.51735)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66067,-0.39209,0.64014)
+ Old Polarization:       (-0.748,0.41575,-0.51735)
+ New Momentum Direction: (-0.66067,-0.39209,-0.64014)
+ New Polarization:       (0.748,-0.41575,-0.51735)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66067,-0.39209,-0.64014)
+ Old Polarization:       (0.748,-0.41575,-0.51735)
+ New Momentum Direction: (-0.66067,0.39209,-0.64014)
+ New Polarization:       (-0.748,-0.41575,0.51735)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66067,0.39209,-0.64014)
+ Old Polarization:       (-0.748,-0.41575,0.51735)
+ New Momentum Direction: (0.66067,0.39209,-0.64014)
+ New Polarization:       (-0.748,0.41575,-0.51735)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66067,0.39209,-0.64014)
+ Old Polarization:       (-0.748,0.41575,-0.51735)
+ New Momentum Direction: (0.66067,0.39209,0.64014)
+ New Polarization:       (0.748,-0.41575,-0.51735)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66067,0.39209,0.64014)
+ Old Polarization:       (0.748,-0.41575,-0.51735)
+ New Momentum Direction: (0.66067,-0.39209,0.64014)
+ New Polarization:       (-0.748,-0.41575,0.51735)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 414, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.77826,-0.54654,-0.30919)
+Old Polarization: (-0.61887,-0.58421,-0.52508)
+New Polarization: (-0.61279,-0.77121,0.17239)
+Polarization Change: (-0.61279,-0.77121,0.17239)
+New Momentum Direction: (0.24629,0.020896,0.96897)
+Momentum Change: (0.24629,0.020896,0.96897)
 
 ** Photon absorbed! **
 Track (trackID 413, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65518,-0.31057,0.68868)
- Old Polarization:       (-0.7541,-0.32376,0.57142)
- New Momentum Direction: (0.65518,-0.31057,-0.68868)
- New Polarization:       (-0.10776,0.86385,-0.49208)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.66847,0.40815,0.62174)
+ Old Polarization:       (-0.73886,0.46006,0.49238)
+ New Momentum Direction: (-0.66847,0.40815,0.62174)
+ New Polarization:       (-0.73886,-0.46006,-0.49238)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65518,-0.31057,-0.68868)
- Old Polarization:       (-0.10776,0.86385,-0.49208)
- New Momentum Direction: (-0.65518,-0.31057,-0.68868)
- New Polarization:       (-0.10776,-0.86385,0.49208)
+ Old Momentum Direction: (-0.66847,0.40815,0.62174)
+ Old Polarization:       (-0.73886,-0.46006,-0.49238)
+ New Momentum Direction: (-0.66847,0.40815,-0.62174)
+ New Polarization:       (0.73886,0.46006,-0.49238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65518,-0.31057,-0.68868)
- Old Polarization:       (-0.10776,-0.86385,0.49208)
- New Momentum Direction: (-0.65518,0.31057,-0.68868)
- New Polarization:       (0.10776,-0.86385,-0.49208)
+ Old Momentum Direction: (-0.66847,0.40815,-0.62174)
+ Old Polarization:       (0.73886,0.46006,-0.49238)
+ New Momentum Direction: (-0.66847,-0.40815,-0.62174)
+ New Polarization:       (-0.73886,0.46006,0.49238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65518,0.31057,-0.68868)
- Old Polarization:       (0.10776,-0.86385,-0.49208)
- New Momentum Direction: (-0.65518,0.31057,0.68868)
- New Polarization:       (0.70164,0.58808,0.40231)
- *** FresnelReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.65518,0.31057,0.68868)
-Old Polarization: (0.70164,0.58808,0.40231)
-New Polarization: (0.6768,0.5472,0.4382)
-Polarization Change: (0.69456,0.56157,0.4497)
-New Momentum Direction: (-0.15649,0.71878,-0.65589)
-Momentum Change: (-0.15878,0.72931,-0.6655)
+ Old Momentum Direction: (-0.66847,-0.40815,-0.62174)
+ Old Polarization:       (-0.73886,0.46006,0.49238)
+ New Momentum Direction: (0.66847,-0.40815,-0.62174)
+ New Polarization:       (-0.73886,-0.46006,-0.49238)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.15878,0.72931,-0.6655)
- Old Polarization:       (0.69456,0.56157,0.4497)
- New Momentum Direction: (-0.15878,0.72931,0.6655)
- New Polarization:       (-0.69456,-0.56157,0.4497)
+ Old Momentum Direction: (0.66847,-0.40815,-0.62174)
+ Old Polarization:       (-0.73886,-0.46006,-0.49238)
+ New Momentum Direction: (0.66847,-0.40815,0.62174)
+ New Polarization:       (0.73886,0.46006,-0.49238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.15878,0.72931,0.6655)
- Old Polarization:       (-0.69456,-0.56157,0.4497)
- New Momentum Direction: (0.15878,0.72931,0.6655)
- New Polarization:       (-0.69456,0.56157,-0.4497)
+ Old Momentum Direction: (0.66847,-0.40815,0.62174)
+ Old Polarization:       (0.73886,0.46006,-0.49238)
+ New Momentum Direction: (0.66847,0.40815,0.62174)
+ New Polarization:       (-0.73886,0.46006,0.49238)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66847,0.40815,0.62174)
+ Old Polarization:       (-0.73886,0.46006,0.49238)
+ New Momentum Direction: (-0.66847,0.40815,0.62174)
+ New Polarization:       (-0.73886,-0.46006,-0.49238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66847,0.40815,0.62174)
+ Old Polarization:       (-0.73886,-0.46006,-0.49238)
+ New Momentum Direction: (-0.66847,0.40815,-0.62174)
+ New Polarization:       (0.73886,0.46006,-0.49238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66847,0.40815,-0.62174)
+ Old Polarization:       (0.73886,0.46006,-0.49238)
+ New Momentum Direction: (0.66847,0.40815,-0.62174)
+ New Polarization:       (0.73886,-0.46006,0.49238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66847,0.40815,-0.62174)
+ Old Polarization:       (0.73886,-0.46006,0.49238)
+ New Momentum Direction: (0.66847,0.40815,0.62174)
+ New Polarization:       (-0.73886,0.46006,0.49238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66847,0.40815,0.62174)
+ Old Polarization:       (-0.73886,0.46006,0.49238)
+ New Momentum Direction: (0.66847,-0.40815,0.62174)
+ New Polarization:       (0.73886,0.46006,-0.49238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66847,-0.40815,0.62174)
+ Old Polarization:       (0.73886,0.46006,-0.49238)
+ New Momentum Direction: (-0.66847,-0.40815,0.62174)
+ New Polarization:       (0.73886,-0.46006,0.49238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66847,-0.40815,0.62174)
+ Old Polarization:       (0.73886,-0.46006,0.49238)
+ New Momentum Direction: (-0.66847,-0.40815,-0.62174)
+ New Polarization:       (-0.73886,0.46006,0.49238)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.66847,-0.40815,-0.62174)
+Old Polarization: (-0.73886,0.46006,0.49238)
+New Polarization: (0.58498,0.29989,-0.75357)
+Polarization Change: (0.58498,0.29989,-0.75357)
+New Momentum Direction: (-0.46837,0.88345,-0.012009)
+Momentum Change: (-0.46837,0.88345,-0.012009)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.46837,0.88345,-0.012009)
+ Old Polarization:       (0.58498,0.29989,-0.75357)
+ New Momentum Direction: (-0.63664,0.77098,-0.016324)
+ New Polarization:       (-0.56615,-0.48166,-0.66894)
+ *** FresnelRefraction *** 
 Track (trackID 412, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72639,0.65469,0.20912)
- Old Polarization:       (-0.67659,0.73465,0.050179)
- New Momentum Direction: (0.36632,0.88637,0.28312)
- New Polarization:       (-0.92393,0.38256,-0.0022683)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.66503,-0.47523,0.5761)
+ Old Polarization:       (-0.74259,-0.50278,0.44247)
+ New Momentum Direction: (-0.66503,-0.47523,0.5761)
+ New Polarization:       (-0.74259,0.50278,-0.44247)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66503,-0.47523,0.5761)
+ Old Polarization:       (-0.74259,0.50278,-0.44247)
+ New Momentum Direction: (-0.66503,-0.47523,-0.5761)
+ New Polarization:       (0.74259,-0.50278,-0.44247)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66503,-0.47523,-0.5761)
+ Old Polarization:       (0.74259,-0.50278,-0.44247)
+ New Momentum Direction: (-0.66503,0.47523,-0.5761)
+ New Polarization:       (-0.74259,-0.50278,0.44247)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.66503,0.47523,-0.5761)
+Old Polarization: (-0.74259,-0.50278,0.44247)
+New Polarization: (-0.96857,0.051047,-0.24345)
+Polarization Change: (-0.96857,0.051047,-0.24345)
+New Momentum Direction: (-0.21611,-0.6573,0.72198)
+Momentum Change: (-0.21611,-0.6573,0.72198)
+
+** Photon absorbed! **
 Track (trackID 411, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80925,-0.16703,-0.56321)
- Old Polarization:       (-0.58622,-0.16742,-0.79266)
- New Momentum Direction: (0.6018,-0.22707,-0.76568)
- New Polarization:       (-0.79781,-0.12714,-0.58935)
+ Old Momentum Direction: (0.73668,0.66291,0.13358)
+ Old Polarization:       (-0.66445,0.7463,-0.03924)
+ New Momentum Direction: (0.40488,0.89635,0.18062)
+ New Polarization:       (-0.90694,0.41881,-0.04537)
  *** FresnelRefraction *** 
 Track (trackID 410, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69307,0.56435,0.44851)
- Old Polarization:       (-0.71281,0.62929,0.30967)
- New Momentum Direction: (0.19781,0.7674,0.60989)
- New Polarization:       (-0.97598,0.21215,0.049612)
+ Old Momentum Direction: (0.78711,-0.48152,-0.38549)
+ Old Polarization:       (-0.60943,-0.51066,-0.60649)
+ New Momentum Direction: (0.54601,-0.65402,-0.52358)
+ New Polarization:       (-0.83286,-0.35612,-0.4237)
  *** FresnelRefraction *** 
 Track (trackID 409, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79126,-0.46279,-0.39966)
- Old Polarization:       (-0.60492,-0.49695,-0.62219)
- New Momentum Direction: (0.56386,-0.62505,-0.53978)
- New Polarization:       (-0.82144,-0.35686,-0.44485)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 408, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65236,-0.10886,0.75005)
- Old Polarization:       (-0.75786,-0.10487,0.64393)
- New Momentum Direction: (0.88383,-0.14749,0.44396)
- New Polarization:       (0.40637,-0.2281,-0.88478)
+ Old Momentum Direction: (0.69831,0.57802,0.4222)
+ Old Polarization:       (-0.70665,0.65069,0.27793)
+ New Momentum Direction: (0.24621,0.78267,0.57168)
+ New Polarization:       (-0.9641,0.25832,0.061553)
  *** FresnelRefraction *** 
 Track (trackID 407, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79368,0.50631,-0.33723)
- Old Polarization:       (-0.60217,0.57515,-0.55371)
- New Momentum Direction: (0.57064,0.68348,-0.45523)
- New Polarization:       (-0.81703,0.41669,-0.39854)
+ Old Momentum Direction: (0.80221,-0.38662,-0.45495)
+ Old Polarization:       (-0.59175,-0.41365,-0.6919)
+ New Momentum Direction: (0.5931,-0.52137,-0.61352)
+ New Polarization:       (-0.80152,-0.31023,-0.5112)
  *** FresnelRefraction *** 
 Track (trackID 406, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.70903,-0.67211,0.21343)
- Old Polarization:       (-0.6954,-0.71663,0.053459)
- New Momentum Direction: (0.28201,-0.91441,0.29038)
- New Polarization:       (-0.95382,-0.29984,-0.017869)
- *** FresnelRefraction *** 
-Track (trackID 405, parentID 1) is processed with stopping code 2
-### pop requested out of 102 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.64944,-0.032167,0.75973)
-Old Polarization: (-0.7604,-0.020458,0.64914)
-New Polarization: (-0.81159,0.32948,-0.004999)
-Polarization Change: (-0.92654,0.37614,-0.005707)
-New Momentum Direction: (0.17761,0.42571,-0.77718)
-Momentum Change: (0.19652,0.47105,-0.85994)
 
 ** Photon absorbed! **
+Track (trackID 405, parentID 1) is processed with stopping code 2
+### pop requested out of 102 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65441,-0.13682,0.74366)
+ Old Polarization:       (-0.75601,-0.13695,0.64008)
+ New Momentum Direction: (0.88127,-0.18425,0.43521)
+ New Polarization:       (0.37559,-0.2859,-0.88159)
+ *** FresnelRefraction *** 
 Track (trackID 404, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80882,0.32648,-0.48911)
- Old Polarization:       (-0.58579,0.37436,-0.71882)
- New Momentum Direction: (0.60594,0.44165,-0.66165)
- New Polarization:       (-0.79397,0.284,-0.53755)
+ Old Momentum Direction: (0.64981,-0.22132,0.72716)
+ Old Polarization:       (-0.7595,-0.22692,0.60964)
+ New Momentum Direction: (0.88192,-0.30038,0.36331)
+ New Polarization:       (0.22008,-0.41919,-0.88082)
  *** FresnelRefraction *** 
 Track (trackID 403, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65731,0.015498,0.75346)
- Old Polarization:       (-0.75349,0.031987,0.65668)
- New Momentum Direction: (0.88562,0.020881,0.46394)
- New Polarization:       (0.46272,0.045348,-0.88534)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 402, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80661,0.34134,-0.48256)
- Old Polarization:       (-0.58859,0.38897,-0.70871)
- New Momentum Direction: (0.59831,0.46272,-0.65416)
- New Polarization:       (-0.79958,0.29186,-0.52487)
+ Old Momentum Direction: (0.73521,-0.67764,0.016386)
+ Old Polarization:       (-0.66609,-0.72673,-0.16788)
+ New Momentum Direction: (0.39293,-0.9193,0.022229)
+ New Polarization:       (-0.91226,-0.39273,-0.11639)
  *** FresnelRefraction *** 
 Track (trackID 401, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76189,0.646,-0.047029)
- Old Polarization:       (-0.63718,0.7345,-0.23348)
- New Momentum Direction: (0.48987,0.86949,-0.063301)
- New Polarization:       (-0.86483,0.47551,-0.16111)
+ Old Momentum Direction: (0.80216,0.425,-0.41942)
+ Old Polarization:       (-0.59267,0.48121,-0.64589)
+ New Momentum Direction: (0.58716,0.57615,-0.56859)
+ New Polarization:       (-0.80647,0.35596,-0.47212)
  *** FresnelRefraction *** 
 Track (trackID 400, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7293,0.66163,0.17426)
- Old Polarization:       (-0.67336,0.73922,0.011459)
- New Momentum Direction: (0.37244,0.89745,0.23638)
- New Polarization:       (-0.92141,0.38801,-0.021355)
- *** FresnelRefraction *** 
-Track (trackID 399, parentID 1) is processed with stopping code 2
-### pop requested out of 96 stacked tracks.
+ Old Momentum Direction: (0.67002,-0.48651,0.5607)
+ Old Polarization:       (-0.73779,-0.51996,0.43047)
+ New Momentum Direction: (-0.67002,-0.48651,0.5607)
+ New Polarization:       (-0.73779,0.51996,-0.43047)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67002,-0.48651,0.5607)
+ Old Polarization:       (-0.73779,0.51996,-0.43047)
+ New Momentum Direction: (-0.67002,-0.48651,-0.5607)
+ New Polarization:       (0.73779,-0.51996,-0.43047)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
+Track (trackID 399, parentID 1) is processed with stopping code 2
+### pop requested out of 96 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66028,-0.34755,0.66576)
+ Old Polarization:       (-0.74902,-0.36944,0.54998)
+ New Momentum Direction: (0.66028,-0.34755,-0.66576)
+ New Polarization:       (0.74902,0.36944,0.54998)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66028,-0.34755,-0.66576)
+ Old Polarization:       (0.74902,0.36944,0.54998)
+ New Momentum Direction: (-0.66028,-0.34755,-0.66576)
+ New Polarization:       (0.74902,-0.36944,-0.54998)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66028,-0.34755,-0.66576)
+ Old Polarization:       (0.74902,-0.36944,-0.54998)
+ New Momentum Direction: (-0.66028,0.34755,-0.66576)
+ New Polarization:       (-0.74902,-0.36944,0.54998)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.66028,0.34755,-0.66576)
+Old Polarization: (-0.74902,-0.36944,0.54998)
+New Polarization: (-0.63167,-0.59585,0.49594)
+Polarization Change: (-0.63167,-0.59585,0.49594)
+New Momentum Direction: (-0.53708,0.79769,0.27431)
+Momentum Change: (-0.53708,0.79769,0.27431)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53708,0.79769,0.27431)
+ Old Polarization:       (-0.63167,-0.59585,0.49594)
+ New Momentum Direction: (0.53708,0.79769,0.27431)
+ New Polarization:       (-0.63167,0.59585,-0.49594)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53708,0.79769,0.27431)
+ Old Polarization:       (-0.63167,0.59585,-0.49594)
+ New Momentum Direction: (0.72501,0.58073,0.3703)
+ New Polarization:       (0.56398,-0.80918,0.16481)
+ *** FresnelRefraction *** 
 Track (trackID 398, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.7107,-0.66863,0.21872)
-Old Polarization: (-0.69374,-0.71771,0.060161)
-New Polarization: (-0.8193,-0.26751,0.12326)
-Polarization Change: (-0.94103,-0.30726,0.14158)
-New Momentum Direction: (0.28276,-0.9408,-0.16236)
-Momentum Change: (0.28398,-0.94486,-0.16306)
  Photon at Boundary! 
- Old Momentum Direction: (0.28398,-0.94486,-0.16306)
- Old Polarization:       (-0.94103,-0.30726,0.14158)
- New Momentum Direction: (0.38517,-0.89595,-0.22117)
- New Polarization:       (0.6206,0.42885,-0.65646)
+ Old Momentum Direction: (0.75804,0.64898,-0.064835)
+ Old Polarization:       (-0.64119,0.72334,-0.25624)
+ New Momentum Direction: (0.46346,0.88173,-0.088087)
+ New Polarization:       (-0.87902,0.44491,-0.17142)
  *** FresnelRefraction *** 
 Track (trackID 397, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65833,-0.29807,0.6912)
+ Old Polarization:       (-0.75137,-0.3154,0.57963)
+ New Momentum Direction: (0.88779,-0.40197,0.22416)
+ New Polarization:       (0.0076978,-0.47401,-0.88049)
+ *** FresnelRefraction *** 
 Track (trackID 396, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72505,0.66172,0.19085)
- Old Polarization:       (-0.67797,0.73452,0.028898)
- New Momentum Direction: (0.34939,0.90028,0.25966)
- New Polarization:       (-0.93053,0.36585,-0.016387)
+ Old Momentum Direction: (0.70917,0.61903,0.33745)
+ Old Polarization:       (-0.69468,0.69524,0.18455)
+ New Momentum Direction: (0.29668,0.83849,0.45708)
+ New Polarization:       (-0.94893,0.31261,0.042478)
  *** FresnelRefraction *** 
 Track (trackID 395, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
@@ -4487,167 +4554,129 @@ Track (trackID 395, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 394, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70825,-0.65183,0.2711)
+ Old Polarization:       (-0.69604,-0.70892,0.11388)
+ New Momentum Direction: (0.30801,-0.87844,0.36535)
+ New Polarization:       (-0.94548,-0.32533,0.014873)
+ *** FresnelRefraction *** 
 Track (trackID 393, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.73604,0.66694,0.11591)
+Old Polarization: (-0.66518,0.74435,-0.058949)
+New Polarization: (-0.97516,0.14692,-0.16575)
+Polarization Change: (-0.97516,0.14692,-0.16575)
+New Momentum Direction: (-0.13039,-0.98571,-0.10662)
+Momentum Change: (-0.13039,-0.98571,-0.10662)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.13039,-0.98571,-0.10662)
+ Old Polarization:       (-0.97516,0.14692,-0.16575)
+ New Momentum Direction: (-0.13039,0.98571,-0.10662)
+ New Polarization:       (-0.32353,-0.14395,-0.9352)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.75996,-0.62463,-0.17969)
- Old Polarization:       (-0.63976,-0.67007,-0.37645)
- New Momentum Direction: (0.47265,-0.8469,-0.24363)
- New Polarization:       (-0.87463,-0.41699,-0.24727)
+ Old Momentum Direction: (-0.13039,0.98571,-0.10662)
+ Old Polarization:       (-0.32353,-0.14395,-0.9352)
+ New Momentum Direction: (-0.17699,0.97351,-0.14473)
+ New Polarization:       (-0.42995,-0.20875,-0.87839)
  *** FresnelRefraction *** 
 Track (trackID 392, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65085,-0.051827,0.75744)
- Old Polarization:       (-0.7592,-0.042077,0.64949)
- New Momentum Direction: (0.88318,-0.070327,0.46374)
- New Polarization:       (0.45556,-0.10672,-0.88379)
- *** FresnelRefraction *** 
-Track (trackID 391, parentID 1) is processed with stopping code 2
-### pop requested out of 88 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65966,-0.36248,0.65838)
- Old Polarization:       (-0.74953,-0.38179,0.54078)
- New Momentum Direction: (-0.65966,-0.36248,0.65838)
- New Polarization:       (-0.74953,0.38179,-0.54078)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65966,-0.36248,0.65838)
- Old Polarization:       (-0.74953,0.38179,-0.54078)
- New Momentum Direction: (-0.65966,-0.36248,-0.65838)
- New Polarization:       (0.74953,-0.38179,-0.54078)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.75614,-0.63696,-0.15009)
+ Old Polarization:       (-0.64321,-0.68115,-0.34974)
+ New Momentum Direction: (-0.75614,-0.63696,-0.15009)
+ New Polarization:       (-0.52535,0.45407,0.7196)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65966,-0.36248,-0.65838)
- Old Polarization:       (0.74953,-0.38179,-0.54078)
- New Momentum Direction: (-0.65966,0.36248,-0.65838)
- New Polarization:       (-0.74953,-0.38179,0.54078)
+ Old Momentum Direction: (-0.75614,-0.63696,-0.15009)
+ Old Polarization:       (-0.52535,0.45407,0.7196)
+ New Momentum Direction: (-0.75614,0.63696,-0.15009)
+ New Polarization:       (0.52535,0.45407,-0.7196)
  *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.65966,0.36248,-0.65838)
-Old Polarization: (-0.74953,-0.38179,0.54078)
-New Polarization: (-0.71844,0.17324,0.45168)
-Polarization Change: (-0.82948,0.20002,0.52149)
-New Momentum Direction: (0.49513,0.26963,0.68415)
-Momentum Change: (0.55852,0.30414,0.77172)
+
+** Photon absorbed! **
+Track (trackID 391, parentID 1) is processed with stopping code 2
+### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.55852,0.30414,0.77172)
- Old Polarization:       (-0.82948,0.20002,0.52149)
- New Momentum Direction: (0.75806,0.41281,0.50491)
- New Polarization:       (0.19145,0.59922,-0.77735)
+ Old Momentum Direction: (0.78718,0.54803,-0.28285)
+ Old Polarization:       (-0.60892,0.61794,-0.49737)
+ New Momentum Direction: (0.55037,0.74193,-0.38293)
+ New Polarization:       (-0.82969,0.43474,-0.35016)
  *** FresnelRefraction *** 
 Track (trackID 390, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66592,-0.44069,0.60195)
- Old Polarization:       (-0.74271,-0.46756,0.47934)
- New Momentum Direction: (-0.66592,-0.44069,0.60195)
- New Polarization:       (-0.74271,0.46756,-0.47934)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66592,-0.44069,0.60195)
- Old Polarization:       (-0.74271,0.46756,-0.47934)
- New Momentum Direction: (-0.66592,-0.44069,-0.60195)
- New Polarization:       (0.74271,-0.46756,-0.47934)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66592,-0.44069,-0.60195)
- Old Polarization:       (0.74271,-0.46756,-0.47934)
- New Momentum Direction: (-0.66592,0.44069,-0.60195)
- New Polarization:       (-0.74271,-0.46756,0.47934)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66592,0.44069,-0.60195)
- Old Polarization:       (-0.74271,-0.46756,0.47934)
- New Momentum Direction: (0.66592,0.44069,-0.60195)
- New Polarization:       (-0.74271,0.46756,-0.47934)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66592,0.44069,-0.60195)
- Old Polarization:       (-0.74271,0.46756,-0.47934)
- New Momentum Direction: (0.66592,0.44069,0.60195)
- New Polarization:       (0.74271,-0.46756,-0.47934)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (0.66592,0.44069,0.60195)
-Old Polarization: (0.74271,-0.46756,-0.47934)
-New Polarization: (0.78928,-0.35981,-0.32326)
-Polarization Change: (0.85263,-0.38869,-0.34921)
-New Momentum Direction: (0.34696,-0.011224,0.85964)
-Momentum Change: (0.37425,-0.012107,0.92725)
- Photon at Boundary! 
- Old Momentum Direction: (0.37425,-0.012107,0.92725)
- Old Polarization:       (0.85263,-0.38869,-0.34921)
- New Momentum Direction: (0.50785,-0.016429,0.86129)
- New Polarization:       (0.81974,-0.2981,-0.48904)
+ Old Momentum Direction: (0.64859,0.042333,0.75996)
+ Old Polarization:       (-0.76089,0.061494,0.64596)
+ New Momentum Direction: (0.88002,0.057438,0.47145)
+ New Polarization:       (0.4641,0.10685,-0.87932)
  *** FresnelRefraction *** 
 Track (trackID 389, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79217,-0.4191,-0.44365)
- Old Polarization:       (-0.60484,-0.4421,-0.66236)
- New Momentum Direction: (0.55821,-0.56976,-0.60314)
- New Polarization:       (-0.82606,-0.31364,-0.46825)
+ Old Momentum Direction: (0.82097,0.11651,-0.55895)
+ Old Polarization:       (-0.57081,0.14471,-0.80823)
+ New Momentum Direction: (0.63863,0.15702,-0.75332)
+ New Polarization:       (-0.76941,0.11401,-0.6285)
  *** FresnelRefraction *** 
 Track (trackID 388, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80939,0.31371,-0.49647)
- Old Polarization:       (-0.58522,0.36009,-0.72654)
- New Momentum Direction: (0.60705,0.42449,-0.67179)
- New Polarization:       (-0.79326,0.27352,-0.54398)
+ Old Momentum Direction: (0.68764,-0.5995,0.40958)
+ Old Polarization:       (-0.71836,-0.64366,0.26393)
+ New Momentum Direction: (-0.68764,-0.5995,0.40958)
+ New Polarization:       (-0.71067,0.67125,-0.21063)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68764,-0.5995,0.40958)
+ Old Polarization:       (-0.71067,0.67125,-0.21063)
+ New Momentum Direction: (-0.68764,0.5995,0.40958)
+ New Polarization:       (0.71067,0.67125,0.21063)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68764,0.5995,0.40958)
+ Old Polarization:       (0.71067,0.67125,0.21063)
+ New Momentum Direction: (-0.68764,0.5995,-0.40958)
+ New Polarization:       (-0.71067,-0.67125,0.21063)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68764,0.5995,-0.40958)
+ Old Polarization:       (-0.71067,-0.67125,0.21063)
+ New Momentum Direction: (-0.18217,0.81187,-0.55468)
+ New Polarization:       (0.97511,0.076655,-0.20805)
  *** FresnelRefraction *** 
 Track (trackID 387, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79018,-0.44334,-0.42316)
- Old Polarization:       (-0.60687,-0.46957,-0.64126)
- New Momentum Direction: (0.55422,-0.60212,-0.57471)
- New Polarization:       (-0.82836,-0.33133,-0.4517)
+Scattering Photon!
+Old Momentum Direction: (0.71902,-0.68318,0.12755)
+Old Polarization: (-0.68373,-0.72826,-0.046411)
+New Polarization: (-0.8912,-0.42314,-0.16347)
+Polarization Change: (-0.8912,-0.42314,-0.16347)
+New Momentum Direction: (-0.37047,0.88689,-0.27599)
+Momentum Change: (-0.37047,0.88689,-0.27599)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.37047,0.88689,-0.27599)
+ Old Polarization:       (-0.8912,-0.42314,-0.16347)
+ New Momentum Direction: (-0.504,0.77783,-0.37546)
+ New Polarization:       (-0.77467,-0.59933,-0.20171)
  *** FresnelRefraction *** 
 Track (trackID 386, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66653,0.35795,0.65392)
- Old Polarization:       (-0.74184,0.40511,0.53438)
- New Momentum Direction: (-0.66653,0.35795,0.65392)
- New Polarization:       (-0.74184,-0.40511,-0.53438)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66653,0.35795,0.65392)
- Old Polarization:       (-0.74184,-0.40511,-0.53438)
- New Momentum Direction: (-0.66653,0.35795,-0.65392)
- New Polarization:       (0.74184,0.40511,-0.53438)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66653,0.35795,-0.65392)
- Old Polarization:       (0.74184,0.40511,-0.53438)
- New Momentum Direction: (-0.66653,-0.35795,-0.65392)
- New Polarization:       (-0.74184,0.40511,0.53438)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66653,-0.35795,-0.65392)
- Old Polarization:       (-0.74184,0.40511,0.53438)
- New Momentum Direction: (0.66653,-0.35795,-0.65392)
- New Polarization:       (-0.74184,-0.40511,-0.53438)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66653,-0.35795,-0.65392)
- Old Polarization:       (-0.74184,-0.40511,-0.53438)
- New Momentum Direction: (0.66653,-0.35795,0.65392)
- New Polarization:       (0.74184,0.40511,-0.53438)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.65623,0.21453,0.72342)
+ Old Polarization:       (-0.75284,0.25086,0.60853)
+ New Momentum Direction: (0.88889,0.29059,0.35415)
+ New Polarization:       (0.21262,0.42308,-0.88079)
+ *** FresnelRefraction *** 
 Track (trackID 385, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79358,-0.44443,-0.41558)
- Old Polarization:       (-0.60232,-0.47693,-0.64012)
- New Momentum Direction: (0.57009,-0.6001,-0.56115)
- New Polarization:       (-0.81742,-0.34563,-0.46082)
+ Old Momentum Direction: (0.77846,-0.54944,-0.3035)
+ Old Polarization:       (-0.61851,-0.58906,-0.52005)
+ New Momentum Direction: (0.52712,-0.74386,-0.41088)
+ New Polarization:       (-0.84368,-0.40022,-0.3578)
  *** FresnelRefraction *** 
 Track (trackID 384, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
@@ -4655,214 +4684,215 @@ Track (trackID 384, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 383, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81969,0.18634,-0.54164)
+ Old Polarization:       (-0.57218,0.22241,-0.78939)
+ New Momentum Direction: (0.63587,0.25108,-0.72981)
+ New Polarization:       (-0.77137,0.1753,-0.61177)
+ *** FresnelRefraction *** 
 Track (trackID 382, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.80846,-0.23326,-0.54035)
+ Old Polarization:       (-0.5863,-0.23901,-0.77403)
+ New Momentum Direction: (0.59972,-0.31715,-0.73468)
+ New Polarization:       (-0.79869,-0.18076,-0.57394)
+ *** FresnelRefraction *** 
 Track (trackID 381, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74002,-0.67234,-0.017837)
- Old Polarization:       (-0.66161,-0.72293,-0.19912)
- New Momentum Direction: (0.41108,-0.91128,-0.024175)
- New Polarization:       (-0.9047,-0.40457,-0.1336)
+ Old Momentum Direction: (0.78034,0.57709,-0.24091)
+ Old Polarization:       (-0.61673,0.6464,-0.44924)
+ New Momentum Direction: (0.52885,0.78321,-0.32695)
+ New Polarization:       (-0.84299,0.4401,-0.30932)
  *** FresnelRefraction *** 
 Track (trackID 380, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78086,0.57094,-0.25355)
- Old Polarization:       (-0.61685,0.64052,-0.45742)
- New Momentum Direction: (0.53161,0.77409,-0.34376)
- New Polarization:       (-0.84177,0.43789,-0.31571)
+ Old Momentum Direction: (0.81004,0.33594,-0.4806)
+ Old Polarization:       (-0.58376,0.38475,-0.71498)
+ New Momentum Direction: (0.60823,0.45476,-0.65058)
+ New Polarization:       (-0.79199,0.29287,-0.53571)
  *** FresnelRefraction *** 
 Track (trackID 379, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79794,0.46031,-0.3891)
- Old Polarization:       (-0.59778,0.52178,-0.60861)
- New Momentum Direction: (0.57892,0.62272,-0.52637)
- New Polarization:       (-0.81203,0.38186,-0.44135)
+ Old Momentum Direction: (0.72527,-0.67995,0.10793)
+ Old Polarization:       (-0.67702,-0.73286,-0.067571)
+ New Momentum Direction: (0.36266,-0.9204,0.1461)
+ New Polarization:       (-0.9249,-0.37469,-0.064562)
  *** FresnelRefraction *** 
 Track (trackID 378, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.81359,0.1321,-0.56623)
- Old Polarization:       (-0.58123,0.159,-0.79805)
- New Momentum Direction: (0.61389,0.17935,-0.76875)
- New Polarization:       (-0.78926,0.12125,-0.60198)
- *** FresnelRefraction *** 
-Track (trackID 377, parentID 1) is processed with stopping code 2
-### pop requested out of 74 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 377, parentID 1) is processed with stopping code 2
+### pop requested out of 74 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.76285,0.64479,-0.048135)
+ Old Polarization:       (-0.6353,0.73362,-0.24123)
+ New Momentum Direction: (0.4925,0.8679,-0.06479)
+ New Polarization:       (-0.86283,0.47718,-0.16679)
+ *** FresnelRefraction *** 
 Track (trackID 376, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6768,0.44235,0.58845)
- Old Polarization:       (-0.73089,0.49929,0.4653)
- New Momentum Direction: (0.057156,0.5999,0.79803)
- New Polarization:       (-0.99602,0.089029,0.0044115)
+ Old Momentum Direction: (0.65055,0.074889,0.75576)
+ Old Polarization:       (-0.75904,0.097416,0.64372)
+ New Momentum Direction: (0.88138,0.10146,0.46138)
+ New Polarization:       (0.4401,0.17861,-0.88001)
  *** FresnelRefraction *** 
 Track (trackID 375, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.78774,0.54334,-0.29024)
+ Old Polarization:       (-0.60836,0.6122,-0.50509)
+ New Momentum Direction: (0.55129,0.7359,-0.3931)
+ New Polarization:       (-0.82919,0.43114,-0.35576)
+ *** FresnelRefraction *** 
 Track (trackID 374, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64959,-0.13923,0.74743)
- Old Polarization:       (-0.76016,-0.13702,0.63513)
- New Momentum Direction: (0.88338,-0.18933,0.42871)
- New Polarization:       (0.36782,-0.28679,-0.88457)
+ Old Momentum Direction: (0.81367,0.33432,-0.47558)
+ Old Polarization:       (-0.57868,0.38778,-0.71746)
+ New Momentum Direction: (0.62271,0.44998,-0.64012)
+ New Polarization:       (-0.78063,0.30142,-0.54751)
  *** FresnelRefraction *** 
 Track (trackID 373, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77001,0.61836,-0.15721)
- Old Polarization:       (-0.6287,0.69335,-0.35215)
- New Momentum Direction: (0.50249,0.83793,-0.21304)
- New Polarization:       (-0.85844,0.45423,-0.23823)
+ Old Momentum Direction: (0.78391,-0.51146,-0.35199)
+ Old Polarization:       (-0.61269,-0.54554,-0.57184)
+ New Momentum Direction: (0.53984,-0.69342,-0.47722)
+ New Polarization:       (-0.83631,-0.37741,-0.39768)
  *** FresnelRefraction *** 
 Track (trackID 372, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72561,-0.6832,0.082037)
- Old Polarization:       (-0.67737,-0.73017,-0.089508)
- New Momentum Direction: (0.35381,-0.92865,0.11151)
- New Polarization:       (-0.92883,-0.36286,-0.074821)
+ Old Momentum Direction: (0.78205,-0.51671,-0.34845)
+ Old Polarization:       (-0.61496,-0.54905,-0.56601)
+ New Momentum Direction: (0.53238,-0.70183,-0.47329)
+ New Polarization:       (-0.84103,-0.37505,-0.38989)
  *** FresnelRefraction *** 
 Track (trackID 371, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71581,-0.67809,0.16674)
- Old Polarization:       (-0.68808,-0.72563,0.0029524)
- New Momentum Direction: (0.3166,-0.92112,0.2265)
- New Polarization:       (-0.94254,-0.33235,-0.034084)
+ Old Momentum Direction: (0.72141,0.65463,0.22588)
+ Old Polarization:       (-0.68116,0.72959,0.061027)
+ New Momentum Direction: (0.33894,0.88935,0.30688)
+ New Polarization:       (-0.93401,0.35723,-0.0036959)
  *** FresnelRefraction *** 
 Track (trackID 370, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66574,0.3525,0.65767)
- Old Polarization:       (-0.74263,0.39886,0.53797)
- New Momentum Direction: (-0.66574,0.3525,0.65767)
- New Polarization:       (-0.74263,-0.39886,-0.53797)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66574,0.3525,0.65767)
- Old Polarization:       (-0.74263,-0.39886,-0.53797)
- New Momentum Direction: (-0.66574,0.3525,-0.65767)
- New Polarization:       (0.74263,0.39886,-0.53797)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.6858,-0.60718,0.40126)
+ Old Polarization:       (-0.71996,-0.64666,0.25198)
+ New Momentum Direction: (0.1456,-0.82539,0.54547)
+ New Polarization:       (-0.98543,-0.16998,0.0058352)
+ *** FresnelRefraction *** 
 Track (trackID 369, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.82062,0.14414,-0.553)
+ Old Polarization:       (-0.57117,0.17546,-0.80186)
+ New Momentum Direction: (0.63795,0.19423,-0.74518)
+ New Polarization:       (-0.76987,0.1384,-0.62302)
+ *** FresnelRefraction *** 
 Track (trackID 368, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.66839,-0.46914,0.5772)
- Old Polarization:       (-0.73995,-0.4983,0.45184)
- New Momentum Direction: (-0.66839,-0.46914,0.5772)
- New Polarization:       (-0.73995,0.4983,-0.45184)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 367, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79794,-0.42417,-0.42822)
- Old Polarization:       (-0.59697,-0.45813,-0.65859)
- New Momentum Direction: (0.58503,-0.57074,-0.57619)
- New Polarization:       (-0.80707,-0.33975,-0.48292)
+ Old Momentum Direction: (0.73553,0.66734,0.11682)
+ Old Polarization:       (-0.66574,0.74393,-0.057983)
+ New Momentum Direction: (0.39159,0.90636,0.15867)
+ New Polarization:       (-0.91285,0.40433,-0.056732)
  *** FresnelRefraction *** 
 Track (trackID 366, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68373,0.51258,0.51941)
- Old Polarization:       (-0.72296,0.57258,0.38662)
- New Momentum Direction: (-0.68373,0.51258,0.51941)
- New Polarization:       (-0.71907,-0.59452,-0.35985)
- *** FresnelReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.79298,0.49631,-0.35336)
+ Old Polarization:       (-0.60305,0.55685,-0.57118)
+ New Momentum Direction: (0.56121,0.67425,-0.48004)
+ New Polarization:       (-0.82353,0.3969,-0.40531)
+ *** FresnelRefraction *** 
 Track (trackID 365, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73295,0.66341,0.1506)
- Old Polarization:       (-0.66937,0.74279,-0.014306)
- New Momentum Direction: (0.38758,0.89896,0.20408)
- New Polarization:       (-0.91506,0.40197,-0.032839)
+ Old Momentum Direction: (0.79477,0.50733,-0.3331)
+ Old Polarization:       (-0.60025,0.57597,-0.55494)
+ New Momentum Direction: (0.57261,0.68531,-0.44996)
+ New Polarization:       (-0.81531,0.41851,-0.40015)
  *** FresnelRefraction *** 
 Track (trackID 364, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68675,0.52468,0.50307)
- Old Polarization:       (-0.7198,0.58732,0.37006)
- New Momentum Direction: (-0.68675,0.52468,0.50307)
- New Polarization:       (-0.71401,-0.61665,-0.33157)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68675,0.52468,0.50307)
- Old Polarization:       (-0.71401,-0.61665,-0.33157)
- New Momentum Direction: (-0.68675,-0.52468,0.50307)
- New Polarization:       (0.71401,-0.61665,0.33157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68675,-0.52468,0.50307)
- Old Polarization:       (0.71401,-0.61665,0.33157)
- New Momentum Direction: (-0.68675,-0.52468,-0.50307)
- New Polarization:       (-0.71401,0.61665,0.33157)
+Scattering Photon!
+Old Momentum Direction: (0.68236,0.49768,0.53545)
+Old Polarization: (-0.72405,0.56101,0.40126)
+New Polarization: (-0.26484,0.51875,0.81287)
+Polarization Change: (-0.26484,0.51875,0.81287)
+New Momentum Direction: (-0.86722,0.24048,-0.43601)
+Momentum Change: (-0.86722,0.24048,-0.43601)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.86722,0.24048,-0.43601)
+ Old Polarization:       (-0.26484,0.51875,0.81287)
+ New Momentum Direction: (-0.86722,0.24048,0.43601)
+ New Polarization:       (0.26484,-0.51875,0.81287)
  *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.68675,-0.52468,-0.50307)
- Old Polarization:       (-0.71401,0.61665,0.33157)
- New Momentum Direction: (-0.15789,-0.71276,-0.68341)
- New Polarization:       (0.98087,-0.033421,-0.19176)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 363, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65527,0.17221,0.7355)
- Old Polarization:       (-0.75424,0.20279,0.62449)
- New Momentum Direction: (0.88975,0.23383,0.392)
- New Polarization:       (0.29575,0.35882,-0.88532)
+ Old Momentum Direction: (0.80534,-0.32038,-0.49878)
+ Old Polarization:       (-0.58898,-0.33699,-0.73453)
+ New Momentum Direction: (0.59635,-0.43383,-0.6754)
+ New Polarization:       (-0.80013,-0.25364,-0.54356)
  *** FresnelRefraction *** 
 Track (trackID 362, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80491,0.36026,-0.47153)
- Old Polarization:       (-0.59059,0.40906,-0.69561)
- New Momentum Direction: (0.59326,0.48873,-0.63968)
- New Polarization:       (-0.80311,0.30477,-0.51198)
+ Old Momentum Direction: (0.79366,0.48926,-0.36155)
+ Old Polarization:       (-0.60236,0.54871,-0.57973)
+ New Momentum Direction: (0.56254,0.66492,-0.49136)
+ New Polarization:       (-0.82276,0.39174,-0.41183)
  *** FresnelRefraction *** 
 Track (trackID 361, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74767,0.66402,0.0077668)
- Old Polarization:       (-0.65334,0.73764,-0.17037)
- New Momentum Direction: (0.42939,0.90306,0.010563)
- New Polarization:       (-0.89634,0.42757,-0.11726)
+ Old Momentum Direction: (0.82082,0.17305,-0.54435)
+ Old Polarization:       (-0.57068,0.20818,-0.79434)
+ New Momentum Direction: (0.63962,0.23288,-0.73256)
+ New Polarization:       (-0.76834,0.16483,-0.61846)
  *** FresnelRefraction *** 
 Track (trackID 360, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74835,0.66316,0.013462)
- Old Polarization:       (-0.65253,0.73969,-0.16451)
- New Momentum Direction: (-0.74835,0.66316,0.013462)
- New Polarization:       (-0.56379,-0.64664,0.51381)
+ Old Momentum Direction: (0.68343,0.5016,0.5304)
+ Old Polarization:       (-0.72294,0.56597,0.39628)
+ New Momentum Direction: (-0.68343,0.5016,0.5304)
+ New Polarization:       (-0.71772,-0.59446,-0.36262)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74835,0.66316,0.013462)
- Old Polarization:       (-0.56379,-0.64664,0.51381)
- New Momentum Direction: (-0.74835,-0.66316,0.013462)
- New Polarization:       (0.56379,-0.64664,-0.51381)
+ Old Momentum Direction: (-0.68343,0.5016,0.5304)
+ Old Polarization:       (-0.71772,-0.59446,-0.36262)
+ New Momentum Direction: (-0.68343,0.5016,-0.5304)
+ New Polarization:       (0.71772,0.59446,-0.36262)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68343,0.5016,-0.5304)
+ Old Polarization:       (0.71772,0.59446,-0.36262)
+ New Momentum Direction: (-0.68343,-0.5016,-0.5304)
+ New Polarization:       (-0.71772,0.59446,0.36262)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68343,-0.5016,-0.5304)
+ Old Polarization:       (-0.71772,0.59446,0.36262)
+ New Momentum Direction: (-0.1477,-0.67957,-0.71859)
+ New Polarization:       (0.98279,-0.019329,-0.18372)
+ *** FresnelRefraction *** 
 Track (trackID 359, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
 
@@ -4870,292 +4900,342 @@ Track (trackID 359, parentID 1) is processed with stopping code 2
 Track (trackID 358, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81714,0.16871,-0.5512)
- Old Polarization:       (-0.57601,0.20189,-0.79212)
- New Momentum Direction: (0.62904,0.22751,-0.74334)
- New Polarization:       (-0.77708,0.15757,-0.60936)
+ Old Momentum Direction: (0.65712,0.099461,0.7472)
+ Old Polarization:       (-0.75319,0.12624,0.64558)
+ New Momentum Direction: (0.88407,0.13381,0.44778)
+ New Polarization:       (0.41165,0.23067,-0.88167)
  *** FresnelRefraction *** 
 Track (trackID 357, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.78736,0.53342,-0.30908)
+Old Polarization: (-0.60925,0.59664,-0.52233)
+New Polarization: (0.036721,-0.98713,0.15565)
+Polarization Change: (0.036721,-0.98713,0.15565)
+New Momentum Direction: (0.80941,0.12073,0.5747)
+Momentum Change: (0.80941,0.12073,0.5747)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.80941,0.12073,0.5747)
+ Old Polarization:       (0.036721,-0.98713,0.15565)
+ New Momentum Direction: (0.60238,0.1641,0.78116)
+ New Polarization:       (-0.070802,-0.9638,0.25707)
+ *** FresnelRefraction *** 
+Track (trackID 356, parentID 1) is processed with stopping code 2
+### pop requested out of 53 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67581,-0.53497,0.50704)
- Old Polarization:       (-0.73176,-0.56946,0.3745)
- New Momentum Direction: (-0.67581,-0.53497,0.50704)
- New Polarization:       (-0.73176,0.56946,-0.3745)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.66064,0.31698,0.6805)
+ Old Polarization:       (-0.74752,0.36122,0.55744)
+ New Momentum Direction: (0.66064,0.31698,-0.6805)
+ New Polarization:       (-0.11967,-0.85042,-0.51231)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67581,-0.53497,0.50704)
- Old Polarization:       (-0.73176,0.56946,-0.3745)
- New Momentum Direction: (-0.67581,0.53497,0.50704)
- New Polarization:       (0.73176,0.56946,0.3745)
+ Old Momentum Direction: (0.66064,0.31698,-0.6805)
+ Old Polarization:       (-0.11967,-0.85042,-0.51231)
+ New Momentum Direction: (-0.66064,0.31698,-0.6805)
+ New Polarization:       (-0.11967,0.85042,0.51231)
  *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.67581,0.53497,0.50704)
- Old Polarization:       (0.73176,0.56946,0.3745)
- New Momentum Direction: (-0.67581,0.53497,-0.50704)
- New Polarization:       (-0.73176,-0.56946,0.3745)
+Scattering Photon!
+Old Momentum Direction: (-0.66064,0.31698,-0.6805)
+Old Polarization: (-0.11967,0.85042,0.51231)
+New Polarization: (0.11761,-0.91411,0.38804)
+Polarization Change: (0.11761,-0.91411,0.38804)
+New Momentum Direction: (-0.062037,0.38323,0.92157)
+Momentum Change: (-0.062037,0.38323,0.92157)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.062037,0.38323,0.92157)
+ Old Polarization:       (0.11761,-0.91411,0.38804)
+ New Momentum Direction: (-0.062037,-0.38323,0.92157)
+ New Polarization:       (-0.11761,-0.91411,-0.38804)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 356, parentID 1) is processed with stopping code 2
-### pop requested out of 53 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71944,0.63831,0.2738)
- Old Polarization:       (-0.68428,0.71894,0.12196)
- New Momentum Direction: (0.34404,0.86292,0.37014)
- New Polarization:       (-0.93273,0.3594,0.029074)
+ Old Momentum Direction: (-0.062037,-0.38323,0.92157)
+ Old Polarization:       (-0.11761,-0.91411,-0.38804)
+ New Momentum Direction: (-0.084266,-0.52054,0.84967)
+ New Polarization:       (-0.11423,-0.84203,-0.52719)
  *** FresnelRefraction *** 
 Track (trackID 355, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74395,-0.66824,0.0010259)
- Old Polarization:       (-0.65716,-0.73189,-0.18024)
- New Momentum Direction: (0.43948,-0.89825,0.0013791)
- New Polarization:       (-0.89107,-0.43616,-0.12552)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 354, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76078,0.64376,-0.082401)
- Old Polarization:       (-0.63886,0.72045,-0.26984)
- New Momentum Direction: (0.47516,0.87278,-0.11171)
- New Polarization:       (-0.87331,0.45227,-0.18108)
+ Old Momentum Direction: (0.76524,-0.60276,-0.22604)
+ Old Polarization:       (-0.63336,-0.64213,-0.43189)
+ New Momentum Direction: (0.48426,-0.81922,-0.30722)
+ New Polarization:       (-0.86818,-0.40639,-0.28481)
  *** FresnelRefraction *** 
 Track (trackID 353, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68232,-0.57179,0.45552)
- Old Polarization:       (-0.72475,-0.61074,0.31895)
- New Momentum Direction: (0.12447,-0.77606,0.61825)
- New Polarization:       (-0.98915,-0.14609,0.015765)
+ Old Momentum Direction: (0.65223,-0.27547,0.70619)
+ Old Polarization:       (-0.75694,-0.28644,0.58737)
+ New Momentum Direction: (0.88481,-0.3737,0.27831)
+ New Polarization:       (0.079933,-0.4667,-0.88079)
  *** FresnelRefraction *** 
 Track (trackID 352, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77322,-0.56282,-0.29219)
- Old Polarization:       (-0.62537,-0.60038,-0.49845)
- New Momentum Direction: (0.50854,-0.76419,-0.39673)
- New Polarization:       (-0.85527,-0.39511,-0.33525)
+ Old Momentum Direction: (0.80372,-0.38192,-0.45627)
+ Old Polarization:       (-0.5898,-0.41003,-0.69571)
+ New Momentum Direction: (0.59865,-0.51414,-0.61423)
+ New Polarization:       (-0.79744,-0.31013,-0.5176)
  *** FresnelRefraction *** 
 Track (trackID 351, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68336,0.50994,0.52248)
- Old Polarization:       (-0.72337,0.56976,0.39001)
- New Momentum Direction: (0.11825,0.69357,0.71062)
- New Polarization:       (-0.98975,0.14004,0.028007)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 350, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81224,0.1857,-0.55298)
- Old Polarization:       (-0.58279,0.21741,-0.783)
- New Momentum Direction: (0.61018,0.25221,-0.75105)
- New Polarization:       (-0.7919,0.16529,-0.58786)
+ Old Momentum Direction: (0.72706,-0.6836,0.063883)
+ Old Polarization:       (-0.67499,-0.7287,-0.11568)
+ New Momentum Direction: (0.35715,-0.93,0.086909)
+ New Polarization:       (-0.92703,-0.36431,-0.088827)
  *** FresnelRefraction *** 
 Track (trackID 349, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7923,0.5048,-0.34268)
- Old Polarization:       (-0.60407,0.57008,-0.55688)
- New Momentum Direction: (0.56388,0.68329,-0.46385)
- New Polarization:       (-0.82178,0.40851,-0.39723)
+ Old Momentum Direction: (0.8046,-0.33422,-0.49084)
+ Old Polarization:       (-0.58971,-0.35263,-0.72656)
+ New Momentum Direction: (0.59507,-0.45233,-0.66429)
+ New Polarization:       (-0.80088,-0.26494,-0.53702)
  *** FresnelRefraction *** 
 Track (trackID 348, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74116,-0.67011,-0.040289)
- Old Polarization:       (-0.6604,-0.71701,-0.22307)
- New Momentum Direction: (0.41047,-0.91023,-0.054726)
- New Polarization:       (-0.90503,-0.39931,-0.1465)
+ Old Momentum Direction: (0.69229,-0.62954,0.35272)
+ Old Polarization:       (-0.71296,-0.67221,0.19957)
+ New Momentum Direction: (0.19809,-0.85511,0.4791)
+ New Polarization:       (-0.97559,-0.21929,0.011976)
  *** FresnelRefraction *** 
 Track (trackID 347, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73847,0.66913,0.083187)
+ Old Polarization:       (-0.66256,0.743,-0.094677)
+ New Momentum Direction: (0.39791,0.91042,0.11318)
+ New Polarization:       (-0.91015,0.40724,-0.076016)
+ *** FresnelRefraction *** 
 Track (trackID 346, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65211,-0.16453,0.74006)
- Old Polarization:       (-0.75789,-0.16553,0.63103)
- New Momentum Direction: (0.65211,-0.16453,-0.74006)
- New Polarization:       (-0.30532,0.8365,-0.45501)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65211,-0.16453,-0.74006)
- Old Polarization:       (-0.30532,0.8365,-0.45501)
- New Momentum Direction: (-0.65211,-0.16453,-0.74006)
- New Polarization:       (-0.30532,-0.8365,0.45501)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.69479,-0.63952,0.32906)
+ Old Polarization:       (-0.71018,-0.68232,0.17344)
+ New Momentum Direction: (0.21131,-0.86912,0.4472)
+ New Polarization:       (-0.97257,-0.2325,0.0076998)
+ *** FresnelRefraction *** 
 Track (trackID 345, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65489,-0.034287,0.75494)
- Old Polarization:       (-0.7557,-0.023198,0.6545)
- New Momentum Direction: (0.88442,-0.046304,0.46438)
- New Polarization:       (0.46105,-0.067467,-0.88481)
+ Old Momentum Direction: (0.68947,0.54072,0.48193)
+ Old Polarization:       (-0.71623,0.60806,0.34245)
+ New Momentum Direction: (0.1892,0.73304,0.65334)
+ New Polarization:       (-0.97767,0.20258,0.05584)
  *** FresnelRefraction *** 
 Track (trackID 344, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.8111,0.32605,-0.48559)
+ Old Polarization:       (-0.58246,0.37445,-0.72148)
+ New Momentum Direction: (0.61154,0.44106,-0.65688)
+ New Polarization:       (-0.78955,0.28634,-0.54279)
+ *** FresnelRefraction *** 
 Track (trackID 343, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81146,-0.25762,-0.52456)
- Old Polarization:       (-0.58187,-0.27254,-0.76626)
- New Momentum Direction: (0.61794,-0.34658,-0.70571)
- New Polarization:       (-0.78447,-0.21195,-0.58282)
+ Old Momentum Direction: (0.73945,0.66791,0.084261)
+ Old Polarization:       (-0.66147,0.74412,-0.093538)
+ New Momentum Direction: (0.40442,0.90738,0.11447)
+ New Polarization:       (-0.90724,0.41384,-0.075193)
  *** FresnelRefraction *** 
 Track (trackID 342, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74501,-0.66451,-0.058278)
- Old Polarization:       (-0.65614,-0.71428,-0.24348)
- New Momentum Direction: (0.42724,-0.90068,-0.07899)
- New Polarization:       (-0.89721,-0.41156,-0.16011)
+ Old Momentum Direction: (0.81106,0.34517,-0.47226)
+ Old Polarization:       (-0.58214,0.3972,-0.70947)
+ New Momentum Direction: (0.61342,0.46602,-0.6376)
+ New Polarization:       (-0.78783,0.30474,-0.53522)
  *** FresnelRefraction *** 
 Track (trackID 341, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 340, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 339, parentID 1) is processed with stopping code 2
-### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7578,0.65227,-0.016904)
- Old Polarization:       (-0.64177,0.74043,-0.19975)
- New Momentum Direction: (0.4772,0.8785,-0.022767)
- New Polarization:       (-0.87175,0.46994,-0.1386)
+ Old Momentum Direction: (0.69123,-0.62397,0.36449)
+ Old Polarization:       (-0.71416,-0.66687,0.21275)
+ New Momentum Direction: (0.1937,-0.84712,0.49484)
+ New Polarization:       (-0.97658,-0.21464,0.014825)
  *** FresnelRefraction *** 
-Track (trackID 338, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
+Track (trackID 340, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66292,-0.38216,0.64382)
- Old Polarization:       (-0.74635,-0.40536,0.52788)
- New Momentum Direction: (-0.66292,-0.38216,0.64382)
- New Polarization:       (-0.74635,0.40536,-0.52788)
+ Old Momentum Direction: (0.65435,-0.34093,0.67497)
+ Old Polarization:       (-0.75433,-0.35687,0.55103)
+ New Momentum Direction: (0.65435,-0.34093,-0.67497)
+ New Polarization:       (0.75433,0.35687,0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66292,-0.38216,0.64382)
- Old Polarization:       (-0.74635,0.40536,-0.52788)
- New Momentum Direction: (-0.66292,-0.38216,-0.64382)
- New Polarization:       (0.74635,-0.40536,-0.52788)
+ Old Momentum Direction: (0.65435,-0.34093,-0.67497)
+ Old Polarization:       (0.75433,0.35687,0.55103)
+ New Momentum Direction: (-0.65435,-0.34093,-0.67497)
+ New Polarization:       (0.75433,-0.35687,-0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66292,-0.38216,-0.64382)
- Old Polarization:       (0.74635,-0.40536,-0.52788)
- New Momentum Direction: (-0.66292,0.38216,-0.64382)
- New Polarization:       (-0.74635,-0.40536,0.52788)
+ Old Momentum Direction: (-0.65435,-0.34093,-0.67497)
+ Old Polarization:       (0.75433,-0.35687,-0.55103)
+ New Momentum Direction: (-0.65435,0.34093,-0.67497)
+ New Polarization:       (-0.75433,-0.35687,0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66292,0.38216,-0.64382)
- Old Polarization:       (-0.74635,-0.40536,0.52788)
- New Momentum Direction: (0.66292,0.38216,-0.64382)
- New Polarization:       (-0.74635,0.40536,-0.52788)
+ Old Momentum Direction: (-0.65435,0.34093,-0.67497)
+ Old Polarization:       (-0.75433,-0.35687,0.55103)
+ New Momentum Direction: (-0.65435,0.34093,0.67497)
+ New Polarization:       (0.75433,0.35687,0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66292,0.38216,-0.64382)
- Old Polarization:       (-0.74635,0.40536,-0.52788)
- New Momentum Direction: (0.66292,0.38216,0.64382)
- New Polarization:       (0.74635,-0.40536,-0.52788)
+ Old Momentum Direction: (-0.65435,0.34093,0.67497)
+ Old Polarization:       (0.75433,0.35687,0.55103)
+ New Momentum Direction: (0.65435,0.34093,0.67497)
+ New Polarization:       (0.75433,-0.35687,-0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66292,0.38216,0.64382)
- Old Polarization:       (0.74635,-0.40536,-0.52788)
- New Momentum Direction: (-0.66292,0.38216,0.64382)
- New Polarization:       (0.74635,0.40536,0.52788)
+ Old Momentum Direction: (0.65435,0.34093,0.67497)
+ Old Polarization:       (0.75433,-0.35687,-0.55103)
+ New Momentum Direction: (0.65435,0.34093,-0.67497)
+ New Polarization:       (-0.75433,0.35687,-0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66292,0.38216,0.64382)
- Old Polarization:       (0.74635,0.40536,0.52788)
- New Momentum Direction: (-0.66292,0.38216,-0.64382)
- New Polarization:       (-0.74635,-0.40536,0.52788)
+ Old Momentum Direction: (0.65435,0.34093,-0.67497)
+ Old Polarization:       (-0.75433,0.35687,-0.55103)
+ New Momentum Direction: (-0.65435,0.34093,-0.67497)
+ New Polarization:       (-0.75433,-0.35687,0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66292,0.38216,-0.64382)
- Old Polarization:       (-0.74635,-0.40536,0.52788)
- New Momentum Direction: (-0.66292,-0.38216,-0.64382)
- New Polarization:       (0.74635,-0.40536,-0.52788)
+ Old Momentum Direction: (-0.65435,0.34093,-0.67497)
+ Old Polarization:       (-0.75433,-0.35687,0.55103)
+ New Momentum Direction: (-0.65435,-0.34093,-0.67497)
+ New Polarization:       (0.75433,-0.35687,-0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66292,-0.38216,-0.64382)
- Old Polarization:       (0.74635,-0.40536,-0.52788)
- New Momentum Direction: (-0.66292,-0.38216,0.64382)
- New Polarization:       (-0.74635,0.40536,-0.52788)
+ Old Momentum Direction: (-0.65435,-0.34093,-0.67497)
+ Old Polarization:       (0.75433,-0.35687,-0.55103)
+ New Momentum Direction: (-0.65435,-0.34093,0.67497)
+ New Polarization:       (-0.75433,0.35687,-0.55103)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66292,-0.38216,0.64382)
- Old Polarization:       (-0.74635,0.40536,-0.52788)
- New Momentum Direction: (0.66292,-0.38216,0.64382)
- New Polarization:       (-0.74635,-0.40536,0.52788)
+ Old Momentum Direction: (-0.65435,-0.34093,0.67497)
+ Old Polarization:       (-0.75433,0.35687,-0.55103)
+ New Momentum Direction: (0.65435,-0.34093,0.67497)
+ New Polarization:       (-0.75433,-0.35687,0.55103)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
+Track (trackID 339, parentID 1) is processed with stopping code 2
+### pop requested out of 36 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66241,-0.34988,0.66242)
+ Old Polarization:       (-0.74708,-0.37398,0.54955)
+ New Momentum Direction: (-0.66241,-0.34988,0.66242)
+ New Polarization:       (-0.74708,0.37398,-0.54955)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66241,-0.34988,0.66242)
+ Old Polarization:       (-0.74708,0.37398,-0.54955)
+ New Momentum Direction: (-0.66241,-0.34988,-0.66242)
+ New Polarization:       (0.74708,-0.37398,-0.54955)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66241,-0.34988,-0.66242)
+ Old Polarization:       (0.74708,-0.37398,-0.54955)
+ New Momentum Direction: (-0.66241,0.34988,-0.66242)
+ New Polarization:       (-0.74708,-0.37398,0.54955)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66241,0.34988,-0.66242)
+ Old Polarization:       (-0.74708,-0.37398,0.54955)
+ New Momentum Direction: (0.66241,0.34988,-0.66242)
+ New Polarization:       (-0.74708,0.37398,-0.54955)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66241,0.34988,-0.66242)
+ Old Polarization:       (-0.74708,0.37398,-0.54955)
+ New Momentum Direction: (0.66241,0.34988,0.66242)
+ New Polarization:       (0.74708,-0.37398,-0.54955)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 338, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81745,0.21273,-0.53528)
+ Old Polarization:       (-0.57514,0.25049,-0.77876)
+ New Momentum Direction: (0.62841,0.28729,-0.72289)
+ New Polarization:       (-0.77729,0.19559,-0.59797)
+ *** FresnelRefraction *** 
 Track (trackID 337, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65762,-0.17996,0.73154)
- Old Polarization:       (-0.75303,-0.18504,0.63143)
- New Momentum Direction: (0.88654,-0.2426,0.39395)
- New Polarization:       (0.29593,-0.35721,-0.88591)
+ Old Momentum Direction: (0.64718,0.022307,0.76201)
+ Old Polarization:       (-0.76218,0.039484,0.64616)
+ New Momentum Direction: (0.87922,0.030305,0.47545)
+ New Polarization:       (0.47313,0.061468,-0.87885)
  *** FresnelRefraction *** 
 Track (trackID 336, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.7576,0.65256,-0.014679)
+ Old Polarization:       (-0.64122,0.73986,-0.20356)
+ New Momentum Direction: (0.47521,0.87965,-0.019787)
+ New Polarization:       (-0.87232,0.46807,-0.14128)
+ *** FresnelRefraction *** 
 Track (trackID 335, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71005,0.60587,0.35882)
- Old Polarization:       (-0.69476,0.68575,0.21691)
- New Momentum Direction: (0.31135,0.81766,0.48425)
- New Polarization:       (-0.94472,0.32146,0.064618)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.68321,-0.55739,0.47174)
+ Old Polarization:       (-0.72373,-0.60278,0.33596)
+ New Momentum Direction: (-0.68321,-0.55739,0.47174)
+ New Polarization:       (-0.7178,0.63129,-0.29366)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68321,-0.55739,0.47174)
+ Old Polarization:       (-0.7178,0.63129,-0.29366)
+ New Momentum Direction: (-0.68321,0.55739,0.47174)
+ New Polarization:       (0.7178,0.63129,0.29366)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.68321,0.55739,0.47174)
+Old Polarization: (0.7178,0.63129,0.29366)
+New Polarization: (-0.97333,-0.068454,0.21894)
+Polarization Change: (-0.97333,-0.068454,0.21894)
+New Momentum Direction: (0.079256,0.79531,0.601)
+Momentum Change: (0.079256,0.79531,0.601)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.079256,0.79531,0.601)
+ Old Polarization:       (-0.97333,-0.068454,0.21894)
+ New Momentum Direction: (0.079256,0.79531,-0.601)
+ New Polarization:       (0.97333,0.068454,0.21894)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 334, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.8059,0.33842,-0.48579)
- Old Polarization:       (-0.58962,0.38457,-0.71025)
- New Momentum Direction: (0.59499,0.45942,-0.65948)
- New Polarization:       (-0.8021,0.28708,-0.52366)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 333, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71836,-0.68221,0.1362)
- Old Polarization:       (-0.68525,-0.72766,-0.030566)
- New Momentum Direction: (0.32285,-0.92813,0.18529)
- New Polarization:       (-0.9403,-0.33683,-0.048819)
+ Old Momentum Direction: (0.75914,-0.62578,-0.17918)
+ Old Polarization:       (-0.64,-0.66735,-0.38084)
+ New Momentum Direction: (0.46634,-0.85043,-0.2435)
+ New Polarization:       (-0.87756,-0.41009,-0.24842)
  *** FresnelRefraction *** 
 Track (trackID 332, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.6529,-0.20306,0.72972)
-Old Polarization: (-0.757,-0.20767,0.61953)
-New Polarization: (-0.86502,-0.051424,0.023026)
-Polarization Change: (-0.99789,-0.059323,0.026563)
-New Momentum Direction: (-0.0044667,0.42623,0.78409)
-Momentum Change: (-0.0050049,0.47759,0.87857)
- Photon at Boundary! 
- Old Momentum Direction: (-0.0050049,0.47759,0.87857)
- Old Polarization:       (-0.99789,-0.059323,0.026563)
- New Momentum Direction: (-0.0067898,0.64791,0.76169)
- New Polarization:       (-0.99759,0.048188,-0.049882)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 331, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78848,0.52215,-0.32504)
- Old Polarization:       (-0.60861,0.586,-0.53498)
- New Momentum Direction: (0.55086,0.70853,-0.44106)
- New Polarization:       (-0.83029,0.41162,-0.37574)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 330, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
 
@@ -5163,127 +5243,140 @@ Track (trackID 330, parentID 1) is processed with stopping code 2
 Track (trackID 329, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73038,-0.68182,0.040865)
- Old Polarization:       (-0.67218,-0.7281,-0.13435)
- New Momentum Direction: (0.37066,-0.92711,0.055566)
- New Polarization:       (-0.92213,-0.37449,-0.097087)
+ Old Momentum Direction: (0.79818,0.45584,-0.39386)
+ Old Polarization:       (-0.59727,0.51342,-0.61618)
+ New Momentum Direction: (0.57543,0.61884,-0.53471)
+ New Polarization:       (-0.81438,0.37344,-0.44421)
  *** FresnelRefraction *** 
 Track (trackID 328, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74363,0.66722,0.042664)
+ Old Polarization:       (-0.65695,0.74106,-0.13877)
+ New Momentum Direction: (0.41548,0.90775,0.058044)
+ New Polarization:       (-0.9023,0.41937,-0.09987)
+ *** FresnelRefraction *** 
 Track (trackID 327, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.77542,0.5894,-0.22654)
-Old Polarization: (-0.62313,0.65628,-0.42545)
-New Polarization: (-0.54858,0.59655,-0.49792)
-Polarization Change: (-0.57674,0.62717,-0.52348)
-New Momentum Direction: (-0.05692,-0.64606,-0.71132)
-Momentum Change: (-0.059132,-0.67116,-0.73895)
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.75092,-0.65126,-0.10941)
+ Old Polarization:       (-0.64891,-0.69692,-0.30531)
+ New Momentum Direction: (0.44319,-0.88404,-0.14851)
+ New Polarization:       (-0.88909,-0.41234,-0.19871)
+ *** FresnelRefraction *** 
 Track (trackID 326, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72596,0.64162,0.24761)
- Old Polarization:       (-0.67721,0.72966,0.094788)
- New Momentum Direction: (0.37837,0.86358,0.33327)
- New Polarization:       (-0.91908,0.39332,0.024263)
+ Old Momentum Direction: (0.78258,0.5728,-0.24387)
+ Old Polarization:       (-0.61397,0.6453,-0.45457)
+ New Momentum Direction: (0.53831,0.77539,-0.33013)
+ New Polarization:       (-0.83701,0.44631,-0.31657)
  *** FresnelRefraction *** 
 Track (trackID 325, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.80365,0.40977,-0.43156)
- Old Polarization:       (-0.59126,0.46751,-0.65715)
- New Momentum Direction: (0.59469,0.55357,-0.58301)
- New Polarization:       (-0.80134,0.34972,-0.48534)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 324, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65429,0.15187,0.74083)
- Old Polarization:       (-0.75528,0.1805,0.63005)
- New Momentum Direction: (0.88857,0.20625,0.40975)
- New Polarization:       (0.33259,0.32553,-0.88511)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 323, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73572,-0.67466,0.059603)
- Old Polarization:       (-0.66634,-0.73678,-0.11468)
- New Momentum Direction: (-0.73572,-0.67466,0.059603)
- New Polarization:       (-0.59812,0.68849,0.41017)
+ Old Momentum Direction: (0.76136,-0.61678,-0.19978)
+ Old Polarization:       (-0.63763,-0.65661,-0.40287)
+ New Momentum Direction: (-0.76136,-0.61678,-0.19978)
+ New Polarization:       (-0.50459,0.37025,0.77994)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.73572,-0.67466,0.059603)
- Old Polarization:       (-0.59812,0.68849,0.41017)
- New Momentum Direction: (-0.99032,-0.11329,0.080228)
- New Polarization:       (-0.091697,0.96774,0.23467)
+ Old Momentum Direction: (-0.76136,-0.61678,-0.19978)
+ Old Polarization:       (-0.50459,0.37025,0.77994)
+ New Momentum Direction: (-0.76136,0.61678,-0.19978)
+ New Polarization:       (0.50459,0.37025,-0.77994)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.76136,0.61678,-0.19978)
+ Old Polarization:       (0.50459,0.37025,-0.77994)
+ New Momentum Direction: (-0.47193,0.83873,-0.27167)
+ New Polarization:       (0.77176,0.24404,-0.58722)
  *** FresnelRefraction *** 
 Track (trackID 322, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74725,-0.65873,-0.08772)
- Old Polarization:       (-0.65375,-0.70498,-0.27497)
- New Momentum Direction: (0.43083,-0.89454,-0.11912)
- New Polarization:       (-0.89559,-0.4076,-0.17826)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 321, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78162,0.5623,-0.26998)
- Old Polarization:       (-0.6162,0.62891,-0.47409)
- New Momentum Direction: (0.53155,0.76358,-0.36662)
- New Polarization:       (-0.84203,0.42938,-0.32654)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 320, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.67086,-0.52233,0.52642)
+Old Polarization: (-0.73624,-0.55417,0.38839)
+New Polarization: (0.053264,-0.35963,0.93157)
+Polarization Change: (0.053264,-0.35963,0.93157)
+New Momentum Direction: (-0.8957,-0.42963,-0.11465)
+Momentum Change: (-0.8957,-0.42963,-0.11465)
+Scattering Photon!
+Old Momentum Direction: (-0.8957,-0.42963,-0.11465)
+Old Polarization: (0.053264,-0.35963,0.93157)
+New Polarization: (-0.34645,0.47216,-0.81058)
+Polarization Change: (-0.34645,0.47216,-0.81058)
+New Momentum Direction: (0.82463,-0.2586,-0.50309)
+Momentum Change: (0.82463,-0.2586,-0.50309)
 
 ** Photon absorbed! **
 Track (trackID 319, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.75318,0.6574,0.023362)
+ Old Polarization:       (-0.64611,0.74598,-0.1614)
+ New Momentum Direction: (0.46303,0.88579,0.031478)
+ New Polarization:       (-0.8787,0.4634,-0.11469)
+ *** FresnelRefraction *** 
 Track (trackID 318, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6567,-0.20941,0.72449)
- Old Polarization:       (-0.75366,-0.21675,0.62049)
- New Momentum Direction: (0.88706,-0.28286,0.36486)
- New Polarization:       (0.23687,-0.3995,-0.8856)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.66334,0.32749,0.67285)
+ Old Polarization:       (-0.74493,0.37447,0.55214)
+ New Momentum Direction: (0.66334,0.32749,-0.67285)
+ New Polarization:       (0.74493,-0.37447,0.55214)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66334,0.32749,-0.67285)
+ Old Polarization:       (0.74493,-0.37447,0.55214)
+ New Momentum Direction: (-0.66334,0.32749,-0.67285)
+ New Polarization:       (0.74493,0.37447,-0.55214)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 317, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65267,0.13453,0.7456)
- Old Polarization:       (-0.75684,0.16116,0.63342)
- New Momentum Direction: (0.88741,0.18292,0.42314)
- New Polarization:       (0.36111,0.29472,-0.88472)
+ Old Momentum Direction: (0.79806,-0.38527,-0.46332)
+ Old Polarization:       (-0.59744,-0.40571,-0.69171)
+ New Momentum Direction: (0.57481,-0.52319,-0.62918)
+ New Polarization:       (-0.81484,-0.29544,-0.49875)
  *** FresnelRefraction *** 
 Track (trackID 316, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7657,-0.5983,-0.2361)
- Old Polarization:       (-0.63362,-0.63853,-0.43682)
- New Momentum Direction: (0.48643,-0.81273,-0.32072)
- New Polarization:       (-0.86749,-0.40549,-0.28817)
+ Old Momentum Direction: (0.71729,0.64726,0.25795)
+ Old Polarization:       (-0.68565,0.72157,0.096029)
+ New Momentum Direction: (0.32243,0.87934,0.35044)
+ New Polarization:       (-0.94001,0.34102,0.0091637)
  *** FresnelRefraction *** 
 Track (trackID 315, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.6927,-0.62043,0.36774)
- Old Polarization:       (-0.71341,-0.66429,0.2231)
- New Momentum Direction: (0.20558,-0.84187,0.49899)
- New Polarization:       (-0.97446,-0.22319,0.024915)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 314, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66778,0.26035,0.69734)
- Old Polarization:       (-0.74213,0.30523,0.59672)
- New Momentum Direction: (0.8983,0.35022,0.26534)
- New Polarization:       (0.082407,0.45889,-0.88466)
+ Old Momentum Direction: (0.68056,0.45125,0.57725)
+ Old Polarization:       (-0.72673,0.51604,0.45339)
+ New Momentum Direction: (0.15485,0.60844,0.77834)
+ New Polarization:       (-0.98487,0.15708,0.073151)
  *** FresnelRefraction *** 
 Track (trackID 313, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
@@ -5292,59 +5385,55 @@ Track (trackID 313, parentID 1) is processed with stopping code 2
 Track (trackID 312, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65674,0.037167,0.7532)
- Old Polarization:       (-0.7539,0.055955,0.6546)
- New Momentum Direction: (0.88582,0.050132,0.46131)
- New Polarization:       (0.45565,0.094037,-0.88518)
+ Old Momentum Direction: (0.81865,0.070323,-0.56996)
+ Old Polarization:       (-0.57427,0.092578,-0.81341)
+ New Momentum Direction: (0.62908,0.095188,-0.77149)
+ New Polarization:       (-0.77733,0.071586,-0.625)
  *** FresnelRefraction *** 
 Track (trackID 311, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76023,0.64875,-0.034315)
- Old Polarization:       (-0.63905,0.73726,-0.21926)
- New Momentum Direction: (0.48486,0.87337,-0.046197)
- New Polarization:       (-0.86758,0.47363,-0.15155)
+ Old Momentum Direction: (0.76049,0.64759,-0.047847)
+ Old Polarization:       (-0.63812,0.73164,-0.23981)
+ New Momentum Direction: (0.48086,0.87441,-0.064606)
+ New Polarization:       (-0.86942,0.46598,-0.16422)
  *** FresnelRefraction *** 
 Track (trackID 310, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68513,-0.58049,0.44004)
- Old Polarization:       (-0.72183,-0.62213,0.30317)
- New Momentum Direction: (0.15881,-0.7868,0.59643)
- New Polarization:       (-0.98395,-0.17595,0.029894)
+ Old Momentum Direction: (0.65395,-0.16618,0.73806)
+ Old Polarization:       (-0.75628,-0.16917,0.632)
+ New Momentum Direction: (0.88167,-0.22405,0.41528)
+ New Polarization:       (0.32908,-0.33878,-0.88144)
  *** FresnelRefraction *** 
 Track (trackID 309, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81028,0.24695,-0.53148)
- Old Polarization:       (-0.58491,0.28434,-0.75962)
- New Momentum Direction: (0.60543,0.33538,-0.72179)
- New Polarization:       (-0.79514,0.21507,-0.56702)
+ Old Momentum Direction: (0.68039,-0.5739,0.45574)
+ Old Polarization:       (-0.72604,-0.61245,0.31269)
+ New Momentum Direction: (0.10277,-0.77897,0.61859)
+ New Polarization:       (-0.99147,-0.1303,0.00063512)
  *** FresnelRefraction *** 
 Track (trackID 308, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68974,0.51135,0.51262)
- Old Polarization:       (-0.71716,0.58,0.38638)
- New Momentum Direction: (0.20872,0.69067,0.69239)
- New Polarization:       (-0.97423,0.20872,0.085477)
+ Old Momentum Direction: (0.81507,0.13996,-0.56221)
+ Old Polarization:       (-0.57911,0.16761,-0.79784)
+ New Momentum Direction: (0.61601,0.1903,-0.7644)
+ New Polarization:       (-0.78756,0.12819,-0.60276)
  *** FresnelRefraction *** 
 Track (trackID 307, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81762,0.15809,-0.55364)
- Old Polarization:       (-0.5754,0.19027,-0.79543)
- New Momentum Direction: (0.63053,0.21311,-0.74633)
- New Polarization:       (-0.77592,0.14873,-0.61305)
+ Old Momentum Direction: (0.64776,0.077885,0.75786)
+ Old Polarization:       (-0.76141,0.1,0.64051)
+ New Momentum Direction: (0.88062,0.10589,0.46183)
+ New Polarization:       (0.43891,0.1849,-0.8793)
  *** FresnelRefraction *** 
 Track (trackID 306, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73298,0.66078,0.16158)
- Old Polarization:       (-0.66934,0.74295,-0.001932)
- New Momentum Direction: (0.39179,0.89372,0.21854)
- New Polarization:       (-0.91324,0.40661,-0.025604)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 305, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
 
@@ -5352,9862 +5441,15068 @@ Track (trackID 305, parentID 1) is processed with stopping code 2
 Track (trackID 304, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 288
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 282
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 289 stacked tracks.
+### pop requested out of 283 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73429,0.043107,0.67747)
- Old Polarization:       (-0.67878,0.033048,0.7336)
- New Momentum Direction: (0.38309,0.058657,0.92185)
- New Polarization:       (-0.92367,0.015263,0.38288)
- *** FresnelRefraction *** 
-Track (trackID 898, parentID 1) is processed with stopping code 2
-### pop requested out of 288 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 897, parentID 1) is processed with stopping code 2
-### pop requested out of 287 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 896, parentID 1) is processed with stopping code 2
-### pop requested out of 286 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 895, parentID 1) is processed with stopping code 2
-### pop requested out of 285 stacked tracks.
+ Old Momentum Direction: (0.59531,0.6576,0.4617)
+ Old Polarization:       (-0.70457,0.70345,-0.093471)
+ New Momentum Direction: (0.59531,-0.6576,0.4617)
+ New Polarization:       (0.70457,0.70345,0.093471)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74057,0.4565,-0.49312)
- Old Polarization:       (-0.67192,0.49315,-0.55257)
- New Momentum Direction: (0.42255,0.61571,-0.6651)
- New Polarization:       (-0.9063,0.28027,-0.31633)
- *** FresnelRefraction *** 
-Track (trackID 894, parentID 1) is processed with stopping code 2
-### pop requested out of 284 stacked tracks.
+ Old Momentum Direction: (0.59531,-0.6576,0.4617)
+ Old Polarization:       (0.70457,0.70345,0.093471)
+ New Momentum Direction: (-0.59531,-0.6576,0.4617)
+ New Polarization:       (0.70457,-0.70345,-0.093471)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74885,-0.58255,-0.316)
- Old Polarization:       (-0.66274,-0.65949,-0.35476)
- New Momentum Direction: (0.446,-0.78674,-0.42676)
- New Polarization:       (-0.89503,-0.39289,-0.21108)
- *** FresnelRefraction *** 
-Track (trackID 893, parentID 1) is processed with stopping code 2
-### pop requested out of 283 stacked tracks.
+ Old Momentum Direction: (-0.59531,-0.6576,0.4617)
+ Old Polarization:       (0.70457,-0.70345,-0.093471)
+ New Momentum Direction: (-0.59531,-0.6576,-0.4617)
+ New Polarization:       (-0.70457,0.70345,-0.093471)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.59531,-0.6576,-0.4617)
+ Old Polarization:       (-0.70457,0.70345,-0.093471)
+ New Momentum Direction: (-0.59531,0.6576,-0.4617)
+ New Polarization:       (0.70457,0.70345,0.093471)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.59531,0.6576,-0.4617)
+ Old Polarization:       (0.70457,0.70345,0.093471)
+ New Momentum Direction: (0.59531,0.6576,-0.4617)
+ New Polarization:       (0.70457,-0.70345,-0.093471)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73865,0.24109,-0.6295)
- Old Polarization:       (-0.67401,0.25042,-0.69498)
- New Momentum Direction: (0.40445,0.32709,-0.85407)
- New Polarization:       (-0.91452,0.13538,-0.38122)
+ Old Momentum Direction: (0.59531,0.6576,-0.4617)
+ Old Polarization:       (0.70457,-0.70345,-0.093471)
+ New Momentum Direction: (0.59531,0.6576,0.4617)
+ New Polarization:       (-0.70457,0.70345,-0.093471)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.59531,0.6576,0.4617)
+Old Polarization: (-0.70457,0.70345,-0.093471)
+New Polarization: (0.36655,-0.81447,-0.44975)
+Polarization Change: (0.36655,-0.81447,-0.44975)
+New Momentum Direction: (-0.67618,0.098838,-0.73008)
+Momentum Change: (-0.67618,0.098838,-0.73008)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67618,0.098838,-0.73008)
+ Old Polarization:       (0.36655,-0.81447,-0.44975)
+ New Momentum Direction: (-0.67618,0.098838,0.73008)
+ New Polarization:       (0.37374,0.9,0.22431)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67618,0.098838,0.73008)
+ Old Polarization:       (0.37374,0.9,0.22431)
+ New Momentum Direction: (0.67618,0.098838,0.73008)
+ New Polarization:       (0.36306,-0.90699,-0.21347)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.67618,0.098838,0.73008)
+ Old Polarization:       (0.36306,-0.90699,-0.21347)
+ New Momentum Direction: (0.9176,0.13413,0.3742)
+ New Polarization:       (0.29324,-0.86394,-0.40941)
  *** FresnelRefraction *** 
-Track (trackID 892, parentID 1) is processed with stopping code 2
+Track (trackID 868, parentID 1) is processed with stopping code 2
 ### pop requested out of 282 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 891, parentID 1) is processed with stopping code 2
-### pop requested out of 281 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.43995,-0.32201,0.8383)
+Old Polarization: (-0.87387,-0.36855,0.31705)
+New Polarization: (0.93349,-0.2297,-0.27538)
+Polarization Change: (0.93349,-0.2297,-0.27538)
+New Momentum Direction: (-0.19124,-0.96849,0.15954)
+Momentum Change: (-0.19124,-0.96849,0.15954)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.19124,-0.96849,0.15954)
+ Old Polarization:       (0.93349,-0.2297,-0.27538)
+ New Momentum Direction: (-0.19124,-0.96849,-0.15954)
+ New Polarization:       (-0.93349,0.2297,-0.27538)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74693,-0.63916,0.18322)
- Old Polarization:       (-0.66488,-0.72028,0.19781)
- New Momentum Direction: (0.43785,-0.86424,0.24774)
- New Polarization:       (-0.89903,-0.42246,0.11518)
+ Old Momentum Direction: (-0.19124,-0.96849,-0.15954)
+ Old Polarization:       (-0.93349,0.2297,-0.27538)
+ New Momentum Direction: (-0.25994,-0.94096,-0.21685)
+ New Polarization:       (-0.87873,0.32361,-0.35088)
  *** FresnelRefraction *** 
-Track (trackID 890, parentID 1) is processed with stopping code 2
+Track (trackID 867, parentID 1) is processed with stopping code 2
+### pop requested out of 281 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 866, parentID 1) is processed with stopping code 2
 ### pop requested out of 280 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73351,0.67768,0.052153)
- Old Polarization:       (-0.67968,0.73161,0.052747)
- New Momentum Direction: (0.39004,0.91808,0.070654)
- New Polarization:       (-0.9208,0.38907,0.027548)
- *** FresnelRefraction *** 
-Track (trackID 889, parentID 1) is processed with stopping code 2
-### pop requested out of 279 stacked tracks.
+ Old Momentum Direction: (0.52792,-0.54526,0.65114)
+ Old Polarization:       (-0.77893,-0.61641,0.11535)
+ New Momentum Direction: (0.52792,-0.54526,-0.65114)
+ New Polarization:       (0.77893,0.61641,0.11535)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74503,-0.39292,-0.53902)
- Old Polarization:       (-0.66701,-0.44578,-0.59698)
- New Momentum Direction: (0.42722,-0.53259,-0.73063)
- New Polarization:       (-0.90413,-0.25637,-0.34179)
- *** FresnelRefraction *** 
-Track (trackID 888, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.52792,-0.54526,-0.65114)
+ Old Polarization:       (0.77893,0.61641,0.11535)
+ New Momentum Direction: (0.52792,0.54526,-0.65114)
+ New Polarization:       (-0.77893,0.61641,-0.11535)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52792,0.54526,-0.65114)
+ Old Polarization:       (-0.77893,0.61641,-0.11535)
+ New Momentum Direction: (-0.52792,0.54526,-0.65114)
+ New Polarization:       (-0.77893,-0.61641,0.11535)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52792,0.54526,-0.65114)
+ Old Polarization:       (-0.77893,-0.61641,0.11535)
+ New Momentum Direction: (-0.52792,0.54526,0.65114)
+ New Polarization:       (0.77893,0.61641,0.11535)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52792,0.54526,0.65114)
+ Old Polarization:       (0.77893,0.61641,0.11535)
+ New Momentum Direction: (-0.52792,-0.54526,0.65114)
+ New Polarization:       (-0.77893,0.61641,-0.11535)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52792,-0.54526,0.65114)
+ Old Polarization:       (-0.77893,0.61641,-0.11535)
+ New Momentum Direction: (0.52792,-0.54526,0.65114)
+ New Polarization:       (-0.77893,-0.61641,0.11535)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 865, parentID 1) is processed with stopping code 2
+### pop requested out of 279 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 864, parentID 1) is processed with stopping code 2
 ### pop requested out of 278 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.663,-0.66017,0.35299)
+ Old Polarization:       (-0.63054,-0.74663,-0.21206)
+ New Momentum Direction: (-0.663,-0.66017,0.35299)
+ New Polarization:       (-0.63054,0.74663,0.21206)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.663,-0.66017,0.35299)
+ Old Polarization:       (-0.63054,0.74663,0.21206)
+ New Momentum Direction: (-0.663,0.66017,0.35299)
+ New Polarization:       (0.63054,0.74663,-0.21206)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.663,0.66017,0.35299)
+ Old Polarization:       (0.63054,0.74663,-0.21206)
+ New Momentum Direction: (-0.663,0.66017,-0.35299)
+ New Polarization:       (-0.63054,-0.74663,-0.21206)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 887, parentID 1) is processed with stopping code 2
+Track (trackID 863, parentID 1) is processed with stopping code 2
 ### pop requested out of 277 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7401,-0.0057765,-0.67248)
- Old Polarization:       (-0.67244,-0.020265,-0.73988)
- New Momentum Direction: (0.40646,-0.007848,-0.91364)
- New Polarization:       (-0.91363,-0.012862,-0.40634)
+ Old Momentum Direction: (0.86796,0.47453,-0.14655)
+ Old Polarization:       (-0.40489,0.50522,-0.76211)
+ New Momentum Direction: (0.74004,0.64262,-0.19845)
+ New Polarization:       (-0.59863,0.49486,-0.62989)
  *** FresnelRefraction *** 
-Track (trackID 886, parentID 1) is processed with stopping code 2
+Track (trackID 862, parentID 1) is processed with stopping code 2
 ### pop requested out of 276 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73077,0.6739,-0.10881)
- Old Polarization:       (-0.68261,0.72033,-0.12316)
- New Momentum Direction: (0.37033,0.91703,-0.14806)
- New Polarization:       (-0.92889,0.36487,-0.06347)
- *** FresnelRefraction *** 
-Track (trackID 885, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.5638,0.63403,0.52928)
+ Old Polarization:       (-0.73845,0.67399,-0.020772)
+ New Momentum Direction: (0.5638,-0.63403,0.52928)
+ New Polarization:       (0.73845,0.67399,0.020772)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5638,-0.63403,0.52928)
+ Old Polarization:       (0.73845,0.67399,0.020772)
+ New Momentum Direction: (-0.5638,-0.63403,0.52928)
+ New Polarization:       (0.73845,-0.67399,-0.020772)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5638,-0.63403,0.52928)
+ Old Polarization:       (0.73845,-0.67399,-0.020772)
+ New Momentum Direction: (-0.5638,-0.63403,-0.52928)
+ New Polarization:       (-0.73845,0.67399,-0.020772)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 861, parentID 1) is processed with stopping code 2
 ### pop requested out of 275 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74724,-0.32358,-0.58045)
- Old Polarization:       (-0.66452,-0.37256,-0.64777)
- New Momentum Direction: (0.44108,-0.43699,-0.7839)
- New Polarization:       (-0.89745,-0.22075,-0.38191)
+ Old Momentum Direction: (0.45385,0.405,0.79373)
+ Old Polarization:       (-0.86091,0.4291,0.27331)
+ New Momentum Direction: (0.61434,0.54822,0.56749)
+ New Polarization:       (-0.29501,0.82664,-0.47921)
  *** FresnelRefraction *** 
-Track (trackID 884, parentID 1) is processed with stopping code 2
+Track (trackID 860, parentID 1) is processed with stopping code 2
 ### pop requested out of 274 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.741,0.49661,-0.45199)
- Old Polarization:       (-0.67145,0.53925,-0.50829)
- New Momentum Direction: (0.42632,0.66898,-0.60887)
- New Polarization:       (-0.90454,0.30931,-0.29351)
+ Old Momentum Direction: (0.93444,0.20041,-0.29438)
+ Old Polarization:       (-0.33346,0.20222,-0.92082)
+ New Momentum Direction: (0.87528,0.27216,-0.39978)
+ New Polarization:       (-0.46651,0.25718,-0.8463)
  *** FresnelRefraction *** 
-Track (trackID 883, parentID 1) is processed with stopping code 2
+Track (trackID 859, parentID 1) is processed with stopping code 2
 ### pop requested out of 273 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74368,-0.39825,-0.53697)
- Old Polarization:       (-0.66851,-0.44979,-0.59227)
- New Momentum Direction: (0.4192,-0.54084,-0.72922)
- New Polarization:       (-0.90788,-0.25431,-0.33329)
+ Old Momentum Direction: (0.43595,0.34399,0.83164)
+ Old Polarization:       (-0.87924,0.35997,0.31202)
+ New Momentum Direction: (0.59152,0.46674,0.65746)
+ New Polarization:       (-0.091575,0.84903,-0.52034)
  *** FresnelRefraction *** 
-Track (trackID 882, parentID 1) is processed with stopping code 2
+Track (trackID 858, parentID 1) is processed with stopping code 2
 ### pop requested out of 272 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73534,0.65692,-0.16655)
- Old Polarization:       (-0.67768,0.71081,-0.18841)
- New Momentum Direction: (0.39904,0.88881,-0.22534)
- New Polarization:       (-0.91692,0.38547,-0.10327)
+ Old Momentum Direction: (0.92511,-0.28236,-0.25388)
+ Old Polarization:       (-0.34181,-0.32806,-0.88065)
+ New Momentum Direction: (0.85776,-0.38226,-0.3437)
+ New Polarization:       (-0.48469,-0.37866,-0.78848)
  *** FresnelRefraction *** 
-Track (trackID 881, parentID 1) is processed with stopping code 2
+Track (trackID 857, parentID 1) is processed with stopping code 2
 ### pop requested out of 271 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7419,0.11368,0.6608)
- Old Polarization:       (-0.67045,0.11284,0.73332)
- New Momentum Direction: (0.43111,0.15297,0.88924)
- New Polarization:       (-0.90226,0.0642,0.42638)
+ Old Momentum Direction: (0.73122,0.66089,0.16893)
+ Old Polarization:       (-0.5546,0.72017,-0.41686)
+ New Momentum Direction: (0.39626,0.88954,0.22738)
+ New Polarization:       (-0.82533,0.45361,-0.33626)
  *** FresnelRefraction *** 
-Track (trackID 880, parentID 1) is processed with stopping code 2
+Track (trackID 856, parentID 1) is processed with stopping code 2
 ### pop requested out of 270 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74585,-0.66594,-0.015088)
- Old Polarization:       (-0.66611,-0.74555,-0.021204)
- New Momentum Direction: (0.42953,-0.90282,-0.020454)
- New Polarization:       (-0.90305,-0.42935,-0.01266)
+ Old Momentum Direction: (0.56871,0.63849,0.51855)
+ Old Polarization:       (-0.73317,0.67928,-0.032316)
+ New Momentum Direction: (0.56871,-0.63849,0.51855)
+ New Polarization:       (0.73317,0.67928,0.032316)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.56871,-0.63849,0.51855)
+Old Polarization: (0.73317,0.67928,0.032316)
+New Polarization: (0.72587,0.55442,0.4071)
+Polarization Change: (0.72587,0.55442,0.4071)
+New Momentum Direction: (-0.16513,-0.43409,0.88561)
+Momentum Change: (-0.16513,-0.43409,0.88561)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.16513,-0.43409,0.88561)
+ Old Polarization:       (0.72587,0.55442,0.4071)
+ New Momentum Direction: (-0.22457,-0.59033,0.77529)
+ New Polarization:       (0.087548,-0.80462,-0.58731)
  *** FresnelRefraction *** 
-Track (trackID 879, parentID 1) is processed with stopping code 2
+Track (trackID 855, parentID 1) is processed with stopping code 2
 ### pop requested out of 269 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73106,0.66133,-0.16789)
- Old Polarization:       (-0.68229,0.70662,-0.18753)
- New Momentum Direction: (-0.73106,0.66133,-0.16789)
- New Polarization:       (-0.68218,-0.7036,0.19897)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73106,0.66133,-0.16789)
- Old Polarization:       (-0.68218,-0.7036,0.19897)
- New Momentum Direction: (-0.73106,-0.66133,-0.16789)
- New Polarization:       (0.68218,-0.7036,-0.19897)
- *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.74468,-0.64839,0.15824)
+Old Polarization: (-0.54113,-0.72534,-0.4255)
+New Polarization: (0.98201,0.023166,0.18742)
+Polarization Change: (0.98201,0.023166,0.18742)
+New Momentum Direction: (-0.097031,0.91332,0.39552)
+Momentum Change: (-0.097031,0.91332,0.39552)
+Scattering Photon!
+Old Momentum Direction: (-0.097031,0.91332,0.39552)
+Old Polarization: (0.98201,0.023166,0.18742)
+New Polarization: (0.98306,0.096273,0.15595)
+Polarization Change: (0.98306,0.096273,0.15595)
+New Momentum Direction: (0.025887,-0.91533,0.40187)
+Momentum Change: (0.025887,-0.91533,0.40187)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.025887,-0.91533,0.40187)
+ Old Polarization:       (0.98306,0.096273,0.15595)
+ New Momentum Direction: (0.035176,-0.837,0.54607)
+ New Polarization:       (0.96235,0.17574,0.20738)
+ *** FresnelRefraction *** 
+Track (trackID 854, parentID 1) is processed with stopping code 2
+### pop requested out of 268 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 878, parentID 1) is processed with stopping code 2
-### pop requested out of 268 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73182,0.67202,0.11326)
- Old Polarization:       (-0.6815,0.72201,0.11942)
- New Momentum Direction: (0.37948,0.91233,0.15377)
- New Polarization:       (-0.9252,0.37445,0.061593)
- *** FresnelRefraction *** 
-Track (trackID 877, parentID 1) is processed with stopping code 2
+Track (trackID 853, parentID 1) is processed with stopping code 2
 ### pop requested out of 267 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74002,-0.32446,0.58915)
- Old Polarization:       (-0.67252,-0.36963,0.64117)
- New Momentum Direction: (0.40856,-0.44031,0.7995)
- New Polarization:       (-0.91269,-0.20564,0.35315)
+ Old Momentum Direction: (0.77016,0.63426,0.06758)
+ Old Polarization:       (-0.51287,0.67876,-0.5256)
+ New Momentum Direction: (0.50163,0.86021,0.091655)
+ New Polarization:       (-0.77018,0.49234,-0.40549)
  *** FresnelRefraction *** 
-Track (trackID 876, parentID 1) is processed with stopping code 2
+Track (trackID 852, parentID 1) is processed with stopping code 2
 ### pop requested out of 266 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74857,-0.63989,-0.17375)
- Old Polarization:       (-0.66306,-0.7222,-0.19693)
- New Momentum Direction: (0.44421,-0.86461,-0.23477)
- New Polarization:       (-0.89592,-0.42854,-0.11694)
+ Old Momentum Direction: (0.94661,-0.058661,-0.31701)
+ Old Polarization:       (-0.32102,-0.080964,-0.94361)
+ New Momentum Direction: (0.89878,-0.079768,-0.43107)
+ New Polarization:       (-0.4374,-0.096975,-0.89402)
  *** FresnelRefraction *** 
-Track (trackID 875, parentID 1) is processed with stopping code 2
+Track (trackID 851, parentID 1) is processed with stopping code 2
 ### pop requested out of 265 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74849,-0.55995,-0.35528)
- Old Polarization:       (-0.66314,-0.63393,-0.39796)
- New Momentum Direction: (0.44425,-0.75648,-0.47998)
- New Polarization:       (-0.8959,-0.37644,-0.23592)
+ Old Momentum Direction: (0.91626,-0.3305,-0.22636)
+ Old Polarization:       (-0.3496,-0.38386,-0.85465)
+ New Momentum Direction: (0.84133,-0.44595,-0.30543)
+ New Polarization:       (-0.50023,-0.42831,-0.75255)
  *** FresnelRefraction *** 
-Track (trackID 874, parentID 1) is processed with stopping code 2
+Track (trackID 850, parentID 1) is processed with stopping code 2
 ### pop requested out of 264 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73515,0.46661,-0.49175)
- Old Polarization:       (-0.67784,0.49633,-0.54239)
- New Momentum Direction: (-0.73515,0.46661,-0.49175)
- New Polarization:       (-0.67747,-0.4797,0.55761)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73515,0.46661,-0.49175)
- Old Polarization:       (-0.67747,-0.4797,0.55761)
- New Momentum Direction: (-0.73515,0.46661,0.49175)
- New Polarization:       (0.67747,0.4797,0.55761)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73515,0.46661,0.49175)
- Old Polarization:       (0.67747,0.4797,0.55761)
- New Momentum Direction: (-0.73515,-0.46661,0.49175)
- New Polarization:       (-0.67747,0.4797,-0.55761)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.73515,-0.46661,0.49175)
-Old Polarization: (-0.67747,0.4797,-0.55761)
-New Polarization: (-0.24638,-0.011698,-0.83686)
-Polarization Change: (-0.2824,-0.013408,-0.9592)
-New Momentum Direction: (0.1418,-0.98795,-0.027938)
-Momentum Change: (0.14202,-0.98947,-0.027981)
- Photon at Boundary! 
- Old Momentum Direction: (0.14202,-0.98947,-0.027981)
- Old Polarization:       (-0.2824,-0.013408,-0.9592)
- New Momentum Direction: (0.19293,-0.98048,-0.038012)
- New Polarization:       (-0.070996,0.024689,-0.99717)
- *** FresnelRefraction *** 
-Track (trackID 873, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 849, parentID 1) is processed with stopping code 2
 ### pop requested out of 263 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74013,0.20942,-0.63902)
- Old Polarization:       (-0.67239,0.21646,-0.70784)
- New Momentum Direction: (0.41252,0.28369,-0.86565)
- New Polarization:       (-0.91091,0.11897,-0.39509)
+ Old Momentum Direction: (0.74468,0.65529,0.12666)
+ Old Polarization:       (-0.54064,0.70354,-0.46124)
+ New Momentum Direction: (0.42711,0.88777,0.17159)
+ New Polarization:       (-0.81119,0.46005,-0.36101)
  *** FresnelRefraction *** 
-Track (trackID 872, parentID 1) is processed with stopping code 2
+Track (trackID 848, parentID 1) is processed with stopping code 2
 ### pop requested out of 262 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73544,0.25949,0.62593)
- Old Polarization:       (-0.67754,0.27133,0.68361)
- New Momentum Direction: (0.39606,0.35164,0.84822)
- New Polarization:       (-0.9182,0.14473,0.36873)
- *** FresnelRefraction *** 
-Track (trackID 871, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 847, parentID 1) is processed with stopping code 2
 ### pop requested out of 261 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74565,-0.6344,0.20382)
- Old Polarization:       (-0.66632,-0.71254,0.21979)
- New Momentum Direction: (0.43088,-0.85916,0.27603)
- New Polarization:       (-0.9024,-0.41203,0.12615)
+ Old Momentum Direction: (0.43938,0.36331,0.82155)
+ Old Polarization:       (-0.87494,0.38031,0.29974)
+ New Momentum Direction: (0.59675,0.49344,0.63278)
+ New Polarization:       (-0.15925,0.84572,-0.5093)
  *** FresnelRefraction *** 
-Track (trackID 870, parentID 1) is processed with stopping code 2
+Track (trackID 846, parentID 1) is processed with stopping code 2
 ### pop requested out of 260 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74249,-0.54068,0.39544)
- Old Polarization:       (-0.66981,-0.60633,0.42862)
- New Momentum Direction: (0.4163,-0.73389,0.53675)
- New Polarization:       (-0.9092,-0.34079,0.23921)
- *** FresnelRefraction *** 
-Track (trackID 869, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.63971,-0.65783,0.39753)
+ Old Polarization:       (-0.65587,-0.73686,-0.16391)
+ New Momentum Direction: (0.63971,0.65783,0.39753)
+ New Polarization:       (0.65587,-0.73686,0.16391)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63971,0.65783,0.39753)
+ Old Polarization:       (0.65587,-0.73686,0.16391)
+ New Momentum Direction: (-0.63971,0.65783,0.39753)
+ New Polarization:       (0.65587,0.73686,-0.16391)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63971,0.65783,0.39753)
+ Old Polarization:       (0.65587,0.73686,-0.16391)
+ New Momentum Direction: (-0.63971,0.65783,-0.39753)
+ New Polarization:       (-0.65587,-0.73686,-0.16391)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63971,0.65783,-0.39753)
+ Old Polarization:       (-0.65587,-0.73686,-0.16391)
+ New Momentum Direction: (-0.63971,-0.65783,-0.39753)
+ New Polarization:       (0.65587,-0.73686,0.16391)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63971,-0.65783,-0.39753)
+ Old Polarization:       (0.65587,-0.73686,0.16391)
+ New Momentum Direction: (0.63971,-0.65783,-0.39753)
+ New Polarization:       (0.65587,0.73686,-0.16391)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 845, parentID 1) is processed with stopping code 2
 ### pop requested out of 259 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74456,-0.028932,-0.66692)
- Old Polarization:       (-0.66749,-0.046086,-0.74319)
- New Momentum Direction: (0.43229,-0.039082,-0.90089)
- New Polarization:       (-0.90169,-0.028187,-0.43146)
+ Old Momentum Direction: (0.42648,-0.22581,0.87586)
+ Old Polarization:       (-0.89182,-0.26655,0.36553)
+ New Momentum Direction: (0.57659,-0.30529,0.75786)
+ New Polarization:       (0.32056,-0.76867,-0.55353)
  *** FresnelRefraction *** 
-Track (trackID 868, parentID 1) is processed with stopping code 2
+Track (trackID 844, parentID 1) is processed with stopping code 2
 ### pop requested out of 258 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5467,0.60901,0.57466)
+ Old Polarization:       (-0.75809,0.65142,0.030842)
+ New Momentum Direction: (0.5467,-0.60901,0.57466)
+ New Polarization:       (0.75809,0.65142,-0.030842)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5467,-0.60901,0.57466)
+ Old Polarization:       (0.75809,0.65142,-0.030842)
+ New Momentum Direction: (0.5467,-0.60901,-0.57466)
+ New Polarization:       (-0.75809,-0.65142,-0.030842)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5467,-0.60901,-0.57466)
+ Old Polarization:       (-0.75809,-0.65142,-0.030842)
+ New Momentum Direction: (-0.5467,-0.60901,-0.57466)
+ New Polarization:       (-0.75809,0.65142,0.030842)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 867, parentID 1) is processed with stopping code 2
+Track (trackID 843, parentID 1) is processed with stopping code 2
 ### pop requested out of 257 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74418,-0.57789,0.33502)
- Old Polarization:       (-0.66794,-0.6493,0.36368)
- New Momentum Direction: (0.4248,-0.78319,0.45404)
- New Polarization:       (-0.90526,-0.37126,0.20657)
- *** FresnelRefraction *** 
-Track (trackID 866, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.52502,0.58367,0.61942)
+ Old Polarization:       (-0.78088,0.61981,0.077849)
+ New Momentum Direction: (0.52502,0.58367,-0.61942)
+ New Polarization:       (0.78088,-0.61981,0.077849)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52502,0.58367,-0.61942)
+ Old Polarization:       (0.78088,-0.61981,0.077849)
+ New Momentum Direction: (0.52502,-0.58367,-0.61942)
+ New Polarization:       (-0.78088,-0.61981,-0.077849)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52502,-0.58367,-0.61942)
+ Old Polarization:       (-0.78088,-0.61981,-0.077849)
+ New Momentum Direction: (-0.52502,-0.58367,-0.61942)
+ New Polarization:       (-0.78088,0.61981,0.077849)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 842, parentID 1) is processed with stopping code 2
 ### pop requested out of 256 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73536,0.65953,0.15577)
- Old Polarization:       (-0.67768,0.71597,0.16777)
- New Momentum Direction: (0.40208,0.89109,0.21047)
- New Polarization:       (-0.91561,0.39151,0.091568)
+ Old Momentum Direction: (0.7311,-0.65433,0.19322)
+ Old Polarization:       (-0.55567,-0.73539,-0.38785)
+ New Momentum Direction: (-0.7311,-0.65433,0.19322)
+ New Polarization:       (-0.3268,0.58446,0.7427)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.7311,-0.65433,0.19322)
+ Old Polarization:       (-0.3268,0.58446,0.7427)
+ New Momentum Direction: (-0.7311,0.65433,0.19322)
+ New Polarization:       (0.3268,0.58446,-0.7427)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.7311,0.65433,0.19322)
+ Old Polarization:       (0.3268,0.58446,-0.7427)
+ New Momentum Direction: (-0.37994,0.88714,0.26196)
+ New Polarization:       (0.58395,0.44967,-0.67587)
  *** FresnelRefraction *** 
-Track (trackID 865, parentID 1) is processed with stopping code 2
+Track (trackID 841, parentID 1) is processed with stopping code 2
 ### pop requested out of 255 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73854,-0.27808,0.61419)
- Old Polarization:       (-0.67413,-0.31789,0.6667)
- New Momentum Direction: (0.40091,-0.37785,0.83456)
- New Polarization:       (-0.91607,-0.1743,0.36116)
+ Old Momentum Direction: (0.4876,-0.44868,0.74895)
+ Old Polarization:       (-0.82562,-0.51592,0.22844)
+ New Momentum Direction: (0.65738,-0.6049,0.44938)
+ New Polarization:       (-0.44187,-0.79249,-0.42036)
  *** FresnelRefraction *** 
-Track (trackID 864, parentID 1) is processed with stopping code 2
+Track (trackID 840, parentID 1) is processed with stopping code 2
 ### pop requested out of 254 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74944,-0.5151,-0.41595)
- Old Polarization:       (-0.66207,-0.58634,-0.46677)
- New Momentum Direction: (0.44998,-0.69479,-0.56106)
- New Polarization:       (-0.89303,-0.35234,-0.27991)
- *** FresnelRefraction *** 
-Track (trackID 863, parentID 1) is processed with stopping code 2
-### pop requested out of 253 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73975,-0.44976,0.50048)
-Old Polarization: (-0.67282,-0.50442,0.54118)
-New Polarization: (-0.55362,-0.66058,0.13777)
-Polarization Change: (-0.63428,-0.75682,0.15784)
-New Momentum Direction: (-0.7387,0.65088,0.15241)
-Momentum Change: (-0.74147,0.65332,0.15298)
 
 ** Photon absorbed! **
-Track (trackID 862, parentID 1) is processed with stopping code 2
+Track (trackID 839, parentID 1) is processed with stopping code 2
+### pop requested out of 253 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.67897,-0.66566,0.30966)
+Old Polarization: (-0.61291,-0.74613,-0.26005)
+New Polarization: (0.62554,0.30839,0.71666)
+Polarization Change: (0.62554,0.30839,0.71666)
+New Momentum Direction: (0.18755,0.83219,-0.52181)
+Momentum Change: (0.18755,0.83219,-0.52181)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18755,0.83219,-0.52181)
+ Old Polarization:       (0.62554,0.30839,0.71666)
+ New Momentum Direction: (0.25454,0.65852,-0.70821)
+ New Polarization:       (0.838,-0.5157,-0.17833)
+ *** FresnelRefraction *** 
+Track (trackID 838, parentID 1) is processed with stopping code 2
 ### pop requested out of 252 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7389,0.39143,0.54847)
- Old Polarization:       (-0.67379,0.42208,0.60651)
- New Momentum Direction: (0.41972,0.52726,0.7388)
- New Polarization:       (-0.90764,0.23893,0.34512)
+ Old Momentum Direction: (0.75735,-0.63801,0.13915)
+ Old Polarization:       (-0.52623,-0.72248,-0.44845)
+ New Momentum Direction: (0.47024,-0.86227,0.18806)
+ New Polarization:       (-0.78717,-0.50615,-0.35239)
  *** FresnelRefraction *** 
-Track (trackID 861, parentID 1) is processed with stopping code 2
+Track (trackID 837, parentID 1) is processed with stopping code 2
 ### pop requested out of 251 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 860, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.87906,-0.45467,-0.14331)
+ Old Polarization:       (-0.39214,-0.51871,-0.75971)
+ New Momentum Direction: (0.76428,-0.61506,-0.19387)
+ New Polarization:       (-0.57671,-0.51733,-0.63228)
+ *** FresnelRefraction *** 
+Track (trackID 836, parentID 1) is processed with stopping code 2
 ### pop requested out of 250 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 859, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.709,-0.65844,0.25254)
+ Old Polarization:       (-0.57956,-0.74805,-0.32331)
+ New Momentum Direction: (0.30808,-0.88827,0.34068)
+ New Polarization:       (-0.86527,-0.41047,-0.28777)
+ *** FresnelRefraction *** 
+Track (trackID 835, parentID 1) is processed with stopping code 2
 ### pop requested out of 249 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73477,0.55217,0.39399)
- Old Polarization:       (-0.67831,0.59558,0.43032)
- New Momentum Direction: (0.39766,0.7469,0.53293)
- New Polarization:       (-0.91753,0.32199,0.23338)
+ Old Momentum Direction: (0.76426,-0.63488,0.1133)
+ Old Polarization:       (-0.51977,-0.71038,-0.47454)
+ New Momentum Direction: (0.48155,-0.86279,0.15397)
+ New Polarization:       (-0.78252,-0.50238,-0.3678)
  *** FresnelRefraction *** 
-Track (trackID 858, parentID 1) is processed with stopping code 2
+Track (trackID 834, parentID 1) is processed with stopping code 2
 ### pop requested out of 248 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74396,-0.16501,0.64753)
- Old Polarization:       (-0.66815,-0.19804,0.71718)
- New Momentum Direction: (0.43598,-0.22223,0.87209)
- New Polarization:       (-0.89991,-0.11752,0.41994)
+ Old Momentum Direction: (0.78837,0.61395,0.039174)
+ Old Polarization:       (-0.49109,0.6664,-0.56102)
+ New Momentum Direction: (0.55952,0.82713,0.052777)
+ New Polarization:       (-0.73152,0.52277,-0.4377)
  *** FresnelRefraction *** 
-Track (trackID 857, parentID 1) is processed with stopping code 2
+Track (trackID 833, parentID 1) is processed with stopping code 2
 ### pop requested out of 247 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 832, parentID 1) is processed with stopping code 2
+### pop requested out of 246 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.74117,-0.23339,-0.62944)
-Old Polarization: (-0.67127,-0.2684,-0.69091)
-New Polarization: (-0.84057,0.10587,-0.18823)
-Polarization Change: (-0.96854,0.12199,-0.21689)
-New Momentum Direction: (-0.22457,-0.56159,0.68697)
-Momentum Change: (-0.24535,-0.61357,0.75056)
+Old Momentum Direction: (0.94436,-0.14306,-0.29617)
+Old Polarization: (-0.31873,-0.17571,-0.93142)
+New Polarization: (0.22166,0.40928,-0.88507)
+Polarization Change: (0.22166,0.40928,-0.88507)
+New Momentum Direction: (-0.6423,-0.62166,-0.44833)
+Momentum Change: (-0.6423,-0.62166,-0.44833)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6423,-0.62166,-0.44833)
+ Old Polarization:       (0.22166,0.40928,-0.88507)
+ New Momentum Direction: (-0.6423,0.62166,-0.44833)
+ New Polarization:       (-0.22166,0.40928,0.88507)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.24535,-0.61357,0.75056)
- Old Polarization:       (-0.96854,0.12199,-0.21689)
- New Momentum Direction: (-0.24535,0.61357,0.75056)
- New Polarization:       (0.96854,0.12199,0.21689)
+ Old Momentum Direction: (-0.6423,0.62166,-0.44833)
+ Old Polarization:       (-0.22166,0.40928,0.88507)
+ New Momentum Direction: (-0.6423,0.62166,0.44833)
+ New Polarization:       (0.22166,-0.40928,0.88507)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.24535,0.61357,0.75056)
- Old Polarization:       (0.96854,0.12199,0.21689)
- New Momentum Direction: (-0.33376,0.83466,0.43811)
- New Polarization:       (0.75226,0.51591,-0.4098)
- *** FresnelRefraction *** 
-Track (trackID 856, parentID 1) is processed with stopping code 2
-### pop requested out of 246 stacked tracks.
+ Old Momentum Direction: (-0.6423,0.62166,0.44833)
+ Old Polarization:       (0.22166,-0.40928,0.88507)
+ New Momentum Direction: (0.6423,0.62166,0.44833)
+ New Polarization:       (0.22166,0.40928,-0.88507)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73716,-0.1125,0.66628)
- Old Polarization:       (-0.67564,-0.13704,0.72438)
- New Momentum Direction: (0.39717,-0.15279,0.90494)
- New Polarization:       (-0.9177,-0.07575,0.38998)
+ Old Momentum Direction: (0.6423,0.62166,0.44833)
+ Old Polarization:       (0.22166,0.40928,-0.88507)
+ New Momentum Direction: (0.6423,-0.62166,0.44833)
+ New Polarization:       (-0.22166,0.40928,0.88507)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6423,-0.62166,0.44833)
+ Old Polarization:       (-0.22166,0.40928,0.88507)
+ New Momentum Direction: (0.6423,-0.62166,-0.44833)
+ New Polarization:       (0.22166,-0.40928,0.88507)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6423,-0.62166,-0.44833)
+ Old Polarization:       (0.22166,-0.40928,0.88507)
+ New Momentum Direction: (-0.6423,-0.62166,-0.44833)
+ New Polarization:       (0.22166,0.40928,-0.88507)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6423,-0.62166,-0.44833)
+ Old Polarization:       (0.22166,0.40928,-0.88507)
+ New Momentum Direction: (-0.6423,0.62166,-0.44833)
+ New Polarization:       (-0.22166,0.40928,0.88507)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6423,0.62166,-0.44833)
+ Old Polarization:       (-0.22166,0.40928,0.88507)
+ New Momentum Direction: (0.6423,0.62166,-0.44833)
+ New Polarization:       (-0.22166,-0.40928,-0.88507)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6423,0.62166,-0.44833)
+ Old Polarization:       (-0.22166,-0.40928,-0.88507)
+ New Momentum Direction: (0.6423,0.62166,0.44833)
+ New Polarization:       (0.22166,0.40928,-0.88507)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6423,0.62166,0.44833)
+ Old Polarization:       (0.22166,0.40928,-0.88507)
+ New Momentum Direction: (0.6423,-0.62166,0.44833)
+ New Polarization:       (-0.22166,0.40928,0.88507)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.6423,-0.62166,0.44833)
+Old Polarization: (-0.22166,0.40928,0.88507)
+New Polarization: (-0.36347,-0.23908,0.90041)
+Polarization Change: (-0.36347,-0.23908,0.90041)
+New Momentum Direction: (0.098544,0.95122,0.29235)
+Momentum Change: (0.098544,0.95122,0.29235)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.098544,0.95122,0.29235)
+ Old Polarization:       (-0.36347,-0.23908,0.90041)
+ New Momentum Direction: (0.13303,0.90915,0.39466)
+ New Polarization:       (-0.23861,-0.35711,0.90307)
  *** FresnelRefraction *** 
-Track (trackID 855, parentID 1) is processed with stopping code 2
+Track (trackID 831, parentID 1) is processed with stopping code 2
 ### pop requested out of 245 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 854, parentID 1) is processed with stopping code 2
+Track (trackID 830, parentID 1) is processed with stopping code 2
 ### pop requested out of 244 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74188,0.027394,0.66997)
- Old Polarization:       (-0.67047,0.016426,0.74176)
- New Momentum Direction: (0.42901,0.036904,0.90255)
- New Polarization:       (-0.90326,0.0080057,0.42902)
- *** FresnelRefraction *** 
-Track (trackID 853, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 829, parentID 1) is processed with stopping code 2
 ### pop requested out of 243 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 852, parentID 1) is processed with stopping code 2
+Track (trackID 828, parentID 1) is processed with stopping code 2
 ### pop requested out of 242 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.62049,0.67399,0.40091)
+ Old Polarization:       (-0.67674,0.71851,-0.16052)
+ New Momentum Direction: (0.62049,-0.67399,0.40091)
+ New Polarization:       (0.67674,0.71851,0.16052)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.62049,-0.67399,0.40091)
+ Old Polarization:       (0.67674,0.71851,0.16052)
+ New Momentum Direction: (-0.62049,-0.67399,0.40091)
+ New Polarization:       (0.67674,-0.71851,-0.16052)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62049,-0.67399,0.40091)
+ Old Polarization:       (0.67674,-0.71851,-0.16052)
+ New Momentum Direction: (-0.62049,-0.67399,-0.40091)
+ New Polarization:       (-0.67674,0.71851,-0.16052)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 851, parentID 1) is processed with stopping code 2
+Track (trackID 827, parentID 1) is processed with stopping code 2
 ### pop requested out of 241 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73356,0.67575,0.072443)
- Old Polarization:       (-0.67962,0.72971,0.075094)
- New Momentum Direction: (0.3905,0.91536,0.09813)
- New Polarization:       (-0.9206,0.3885,0.039539)
+ Old Momentum Direction: (0.41253,-0.015106,0.91082)
+ Old Polarization:       (-0.9106,-0.034089,0.41187)
+ New Momentum Direction: (0.5549,-0.020319,0.83167)
+ New Polarization:       (0.82828,-0.079849,-0.55459)
  *** FresnelRefraction *** 
-Track (trackID 850, parentID 1) is processed with stopping code 2
+Track (trackID 826, parentID 1) is processed with stopping code 2
 ### pop requested out of 240 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.941,0.14976,-0.30345)
+Old Polarization: (-0.32475,0.14762,-0.93421)
+New Polarization: (0.16864,-0.40003,-0.90085)
+Polarization Change: (0.16864,-0.40003,-0.90085)
+New Momentum Direction: (0.65247,-0.63973,0.40623)
+Momentum Change: (0.65247,-0.63973,0.40623)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,-0.63973,0.40623)
+ Old Polarization:       (0.16864,-0.40003,-0.90085)
+ New Momentum Direction: (-0.65247,-0.63973,0.40623)
+ New Polarization:       (0.16864,0.40003,0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,-0.63973,0.40623)
+ Old Polarization:       (0.16864,0.40003,0.90085)
+ New Momentum Direction: (-0.65247,0.63973,0.40623)
+ New Polarization:       (-0.16864,0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,0.63973,0.40623)
+ Old Polarization:       (-0.16864,0.40003,-0.90085)
+ New Momentum Direction: (-0.65247,0.63973,-0.40623)
+ New Polarization:       (0.16864,-0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,0.63973,-0.40623)
+ Old Polarization:       (0.16864,-0.40003,-0.90085)
+ New Momentum Direction: (0.65247,0.63973,-0.40623)
+ New Polarization:       (0.16864,0.40003,0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,0.63973,-0.40623)
+ Old Polarization:       (0.16864,0.40003,0.90085)
+ New Momentum Direction: (0.65247,-0.63973,-0.40623)
+ New Polarization:       (-0.16864,0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,-0.63973,-0.40623)
+ Old Polarization:       (-0.16864,0.40003,-0.90085)
+ New Momentum Direction: (-0.65247,-0.63973,-0.40623)
+ New Polarization:       (-0.16864,-0.40003,0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,-0.63973,-0.40623)
+ Old Polarization:       (-0.16864,-0.40003,0.90085)
+ New Momentum Direction: (-0.65247,-0.63973,0.40623)
+ New Polarization:       (0.16864,0.40003,0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,-0.63973,0.40623)
+ Old Polarization:       (0.16864,0.40003,0.90085)
+ New Momentum Direction: (-0.65247,0.63973,0.40623)
+ New Polarization:       (-0.16864,0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,0.63973,0.40623)
+ Old Polarization:       (-0.16864,0.40003,-0.90085)
+ New Momentum Direction: (0.65247,0.63973,0.40623)
+ New Polarization:       (-0.16864,-0.40003,0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,0.63973,0.40623)
+ Old Polarization:       (-0.16864,-0.40003,0.90085)
+ New Momentum Direction: (0.65247,-0.63973,0.40623)
+ New Polarization:       (0.16864,-0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,-0.63973,0.40623)
+ Old Polarization:       (0.16864,-0.40003,-0.90085)
+ New Momentum Direction: (0.65247,-0.63973,-0.40623)
+ New Polarization:       (-0.16864,0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,-0.63973,-0.40623)
+ Old Polarization:       (-0.16864,0.40003,-0.90085)
+ New Momentum Direction: (-0.65247,-0.63973,-0.40623)
+ New Polarization:       (-0.16864,-0.40003,0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,-0.63973,-0.40623)
+ Old Polarization:       (-0.16864,-0.40003,0.90085)
+ New Momentum Direction: (-0.65247,0.63973,-0.40623)
+ New Polarization:       (0.16864,-0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65247,0.63973,-0.40623)
+ Old Polarization:       (0.16864,-0.40003,-0.90085)
+ New Momentum Direction: (0.65247,0.63973,-0.40623)
+ New Polarization:       (0.16864,0.40003,0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,0.63973,-0.40623)
+ Old Polarization:       (0.16864,0.40003,0.90085)
+ New Momentum Direction: (0.65247,-0.63973,-0.40623)
+ New Polarization:       (-0.16864,0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,-0.63973,-0.40623)
+ Old Polarization:       (-0.16864,0.40003,-0.90085)
+ New Momentum Direction: (0.65247,-0.63973,0.40623)
+ New Polarization:       (0.16864,-0.40003,-0.90085)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65247,-0.63973,0.40623)
+ Old Polarization:       (0.16864,-0.40003,-0.90085)
+ New Momentum Direction: (-0.65247,-0.63973,0.40623)
+ New Polarization:       (0.16864,0.40003,0.90085)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 849, parentID 1) is processed with stopping code 2
+Track (trackID 825, parentID 1) is processed with stopping code 2
 ### pop requested out of 239 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7466,-0.43705,0.50157)
- Old Polarization:       (-0.66521,-0.50075,0.55385)
- New Momentum Direction: (0.44319,-0.5889,0.67585)
- New Polarization:       (-0.89639,-0.29824,0.32794)
- *** FresnelRefraction *** 
-Track (trackID 848, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.52668,-0.53113,0.66371)
+ Old Polarization:       (-0.78236,-0.60822,0.13412)
+ New Momentum Direction: (0.52668,-0.53113,-0.66371)
+ New Polarization:       (0.78236,0.60822,0.13412)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52668,-0.53113,-0.66371)
+ Old Polarization:       (0.78236,0.60822,0.13412)
+ New Momentum Direction: (0.52668,0.53113,-0.66371)
+ New Polarization:       (-0.78236,0.60822,-0.13412)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52668,0.53113,-0.66371)
+ Old Polarization:       (-0.78236,0.60822,-0.13412)
+ New Momentum Direction: (-0.52668,0.53113,-0.66371)
+ New Polarization:       (-0.78236,-0.60822,0.13412)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52668,0.53113,-0.66371)
+ Old Polarization:       (-0.78236,-0.60822,0.13412)
+ New Momentum Direction: (-0.52668,0.53113,0.66371)
+ New Polarization:       (0.78236,0.60822,0.13412)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 824, parentID 1) is processed with stopping code 2
 ### pop requested out of 238 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74205,0.19579,-0.64111)
- Old Polarization:       (-0.67027,0.20257,-0.71394)
- New Momentum Direction: (0.42354,0.26458,-0.86638)
- New Polarization:       (-0.90583,0.11405,-0.40799)
+ Old Momentum Direction: (0.42978,0.30669,0.84926)
+ Old Polarization:       (-0.88685,0.3201,0.33321)
+ New Momentum Direction: (0.58232,0.41554,0.69874)
+ New Polarization:       (0.042816,0.84263,-0.53679)
  *** FresnelRefraction *** 
-Track (trackID 847, parentID 1) is processed with stopping code 2
+Track (trackID 823, parentID 1) is processed with stopping code 2
 ### pop requested out of 237 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74139,-0.274,-0.61259)
- Old Polarization:       (-0.67103,-0.31258,-0.67232)
- New Momentum Direction: (0.40792,-0.37279,-0.83344)
- New Polarization:       (-0.91299,-0.1732,-0.36939)
- *** FresnelRefraction *** 
-Track (trackID 846, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 822, parentID 1) is processed with stopping code 2
 ### pop requested out of 236 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74547,-0.3651,0.55766)
- Old Polarization:       (-0.66648,-0.42028,0.61577)
- New Momentum Direction: (0.43899,-0.49215,0.75171)
- New Polarization:       (-0.89845,-0.24869,0.36186)
- *** FresnelRefraction *** 
-Track (trackID 845, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (0.56253,0.62794,0.53782)
+Old Polarization: (-0.74064,0.67183,-0.0097261)
+New Polarization: (-0.016801,0.99985,0.003669)
+Polarization Change: (-0.016801,0.99985,0.003669)
+New Momentum Direction: (-0.99972,-0.016737,-0.016777)
+Momentum Change: (-0.99972,-0.016737,-0.016777)
+
+** Photon absorbed! **
+Track (trackID 821, parentID 1) is processed with stopping code 2
 ### pop requested out of 235 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73519,0.42238,-0.53018)
- Old Polarization:       (-0.6778,0.44728,-0.58355)
- New Momentum Direction: (0.38838,0.57419,-0.72073)
- New Polarization:       (-0.92146,0.23478,-0.3095)
+ Old Momentum Direction: (0.8359,-0.54746,-0.039509)
+ Old Polarization:       (-0.43902,-0.62366,-0.64677)
+ New Momentum Direction: (0.67139,-0.73918,-0.053346)
+ New Polarization:       (-0.65266,-0.55563,-0.51509)
  *** FresnelRefraction *** 
-Track (trackID 844, parentID 1) is processed with stopping code 2
+Track (trackID 820, parentID 1) is processed with stopping code 2
 ### pop requested out of 234 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74197,-0.30701,-0.59601)
- Old Polarization:       (-0.67039,-0.34889,-0.65487)
- New Momentum Direction: (0.41075,-0.41751,-0.81053)
- New Polarization:       (-0.91172,-0.19424,-0.36198)
- *** FresnelRefraction *** 
-Track (trackID 843, parentID 1) is processed with stopping code 2
-### pop requested out of 233 stacked tracks.
+ Old Momentum Direction: (0.82313,-0.56766,-0.014878)
+ Old Polarization:       (-0.45412,-0.6423,-0.61743)
+ New Momentum Direction: (-0.82313,-0.56766,-0.014878)
+ New Polarization:       (0.070043,-0.12749,0.98936)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.82313,-0.56766,-0.014878)
+ Old Polarization:       (0.070043,-0.12749,0.98936)
+ New Momentum Direction: (-0.82313,0.56766,-0.014878)
+ New Polarization:       (-0.070043,-0.12749,-0.98936)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73795,0.083569,0.66967)
- Old Polarization:       (-0.6748,0.078143,0.73385)
- New Momentum Direction: (0.40724,0.1131,0.90629)
- New Polarization:       (-0.91328,0.041464,0.40521)
+ Old Momentum Direction: (-0.82313,0.56766,-0.014878)
+ Old Polarization:       (-0.070043,-0.12749,-0.98936)
+ New Momentum Direction: (-0.63953,0.7685,-0.020142)
+ New Polarization:       (0.13233,0.084236,-0.98762)
  *** FresnelRefraction *** 
-Track (trackID 842, parentID 1) is processed with stopping code 2
+Track (trackID 819, parentID 1) is processed with stopping code 2
+### pop requested out of 233 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 818, parentID 1) is processed with stopping code 2
 ### pop requested out of 232 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73447,0.1334,0.66539)
- Old Polarization:       (-0.67858,0.13185,0.72259)
- New Momentum Direction: (0.38676,0.18128,0.90419)
- New Polarization:       (-0.92215,0.067642,0.38088)
+ Old Momentum Direction: (0.94024,-0.1902,-0.28243)
+ Old Polarization:       (-0.32221,-0.22877,-0.91861)
+ New Momentum Direction: (0.88849,-0.25632,-0.38063)
+ New Polarization:       (-0.44504,-0.27905,-0.85093)
  *** FresnelRefraction *** 
-Track (trackID 841, parentID 1) is processed with stopping code 2
+Track (trackID 817, parentID 1) is processed with stopping code 2
 ### pop requested out of 231 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 840, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50853,-0.5177,0.68803)
+ Old Polarization:       (-0.79888,-0.58179,0.15269)
+ New Momentum Direction: (0.50853,-0.5177,-0.68803)
+ New Polarization:       (0.62996,0.76842,-0.11258)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50853,-0.5177,-0.68803)
+ Old Polarization:       (0.62996,0.76842,-0.11258)
+ New Momentum Direction: (0.50853,0.5177,-0.68803)
+ New Polarization:       (-0.62996,0.76842,0.11258)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50853,0.5177,-0.68803)
+ Old Polarization:       (-0.62996,0.76842,0.11258)
+ New Momentum Direction: (-0.50853,0.5177,-0.68803)
+ New Polarization:       (-0.62996,-0.76842,-0.11258)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.50853,0.5177,-0.68803)
+ Old Polarization:       (-0.62996,-0.76842,-0.11258)
+ New Momentum Direction: (-0.69142,0.7039,-0.16265)
+ New Polarization:       (-0.71926,-0.64957,0.24641)
+ *** FresnelRefraction *** 
+Track (trackID 816, parentID 1) is processed with stopping code 2
 ### pop requested out of 230 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74041,-0.083061,-0.667)
- Old Polarization:       (-0.67209,-0.10465,-0.73304)
- New Momentum Direction: (0.40643,-0.11291,-0.90668)
- New Polarization:       (-0.91365,-0.059083,-0.4022)
+ Old Momentum Direction: (0.50138,-0.49121,0.71227)
+ Old Polarization:       (-0.80871,-0.5587,0.18396)
+ New Momentum Direction: (0.67843,-0.66466,0.31298)
+ New Polarization:       (-0.56145,-0.74383,-0.36262)
  *** FresnelRefraction *** 
-Track (trackID 839, parentID 1) is processed with stopping code 2
+Track (trackID 815, parentID 1) is processed with stopping code 2
 ### pop requested out of 229 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74438,-0.65393,0.13523)
- Old Polarization:       (-0.66774,-0.73042,0.14354)
- New Momentum Direction: (0.42247,-0.8876,0.18355)
- New Polarization:       (-0.90637,-0.41472,0.080672)
+ Old Momentum Direction: (0.41566,-0.19452,0.88848)
+ Old Polarization:       (-0.89999,-0.22904,0.3709)
+ New Momentum Direction: (0.56534,-0.26458,0.78127)
+ New Polarization:       (0.42929,-0.7144,-0.55257)
  *** FresnelRefraction *** 
-Track (trackID 838, parentID 1) is processed with stopping code 2
+Track (trackID 814, parentID 1) is processed with stopping code 2
 ### pop requested out of 228 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74493,-0.33789,0.57525)
- Old Polarization:       (-0.66708,-0.38974,0.63491)
- New Momentum Direction: (0.43676,-0.4556,0.77567)
- New Polarization:       (-0.89953,-0.22978,0.37155)
- *** FresnelRefraction *** 
-Track (trackID 837, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (0.4815,-0.45745,0.74759)
+Old Polarization: (-0.82838,-0.51611,0.21773)
+New Polarization: (-0.61186,-0.79022,0.034365)
+Polarization Change: (-0.61186,-0.79022,0.034365)
+New Momentum Direction: (-0.68296,0.54972,0.48101)
+Momentum Change: (-0.68296,0.54972,0.48101)
+
+** Photon absorbed! **
+Track (trackID 813, parentID 1) is processed with stopping code 2
 ### pop requested out of 227 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75035,-0.66097,0.009703)
- Old Polarization:       (-0.66104,-0.75033,0.0061426)
- New Momentum Direction: (0.45476,-0.89052,0.013073)
- New Polarization:       (-0.89061,-0.45476,0.0033128)
+ Old Momentum Direction: (0.43847,-0.29533,0.84884)
+ Old Polarization:       (-0.87798,-0.3426,0.33433)
+ New Momentum Direction: (0.5934,-0.39968,0.69867)
+ New Polarization:       (0.066378,-0.84075,-0.53734)
  *** FresnelRefraction *** 
-Track (trackID 836, parentID 1) is processed with stopping code 2
+Track (trackID 812, parentID 1) is processed with stopping code 2
 ### pop requested out of 226 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 835, parentID 1) is processed with stopping code 2
+Track (trackID 811, parentID 1) is processed with stopping code 2
 ### pop requested out of 225 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74794,-0.25632,-0.61228)
- Old Polarization:       (-0.66372,-0.29912,-0.68556)
- New Momentum Direction: (0.44622,-0.34558,-0.82551)
- New Polarization:       (-0.8949,-0.17941,-0.40862)
+ Old Momentum Direction: (0.94193,-0.15136,-0.29976)
+ Old Polarization:       (-0.32471,-0.18292,-0.92796)
+ New Momentum Direction: (0.89016,-0.20538,-0.40673)
+ New Polarization:       (-0.44741,-0.22508,-0.86554)
  *** FresnelRefraction *** 
-Track (trackID 834, parentID 1) is processed with stopping code 2
+Track (trackID 810, parentID 1) is processed with stopping code 2
 ### pop requested out of 224 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 833, parentID 1) is processed with stopping code 2
+Track (trackID 809, parentID 1) is processed with stopping code 2
 ### pop requested out of 223 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74325,-0.47603,0.47008)
- Old Polarization:       (-0.66896,-0.53803,0.51285)
- New Momentum Direction: (0.42301,-0.64474,0.63669)
- New Polarization:       (-0.90609,-0.30725,0.29087)
- *** FresnelRefraction *** 
-Track (trackID 832, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.63493,-0.65646,0.40734)
+ Old Polarization:       (-0.66105,-0.73451,-0.15331)
+ New Momentum Direction: (0.63493,0.65646,0.40734)
+ New Polarization:       (0.66105,-0.73451,0.15331)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 808, parentID 1) is processed with stopping code 2
 ### pop requested out of 222 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74595,-0.65702,0.10905)
- Old Polarization:       (-0.66599,-0.73699,0.11536)
- New Momentum Direction: (0.4313,-0.89004,0.14772)
- New Polarization:       (-0.9022,-0.42624,0.066006)
+ Old Momentum Direction: (0.93034,0.23534,-0.28123)
+ Old Polarization:       (-0.33631,0.24188,-0.91016)
+ New Momentum Direction: (0.86794,0.31874,-0.38089)
+ New Polarization:       (-0.47337,0.29877,-0.82865)
  *** FresnelRefraction *** 
-Track (trackID 831, parentID 1) is processed with stopping code 2
+Track (trackID 807, parentID 1) is processed with stopping code 2
 ### pop requested out of 221 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74114,0.20707,-0.63862)
- Old Polarization:       (-0.67128,0.21452,-0.70949)
- New Momentum Direction: (0.41848,0.28013,-0.86395)
- New Polarization:       (-0.90818,0.11951,-0.40116)
+ Old Momentum Direction: (0.78292,0.61997,0.051757)
+ Old Polarization:       (-0.4971,0.67343,-0.54715)
+ New Momentum Direction: (0.54573,0.83505,0.069713)
+ New Polarization:       (-0.74041,0.51949,-0.42652)
  *** FresnelRefraction *** 
-Track (trackID 830, parentID 1) is processed with stopping code 2
+Track (trackID 806, parentID 1) is processed with stopping code 2
 ### pop requested out of 220 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74655,-0.53596,-0.39422)
- Old Polarization:       (-0.66533,-0.60408,-0.43867)
- New Momentum Direction: (0.43363,-0.72588,-0.53392)
- New Polarization:       (-0.90109,-0.35115,-0.25443)
- *** FresnelRefraction *** 
-Track (trackID 829, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 805, parentID 1) is processed with stopping code 2
 ### pop requested out of 219 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52406,-0.52228,0.67274)
+ Old Polarization:       (-0.78599,-0.60079,0.14587)
+ New Momentum Direction: (0.52406,-0.52228,-0.67274)
+ New Polarization:       (0.61714,0.77723,-0.12264)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52406,-0.52228,-0.67274)
+ Old Polarization:       (0.61714,0.77723,-0.12264)
+ New Momentum Direction: (-0.52406,-0.52228,-0.67274)
+ New Polarization:       (0.61714,-0.77723,0.12264)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52406,-0.52228,-0.67274)
+ Old Polarization:       (0.61714,-0.77723,0.12264)
+ New Momentum Direction: (-0.52406,0.52228,-0.67274)
+ New Polarization:       (-0.61714,-0.77723,-0.12264)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 828, parentID 1) is processed with stopping code 2
+Track (trackID 804, parentID 1) is processed with stopping code 2
 ### pop requested out of 218 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74707,-0.27985,-0.60297)
- Old Polarization:       (-0.66471,-0.32428,-0.67306)
- New Momentum Direction: (0.44096,-0.37785,-0.81412)
- New Polarization:       (-0.8975,-0.19235,-0.39685)
+ Old Momentum Direction: (0.8271,0.55996,-0.048527)
+ Old Polarization:       (-0.44828,0.60512,-0.65794)
+ New Momentum Direction: (0.65242,0.75503,-0.065432)
+ New Polarization:       (-0.66639,0.53041,-0.524)
  *** FresnelRefraction *** 
-Track (trackID 827, parentID 1) is processed with stopping code 2
+Track (trackID 803, parentID 1) is processed with stopping code 2
 ### pop requested out of 217 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73423,0.21564,0.64375)
- Old Polarization:       (-0.67886,0.22204,0.69989)
- New Momentum Direction: (0.38724,0.29285,0.87423)
- New Polarization:       (-0.92195,0.11552,0.36968)
+ Old Momentum Direction: (0.43336,-0.22832,0.87182)
+ Old Polarization:       (-0.88805,-0.273,0.36993)
+ New Momentum Direction: (0.58225,-0.30676,0.75292)
+ New Polarization:       (0.31393,-0.76943,-0.55626)
  *** FresnelRefraction *** 
-Track (trackID 826, parentID 1) is processed with stopping code 2
+Track (trackID 802, parentID 1) is processed with stopping code 2
 ### pop requested out of 216 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73726,0.22316,-0.63768)
- Old Polarization:       (-0.67553,0.22965,-0.70065)
- New Momentum Direction: (0.3952,0.30343,-0.86703)
- New Polarization:       (-0.91855,0.12124,-0.37625)
+ Old Momentum Direction: (0.69414,0.67783,0.24232)
+ Old Polarization:       (-0.59617,0.72999,-0.3342)
+ New Momentum Direction: (0.2256,0.91736,0.32795)
+ New Polarization:       (-0.89533,0.32793,-0.3014)
  *** FresnelRefraction *** 
-Track (trackID 825, parentID 1) is processed with stopping code 2
+Track (trackID 801, parentID 1) is processed with stopping code 2
 ### pop requested out of 215 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 824, parentID 1) is processed with stopping code 2
+Track (trackID 800, parentID 1) is processed with stopping code 2
 ### pop requested out of 214 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.746,-0.29034,-0.59932)
- Old Polarization:       (-0.66591,-0.33476,-0.66671)
- New Momentum Direction: (0.43474,-0.39262,-0.81046)
- New Polarization:       (-0.90053,-0.19605,-0.38808)
- *** FresnelRefraction *** 
-Track (trackID 823, parentID 1) is processed with stopping code 2
-### pop requested out of 213 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 822, parentID 1) is processed with stopping code 2
-### pop requested out of 212 stacked tracks.
+ Old Momentum Direction: (0.67213,-0.659,0.33757)
+ Old Polarization:       (-0.6205,-0.75008,-0.22884)
+ New Momentum Direction: (-0.67213,-0.659,0.33757)
+ New Polarization:       (-0.59804,0.75198,0.27726)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74682,-0.63327,-0.20304)
- Old Polarization:       (-0.66503,-0.71112,-0.22814)
- New Momentum Direction: (0.43437,-0.85773,-0.275)
- New Polarization:       (-0.90073,-0.4136,-0.13271)
- *** FresnelRefraction *** 
-Track (trackID 821, parentID 1) is processed with stopping code 2
-### pop requested out of 211 stacked tracks.
+ Old Momentum Direction: (-0.67213,-0.659,0.33757)
+ Old Polarization:       (-0.59804,0.75198,0.27726)
+ New Momentum Direction: (-0.67213,0.659,0.33757)
+ New Polarization:       (0.59804,0.75198,-0.27726)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67213,0.659,0.33757)
+ Old Polarization:       (0.59804,0.75198,-0.27726)
+ New Momentum Direction: (-0.67213,0.659,-0.33757)
+ New Polarization:       (-0.59804,-0.75198,-0.27726)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 820, parentID 1) is processed with stopping code 2
-### pop requested out of 210 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74011,0.63614,-0.21809)
- Old Polarization:       (-0.67246,0.69716,-0.24853)
- New Momentum Direction: (0.4265,0.8556,-0.29333)
- New Polarization:       (-0.90447,0.40144,-0.14416)
- *** FresnelRefraction *** 
-Track (trackID 819, parentID 1) is processed with stopping code 2
-### pop requested out of 209 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 818, parentID 1) is processed with stopping code 2
-### pop requested out of 208 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74521,-0.58269,0.32424)
- Old Polarization:       (-0.66679,-0.65643,0.35284)
- New Momentum Direction: (0.43059,-0.78867,0.43886)
- New Polarization:       (-0.90252,-0.37985,0.20289)
- *** FresnelRefraction *** 
-Track (trackID 817, parentID 1) is processed with stopping code 2
-### pop requested out of 207 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.75099,-0.64862,0.12372)
- Old Polarization:       (-0.6603,-0.73903,0.13359)
- New Momentum Direction: (0.45926,-0.87257,0.16643)
- New Polarization:       (-0.88829,-0.45206,0.081125)
- *** FresnelRefraction *** 
-Track (trackID 816, parentID 1) is processed with stopping code 2
-### pop requested out of 206 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.75189,-0.59669,-0.28039)
- Old Polarization:       (-0.65928,-0.68126,-0.31817)
- New Momentum Direction: (0.46225,-0.80256,-0.37714)
- New Polarization:       (-0.88675,-0.41888,-0.19548)
- *** FresnelRefraction *** 
-Track (trackID 815, parentID 1) is processed with stopping code 2
-### pop requested out of 205 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74485,-0.62704,-0.22807)
- Old Polarization:       (-0.66723,-0.70013,-0.2542)
- New Momentum Direction: (0.42295,-0.85157,-0.30974)
- New Polarization:       (-0.90615,-0.39757,-0.1443)
- *** FresnelRefraction *** 
-Track (trackID 814, parentID 1) is processed with stopping code 2
-### pop requested out of 204 stacked tracks.
+Track (trackID 799, parentID 1) is processed with stopping code 2
+### pop requested out of 213 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73486,0.60531,0.3059)
- Old Polarization:       (-0.67822,0.65488,0.3334)
- New Momentum Direction: (0.39887,0.81843,0.41361)
- New Polarization:       (-0.91701,0.35532,0.18122)
- *** FresnelRefraction *** 
-Track (trackID 813, parentID 1) is processed with stopping code 2
-### pop requested out of 203 stacked tracks.
+ Old Momentum Direction: (0.58699,0.65095,0.48136)
+ Old Polarization:       (-0.71376,0.6967,-0.071772)
+ New Momentum Direction: (0.58699,-0.65095,0.48136)
+ New Polarization:       (0.71376,0.6967,0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74407,-0.11262,-0.65854)
- Old Polarization:       (-0.66804,-0.13827,-0.73116)
- New Momentum Direction: (0.42753,-0.15239,-0.89107)
- New Polarization:       (-0.90397,-0.080822,-0.4199)
- *** FresnelRefraction *** 
-Track (trackID 812, parentID 1) is processed with stopping code 2
-### pop requested out of 202 stacked tracks.
+ Old Momentum Direction: (0.58699,-0.65095,0.48136)
+ Old Polarization:       (0.71376,0.6967,0.071772)
+ New Momentum Direction: (-0.58699,-0.65095,0.48136)
+ New Polarization:       (0.71376,-0.6967,-0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73196,0.66811,0.13361)
- Old Polarization:       (-0.68134,0.7181,0.14178)
- New Momentum Direction: (0.38051,0.90682,0.18135)
- New Polarization:       (-0.92478,0.37336,0.073441)
- *** FresnelRefraction *** 
-Track (trackID 811, parentID 1) is processed with stopping code 2
-### pop requested out of 201 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 810, parentID 1) is processed with stopping code 2
-### pop requested out of 200 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 809, parentID 1) is processed with stopping code 2
-### pop requested out of 199 stacked tracks.
+ Old Momentum Direction: (-0.58699,-0.65095,0.48136)
+ Old Polarization:       (0.71376,-0.6967,-0.071772)
+ New Momentum Direction: (-0.58699,-0.65095,-0.48136)
+ New Polarization:       (-0.71376,0.6967,-0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73864,0.048152,0.67238)
- Old Polarization:       (-0.67404,0.039136,0.73766)
- New Momentum Direction: (0.41055,0.065134,0.90951)
- New Polarization:       (-0.9118,0.020081,0.41014)
- *** FresnelRefraction *** 
-Track (trackID 808, parentID 1) is processed with stopping code 2
-### pop requested out of 198 stacked tracks.
+ Old Momentum Direction: (-0.58699,-0.65095,-0.48136)
+ Old Polarization:       (-0.71376,0.6967,-0.071772)
+ New Momentum Direction: (-0.58699,0.65095,-0.48136)
+ New Polarization:       (0.71376,0.6967,0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73989,0.22609,-0.6336)
- Old Polarization:       (-0.67265,0.23475,-0.70173)
- New Momentum Direction: (0.41155,0.3063,-0.85837)
- New Polarization:       (-0.91134,0.1289,-0.39095)
- *** FresnelRefraction *** 
-Track (trackID 807, parentID 1) is processed with stopping code 2
-### pop requested out of 197 stacked tracks.
+ Old Momentum Direction: (-0.58699,0.65095,-0.48136)
+ Old Polarization:       (0.71376,0.6967,0.071772)
+ New Momentum Direction: (0.58699,0.65095,-0.48136)
+ New Polarization:       (0.71376,-0.6967,-0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73481,0.42069,0.53205)
- Old Polarization:       (-0.67825,0.44937,0.58141)
- New Momentum Direction: (0.39558,0.56964,0.72044)
- New Polarization:       (-0.91842,0.24105,0.31369)
- *** FresnelRefraction *** 
-Track (trackID 806, parentID 1) is processed with stopping code 2
-### pop requested out of 196 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 805, parentID 1) is processed with stopping code 2
-### pop requested out of 195 stacked tracks.
+ Old Momentum Direction: (0.58699,0.65095,-0.48136)
+ Old Polarization:       (0.71376,-0.6967,-0.071772)
+ New Momentum Direction: (0.58699,0.65095,0.48136)
+ New Polarization:       (-0.71376,0.6967,-0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74185,-0.17326,-0.64779)
- Old Polarization:       (-0.67051,-0.20353,-0.71343)
- New Momentum Direction: (0.41302,-0.23531,-0.8798)
- New Polarization:       (-0.91069,-0.11473,-0.39684)
- *** FresnelRefraction *** 
-Track (trackID 804, parentID 1) is processed with stopping code 2
-### pop requested out of 194 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73218,0.67682,-0.076309)
-Old Polarization: (-0.6811,0.72687,-0.088145)
-New Polarization: (-0.74398,0.55105,-0.052301)
-Polarization Change: (-0.8023,0.59425,-0.0564)
-New Momentum Direction: (-0.58867,-0.77435,0.21513)
-Momentum Change: (-0.59091,-0.7773,0.21595)
-
-** Photon absorbed! **
-Track (trackID 803, parentID 1) is processed with stopping code 2
-### pop requested out of 193 stacked tracks.
+ Old Momentum Direction: (0.58699,0.65095,0.48136)
+ Old Polarization:       (-0.71376,0.6967,-0.071772)
+ New Momentum Direction: (0.58699,-0.65095,0.48136)
+ New Polarization:       (0.71376,0.6967,0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74207,-0.42506,0.51833)
- Old Polarization:       (-0.67026,-0.48114,0.56503)
- New Momentum Direction: (-0.74207,-0.42506,0.51833)
- New Polarization:       (-0.66973,0.50278,-0.54651)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.58699,-0.65095,0.48136)
+ Old Polarization:       (0.71376,0.6967,0.071772)
+ New Momentum Direction: (-0.58699,-0.65095,0.48136)
+ New Polarization:       (0.71376,-0.6967,-0.071772)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74207,-0.42506,0.51833)
- Old Polarization:       (-0.66973,0.50278,-0.54651)
- New Momentum Direction: (-0.74207,-0.42506,-0.51833)
- New Polarization:       (0.66973,-0.50278,-0.54651)
+ Old Momentum Direction: (-0.58699,-0.65095,0.48136)
+ Old Polarization:       (0.71376,-0.6967,-0.071772)
+ New Momentum Direction: (-0.58699,-0.65095,-0.48136)
+ New Polarization:       (-0.71376,0.6967,-0.071772)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74207,-0.42506,-0.51833)
- Old Polarization:       (0.66973,-0.50278,-0.54651)
- New Momentum Direction: (-0.74207,0.42506,-0.51833)
- New Polarization:       (-0.66973,-0.50278,0.54651)
+ Old Momentum Direction: (-0.58699,-0.65095,-0.48136)
+ Old Polarization:       (-0.71376,0.6967,-0.071772)
+ New Momentum Direction: (-0.58699,0.65095,-0.48136)
+ New Polarization:       (0.71376,0.6967,0.071772)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74207,0.42506,-0.51833)
- Old Polarization:       (-0.66973,-0.50278,0.54651)
- New Momentum Direction: (-0.41771,0.57613,-0.70256)
- New Polarization:       (0.90821,0.24262,-0.34103)
- *** FresnelRefraction *** 
-Track (trackID 802, parentID 1) is processed with stopping code 2
-### pop requested out of 192 stacked tracks.
+ Old Momentum Direction: (-0.58699,0.65095,-0.48136)
+ Old Polarization:       (0.71376,0.6967,0.071772)
+ New Momentum Direction: (0.58699,0.65095,-0.48136)
+ New Polarization:       (0.71376,-0.6967,-0.071772)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 801, parentID 1) is processed with stopping code 2
-### pop requested out of 191 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.75024,-0.60005,-0.27765)
- Old Polarization:       (-0.66117,-0.68159,-0.31352)
- New Momentum Direction: (0.45343,-0.8089,-0.37428)
- New Polarization:       (-0.89129,-0.412,-0.18936)
- *** FresnelRefraction *** 
-Track (trackID 800, parentID 1) is processed with stopping code 2
-### pop requested out of 190 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74678,-0.47326,-0.46728)
- Old Polarization:       (-0.66506,-0.53599,-0.52002)
- New Momentum Direction: (0.43586,-0.64044,-0.63235)
- New Polarization:       (-0.9,-0.31329,-0.30305)
- *** FresnelRefraction *** 
-Track (trackID 799, parentID 1) is processed with stopping code 2
-### pop requested out of 189 stacked tracks.
+Track (trackID 798, parentID 1) is processed with stopping code 2
+### pop requested out of 212 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73741,-0.0038132,0.67543)
- Old Polarization:       (-0.67538,-0.018173,0.73725)
- New Momentum Direction: (0.40173,-0.0051699,0.91574)
- New Polarization:       (-0.91572,-0.011721,0.40165)
+ Old Momentum Direction: (0.69008,-0.66661,0.28181)
+ Old Polarization:       (-0.6008,-0.74475,-0.2905)
+ New Momentum Direction: (0.1797,-0.90608,0.38304)
+ New Polarization:       (-0.9092,-0.30164,-0.28699)
  *** FresnelRefraction *** 
-Track (trackID 798, parentID 1) is processed with stopping code 2
-### pop requested out of 188 stacked tracks.
-
-** Photon absorbed! **
 Track (trackID 797, parentID 1) is processed with stopping code 2
-### pop requested out of 187 stacked tracks.
+### pop requested out of 211 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73307,0.47794,0.48392)
- Old Polarization:       (-0.68014,0.51035,0.52626)
- New Momentum Direction: (0.38563,0.64835,0.65646)
- New Polarization:       (-0.92264,0.26778,0.27752)
+ Old Momentum Direction: (0.40734,-0.0829,0.9095)
+ Old Polarization:       (-0.91094,-0.108,0.39814)
+ New Momentum Direction: (0.55241,-0.11242,0.82596)
+ New Polarization:       (0.74827,-0.36979,-0.55078)
  *** FresnelRefraction *** 
 Track (trackID 796, parentID 1) is processed with stopping code 2
-### pop requested out of 186 stacked tracks.
+### pop requested out of 210 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73754,0.24072,-0.63094)
- Old Polarization:       (-0.67523,0.24916,-0.69425)
- New Momentum Direction: (0.3975,0.32709,-0.85733)
- New Polarization:       (-0.91756,0.13247,-0.37489)
+ Old Momentum Direction: (0.93393,-0.23119,-0.27262)
+ Old Polarization:       (-0.33116,-0.27257,-0.90335)
+ New Momentum Direction: (0.8755,-0.31253,-0.36853)
+ New Polarization:       (-0.46313,-0.32516,-0.82449)
  *** FresnelRefraction *** 
 Track (trackID 795, parentID 1) is processed with stopping code 2
-### pop requested out of 185 stacked tracks.
-
-** Photon absorbed! **
+### pop requested out of 209 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.92145,0.28528,-0.26372)
+ Old Polarization:       (-0.34648,0.29639,-0.89)
+ New Momentum Direction: (0.85016,0.38663,-0.35741)
+ New Polarization:       (-0.49385,0.35014,-0.79594)
+ *** FresnelRefraction *** 
 Track (trackID 794, parentID 1) is processed with stopping code 2
-### pop requested out of 184 stacked tracks.
+### pop requested out of 208 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73175,0.68115,0.023918)
- Old Polarization:       (-0.68157,0.73144,0.021554)
- New Momentum Direction: (0.37844,0.92506,0.032483)
- New Polarization:       (-0.92562,0.3783,0.010523)
+ Old Momentum Direction: (0.44166,-0.33384,0.83276)
+ Old Polarization:       (-0.8714,-0.38056,0.30959)
+ New Momentum Direction: (0.60097,-0.45427,0.65762)
+ New Polarization:       (-0.075271,-0.85129,-0.51926)
  *** FresnelRefraction *** 
 Track (trackID 793, parentID 1) is processed with stopping code 2
-### pop requested out of 183 stacked tracks.
+### pop requested out of 207 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74383,-0.51528,-0.42569)
- Old Polarization:       (-0.66836,-0.57683,-0.46964)
- New Momentum Direction: (0.41805,-0.70034,-0.57858)
- New Polarization:       (-0.90842,-0.32458,-0.26349)
+ Old Momentum Direction: (0.90605,0.35321,-0.23304)
+ Old Polarization:       (-0.36408,0.37001,-0.85472)
+ New Momentum Direction: (0.81871,0.47929,-0.31622)
+ New Polarization:       (-0.52753,0.41031,-0.74388)
  *** FresnelRefraction *** 
 Track (trackID 792, parentID 1) is processed with stopping code 2
-### pop requested out of 182 stacked tracks.
+### pop requested out of 206 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74722,-0.24303,-0.61855)
- Old Polarization:       (-0.66454,-0.28383,-0.69125)
- New Momentum Direction: (0.44251,-0.32794,-0.83465)
- New Polarization:       (-0.89674,-0.16909,-0.40899)
+ Old Momentum Direction: (0.45391,0.3852,0.80348)
+ Old Polarization:       (-0.86366,0.41203,0.29038)
+ New Momentum Direction: (0.61132,0.51878,0.59763)
+ New Polarization:       (-0.22719,0.83842,-0.49542)
  *** FresnelRefraction *** 
 Track (trackID 791, parentID 1) is processed with stopping code 2
-### pop requested out of 181 stacked tracks.
+### pop requested out of 205 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73605,0.67304,-0.072386)
- Old Polarization:       (-0.67691,0.73116,-0.084797)
- New Momentum Direction: (0.40469,0.90921,-0.097786)
- New Polarization:       (-0.91445,0.40192,-0.047408)
+ Old Momentum Direction: (0.92843,-0.26625,-0.25908)
+ Old Polarization:       (-0.33721,-0.31134,-0.88846)
+ New Momentum Direction: (0.86476,-0.35991,-0.35021)
+ New Polarization:       (-0.47568,-0.36354,-0.80098)
  *** FresnelRefraction *** 
 Track (trackID 790, parentID 1) is processed with stopping code 2
-### pop requested out of 180 stacked tracks.
+### pop requested out of 204 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73612,0.51855,-0.435)
- Old Polarization:       (-0.6768,0.55586,-0.48266)
- New Momentum Direction: (0.39782,0.7029,-0.58964)
- New Polarization:       (-0.91743,0.29934,-0.26214)
+ Old Momentum Direction: (0.80032,-0.59834,0.038512)
+ Old Polarization:       (-0.4791,-0.6768,-0.55893)
+ New Momentum Direction: (0.58461,-0.80964,0.052112)
+ New Polarization:       (-0.71666,-0.54544,-0.43462)
  *** FresnelRefraction *** 
 Track (trackID 789, parentID 1) is processed with stopping code 2
-### pop requested out of 179 stacked tracks.
+### pop requested out of 203 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74671,-0.022123,-0.66478)
- Old Polarization:       (-0.66508,-0.038762,-0.74576)
- New Momentum Direction: (0.44445,-0.029795,-0.89531)
- New Polarization:       (-0.89576,-0.024377,-0.44387)
+ Old Momentum Direction: (0.72453,-0.65764,0.20633)
+ Old Polarization:       (-0.56301,-0.73737,-0.37324)
+ New Momentum Direction: (0.35349,-0.89254,0.28002)
+ New Polarization:       (-0.847,-0.43245,-0.30916)
  *** FresnelRefraction *** 
 Track (trackID 788, parentID 1) is processed with stopping code 2
-### pop requested out of 178 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73319,0.59977,0.32047)
- Old Polarization:       (-0.68002,0.64549,0.34774)
- New Momentum Direction: (0.38833,0.81278,0.43428)
- New Polarization:       (-0.92152,0.34171,0.18449)
- *** FresnelRefraction *** 
+### pop requested out of 202 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 787, parentID 1) is processed with stopping code 2
-### pop requested out of 177 stacked tracks.
+### pop requested out of 201 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74427,-0.49576,-0.44753)
- Old Polarization:       (-0.66787,-0.55642,-0.49431)
- New Momentum Direction: (0.42098,-0.67331,-0.60781)
- New Polarization:       (-0.90706,-0.31517,-0.27911)
+ Old Momentum Direction: (0.94975,0.045532,-0.30969)
+ Old Polarization:       (-0.31129,0.033536,-0.94972)
+ New Momentum Direction: (0.90677,0.061331,-0.41714)
+ New Polarization:       (-0.42036,0.054735,-0.90571)
  *** FresnelRefraction *** 
 Track (trackID 786, parentID 1) is processed with stopping code 2
-### pop requested out of 176 stacked tracks.
+### pop requested out of 200 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.82368,-0.56696,-0.010639)
+ Old Polarization:       (-0.45244,-0.64577,-0.61505)
+ New Momentum Direction: (-0.82368,-0.56696,-0.010639)
+ New Polarization:       (0.074157,-0.1263,0.98922)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.82368,-0.56696,-0.010639)
+ Old Polarization:       (0.074157,-0.1263,0.98922)
+ New Momentum Direction: (-0.82368,0.56696,-0.010639)
+ New Polarization:       (-0.074157,-0.1263,-0.98922)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 785, parentID 1) is processed with stopping code 2
-### pop requested out of 175 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74241,0.042937,-0.66857)
- Old Polarization:       (-0.66988,0.033324,-0.74172)
- New Momentum Direction: (0.42159,0.058116,-0.90492)
- New Polarization:       (-0.90674,0.017326,-0.42133)
- *** FresnelRefraction *** 
+### pop requested out of 199 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 784, parentID 1) is processed with stopping code 2
-### pop requested out of 174 stacked tracks.
+### pop requested out of 198 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 783, parentID 1) is processed with stopping code 2
-### pop requested out of 173 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73785,0.65428,-0.16584)
- Old Polarization:       (-0.67495,0.71325,-0.18902)
- New Momentum Direction: (0.41421,0.88228,-0.22364)
- New Polarization:       (-0.91017,0.40017,-0.10705)
- *** FresnelRefraction *** 
-Track (trackID 782, parentID 1) is processed with stopping code 2
-### pop requested out of 172 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73325,0.21683,0.64447)
-Old Polarization: (-0.67992,0.22268,0.69866)
-New Polarization: (-0.35443,0.24645,0.77821)
-Polarization Change: (-0.39827,0.27693,0.87447)
-New Momentum Direction: (0.29532,-0.77824,0.38096)
-Momentum Change: (0.32261,-0.85014,0.41615)
+### pop requested out of 197 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 781, parentID 1) is processed with stopping code 2
-### pop requested out of 171 stacked tracks.
+Track (trackID 782, parentID 1) is processed with stopping code 2
+### pop requested out of 196 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74255,-0.64095,0.19445)
- Old Polarization:       (-0.66977,-0.71299,0.20747)
- New Momentum Direction: (0.41237,-0.87178,0.26448)
- New Polarization:       (-0.911,-0.39625,0.11426)
+ Old Momentum Direction: (0.9303,0.23924,-0.27805)
+ Old Polarization:       (-0.33528,0.24715,-0.90912)
+ New Momentum Direction: (0.86836,0.32346,-0.37594)
+ New Polarization:       (-0.47168,0.30447,-0.82754)
  *** FresnelRefraction *** 
+Track (trackID 781, parentID 1) is processed with stopping code 2
+### pop requested out of 195 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 780, parentID 1) is processed with stopping code 2
-### pop requested out of 170 stacked tracks.
+### pop requested out of 194 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73945,-0.35636,0.57115)
- Old Polarization:       (-0.67314,-0.4035,0.61974)
- New Momentum Direction: (0.40411,-0.4842,0.77604)
- New Polarization:       (-0.91467,-0.22206,0.33775)
+ Old Momentum Direction: (0.89975,0.37976,-0.21502)
+ Old Polarization:       (-0.36966,0.40132,-0.83803)
+ New Momentum Direction: (0.80687,0.51406,-0.29105)
+ New Polarization:       (-0.53748,0.43439,-0.72279)
  *** FresnelRefraction *** 
 Track (trackID 779, parentID 1) is processed with stopping code 2
-### pop requested out of 169 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74539,-0.47896,-0.46368)
- Old Polarization:       (-0.66662,-0.53998,-0.51385)
- New Momentum Direction: (0.42779,-0.64941,-0.6287)
- New Polarization:       (-0.90387,-0.31038,-0.29443)
- *** FresnelRefraction *** 
-Track (trackID 778, parentID 1) is processed with stopping code 2
-### pop requested out of 168 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7343,0.27759,0.61947)
- Old Polarization:       (-0.67879,0.29035,0.6745)
- New Momentum Direction: (0.38922,0.37668,0.84061)
- New Polarization:       (-0.92112,0.15251,0.35816)
- *** FresnelRefraction *** 
-Track (trackID 777, parentID 1) is processed with stopping code 2
-### pop requested out of 167 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74277,-0.64423,0.1824)
- Old Polarization:       (-0.66953,-0.71689,0.19442)
- New Momentum Direction: (0.41352,-0.87606,0.24804)
- New Polarization:       (-0.91048,-0.39939,0.10731)
- *** FresnelRefraction *** 
-Track (trackID 776, parentID 1) is processed with stopping code 2
-### pop requested out of 166 stacked tracks.
+### pop requested out of 193 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74415,-0.56578,-0.35515)
- Old Polarization:       (-0.66801,-0.63213,-0.39266)
- New Momentum Direction: (0.41928,-0.76892,-0.48266)
- New Polarization:       (-0.90786,-0.35637,-0.2209)
- *** FresnelRefraction *** 
-Track (trackID 775, parentID 1) is processed with stopping code 2
-### pop requested out of 165 stacked tracks.
+ Old Momentum Direction: (0.55926,0.61255,0.55858)
+ Old Polarization:       (-0.74629,0.66539,0.017518)
+ New Momentum Direction: (0.55926,-0.61255,0.55858)
+ New Polarization:       (0.74629,0.66539,-0.017518)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74399,0.17381,-0.6452)
- Old Polarization:       (-0.66812,0.1792,-0.72215)
- New Momentum Direction: (0.43401,0.23434,-0.8699)
- New Polarization:       (-0.90086,0.10308,-0.4217)
- *** FresnelRefraction *** 
-Track (trackID 774, parentID 1) is processed with stopping code 2
-### pop requested out of 164 stacked tracks.
+ Old Momentum Direction: (0.55926,-0.61255,0.55858)
+ Old Polarization:       (0.74629,0.66539,-0.017518)
+ New Momentum Direction: (-0.55926,-0.61255,0.55858)
+ New Polarization:       (0.74629,-0.66539,0.017518)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73251,0.67432,-0.093361)
- Old Polarization:       (-0.68074,0.72469,-0.10689)
- New Momentum Direction: (0.38216,0.91536,-0.12673)
- New Polarization:       (-0.92409,0.37795,-0.056718)
- *** FresnelRefraction *** 
-Track (trackID 773, parentID 1) is processed with stopping code 2
-### pop requested out of 163 stacked tracks.
+ Old Momentum Direction: (-0.55926,-0.61255,0.55858)
+ Old Polarization:       (0.74629,-0.66539,0.017518)
+ New Momentum Direction: (-0.55926,-0.61255,-0.55858)
+ New Polarization:       (-0.74629,0.66539,0.017518)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74239,-0.62858,0.23181)
- Old Polarization:       (-0.66994,-0.69968,0.24827)
- New Momentum Direction: (0.41208,-0.85487,0.31526)
- New Polarization:       (-0.91113,-0.38876,0.13679)
- *** FresnelRefraction *** 
-Track (trackID 772, parentID 1) is processed with stopping code 2
-### pop requested out of 162 stacked tracks.
+ Old Momentum Direction: (-0.55926,-0.61255,-0.55858)
+ Old Polarization:       (-0.74629,0.66539,0.017518)
+ New Momentum Direction: (-0.55926,0.61255,-0.55858)
+ New Polarization:       (0.74629,0.66539,-0.017518)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74652,-0.14959,-0.64832)
- Old Polarization:       (-0.66531,-0.18016,-0.72451)
- New Momentum Direction: (0.4406,-0.20183,-0.87472)
- New Polarization:       (-0.89767,-0.10752,-0.42735)
- *** FresnelRefraction *** 
-Track (trackID 771, parentID 1) is processed with stopping code 2
-### pop requested out of 161 stacked tracks.
+ Old Momentum Direction: (-0.55926,0.61255,-0.55858)
+ Old Polarization:       (0.74629,0.66539,-0.017518)
+ New Momentum Direction: (0.55926,0.61255,-0.55858)
+ New Polarization:       (0.74629,-0.66539,0.017518)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74288,-0.26158,-0.61621)
- Old Polarization:       (-0.66939,-0.30043,-0.67946)
- New Momentum Direction: (0.41718,-0.35512,-0.83657)
- New Polarization:       (-0.9088,-0.16988,-0.38108)
- *** FresnelRefraction *** 
-Track (trackID 770, parentID 1) is processed with stopping code 2
-### pop requested out of 160 stacked tracks.
+ Old Momentum Direction: (0.55926,0.61255,-0.55858)
+ Old Polarization:       (0.74629,-0.66539,0.017518)
+ New Momentum Direction: (0.55926,0.61255,0.55858)
+ New Polarization:       (-0.74629,0.66539,0.017518)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73981,-0.14816,0.6563)
- Old Polarization:       (-0.67274,-0.17722,0.71834)
- New Momentum Direction: (0.41242,-0.20061,0.88863)
- New Polarization:       (-0.91095,-0.10053,0.40009)
- *** FresnelRefraction *** 
-Track (trackID 769, parentID 1) is processed with stopping code 2
-### pop requested out of 159 stacked tracks.
+ Old Momentum Direction: (0.55926,0.61255,0.55858)
+ Old Polarization:       (-0.74629,0.66539,0.017518)
+ New Momentum Direction: (0.55926,-0.61255,0.55858)
+ New Polarization:       (0.74629,0.66539,-0.017518)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 768, parentID 1) is processed with stopping code 2
-### pop requested out of 158 stacked tracks.
+Track (trackID 778, parentID 1) is processed with stopping code 2
+### pop requested out of 192 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 767, parentID 1) is processed with stopping code 2
-### pop requested out of 157 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74039,-0.40511,0.53638)
- Old Polarization:       (-0.67211,-0.45729,0.58237)
- New Momentum Direction: (0.40828,-0.55017,0.72844)
- New Polarization:       (-0.91282,-0.25354,0.32012)
- *** FresnelRefraction *** 
-Track (trackID 766, parentID 1) is processed with stopping code 2
-### pop requested out of 156 stacked tracks.
+Track (trackID 777, parentID 1) is processed with stopping code 2
+### pop requested out of 191 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74749,-0.60376,-0.27702)
- Old Polarization:       (-0.66427,-0.68007,-0.31024)
- New Momentum Direction: (0.43826,-0.81696,-0.37484)
- New Polarization:       (-0.89885,-0.3988,-0.18176)
+ Old Momentum Direction: (0.85399,-0.5114,-0.095773)
+ Old Polarization:       (-0.42234,-0.57388,-0.70163)
+ New Momentum Direction: (0.7062,-0.69591,-0.13033)
+ New Polarization:       (-0.6298,-0.53336,-0.5647)
  *** FresnelRefraction *** 
-Track (trackID 765, parentID 1) is processed with stopping code 2
-### pop requested out of 155 stacked tracks.
+Track (trackID 776, parentID 1) is processed with stopping code 2
+### pop requested out of 190 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74571,-0.3924,0.53846)
- Old Polarization:       (-0.66621,-0.45055,0.59428)
- New Momentum Direction: (0.43956,-0.529,0.72591)
- New Polarization:       (-0.89817,-0.26671,0.3495)
- *** FresnelRefraction *** 
-Track (trackID 764, parentID 1) is processed with stopping code 2
-### pop requested out of 154 stacked tracks.
+ Old Momentum Direction: (0.51616,-0.53147,0.67165)
+ Old Polarization:       (-0.79065,-0.59718,0.13508)
+ New Momentum Direction: (0.51616,-0.53147,-0.67165)
+ New Polarization:       (0.79065,0.59718,0.13508)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74436,-0.58511,-0.32182)
- Old Polarization:       (-0.66777,-0.6535,-0.35638)
- New Momentum Direction: (0.42033,-0.79505,-0.43729)
- New Polarization:       (-0.90737,-0.36917,-0.20099)
- *** FresnelRefraction *** 
-Track (trackID 763, parentID 1) is processed with stopping code 2
-### pop requested out of 153 stacked tracks.
+ Old Momentum Direction: (0.51616,-0.53147,-0.67165)
+ Old Polarization:       (0.79065,0.59718,0.13508)
+ New Momentum Direction: (0.51616,0.53147,-0.67165)
+ New Polarization:       (-0.79065,0.59718,-0.13508)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74092,0.12268,0.66029)
- Old Polarization:       (-0.67154,0.12254,0.73077)
- New Momentum Direction: (0.42573,0.16528,0.88963)
- New Polarization:       (-0.90482,0.069002,0.42017)
- *** FresnelRefraction *** 
-Track (trackID 762, parentID 1) is processed with stopping code 2
-### pop requested out of 152 stacked tracks.
+ Old Momentum Direction: (0.51616,0.53147,-0.67165)
+ Old Polarization:       (-0.79065,0.59718,-0.13508)
+ New Momentum Direction: (-0.51616,0.53147,-0.67165)
+ New Polarization:       (-0.79065,-0.59718,0.13508)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 761, parentID 1) is processed with stopping code 2
-### pop requested out of 151 stacked tracks.
+Track (trackID 775, parentID 1) is processed with stopping code 2
+### pop requested out of 189 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74775,-0.22437,-0.62493)
- Old Polarization:       (-0.66394,-0.26365,-0.69977)
- New Momentum Direction: (0.4458,-0.30248,-0.84248)
- New Polarization:       (-0.8951,-0.1582,-0.41685)
+ Old Momentum Direction: (0.68942,-0.66693,0.28267)
+ Old Polarization:       (-0.60153,-0.74453,-0.28954)
+ New Momentum Direction: (0.17302,-0.90683,0.38435)
+ New Polarization:       (-0.91102,-0.29565,-0.28746)
  *** FresnelRefraction *** 
-Track (trackID 760, parentID 1) is processed with stopping code 2
-### pop requested out of 150 stacked tracks.
+Track (trackID 774, parentID 1) is processed with stopping code 2
+### pop requested out of 188 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73797,-0.056211,0.67248)
- Old Polarization:       (-0.67476,-0.075737,0.73414)
- New Momentum Direction: (0.40378,-0.076204,0.91168)
- New Polarization:       (-0.91481,-0.043269,0.40155)
- *** FresnelRefraction *** 
-Track (trackID 759, parentID 1) is processed with stopping code 2
-### pop requested out of 149 stacked tracks.
+ Old Momentum Direction: (0.49406,0.51368,0.70145)
+ Old Polarization:       (-0.81706,0.5501,0.17265)
+ New Momentum Direction: (0.49406,0.51368,-0.70145)
+ New Polarization:       (0.64476,-0.75772,-0.10075)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74352,-0.64672,-0.17008)
- Old Polarization:       (-0.66871,-0.71884,-0.18999)
- New Momentum Direction: (0.41503,-0.87989,-0.2314)
- New Polarization:       (-0.90981,-0.40123,-0.10616)
- *** FresnelRefraction *** 
-Track (trackID 758, parentID 1) is processed with stopping code 2
-### pop requested out of 148 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 757, parentID 1) is processed with stopping code 2
-### pop requested out of 147 stacked tracks.
+ Old Momentum Direction: (0.49406,0.51368,-0.70145)
+ Old Polarization:       (0.64476,-0.75772,-0.10075)
+ New Momentum Direction: (0.49406,-0.51368,-0.70145)
+ New Polarization:       (-0.64476,-0.75772,0.10075)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73921,-0.20922,0.64015)
- Old Polarization:       (-0.6734,-0.24361,0.69799)
- New Momentum Direction: (0.40709,-0.28375,0.8682)
- New Polarization:       (-0.91334,-0.13591,0.38384)
- *** FresnelRefraction *** 
-Track (trackID 756, parentID 1) is processed with stopping code 2
-### pop requested out of 146 stacked tracks.
+ Old Momentum Direction: (0.49406,-0.51368,-0.70145)
+ Old Polarization:       (-0.64476,-0.75772,0.10075)
+ New Momentum Direction: (-0.49406,-0.51368,-0.70145)
+ New Polarization:       (-0.64476,0.75772,-0.10075)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74583,-0.53466,-0.39734)
- Old Polarization:       (-0.66613,-0.60138,-0.44116)
- New Momentum Direction: (0.42954,-0.72481,-0.53865)
- New Polarization:       (-0.90304,-0.34663,-0.25369)
+ Old Momentum Direction: (-0.49406,-0.51368,-0.70145)
+ Old Polarization:       (-0.64476,0.75772,-0.10075)
+ New Momentum Direction: (-0.6681,-0.69463,-0.26669)
+ New Polarization:       (-0.74365,0.63542,0.20792)
  *** FresnelRefraction *** 
-Track (trackID 755, parentID 1) is processed with stopping code 2
-### pop requested out of 145 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 754, parentID 1) is processed with stopping code 2
-### pop requested out of 144 stacked tracks.
+Track (trackID 773, parentID 1) is processed with stopping code 2
+### pop requested out of 187 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,-0.65015,0.41598)
+ Old Polarization:       (-0.66068,-0.73708,-0.14219)
+ New Momentum Direction: (0.63581,0.65015,0.41598)
+ New Polarization:       (0.66068,-0.73708,0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,0.65015,0.41598)
+ Old Polarization:       (0.66068,-0.73708,0.14219)
+ New Momentum Direction: (-0.63581,0.65015,0.41598)
+ New Polarization:       (0.66068,0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,0.65015,0.41598)
+ Old Polarization:       (0.66068,0.73708,-0.14219)
+ New Momentum Direction: (-0.63581,0.65015,-0.41598)
+ New Polarization:       (-0.66068,-0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,0.65015,-0.41598)
+ Old Polarization:       (-0.66068,-0.73708,-0.14219)
+ New Momentum Direction: (-0.63581,-0.65015,-0.41598)
+ New Polarization:       (0.66068,-0.73708,0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,-0.65015,-0.41598)
+ Old Polarization:       (0.66068,-0.73708,0.14219)
+ New Momentum Direction: (0.63581,-0.65015,-0.41598)
+ New Polarization:       (0.66068,0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,-0.65015,-0.41598)
+ Old Polarization:       (0.66068,0.73708,-0.14219)
+ New Momentum Direction: (0.63581,-0.65015,0.41598)
+ New Polarization:       (-0.66068,-0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,-0.65015,0.41598)
+ Old Polarization:       (-0.66068,-0.73708,-0.14219)
+ New Momentum Direction: (0.63581,0.65015,0.41598)
+ New Polarization:       (0.66068,-0.73708,0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,0.65015,0.41598)
+ Old Polarization:       (0.66068,-0.73708,0.14219)
+ New Momentum Direction: (-0.63581,0.65015,0.41598)
+ New Polarization:       (0.66068,0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,0.65015,0.41598)
+ Old Polarization:       (0.66068,0.73708,-0.14219)
+ New Momentum Direction: (-0.63581,-0.65015,0.41598)
+ New Polarization:       (-0.66068,0.73708,0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,-0.65015,0.41598)
+ Old Polarization:       (-0.66068,0.73708,0.14219)
+ New Momentum Direction: (0.63581,-0.65015,0.41598)
+ New Polarization:       (-0.66068,-0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,-0.65015,0.41598)
+ Old Polarization:       (-0.66068,-0.73708,-0.14219)
+ New Momentum Direction: (0.63581,-0.65015,-0.41598)
+ New Polarization:       (0.66068,0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,-0.65015,-0.41598)
+ Old Polarization:       (0.66068,0.73708,-0.14219)
+ New Momentum Direction: (0.63581,0.65015,-0.41598)
+ New Polarization:       (-0.66068,0.73708,0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,0.65015,-0.41598)
+ Old Polarization:       (-0.66068,0.73708,0.14219)
+ New Momentum Direction: (-0.63581,0.65015,-0.41598)
+ New Polarization:       (-0.66068,-0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,0.65015,-0.41598)
+ Old Polarization:       (-0.66068,-0.73708,-0.14219)
+ New Momentum Direction: (-0.63581,0.65015,0.41598)
+ New Polarization:       (0.66068,0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,0.65015,0.41598)
+ Old Polarization:       (0.66068,0.73708,-0.14219)
+ New Momentum Direction: (-0.63581,-0.65015,0.41598)
+ New Polarization:       (-0.66068,0.73708,0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,-0.65015,0.41598)
+ Old Polarization:       (-0.66068,0.73708,0.14219)
+ New Momentum Direction: (0.63581,-0.65015,0.41598)
+ New Polarization:       (-0.66068,-0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,-0.65015,0.41598)
+ Old Polarization:       (-0.66068,-0.73708,-0.14219)
+ New Momentum Direction: (0.63581,0.65015,0.41598)
+ New Polarization:       (0.66068,-0.73708,0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63581,0.65015,0.41598)
+ Old Polarization:       (0.66068,-0.73708,0.14219)
+ New Momentum Direction: (-0.63581,0.65015,0.41598)
+ New Polarization:       (0.66068,0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63581,0.65015,0.41598)
+ Old Polarization:       (0.66068,0.73708,-0.14219)
+ New Momentum Direction: (-0.63581,0.65015,-0.41598)
+ New Polarization:       (-0.66068,-0.73708,-0.14219)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 772, parentID 1) is processed with stopping code 2
+### pop requested out of 186 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40471,-0.0098013,0.91439)
+ Old Polarization:       (-0.91419,-0.027818,0.40433)
+ New Momentum Direction: (0.54854,-0.013284,0.83602)
+ New Polarization:       (0.83434,-0.056591,-0.54834)
+ *** FresnelRefraction *** 
+Track (trackID 771, parentID 1) is processed with stopping code 2
+### pop requested out of 185 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 770, parentID 1) is processed with stopping code 2
+### pop requested out of 184 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 769, parentID 1) is processed with stopping code 2
+### pop requested out of 183 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 768, parentID 1) is processed with stopping code 2
+### pop requested out of 182 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.67883,0.68211,0.27186)
+ Old Polarization:       (-0.61306,0.73026,-0.30146)
+ New Momentum Direction: (0.67883,-0.68211,0.27186)
+ New Polarization:       (-0.65622,-0.72968,-0.19224)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.67883,-0.68211,0.27186)
+ Old Polarization:       (-0.65622,-0.72968,-0.19224)
+ New Momentum Direction: (-0.67883,-0.68211,0.27186)
+ New Polarization:       (-0.63335,0.73125,0.25328)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67883,-0.68211,0.27186)
+ Old Polarization:       (-0.63335,0.73125,0.25328)
+ New Momentum Direction: (-0.67883,-0.68211,-0.27186)
+ New Polarization:       (0.63335,-0.73125,0.25328)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67883,-0.68211,-0.27186)
+ Old Polarization:       (0.63335,-0.73125,0.25328)
+ New Momentum Direction: (-0.67883,0.68211,-0.27186)
+ New Polarization:       (0.63306,0.73125,0.25399)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.67883,0.68211,-0.27186)
+ Old Polarization:       (0.63306,0.73125,0.25399)
+ New Momentum Direction: (-0.083703,0.92568,-0.36893)
+ New Polarization:       (0.94302,0.19323,0.27087)
+ *** FresnelRefraction *** 
+Track (trackID 767, parentID 1) is processed with stopping code 2
+### pop requested out of 181 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 766, parentID 1) is processed with stopping code 2
+### pop requested out of 180 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,0.65074,0.47496)
+ Old Polarization:       (-0.70848,0.70147,-0.077422)
+ New Momentum Direction: (0.5924,-0.65074,0.47496)
+ New Polarization:       (0.70848,0.70147,0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,-0.65074,0.47496)
+ Old Polarization:       (0.70848,0.70147,0.077422)
+ New Momentum Direction: (-0.5924,-0.65074,0.47496)
+ New Polarization:       (0.70848,-0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5924,-0.65074,0.47496)
+ Old Polarization:       (0.70848,-0.70147,-0.077422)
+ New Momentum Direction: (-0.5924,-0.65074,-0.47496)
+ New Polarization:       (-0.70848,0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5924,-0.65074,-0.47496)
+ Old Polarization:       (-0.70848,0.70147,-0.077422)
+ New Momentum Direction: (-0.5924,0.65074,-0.47496)
+ New Polarization:       (0.70848,0.70147,0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5924,0.65074,-0.47496)
+ Old Polarization:       (0.70848,0.70147,0.077422)
+ New Momentum Direction: (0.5924,0.65074,-0.47496)
+ New Polarization:       (0.70848,-0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,0.65074,-0.47496)
+ Old Polarization:       (0.70848,-0.70147,-0.077422)
+ New Momentum Direction: (0.5924,0.65074,0.47496)
+ New Polarization:       (-0.70848,0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,0.65074,0.47496)
+ Old Polarization:       (-0.70848,0.70147,-0.077422)
+ New Momentum Direction: (0.5924,-0.65074,0.47496)
+ New Polarization:       (0.70848,0.70147,0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,-0.65074,0.47496)
+ Old Polarization:       (0.70848,0.70147,0.077422)
+ New Momentum Direction: (-0.5924,-0.65074,0.47496)
+ New Polarization:       (0.70848,-0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5924,-0.65074,0.47496)
+ Old Polarization:       (0.70848,-0.70147,-0.077422)
+ New Momentum Direction: (-0.5924,-0.65074,-0.47496)
+ New Polarization:       (-0.70848,0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5924,-0.65074,-0.47496)
+ Old Polarization:       (-0.70848,0.70147,-0.077422)
+ New Momentum Direction: (-0.5924,0.65074,-0.47496)
+ New Polarization:       (0.70848,0.70147,0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5924,0.65074,-0.47496)
+ Old Polarization:       (0.70848,0.70147,0.077422)
+ New Momentum Direction: (0.5924,0.65074,-0.47496)
+ New Polarization:       (0.70848,-0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,0.65074,-0.47496)
+ Old Polarization:       (0.70848,-0.70147,-0.077422)
+ New Momentum Direction: (0.5924,-0.65074,-0.47496)
+ New Polarization:       (-0.70848,-0.70147,0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,-0.65074,-0.47496)
+ Old Polarization:       (-0.70848,-0.70147,0.077422)
+ New Momentum Direction: (0.5924,-0.65074,0.47496)
+ New Polarization:       (0.70848,0.70147,0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5924,-0.65074,0.47496)
+ Old Polarization:       (0.70848,0.70147,0.077422)
+ New Momentum Direction: (-0.5924,-0.65074,0.47496)
+ New Polarization:       (0.70848,-0.70147,-0.077422)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5924,-0.65074,0.47496)
+ Old Polarization:       (0.70848,-0.70147,-0.077422)
+ New Momentum Direction: (-0.5924,0.65074,0.47496)
+ New Polarization:       (-0.70848,-0.70147,0.077422)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 765, parentID 1) is processed with stopping code 2
+### pop requested out of 179 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57028,-0.6091,0.55117)
+ Old Polarization:       (-0.73156,-0.68177,0.003494)
+ New Momentum Direction: (0.57028,0.6091,0.55117)
+ New Polarization:       (0.73156,-0.68177,-0.003494)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57028,0.6091,0.55117)
+ Old Polarization:       (0.73156,-0.68177,-0.003494)
+ New Momentum Direction: (-0.57028,0.6091,0.55117)
+ New Polarization:       (0.73156,0.68177,0.003494)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57028,0.6091,0.55117)
+ Old Polarization:       (0.73156,0.68177,0.003494)
+ New Momentum Direction: (-0.57028,0.6091,-0.55117)
+ New Polarization:       (-0.73156,-0.68177,0.003494)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57028,0.6091,-0.55117)
+ Old Polarization:       (-0.73156,-0.68177,0.003494)
+ New Momentum Direction: (-0.57028,-0.6091,-0.55117)
+ New Polarization:       (0.73156,-0.68177,-0.003494)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57028,-0.6091,-0.55117)
+ Old Polarization:       (0.73156,-0.68177,-0.003494)
+ New Momentum Direction: (0.57028,-0.6091,-0.55117)
+ New Polarization:       (0.73156,0.68177,0.003494)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57028,-0.6091,-0.55117)
+ Old Polarization:       (0.73156,0.68177,0.003494)
+ New Momentum Direction: (0.57028,-0.6091,0.55117)
+ New Polarization:       (-0.73156,-0.68177,0.003494)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 764, parentID 1) is processed with stopping code 2
+### pop requested out of 178 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,0.6658,0.42322)
+ Old Polarization:       (-0.68398,0.71694,-0.13477)
+ New Momentum Direction: (0.61449,-0.6658,0.42322)
+ New Polarization:       (0.68398,0.71694,0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,-0.6658,0.42322)
+ Old Polarization:       (0.68398,0.71694,0.13477)
+ New Momentum Direction: (-0.61449,-0.6658,0.42322)
+ New Polarization:       (0.68398,-0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,-0.6658,0.42322)
+ Old Polarization:       (0.68398,-0.71694,-0.13477)
+ New Momentum Direction: (-0.61449,-0.6658,-0.42322)
+ New Polarization:       (-0.68398,0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,-0.6658,-0.42322)
+ Old Polarization:       (-0.68398,0.71694,-0.13477)
+ New Momentum Direction: (-0.61449,0.6658,-0.42322)
+ New Polarization:       (0.68398,0.71694,0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,0.6658,-0.42322)
+ Old Polarization:       (0.68398,0.71694,0.13477)
+ New Momentum Direction: (0.61449,0.6658,-0.42322)
+ New Polarization:       (0.68398,-0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,0.6658,-0.42322)
+ Old Polarization:       (0.68398,-0.71694,-0.13477)
+ New Momentum Direction: (0.61449,0.6658,0.42322)
+ New Polarization:       (-0.68398,0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,0.6658,0.42322)
+ Old Polarization:       (-0.68398,0.71694,-0.13477)
+ New Momentum Direction: (0.61449,-0.6658,0.42322)
+ New Polarization:       (0.68398,0.71694,0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,-0.6658,0.42322)
+ Old Polarization:       (0.68398,0.71694,0.13477)
+ New Momentum Direction: (-0.61449,-0.6658,0.42322)
+ New Polarization:       (0.68398,-0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,-0.6658,0.42322)
+ Old Polarization:       (0.68398,-0.71694,-0.13477)
+ New Momentum Direction: (-0.61449,0.6658,0.42322)
+ New Polarization:       (-0.68398,-0.71694,0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,0.6658,0.42322)
+ Old Polarization:       (-0.68398,-0.71694,0.13477)
+ New Momentum Direction: (0.61449,0.6658,0.42322)
+ New Polarization:       (-0.68398,0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,0.6658,0.42322)
+ Old Polarization:       (-0.68398,0.71694,-0.13477)
+ New Momentum Direction: (0.61449,0.6658,-0.42322)
+ New Polarization:       (0.68398,-0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,0.6658,-0.42322)
+ Old Polarization:       (0.68398,-0.71694,-0.13477)
+ New Momentum Direction: (0.61449,-0.6658,-0.42322)
+ New Polarization:       (-0.68398,-0.71694,0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.61449,-0.6658,-0.42322)
+ Old Polarization:       (-0.68398,-0.71694,0.13477)
+ New Momentum Direction: (-0.61449,-0.6658,-0.42322)
+ New Polarization:       (-0.68398,0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,-0.6658,-0.42322)
+ Old Polarization:       (-0.68398,0.71694,-0.13477)
+ New Momentum Direction: (-0.61449,0.6658,-0.42322)
+ New Polarization:       (0.68398,0.71694,0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,0.6658,-0.42322)
+ Old Polarization:       (0.68398,0.71694,0.13477)
+ New Momentum Direction: (-0.61449,0.6658,0.42322)
+ New Polarization:       (-0.68398,-0.71694,0.13477)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.61449,0.6658,0.42322)
+ Old Polarization:       (-0.68398,-0.71694,0.13477)
+ New Momentum Direction: (0.61449,0.6658,0.42322)
+ New Polarization:       (-0.68398,0.71694,-0.13477)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 763, parentID 1) is processed with stopping code 2
+### pop requested out of 177 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 762, parentID 1) is processed with stopping code 2
+### pop requested out of 176 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.8357,0.54458,-0.071005)
+ Old Polarization:       (-0.43944,0.58554,-0.6812)
+ New Momentum Direction: (0.67051,0.73567,-0.09592)
+ New Polarization:       (-0.65362,0.52461,-0.5455)
+ *** FresnelRefraction *** 
+Track (trackID 761, parentID 1) is processed with stopping code 2
+### pop requested out of 175 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74999,0.64934,0.12596)
+ Old Polarization:       (-0.53373,0.70659,-0.46461)
+ New Momentum Direction: (0.45464,0.87438,0.16961)
+ New Polarization:       (-0.79485,0.48422,-0.3657)
+ *** FresnelRefraction *** 
+Track (trackID 760, parentID 1) is processed with stopping code 2
+### pop requested out of 174 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.46498,-0.40006,0.78978)
+ Old Polarization:       (-0.84819,-0.45694,0.26791)
+ New Momentum Direction: (0.62997,-0.54201,0.55621)
+ New Polarization:       (-0.29585,-0.82967,-0.47342)
+ *** FresnelRefraction *** 
+Track (trackID 759, parentID 1) is processed with stopping code 2
+### pop requested out of 173 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.78512,-0.61486,0.07431)
+ Old Polarization:       (-0.49572,-0.6958,-0.51974)
+ New Momentum Direction: (0.54624,-0.83158,0.1005)
+ New Polarization:       (-0.7417,-0.53594,-0.4033)
+ *** FresnelRefraction *** 
+Track (trackID 758, parentID 1) is processed with stopping code 2
+### pop requested out of 172 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 757, parentID 1) is processed with stopping code 2
+### pop requested out of 171 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 756, parentID 1) is processed with stopping code 2
+### pop requested out of 170 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4828,-0.46124,0.74442)
+ Old Polarization:       (-0.82689,-0.52003,0.21407)
+ New Momentum Direction: (0.65653,-0.62722,0.41901)
+ New Polarization:       (-0.48177,-0.7761,-0.40689)
+ *** FresnelRefraction *** 
+Track (trackID 755, parentID 1) is processed with stopping code 2
+### pop requested out of 169 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.68602,-0.66379,0.29792)
+ Old Polarization:       (-0.60513,-0.74789,-0.27291)
+ New Momentum Direction: (0.1716,-0.89879,0.4034)
+ New Polarization:       (-0.91107,-0.30058,-0.28215)
+ *** FresnelRefraction *** 
+Track (trackID 754, parentID 1) is processed with stopping code 2
+### pop requested out of 168 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 753, parentID 1) is processed with stopping code 2
+### pop requested out of 167 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.42261,-0.22127,0.87889)
+Old Polarization: (-0.8942,-0.25983,0.36455)
+New Polarization: (-0.58484,-0.51965,-0.62284)
+Polarization Change: (-0.58484,-0.51965,-0.62284)
+New Momentum Direction: (0.71164,0.039783,-0.70142)
+Momentum Change: (0.71164,0.039783,-0.70142)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71164,0.039783,-0.70142)
+ Old Polarization:       (-0.58484,-0.51965,-0.62284)
+ New Momentum Direction: (0.3038,0.05395,-0.95121)
+ New Polarization:       (-0.87377,-0.38219,-0.30075)
+ *** FresnelRefraction *** 
+Track (trackID 752, parentID 1) is processed with stopping code 2
+### pop requested out of 166 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56785,0.63261,0.52664)
+ Old Polarization:       (-0.73495,0.67778,-0.021703)
+ New Momentum Direction: (0.56785,-0.63261,0.52664)
+ New Polarization:       (0.73495,0.67778,0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56785,-0.63261,0.52664)
+ Old Polarization:       (0.73495,0.67778,0.021703)
+ New Momentum Direction: (-0.56785,-0.63261,0.52664)
+ New Polarization:       (0.73495,-0.67778,-0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56785,-0.63261,0.52664)
+ Old Polarization:       (0.73495,-0.67778,-0.021703)
+ New Momentum Direction: (-0.56785,-0.63261,-0.52664)
+ New Polarization:       (-0.73495,0.67778,-0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56785,-0.63261,-0.52664)
+ Old Polarization:       (-0.73495,0.67778,-0.021703)
+ New Momentum Direction: (-0.56785,0.63261,-0.52664)
+ New Polarization:       (0.73495,0.67778,0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56785,0.63261,-0.52664)
+ Old Polarization:       (0.73495,0.67778,0.021703)
+ New Momentum Direction: (0.56785,0.63261,-0.52664)
+ New Polarization:       (0.73495,-0.67778,-0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56785,0.63261,-0.52664)
+ Old Polarization:       (0.73495,-0.67778,-0.021703)
+ New Momentum Direction: (0.56785,0.63261,0.52664)
+ New Polarization:       (-0.73495,0.67778,-0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56785,0.63261,0.52664)
+ Old Polarization:       (-0.73495,0.67778,-0.021703)
+ New Momentum Direction: (0.56785,-0.63261,0.52664)
+ New Polarization:       (0.73495,0.67778,0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56785,-0.63261,0.52664)
+ Old Polarization:       (0.73495,0.67778,0.021703)
+ New Momentum Direction: (-0.56785,-0.63261,0.52664)
+ New Polarization:       (0.73495,-0.67778,-0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56785,-0.63261,0.52664)
+ Old Polarization:       (0.73495,-0.67778,-0.021703)
+ New Momentum Direction: (-0.56785,-0.63261,-0.52664)
+ New Polarization:       (-0.73495,0.67778,-0.021703)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56785,-0.63261,-0.52664)
+ Old Polarization:       (-0.73495,0.67778,-0.021703)
+ New Momentum Direction: (-0.56785,0.63261,-0.52664)
+ New Polarization:       (0.73495,0.67778,0.021703)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 751, parentID 1) is processed with stopping code 2
+### pop requested out of 165 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 750, parentID 1) is processed with stopping code 2
+### pop requested out of 164 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5198,0.5592,0.64583)
+ Old Polarization:       (-0.78948,0.60327,0.11307)
+ New Momentum Direction: (0.5198,0.5592,-0.64583)
+ New Polarization:       (0.78948,-0.60327,0.11307)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5198,0.5592,-0.64583)
+ Old Polarization:       (0.78948,-0.60327,0.11307)
+ New Momentum Direction: (0.5198,-0.5592,-0.64583)
+ New Polarization:       (-0.78948,-0.60327,-0.11307)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5198,-0.5592,-0.64583)
+ Old Polarization:       (-0.78948,-0.60327,-0.11307)
+ New Momentum Direction: (-0.5198,-0.5592,-0.64583)
+ New Polarization:       (-0.78948,0.60327,0.11307)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 749, parentID 1) is processed with stopping code 2
+### pop requested out of 163 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94987,-0.062783,-0.30629)
+ Old Polarization:       (-0.31094,-0.087168,-0.94642)
+ New Momentum Direction: (0.90705,-0.084541,-0.41244)
+ New Polarization:       (-0.41975,-0.10578,-0.90145)
+ *** FresnelRefraction *** 
+Track (trackID 748, parentID 1) is processed with stopping code 2
+### pop requested out of 162 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9112,-0.35525,-0.20859)
+ Old Polarization:       (-0.35346,-0.41408,-0.83881)
+ New Momentum Direction: (0.8324,-0.47788,-0.2806)
+ New Polarization:       (-0.50739,-0.45362,-0.73265)
+ *** FresnelRefraction *** 
+Track (trackID 747, parentID 1) is processed with stopping code 2
+### pop requested out of 161 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.41021,0.17521,0.895)
+ Old Polarization:       (-0.90756,0.17506,0.3817)
+ New Momentum Direction: (0.5565,0.23769,0.79612)
+ New Polarization:       (0.51308,0.65535,-0.55431)
+ *** FresnelRefraction *** 
+Track (trackID 746, parentID 1) is processed with stopping code 2
+### pop requested out of 160 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.91167,-0.33995,-0.23084)
+Old Polarization: (-0.3594,-0.38734,-0.849)
+New Polarization: (-0.10922,0.24827,-0.96251)
+Polarization Change: (-0.10922,0.24827,-0.96251)
+New Momentum Direction: (0.42543,0.88681,0.18046)
+Momentum Change: (0.42543,0.88681,0.18046)
+
+** Photon absorbed! **
+Track (trackID 745, parentID 1) is processed with stopping code 2
+### pop requested out of 159 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.85642,-0.50766,-0.093998)
+ Old Polarization:       (-0.41794,-0.57481,-0.70351)
+ New Momentum Direction: (0.71441,-0.68803,-0.1274)
+ New Polarization:       (-0.62063,-0.53897,-0.5695)
+ *** FresnelRefraction *** 
+Track (trackID 744, parentID 1) is processed with stopping code 2
+### pop requested out of 158 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51408,0.56038,0.64938)
+ Old Polarization:       (-0.79378,0.59768,0.11263)
+ New Momentum Direction: (0.51408,0.56038,-0.64938)
+ New Polarization:       (0.79378,-0.59768,0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51408,0.56038,-0.64938)
+ Old Polarization:       (0.79378,-0.59768,0.11263)
+ New Momentum Direction: (0.51408,-0.56038,-0.64938)
+ New Polarization:       (-0.79378,-0.59768,-0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51408,-0.56038,-0.64938)
+ Old Polarization:       (-0.79378,-0.59768,-0.11263)
+ New Momentum Direction: (-0.51408,-0.56038,-0.64938)
+ New Polarization:       (-0.79378,0.59768,0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51408,-0.56038,-0.64938)
+ Old Polarization:       (-0.79378,0.59768,0.11263)
+ New Momentum Direction: (-0.51408,-0.56038,0.64938)
+ New Polarization:       (0.79378,-0.59768,0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51408,-0.56038,0.64938)
+ Old Polarization:       (0.79378,-0.59768,0.11263)
+ New Momentum Direction: (-0.51408,0.56038,0.64938)
+ New Polarization:       (-0.79378,-0.59768,-0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51408,0.56038,0.64938)
+ Old Polarization:       (-0.79378,-0.59768,-0.11263)
+ New Momentum Direction: (0.51408,0.56038,0.64938)
+ New Polarization:       (-0.79378,0.59768,0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51408,0.56038,0.64938)
+ Old Polarization:       (-0.79378,0.59768,0.11263)
+ New Momentum Direction: (0.51408,0.56038,-0.64938)
+ New Polarization:       (0.79378,-0.59768,0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51408,0.56038,-0.64938)
+ Old Polarization:       (0.79378,-0.59768,0.11263)
+ New Momentum Direction: (0.51408,-0.56038,-0.64938)
+ New Polarization:       (-0.79378,-0.59768,-0.11263)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51408,-0.56038,-0.64938)
+ Old Polarization:       (-0.79378,-0.59768,-0.11263)
+ New Momentum Direction: (-0.51408,-0.56038,-0.64938)
+ New Polarization:       (-0.79378,0.59768,0.11263)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 743, parentID 1) is processed with stopping code 2
+### pop requested out of 157 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93718,-0.19772,-0.2874)
+ Old Polarization:       (-0.32982,-0.23381,-0.91463)
+ New Momentum Direction: (0.88093,-0.26823,-0.38989)
+ New Polarization:       (-0.45894,-0.28317,-0.84213)
+ *** FresnelRefraction *** 
+Track (trackID 742, parentID 1) is processed with stopping code 2
+### pop requested out of 156 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 741, parentID 1) is processed with stopping code 2
+### pop requested out of 155 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40899,-0.11996,0.90462)
+ Old Polarization:       (-0.90836,-0.14829,0.39101)
+ New Momentum Direction: (0.55531,-0.16288,0.81554)
+ New Polarization:       (0.66208,-0.50685,-0.55205)
+ *** FresnelRefraction *** 
+Track (trackID 740, parentID 1) is processed with stopping code 2
+### pop requested out of 154 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.84716,-0.52694,-0.068164)
+ Old Polarization:       (-0.42713,-0.59909,-0.67724)
+ New Momentum Direction: (0.69561,-0.71248,-0.092165)
+ New Polarization:       (-0.63442,-0.549,-0.54416)
+ *** FresnelRefraction *** 
+Track (trackID 739, parentID 1) is processed with stopping code 2
+### pop requested out of 153 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 738, parentID 1) is processed with stopping code 2
+### pop requested out of 152 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40825,-0.039827,0.912)
+ Old Polarization:       (-0.91201,-0.061109,0.40559)
+ New Momentum Direction: (0.5519,-0.05384,0.83217)
+ New Polarization:       (0.81262,-0.18936,-0.55118)
+ *** FresnelRefraction *** 
+Track (trackID 737, parentID 1) is processed with stopping code 2
+### pop requested out of 151 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.62561,-0.65326,0.42646)
+ Old Polarization:       (-0.67112,-0.72937,-0.13273)
+ New Momentum Direction: (0.62561,0.65326,0.42646)
+ New Polarization:       (0.67112,-0.72937,0.13273)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.62561,0.65326,0.42646)
+ Old Polarization:       (0.67112,-0.72937,0.13273)
+ New Momentum Direction: (-0.62561,0.65326,0.42646)
+ New Polarization:       (0.67112,0.72937,-0.13273)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62561,0.65326,0.42646)
+ Old Polarization:       (0.67112,0.72937,-0.13273)
+ New Momentum Direction: (-0.62561,0.65326,-0.42646)
+ New Polarization:       (-0.67112,-0.72937,-0.13273)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 736, parentID 1) is processed with stopping code 2
+### pop requested out of 150 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94329,0.10543,-0.3148)
+ Old Polarization:       (-0.32487,0.097923,-0.94068)
+ New Momentum Direction: (-0.94329,0.10543,-0.3148)
+ New Polarization:       (0.31784,0.56059,-0.76467)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
+Track (trackID 735, parentID 1) is processed with stopping code 2
+### pop requested out of 149 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4924,0.49979,0.71257)
+ Old Polarization:       (-0.82065,0.53935,0.18878)
+ New Momentum Direction: (0.66334,0.6733,0.32657)
+ New Polarization:       (-0.56798,0.73714,-0.36609)
+ *** FresnelRefraction *** 
+Track (trackID 734, parentID 1) is processed with stopping code 2
+### pop requested out of 148 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 733, parentID 1) is processed with stopping code 2
+### pop requested out of 147 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81564,-0.57855,-0.0034119)
+ Old Polarization:       (-0.46343,-0.6498,-0.60249)
+ New Momentum Direction: (0.61857,-0.78571,-0.0046336)
+ New Polarization:       (-0.69487,-0.54429,-0.47)
+ *** FresnelRefraction *** 
+Track (trackID 732, parentID 1) is processed with stopping code 2
+### pop requested out of 146 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52259,-0.54173,0.65835)
+ Old Polarization:       (-0.78383,-0.60907,0.12101)
+ New Momentum Direction: (0.52259,-0.54173,-0.65835)
+ New Polarization:       (0.78383,0.60907,0.12101)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52259,-0.54173,-0.65835)
+ Old Polarization:       (0.78383,0.60907,0.12101)
+ New Momentum Direction: (0.52259,0.54173,-0.65835)
+ New Polarization:       (-0.78383,0.60907,-0.12101)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52259,0.54173,-0.65835)
+ Old Polarization:       (-0.78383,0.60907,-0.12101)
+ New Momentum Direction: (-0.52259,0.54173,-0.65835)
+ New Polarization:       (-0.78383,-0.60907,0.12101)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 731, parentID 1) is processed with stopping code 2
+### pop requested out of 145 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.58439,0.64313,0.49484)
+ Old Polarization:       (-0.71752,0.69436,-0.055075)
+ New Momentum Direction: (0.58439,-0.64313,0.49484)
+ New Polarization:       (0.71752,0.69436,0.055075)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.58439,-0.64313,0.49484)
+ Old Polarization:       (0.71752,0.69436,0.055075)
+ New Momentum Direction: (-0.58439,-0.64313,0.49484)
+ New Polarization:       (0.71752,-0.69436,-0.055075)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58439,-0.64313,0.49484)
+ Old Polarization:       (0.71752,-0.69436,-0.055075)
+ New Momentum Direction: (-0.58439,-0.64313,-0.49484)
+ New Polarization:       (-0.71752,0.69436,-0.055075)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58439,-0.64313,-0.49484)
+ Old Polarization:       (-0.71752,0.69436,-0.055075)
+ New Momentum Direction: (-0.58439,0.64313,-0.49484)
+ New Polarization:       (0.71752,0.69436,0.055075)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58439,0.64313,-0.49484)
+ Old Polarization:       (0.71752,0.69436,0.055075)
+ New Momentum Direction: (0.58439,0.64313,-0.49484)
+ New Polarization:       (0.71752,-0.69436,-0.055075)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 730, parentID 1) is processed with stopping code 2
+### pop requested out of 144 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40335,0.06357,0.91284)
+ Old Polarization:       (-0.91477,0.0526,0.40054)
+ New Momentum Direction: (0.54745,0.086283,0.83238)
+ New Polarization:       (0.79165,0.26903,-0.54856)
+ *** FresnelRefraction *** 
+Track (trackID 729, parentID 1) is processed with stopping code 2
+### pop requested out of 143 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.47792,-0.42703,0.76762)
+ Old Polarization:       (-0.83566,-0.4903,0.24753)
+ New Momentum Direction: (0.64525,-0.57655,0.50124)
+ New Polarization:       (-0.37816,-0.81112,-0.44618)
+ *** FresnelRefraction *** 
+Track (trackID 728, parentID 1) is processed with stopping code 2
+### pop requested out of 142 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42536,0.28841,0.85784)
+ Old Polarization:       (-0.89107,0.29929,0.34121)
+ New Momentum Direction: (0.57695,0.39118,0.71701)
+ New Polarization:       (0.10882,0.83321,-0.54214)
+ *** FresnelRefraction *** 
+Track (trackID 727, parentID 1) is processed with stopping code 2
+### pop requested out of 141 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.88263,0.43273,-0.18359)
+ Old Polarization:       (-0.39011,0.4564,-0.7997)
+ New Momentum Direction: (0.76977,0.58762,-0.24931)
+ New Polarization:       (-0.57435,0.46721,-0.67219)
+ *** FresnelRefraction *** 
+Track (trackID 726, parentID 1) is processed with stopping code 2
+### pop requested out of 140 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66441,0.68454,0.29995)
+ Old Polarization:       (-0.6288,0.72893,-0.2707)
+ New Momentum Direction: (0.90388,0.12844,0.40806)
+ New Polarization:       (0.11412,-0.99169,0.059373)
+ *** FresnelRefraction *** 
+Track (trackID 725, parentID 1) is processed with stopping code 2
+### pop requested out of 139 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 724, parentID 1) is processed with stopping code 2
+### pop requested out of 138 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94722,-0.043354,-0.31764)
+ Old Polarization:       (-0.31992,-0.06435,-0.94526)
+ New Momentum Direction: (0.90012,-0.058915,-0.43165)
+ New Polarization:       (-0.43517,-0.075194,-0.8972)
+ *** FresnelRefraction *** 
+Track (trackID 723, parentID 1) is processed with stopping code 2
+### pop requested out of 137 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73335,0.66385,0.14663)
+ Old Polarization:       (-0.55351,0.70825,-0.43819)
+ New Momentum Direction: (-0.73335,0.66385,0.14663)
+ New Polarization:       (-0.32104,-0.52827,0.78605)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
+Track (trackID 722, parentID 1) is processed with stopping code 2
+### pop requested out of 136 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.41022,0.072146,0.90913)
+ Old Polarization:       (-0.91156,0.063018,0.40632)
+ New Momentum Direction: (0.55312,0.097278,0.8274)
+ New Polarization:       (0.77585,0.30166,-0.55413)
+ *** FresnelRefraction *** 
+Track (trackID 721, parentID 1) is processed with stopping code 2
+### pop requested out of 135 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.47361,-0.43551,0.76552)
+ Old Polarization:       (-0.83718,-0.49258,0.23771)
+ New Momentum Direction: (0.64368,-0.59189,0.48512)
+ New Polarization:       (-0.40707,-0.80159,-0.43789)
+ *** FresnelRefraction *** 
+Track (trackID 720, parentID 1) is processed with stopping code 2
+### pop requested out of 134 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45155,0.39927,0.79793)
+ Old Polarization:       (-0.8631,0.42219,0.27717)
+ New Momentum Direction: (0.61162,0.5408,0.57745)
+ New Polarization:       (-0.27701,0.83007,-0.48399)
+ *** FresnelRefraction *** 
+Track (trackID 719, parentID 1) is processed with stopping code 2
+### pop requested out of 133 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49226,0.51989,0.69813)
+ Old Polarization:       (-0.81729,0.55206,0.16516)
+ New Momentum Direction: (0.49226,0.51989,-0.69813)
+ New Polarization:       (0.64882,-0.75382,-0.10388)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49226,0.51989,-0.69813)
+ Old Polarization:       (0.64882,-0.75382,-0.10388)
+ New Momentum Direction: (0.49226,-0.51989,-0.69813)
+ New Polarization:       (-0.64882,-0.75382,0.10388)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49226,-0.51989,-0.69813)
+ Old Polarization:       (-0.64882,-0.75382,0.10388)
+ New Momentum Direction: (-0.49226,-0.51989,-0.69813)
+ New Polarization:       (-0.64882,0.75382,-0.10388)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49226,-0.51989,-0.69813)
+ Old Polarization:       (-0.64882,0.75382,-0.10388)
+ New Momentum Direction: (-0.49226,-0.51989,0.69813)
+ New Polarization:       (0.76653,-0.63894,0.064669)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49226,-0.51989,0.69813)
+ Old Polarization:       (0.76653,-0.63894,0.064669)
+ New Momentum Direction: (-0.49226,0.51989,0.69813)
+ New Polarization:       (-0.76653,-0.63894,-0.064669)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49226,0.51989,0.69813)
+ Old Polarization:       (-0.76653,-0.63894,-0.064669)
+ New Momentum Direction: (0.49226,0.51989,0.69813)
+ New Polarization:       (-0.76653,0.63894,0.064669)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49226,0.51989,0.69813)
+ Old Polarization:       (-0.76653,0.63894,0.064669)
+ New Momentum Direction: (0.49226,0.51989,-0.69813)
+ New Polarization:       (0.69812,-0.71486,-0.0401)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49226,0.51989,-0.69813)
+ Old Polarization:       (0.69812,-0.71486,-0.0401)
+ New Momentum Direction: (0.49226,-0.51989,-0.69813)
+ New Polarization:       (-0.69812,-0.71486,0.0401)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49226,-0.51989,-0.69813)
+ Old Polarization:       (-0.69812,-0.71486,0.0401)
+ New Momentum Direction: (0.6683,-0.70582,-0.23496)
+ New Polarization:       (-0.70906,-0.69991,0.085744)
+ *** FresnelRefraction *** 
+Track (trackID 718, parentID 1) is processed with stopping code 2
+### pop requested out of 132 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94123,0.14778,-0.30371)
+ Old Polarization:       (-0.32443,0.14548,-0.93466)
+ New Momentum Direction: (0.88919,0.20019,-0.41141)
+ New Polarization:       (-0.44759,0.19418,-0.8729)
+ *** FresnelRefraction *** 
+Track (trackID 717, parentID 1) is processed with stopping code 2
+### pop requested out of 131 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 716, parentID 1) is processed with stopping code 2
+### pop requested out of 130 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40121,-0.0020296,0.91598)
+ Old Polarization:       (-0.91583,-0.019195,0.4011)
+ New Momentum Direction: (0.54561,-0.0027601,0.83803)
+ New Polarization:       (0.83781,-0.021527,-0.54554)
+ *** FresnelRefraction *** 
+Track (trackID 715, parentID 1) is processed with stopping code 2
+### pop requested out of 129 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45465,-0.37761,0.80666)
+ Old Polarization:       (-0.85784,-0.42928,0.28255)
+ New Momentum Direction: (0.61795,-0.51324,0.59558)
+ New Polarization:       (-0.22458,-0.8412,-0.49188)
+ *** FresnelRefraction *** 
+Track (trackID 714, parentID 1) is processed with stopping code 2
+### pop requested out of 128 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94935,-0.017122,-0.31377)
+ Old Polarization:       (-0.31419,-0.036019,-0.94868)
+ New Momentum Direction: (0.90527,-0.023149,-0.4242)
+ New Polarization:       (-0.4248,-0.03779,-0.9045)
+ *** FresnelRefraction *** 
+Track (trackID 713, parentID 1) is processed with stopping code 2
+### pop requested out of 127 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49156,0.52039,0.69825)
+ Old Polarization:       (-0.8177,0.55163,0.16453)
+ New Momentum Direction: (0.66788,0.70705,0.23242)
+ New Polarization:       (-0.62508,0.70238,-0.34051)
+ *** FresnelRefraction *** 
+Track (trackID 712, parentID 1) is processed with stopping code 2
+### pop requested out of 126 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 711, parentID 1) is processed with stopping code 2
+### pop requested out of 125 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 710, parentID 1) is processed with stopping code 2
+### pop requested out of 124 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45818,-0.35604,0.81444)
+ Old Polarization:       (-0.85878,-0.41368,0.30227)
+ New Momentum Direction: (0.61721,-0.47963,0.62371)
+ New Polarization:       (-0.14633,-0.84886,-0.50796)
+ *** FresnelRefraction *** 
+Track (trackID 709, parentID 1) is processed with stopping code 2
+### pop requested out of 123 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44846,0.40028,0.79916)
+ Old Polarization:       (-0.86477,0.42035,0.27474)
+ New Momentum Direction: (0.60935,0.54388,0.57696)
+ New Polarization:       (-0.28243,0.82881,-0.48302)
+ *** FresnelRefraction *** 
+Track (trackID 708, parentID 1) is processed with stopping code 2
+### pop requested out of 122 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54479,-0.57176,0.61344)
+ Old Polarization:       (-0.76035,-0.64531,0.073786)
+ New Momentum Direction: (0.54479,-0.57176,-0.61344)
+ New Polarization:       (0.76035,0.64531,0.073786)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54479,-0.57176,-0.61344)
+ Old Polarization:       (0.76035,0.64531,0.073786)
+ New Momentum Direction: (0.54479,0.57176,-0.61344)
+ New Polarization:       (-0.76035,0.64531,-0.073786)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54479,0.57176,-0.61344)
+ Old Polarization:       (-0.76035,0.64531,-0.073786)
+ New Momentum Direction: (-0.54479,0.57176,-0.61344)
+ New Polarization:       (-0.76035,-0.64531,0.073786)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 707, parentID 1) is processed with stopping code 2
+### pop requested out of 121 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.87457,-0.46618,-0.13344)
+ Old Polarization:       (-0.39725,-0.53102,-0.74847)
+ New Momentum Direction: (0.75461,-0.63084,-0.18057)
+ New Polarization:       (-0.5855,-0.5231,-0.61932)
+ *** FresnelRefraction *** 
+Track (trackID 706, parentID 1) is processed with stopping code 2
+### pop requested out of 120 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.87401,-0.46687,-0.13468)
+ Old Polarization:       (-0.39853,-0.53019,-0.74838)
+ New Momentum Direction: (0.75263,-0.63264,-0.18251)
+ New Polarization:       (-0.58815,-0.52133,-0.6183)
+ *** FresnelRefraction *** 
+Track (trackID 705, parentID 1) is processed with stopping code 2
+### pop requested out of 119 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.408,-0.040835,0.91207)
+ Old Polarization:       (-0.9121,-0.062189,0.40523)
+ New Momentum Direction: (0.55172,-0.055219,0.8322)
+ New Polarization:       (0.8117,-0.19381,-0.55098)
+ *** FresnelRefraction *** 
+Track (trackID 704, parentID 1) is processed with stopping code 2
+### pop requested out of 118 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 703, parentID 1) is processed with stopping code 2
+### pop requested out of 117 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 702, parentID 1) is processed with stopping code 2
+### pop requested out of 116 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.88536,-0.43616,-0.16094)
+ Old Polarization:       (-0.38597,-0.49662,-0.77743)
+ New Momentum Direction: (0.77669,-0.59093,-0.21805)
+ New Polarization:       (-0.56654,-0.5041,-0.65186)
+ *** FresnelRefraction *** 
+Track (trackID 701, parentID 1) is processed with stopping code 2
+### pop requested out of 115 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.90238,-0.38314,-0.19728)
+ Old Polarization:       (-0.36616,-0.44024,-0.81983)
+ New Momentum Direction: (0.81269,-0.51805,-0.26675)
+ New Polarization:       (-0.531,-0.46991,-0.70514)
+ *** FresnelRefraction *** 
+Track (trackID 700, parentID 1) is processed with stopping code 2
+### pop requested out of 114 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 699, parentID 1) is processed with stopping code 2
+### pop requested out of 113 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73745,0.6615,0.13632)
+ Old Polarization:       (-0.54912,0.70474,-0.44922)
+ New Momentum Direction: (0.39591,0.89939,0.18534)
+ New Polarization:       (-0.82772,0.43692,-0.35212)
+ *** FresnelRefraction *** 
+Track (trackID 698, parentID 1) is processed with stopping code 2
+### pop requested out of 112 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95102,0.025997,-0.30804)
+ Old Polarization:       (-0.30842,0.011871,-0.95118)
+ New Momentum Direction: (0.90959,0.034943,-0.41403)
+ New Polarization:       (-0.41498,0.02614,-0.90946)
+ *** FresnelRefraction *** 
+Track (trackID 697, parentID 1) is processed with stopping code 2
+### pop requested out of 111 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.80107,0.59856,-0.0038255)
+ Old Polarization:       (-0.47936,0.63769,-0.60296)
+ New Momentum Direction: (0.58242,0.81287,-0.0051952)
+ New Polarization:       (-0.71978,0.51273,-0.468)
+ *** FresnelRefraction *** 
+Track (trackID 696, parentID 1) is processed with stopping code 2
+### pop requested out of 110 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56774,0.63197,0.52753)
+ Old Polarization:       (-0.73516,0.67758,-0.02053)
+ New Momentum Direction: (0.56774,-0.63197,0.52753)
+ New Polarization:       (0.73516,0.67758,0.02053)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56774,-0.63197,0.52753)
+ Old Polarization:       (0.73516,0.67758,0.02053)
+ New Momentum Direction: (-0.56774,-0.63197,0.52753)
+ New Polarization:       (0.73516,-0.67758,-0.02053)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56774,-0.63197,0.52753)
+ Old Polarization:       (0.73516,-0.67758,-0.02053)
+ New Momentum Direction: (-0.56774,-0.63197,-0.52753)
+ New Polarization:       (-0.73516,0.67758,-0.02053)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 695, parentID 1) is processed with stopping code 2
+### pop requested out of 109 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.86352,-0.49216,-0.11005)
+ Old Polarization:       (-0.41001,-0.5581,-0.7214)
+ New Momentum Direction: (0.73012,-0.66685,-0.14911)
+ New Polarization:       (-0.6074,-0.5334,-0.58868)
+ *** FresnelRefraction *** 
+Track (trackID 694, parentID 1) is processed with stopping code 2
+### pop requested out of 108 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.41573,0.20861,0.88524)
+ Old Polarization:       (-0.90278,0.21266,0.37386)
+ New Momentum Direction: (0.56286,0.28244,0.7768)
+ New Polarization:       (0.39998,0.72936,-0.55502)
+ *** FresnelRefraction *** 
+Track (trackID 693, parentID 1) is processed with stopping code 2
+### pop requested out of 107 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51826,0.56055,0.6459)
+ Old Polarization:       (-0.79046,0.60226,0.11158)
+ New Momentum Direction: (0.51826,0.56055,-0.6459)
+ New Polarization:       (0.79046,-0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51826,0.56055,-0.6459)
+ Old Polarization:       (0.79046,-0.60226,0.11158)
+ New Momentum Direction: (0.51826,-0.56055,-0.6459)
+ New Polarization:       (-0.79046,-0.60226,-0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51826,-0.56055,-0.6459)
+ Old Polarization:       (-0.79046,-0.60226,-0.11158)
+ New Momentum Direction: (-0.51826,-0.56055,-0.6459)
+ New Polarization:       (-0.79046,0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51826,-0.56055,-0.6459)
+ Old Polarization:       (-0.79046,0.60226,0.11158)
+ New Momentum Direction: (-0.51826,-0.56055,0.6459)
+ New Polarization:       (0.79046,-0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51826,-0.56055,0.6459)
+ Old Polarization:       (0.79046,-0.60226,0.11158)
+ New Momentum Direction: (-0.51826,0.56055,0.6459)
+ New Polarization:       (-0.79046,-0.60226,-0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51826,0.56055,0.6459)
+ Old Polarization:       (-0.79046,-0.60226,-0.11158)
+ New Momentum Direction: (0.51826,0.56055,0.6459)
+ New Polarization:       (-0.79046,0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51826,0.56055,0.6459)
+ Old Polarization:       (-0.79046,0.60226,0.11158)
+ New Momentum Direction: (0.51826,0.56055,-0.6459)
+ New Polarization:       (0.79046,-0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51826,0.56055,-0.6459)
+ Old Polarization:       (0.79046,-0.60226,0.11158)
+ New Momentum Direction: (0.51826,-0.56055,-0.6459)
+ New Polarization:       (-0.79046,-0.60226,-0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51826,-0.56055,-0.6459)
+ Old Polarization:       (-0.79046,-0.60226,-0.11158)
+ New Momentum Direction: (-0.51826,-0.56055,-0.6459)
+ New Polarization:       (-0.79046,0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51826,-0.56055,-0.6459)
+ Old Polarization:       (-0.79046,0.60226,0.11158)
+ New Momentum Direction: (-0.51826,-0.56055,0.6459)
+ New Polarization:       (0.79046,-0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51826,-0.56055,0.6459)
+ Old Polarization:       (0.79046,-0.60226,0.11158)
+ New Momentum Direction: (-0.51826,0.56055,0.6459)
+ New Polarization:       (-0.79046,-0.60226,-0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51826,0.56055,0.6459)
+ Old Polarization:       (-0.79046,-0.60226,-0.11158)
+ New Momentum Direction: (0.51826,0.56055,0.6459)
+ New Polarization:       (-0.79046,0.60226,0.11158)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51826,0.56055,0.6459)
+ Old Polarization:       (-0.79046,0.60226,0.11158)
+ New Momentum Direction: (0.51826,0.56055,-0.6459)
+ New Polarization:       (0.79046,-0.60226,0.11158)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 692, parentID 1) is processed with stopping code 2
+### pop requested out of 106 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93834,0.18737,-0.29055)
+ Old Polarization:       (-0.32493,0.19087,-0.92628)
+ New Momentum Direction: (0.8846,0.25274,-0.39193)
+ New Polarization:       (-0.45057,0.24631,-0.85809)
+ *** FresnelRefraction *** 
+Track (trackID 691, parentID 1) is processed with stopping code 2
+### pop requested out of 105 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94044,0.15478,-0.30269)
+ Old Polarization:       (-0.32551,0.15307,-0.93307)
+ New Momentum Direction: (0.88757,0.20973,-0.41016)
+ New Polarization:       (-0.44987,0.20294,-0.86973)
+ *** FresnelRefraction *** 
+Track (trackID 690, parentID 1) is processed with stopping code 2
+### pop requested out of 104 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94554,-0.1201,-0.30253)
+ Old Polarization:       (-0.31851,-0.14973,-0.93602)
+ New Momentum Direction: (0.89793,-0.16239,-0.40908)
+ New Polarization:       (-0.43496,-0.18537,-0.88116)
+ *** FresnelRefraction *** 
+Track (trackID 689, parentID 1) is processed with stopping code 2
+### pop requested out of 103 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.88863,-0.42652,-0.16854)
+ Old Polarization:       (-0.38235,-0.48607,-0.78584)
+ New Momentum Direction: (0.78355,-0.57785,-0.22834)
+ New Polarization:       (-0.5602,-0.49806,-0.6619)
+ *** FresnelRefraction *** 
+Track (trackID 688, parentID 1) is processed with stopping code 2
+### pop requested out of 102 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40346,0.014009,0.91489)
+ Old Polarization:       (-0.91497,-0.0016724,0.40352)
+ New Momentum Direction: (0.54734,0.019005,0.83669)
+ New Polarization:       (0.83523,0.050893,-0.54754)
+ *** FresnelRefraction *** 
+Track (trackID 687, parentID 1) is processed with stopping code 2
+### pop requested out of 101 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51171,-0.50171,0.69745)
+ Old Polarization:       (-0.79917,-0.57595,0.17204)
+ New Momentum Direction: (0.6893,-0.67582,0.26102)
+ New Polarization:       (-0.58778,-0.73231,-0.34386)
+ *** FresnelRefraction *** 
+Track (trackID 686, parentID 1) is processed with stopping code 2
+### pop requested out of 100 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45627,-0.35365,0.81654)
+ Old Polarization:       (-0.86025,-0.40997,0.30313)
+ New Momentum Direction: (0.61536,-0.47695,0.62757)
+ New Polarization:       (-0.13877,-0.84928,-0.50938)
+ *** FresnelRefraction *** 
+Track (trackID 685, parentID 1) is processed with stopping code 2
+### pop requested out of 99 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.5411,-0.57345,0.61511)
+Old Polarization: (-0.76321,-0.64204,0.072831)
+New Polarization: (-0.9959,-0.010781,0.089769)
+Polarization Change: (-0.9959,-0.010781,0.089769)
+New Momentum Direction: (-0.011307,0.99992,-0.0053508)
+Momentum Change: (-0.011307,0.99992,-0.0053508)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.011307,0.99992,-0.0053508)
+ Old Polarization:       (-0.9959,-0.010781,0.089769)
+ New Momentum Direction: (-0.01538,0.99986,-0.0072782)
+ New Polarization:       (-0.99931,-0.015617,-0.033655)
+ *** FresnelRefraction *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.01538,0.99986,-0.0072782)
+ Old Polarization:       (-0.99931,-0.015617,-0.033655)
+ New Momentum Direction: (-0.011307,0.99992,-0.0053508)
+ New Polarization:       (-0.99591,-0.010781,0.089761)
+ *** FresnelRefraction *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.011307,0.99992,-0.0053508)
+ Old Polarization:       (-0.99591,-0.010781,0.089761)
+ New Momentum Direction: (-0.01538,0.99986,-0.0072782)
+ New Polarization:       (-0.99931,-0.015617,-0.033663)
+ *** FresnelRefraction *** 
+Track (trackID 684, parentID 1) is processed with stopping code 2
+### pop requested out of 98 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.92049,0.28501,-0.26735)
+ Old Polarization:       (-0.34942,0.29398,-0.88965)
+ New Momentum Direction: (0.84719,0.3875,-0.36349)
+ New Polarization:       (-0.4993,0.34686,-0.79397)
+ *** FresnelRefraction *** 
+Track (trackID 683, parentID 1) is processed with stopping code 2
+### pop requested out of 97 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95016,0.02582,-0.31068)
+ Old Polarization:       (-0.31105,0.011564,-0.95032)
+ New Momentum Direction: (0.90749,0.03479,-0.41863)
+ New Polarization:       (-0.41955,0.025665,-0.90737)
+ *** FresnelRefraction *** 
+Track (trackID 682, parentID 1) is processed with stopping code 2
+### pop requested out of 96 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42089,0.27643,0.86397)
+ Old Polarization:       (-0.89452,0.28462,0.3447)
+ New Momentum Direction: (0.57223,0.37583,0.7289)
+ New Polarization:       (0.15123,0.8252,-0.54421)
+ *** FresnelRefraction *** 
+Track (trackID 681, parentID 1) is processed with stopping code 2
+### pop requested out of 95 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 680, parentID 1) is processed with stopping code 2
+### pop requested out of 94 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 679, parentID 1) is processed with stopping code 2
+### pop requested out of 93 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 678, parentID 1) is processed with stopping code 2
+### pop requested out of 92 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81983,0.57063,-0.047535)
+ Old Polarization:       (-0.45923,0.60565,-0.64985)
+ New Momentum Direction: (0.62766,0.7758,-0.064627)
+ New Polarization:       (-0.68896,0.51491,-0.5101)
+ *** FresnelRefraction *** 
+Track (trackID 677, parentID 1) is processed with stopping code 2
+### pop requested out of 91 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81583,0.5779,-0.021176)
+ Old Polarization:       (-0.46036,0.62687,-0.62857)
+ New Momentum Direction: (0.62734,0.77823,-0.028517)
+ New Polarization:       (-0.68432,0.53342,-0.49716)
+ *** FresnelRefraction *** 
+Track (trackID 676, parentID 1) is processed with stopping code 2
+### pop requested out of 90 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42105,0.27002,0.86591)
+ Old Polarization:       (-0.89505,0.27837,0.34841)
+ New Momentum Direction: (0.57179,0.3667,0.73389)
+ New Polarization:       (0.1756,0.81912,-0.54609)
+ *** FresnelRefraction *** 
+Track (trackID 675, parentID 1) is processed with stopping code 2
+### pop requested out of 89 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49297,0.49473,0.7157)
+ Old Polarization:       (-0.82111,0.53655,0.19468)
+ New Momentum Direction: (0.66257,0.66494,0.34475)
+ New Polarization:       (-0.55364,0.7448,-0.3725)
+ *** FresnelRefraction *** 
+Track (trackID 674, parentID 1) is processed with stopping code 2
+### pop requested out of 88 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94191,-0.16048,-0.29504)
+ Old Polarization:       (-0.32318,-0.1939,-0.92626)
+ New Momentum Direction: (0.89069,-0.21722,-0.39936)
+ New Polarization:       (-0.44515,-0.23843,-0.86313)
+ *** FresnelRefraction *** 
+Track (trackID 673, parentID 1) is processed with stopping code 2
+### pop requested out of 87 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 672, parentID 1) is processed with stopping code 2
+### pop requested out of 86 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94161,-0.1459,-0.30346)
+ Old Polarization:       (-0.32656,-0.17606,-0.92863)
+ New Momentum Direction: (0.88899,-0.19842,-0.41272)
+ New Polarization:       (-0.45044,-0.21653,-0.86615)
+ *** FresnelRefraction *** 
+Track (trackID 671, parentID 1) is processed with stopping code 2
+### pop requested out of 85 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 670, parentID 1) is processed with stopping code 2
+### pop requested out of 84 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.75396,-0.63996,0.14832)
+ Old Polarization:       (-0.52984,-0.72588,-0.4386)
+ New Momentum Direction: (0.46151,-0.86423,0.2003)
+ New Polarization:       (-0.79183,-0.5031,-0.34625)
+ *** FresnelRefraction *** 
+Track (trackID 669, parentID 1) is processed with stopping code 2
+### pop requested out of 83 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48603,-0.46744,0.73843)
+ Old Polarization:       (-0.82364,-0.52751,0.2082)
+ New Momentum Direction: (0.48603,-0.46744,-0.73843)
+ New Polarization:       (0.6281,0.77434,-0.076754)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48603,-0.46744,-0.73843)
+ Old Polarization:       (0.6281,0.77434,-0.076754)
+ New Momentum Direction: (-0.48603,-0.46744,-0.73843)
+ New Polarization:       (0.6281,-0.77434,0.076754)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.48603,-0.46744,-0.73843)
+ Old Polarization:       (0.6281,-0.77434,0.076754)
+ New Momentum Direction: (-0.48603,0.46744,-0.73843)
+ New Polarization:       (-0.6281,-0.77434,-0.076754)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.48603,0.46744,-0.73843)
+ Old Polarization:       (-0.6281,-0.77434,-0.076754)
+ New Momentum Direction: (-0.66051,0.63524,-0.40024)
+ New Polarization:       (-0.7318,-0.6639,0.15397)
+ *** FresnelRefraction *** 
+Track (trackID 668, parentID 1) is processed with stopping code 2
+### pop requested out of 82 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40216,-0.036395,0.91484)
+ Old Polarization:       (-0.91481,-0.056674,0.39989)
+ New Momentum Direction: (0.5469,-0.049493,0.83574)
+ New Polarization:       (0.81894,-0.17573,-0.54631)
+ *** FresnelRefraction *** 
+Track (trackID 667, parentID 1) is processed with stopping code 2
+### pop requested out of 81 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.85901,0.49441,-0.13289)
+ Old Polarization:       (-0.4162,0.52324,-0.74364)
+ New Momentum Direction: (0.71843,0.67176,-0.18055)
+ New Polarization:       (-0.61888,0.49879,-0.6068)
+ *** FresnelRefraction *** 
+Track (trackID 666, parentID 1) is processed with stopping code 2
+### pop requested out of 80 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4071,-0.010858,0.91332)
+ Old Polarization:       (-0.91312,-0.029089,0.40666)
+ New Momentum Direction: (0.55048,-0.014682,0.83472)
+ New Polarization:       (0.83275,-0.061233,-0.55025)
+ *** FresnelRefraction *** 
+Track (trackID 665, parentID 1) is processed with stopping code 2
+### pop requested out of 79 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40769,0.1452,0.9015)
+ Old Polarization:       (-0.9103,0.14215,0.38878)
+ New Momentum Direction: (0.55311,0.19699,0.80949)
+ New Polarization:       (0.60657,0.57084,-0.55337)
+ *** FresnelRefraction *** 
+Track (trackID 664, parentID 1) is processed with stopping code 2
+### pop requested out of 78 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93787,0.18618,-0.29281)
+ Old Polarization:       (-0.32661,0.18875,-0.92612)
+ New Momentum Direction: (0.88324,0.2516,-0.39571)
+ New Polarization:       (-0.4535,0.24363,-0.85731)
+ *** FresnelRefraction *** 
+Track (trackID 663, parentID 1) is processed with stopping code 2
+### pop requested out of 77 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.7375,-0.65139,0.17828)
+ Old Polarization:       (-0.54867,-0.73183,-0.4042)
+ New Momentum Direction: (-0.7375,-0.65139,0.17828)
+ New Polarization:       (-0.29765,0.55048,0.77999)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.7375,-0.65139,0.17828)
+ Old Polarization:       (-0.29765,0.55048,0.77999)
+ New Momentum Direction: (-0.7375,0.65139,0.17828)
+ New Polarization:       (0.29765,0.55048,-0.77999)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.7375,0.65139,0.17828)
+ Old Polarization:       (0.29765,0.55048,-0.77999)
+ New Momentum Direction: (-0.40161,0.88333,0.24176)
+ New Polarization:       (0.53898,0.4414,-0.7174)
+ *** FresnelRefraction *** 
+Track (trackID 662, parentID 1) is processed with stopping code 2
+### pop requested out of 76 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 661, parentID 1) is processed with stopping code 2
+### pop requested out of 75 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 660, parentID 1) is processed with stopping code 2
+### pop requested out of 74 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 659, parentID 1) is processed with stopping code 2
+### pop requested out of 73 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54281,-0.57527,0.6119)
+ Old Polarization:       (-0.76145,-0.64447,0.069577)
+ New Momentum Direction: (0.54281,-0.57527,-0.6119)
+ New Polarization:       (0.76145,0.64447,0.069577)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54281,-0.57527,-0.6119)
+ Old Polarization:       (0.76145,0.64447,0.069577)
+ New Momentum Direction: (0.54281,0.57527,-0.6119)
+ New Polarization:       (-0.76145,0.64447,-0.069577)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54281,0.57527,-0.6119)
+ Old Polarization:       (-0.76145,0.64447,-0.069577)
+ New Momentum Direction: (-0.54281,0.57527,-0.6119)
+ New Polarization:       (-0.76145,-0.64447,0.069577)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 658, parentID 1) is processed with stopping code 2
+### pop requested out of 72 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.82858,0.5575,-0.051511)
+ Old Polarization:       (-0.44657,0.6026,-0.66139)
+ New Momentum Direction: (0.65597,0.75159,-0.069445)
+ New Polarization:       (-0.66362,0.53045,-0.52747)
+ *** FresnelRefraction *** 
+Track (trackID 657, parentID 1) is processed with stopping code 2
+### pop requested out of 71 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49059,-0.47434,0.73097)
+ Old Polarization:       (-0.81931,-0.53675,0.20157)
+ New Momentum Direction: (0.49059,-0.47434,-0.73097)
+ New Polarization:       (0.62679,0.77484,-0.08214)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
+Track (trackID 656, parentID 1) is processed with stopping code 2
+### pop requested out of 70 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 655, parentID 1) is processed with stopping code 2
+### pop requested out of 69 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42075,0.20234,0.88433)
+ Old Polarization:       (-0.90082,0.20842,0.38091)
+ New Momentum Direction: (0.56648,0.27242,0.77775)
+ New Polarization:       (0.42385,0.71306,-0.55847)
+ *** FresnelRefraction *** 
+Track (trackID 654, parentID 1) is processed with stopping code 2
+### pop requested out of 68 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70522,-0.66073,0.25711)
+ Old Polarization:       (-0.5839,-0.74695,-0.318)
+ New Momentum Direction: (-0.70522,-0.66073,0.25711)
+ New Polarization:       (-0.43932,0.69186,0.573)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70522,-0.66073,0.25711)
+ Old Polarization:       (-0.43932,0.69186,0.573)
+ New Momentum Direction: (-0.70522,0.66073,0.25711)
+ New Polarization:       (0.43932,0.69186,-0.573)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70522,0.66073,0.25711)
+ Old Polarization:       (0.43932,0.69186,-0.573)
+ New Momentum Direction: (-0.70522,0.66073,-0.25711)
+ New Polarization:       (-0.43932,-0.69186,-0.573)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70522,0.66073,-0.25711)
+ Old Polarization:       (-0.43932,-0.69186,-0.573)
+ New Momentum Direction: (0.70522,0.66073,-0.25711)
+ New Polarization:       (0.27966,0.073998,0.95724)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70522,0.66073,-0.25711)
+ Old Polarization:       (0.27966,0.073998,0.95724)
+ New Momentum Direction: (0.70522,-0.66073,-0.25711)
+ New Polarization:       (-0.27966,0.073998,-0.95724)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 653, parentID 1) is processed with stopping code 2
+### pop requested out of 67 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.87218,0.46321,-0.15731)
+ Old Polarization:       (-0.40064,0.49183,-0.77304)
+ New Momentum Direction: (0.7486,0.62781,-0.21321)
+ New Polarization:       (-0.5918,0.48768,-0.64183)
+ *** FresnelRefraction *** 
+Track (trackID 652, parentID 1) is processed with stopping code 2
+### pop requested out of 66 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.82214,0.56677,-0.053361)
+ Old Polarization:       (-0.45684,0.60093,-0.65588)
+ New Momentum Direction: (0.63285,0.77087,-0.072577)
+ New Polarization:       (-0.68543,0.51417,-0.51557)
+ *** FresnelRefraction *** 
+Track (trackID 651, parentID 1) is processed with stopping code 2
+### pop requested out of 65 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94457,-0.1401,-0.29691)
+ Old Polarization:       (-0.31856,-0.17238,-0.9321)
+ New Momentum Direction: (0.89641,-0.18914,-0.40085)
+ New Polarization:       (-0.43598,-0.2133,-0.87431)
+ *** FresnelRefraction *** 
+Track (trackID 650, parentID 1) is processed with stopping code 2
+### pop requested out of 64 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94797,-0.089562,-0.30551)
+ Old Polarization:       (-0.3146,-0.11645,-0.94205)
+ New Momentum Direction: (0.90297,-0.12088,-0.41234)
+ New Polarization:       (-0.42692,-0.14361,-0.89281)
+ *** FresnelRefraction *** 
+Track (trackID 649, parentID 1) is processed with stopping code 2
+### pop requested out of 63 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.92825,-0.26129,-0.26473)
+ Old Polarization:       (-0.33939,-0.30373,-0.89026)
+ New Momentum Direction: (0.86345,-0.35435,-0.35901)
+ New Polarization:       (-0.47943,-0.35522,-0.80247)
+ *** FresnelRefraction *** 
+Track (trackID 648, parentID 1) is processed with stopping code 2
+### pop requested out of 62 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 647, parentID 1) is processed with stopping code 2
+### pop requested out of 61 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.90983,0.33621,-0.24325)
+ Old Polarization:       (-0.3606,0.35046,-0.86438)
+ New Momentum Direction: (0.82594,0.45676,-0.33046)
+ New Polarization:       (-0.52106,0.39468,-0.75679)
+ *** FresnelRefraction *** 
+Track (trackID 646, parentID 1) is processed with stopping code 2
+### pop requested out of 60 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.60828,0.66008,0.44078)
+ Old Polarization:       (-0.69114,0.71355,-0.11478)
+ New Momentum Direction: (0.60828,-0.66008,0.44078)
+ New Polarization:       (0.69114,0.71355,0.11478)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.60828,-0.66008,0.44078)
+ Old Polarization:       (0.69114,0.71355,0.11478)
+ New Momentum Direction: (-0.60828,-0.66008,0.44078)
+ New Polarization:       (0.69114,-0.71355,-0.11478)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.60828,-0.66008,0.44078)
+ Old Polarization:       (0.69114,-0.71355,-0.11478)
+ New Momentum Direction: (-0.60828,-0.66008,-0.44078)
+ New Polarization:       (-0.69114,0.71355,-0.11478)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 645, parentID 1) is processed with stopping code 2
+### pop requested out of 59 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 644, parentID 1) is processed with stopping code 2
+### pop requested out of 58 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 643, parentID 1) is processed with stopping code 2
+### pop requested out of 57 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 642, parentID 1) is processed with stopping code 2
+### pop requested out of 56 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 641, parentID 1) is processed with stopping code 2
+### pop requested out of 55 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.90068,-0.38683,-0.19786)
+ Old Polarization:       (-0.36938,-0.44193,-0.81747)
+ New Momentum Direction: (0.80818,-0.52433,-0.26819)
+ New Polarization:       (-0.53716,-0.46956,-0.70069)
+ *** FresnelRefraction *** 
+Track (trackID 640, parentID 1) is processed with stopping code 2
+### pop requested out of 54 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9425,-0.15311,-0.29707)
+ Old Polarization:       (-0.3227,-0.18567,-0.92811)
+ New Momentum Direction: (0.89177,-0.2073,-0.40221)
+ New Polarization:       (-0.44393,-0.22871,-0.86638)
+ *** FresnelRefraction *** 
+Track (trackID 639, parentID 1) is processed with stopping code 2
+### pop requested out of 53 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 638, parentID 1) is processed with stopping code 2
+### pop requested out of 52 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6359,0.67376,0.37639)
+ Old Polarization:       (-0.66048,0.72739,-0.18621)
+ New Momentum Direction: (0.85963,0.046357,0.50882)
+ New Polarization:       (-0.011932,-0.99378,0.1107)
+ *** FresnelRefraction *** 
+Track (trackID 637, parentID 1) is processed with stopping code 2
+### pop requested out of 51 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93978,0.18284,-0.28876)
+ Old Polarization:       (-0.32159,0.18701,-0.92823)
+ New Momentum Direction: (-0.93978,0.18284,-0.28876)
+ New Polarization:       (0.30239,0.83857,-0.45316)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.93978,0.18284,-0.28876)
+ Old Polarization:       (0.30239,0.83857,-0.45316)
+ New Momentum Direction: (-0.88802,0.24598,-0.38847)
+ New Polarization:       (0.42862,0.74867,-0.50574)
+ *** FresnelRefraction *** 
+Track (trackID 636, parentID 1) is processed with stopping code 2
+### pop requested out of 50 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 635, parentID 1) is processed with stopping code 2
+### pop requested out of 49 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.43815,-0.29908,0.84769)
+ Old Polarization:       (-0.8777,-0.34593,0.33161)
+ New Momentum Direction: (0.59361,-0.40519,0.69531)
+ New Polarization:       (0.052098,-0.84283,-0.53565)
+ *** FresnelRefraction *** 
+Track (trackID 634, parentID 1) is processed with stopping code 2
+### pop requested out of 48 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 633, parentID 1) is processed with stopping code 2
+### pop requested out of 47 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48618,0.5035,0.71422)
+ Old Polarization:       (-0.8244,0.53533,0.18379)
+ New Momentum Direction: (0.48618,0.5035,-0.71422)
+ New Polarization:       (0.64675,-0.75696,-0.093378)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48618,0.5035,-0.71422)
+ Old Polarization:       (0.64675,-0.75696,-0.093378)
+ New Momentum Direction: (0.48618,-0.5035,-0.71422)
+ New Polarization:       (-0.64675,-0.75696,0.093378)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48618,-0.5035,-0.71422)
+ Old Polarization:       (-0.64675,-0.75696,0.093378)
+ New Momentum Direction: (-0.48618,-0.5035,-0.71422)
+ New Polarization:       (-0.64675,0.75696,-0.093378)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 632, parentID 1) is processed with stopping code 2
+### pop requested out of 46 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94869,0.0018497,-0.31621)
+ Old Polarization:       (-0.31615,-0.015029,-0.94859)
+ New Momentum Direction: (0.90363,0.0025053,-0.4283)
+ New Polarization:       (-0.42826,-0.0097977,-0.9036)
+ *** FresnelRefraction *** 
+Track (trackID 631, parentID 1) is processed with stopping code 2
+### pop requested out of 45 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94002,0.15277,-0.305)
+ Old Polarization:       (-0.32713,0.15023,-0.93296)
+ New Momentum Direction: (0.88632,0.20739,-0.41404)
+ New Polarization:       (-0.45265,0.19936,-0.86912)
+ *** FresnelRefraction *** 
+Track (trackID 630, parentID 1) is processed with stopping code 2
+### pop requested out of 44 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50035,-0.50267,0.70496)
+ Old Polarization:       (-0.80753,-0.56462,0.17055)
+ New Momentum Direction: (0.50035,-0.50267,-0.70496)
+ New Polarization:       (0.63161,0.76882,-0.099913)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50035,-0.50267,-0.70496)
+ Old Polarization:       (0.63161,0.76882,-0.099913)
+ New Momentum Direction: (0.50035,0.50267,-0.70496)
+ New Polarization:       (-0.63161,0.76882,0.099913)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50035,0.50267,-0.70496)
+ Old Polarization:       (-0.63161,0.76882,0.099913)
+ New Momentum Direction: (-0.50035,0.50267,-0.70496)
+ New Polarization:       (-0.63161,-0.76882,-0.099913)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 629, parentID 1) is processed with stopping code 2
+### pop requested out of 43 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.47657,-0.44136,0.76032)
+ Old Polarization:       (-0.83429,-0.49975,0.23283)
+ New Momentum Direction: (0.64722,-0.59941,0.47096)
+ New Polarization:       (-0.424,-0.7965,-0.43106)
+ *** FresnelRefraction *** 
+Track (trackID 628, parentID 1) is processed with stopping code 2
+### pop requested out of 42 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.74137,0.65737,0.13505)
+ Old Polarization:       (-0.5442,0.70664,-0.45222)
+ New Momentum Direction: (0.41744,0.89012,0.18287)
+ New Polarization:       (-0.81603,0.45573,-0.35553)
+ *** FresnelRefraction *** 
+Track (trackID 627, parentID 1) is processed with stopping code 2
+### pop requested out of 41 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.92463,-0.29345,-0.24279)
+ Old Polarization:       (-0.33914,-0.3442,-0.87551)
+ New Momentum Direction: (0.85844,-0.39519,-0.32697)
+ New Polarization:       (-0.48019,-0.39516,-0.78311)
+ *** FresnelRefraction *** 
+Track (trackID 626, parentID 1) is processed with stopping code 2
+### pop requested out of 40 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.86684,-0.48348,-0.12183)
+Old Polarization: (-0.40739,-0.54593,-0.73212)
+New Polarization: (-0.70271,-0.3214,-0.63474)
+Polarization Change: (-0.70271,-0.3214,-0.63474)
+New Momentum Direction: (0.64722,-0.65927,-0.3827)
+Momentum Change: (0.64722,-0.65927,-0.3827)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.64722,-0.65927,-0.3827)
+ Old Polarization:       (-0.70271,-0.3214,-0.63474)
+ New Momentum Direction: (-0.64722,-0.65927,-0.3827)
+ New Polarization:       (-0.70271,0.3214,0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64722,-0.65927,-0.3827)
+ Old Polarization:       (-0.70271,0.3214,0.63474)
+ New Momentum Direction: (-0.64722,0.65927,-0.3827)
+ New Polarization:       (0.70271,0.3214,-0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64722,0.65927,-0.3827)
+ Old Polarization:       (0.70271,0.3214,-0.63474)
+ New Momentum Direction: (-0.64722,0.65927,0.3827)
+ New Polarization:       (-0.70271,-0.3214,-0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64722,0.65927,0.3827)
+ Old Polarization:       (-0.70271,-0.3214,-0.63474)
+ New Momentum Direction: (0.64722,0.65927,0.3827)
+ New Polarization:       (-0.70271,0.3214,0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.64722,0.65927,0.3827)
+ Old Polarization:       (-0.70271,0.3214,0.63474)
+ New Momentum Direction: (0.64722,-0.65927,0.3827)
+ New Polarization:       (0.70271,0.3214,-0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.64722,-0.65927,0.3827)
+ Old Polarization:       (0.70271,0.3214,-0.63474)
+ New Momentum Direction: (0.64722,-0.65927,-0.3827)
+ New Polarization:       (-0.70271,-0.3214,-0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.64722,-0.65927,-0.3827)
+ Old Polarization:       (-0.70271,-0.3214,-0.63474)
+ New Momentum Direction: (-0.64722,-0.65927,-0.3827)
+ New Polarization:       (-0.70271,0.3214,0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64722,-0.65927,-0.3827)
+ Old Polarization:       (-0.70271,0.3214,0.63474)
+ New Momentum Direction: (-0.64722,0.65927,-0.3827)
+ New Polarization:       (0.70271,0.3214,-0.63474)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64722,0.65927,-0.3827)
+ Old Polarization:       (0.70271,0.3214,-0.63474)
+ New Momentum Direction: (-0.64722,0.65927,0.3827)
+ New Polarization:       (-0.70271,-0.3214,-0.63474)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.64722,0.65927,0.3827)
+Old Polarization: (-0.70271,-0.3214,-0.63474)
+New Polarization: (0.73256,-0.46556,0.49661)
+Polarization Change: (0.73256,-0.46556,0.49661)
+New Momentum Direction: (0.27877,0.87075,0.40508)
+Momentum Change: (0.27877,0.87075,0.40508)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.27877,0.87075,0.40508)
+ Old Polarization:       (0.73256,-0.46556,0.49661)
+ New Momentum Direction: (0.37856,0.74439,0.55007)
+ New Polarization:       (0.60559,-0.64864,0.461)
+ *** FresnelRefraction *** 
+Track (trackID 625, parentID 1) is processed with stopping code 2
+### pop requested out of 39 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 624, parentID 1) is processed with stopping code 2
+### pop requested out of 38 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 623, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40896,0.0089027,0.91251)
+ Old Polarization:       (-0.91249,-0.0072656,0.40902)
+ New Momentum Direction: (0.5518,0.012012,0.83389)
+ New Polarization:       (0.83345,0.027357,-0.55191)
+ *** FresnelRefraction *** 
+Track (trackID 622, parentID 1) is processed with stopping code 2
+### pop requested out of 36 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.47613,-0.43794,0.76256)
+Old Polarization: (-0.83512,-0.4968,0.23612)
+New Polarization: (0.77188,-0.23936,-0.58899)
+Polarization Change: (0.77188,-0.23936,-0.58899)
+New Momentum Direction: (-0.43102,-0.87803,-0.20805)
+Momentum Change: (-0.43102,-0.87803,-0.20805)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.43102,-0.87803,-0.20805)
+ Old Polarization:       (0.77188,-0.23936,-0.58899)
+ New Momentum Direction: (-0.58494,-0.76035,-0.28234)
+ New Polarization:       (-0.088796,0.40605,-0.90953)
+ *** FresnelRefraction *** 
+Track (trackID 621, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42618,-0.24035,0.87213)
+ Old Polarization:       (-0.89054,-0.28102,0.35773)
+ New Momentum Direction: (0.5777,-0.32581,0.74841)
+ New Polarization:       (0.2667,-0.79122,-0.55031)
+ *** FresnelRefraction *** 
+Track (trackID 620, parentID 1) is processed with stopping code 2
+### pop requested out of 34 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.67802,-0.66013,0.32329)
+ Old Polarization:       (-0.61394,-0.75045,-0.24475)
+ New Momentum Direction: (0.13171,-0.89026,0.436)
+ New Polarization:       (-0.92062,-0.27295,-0.27922)
+ *** FresnelRefraction *** 
+Track (trackID 619, parentID 1) is processed with stopping code 2
+### pop requested out of 33 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.87049,-0.47679,-0.12216)
+ Old Polarization:       (-0.4013,-0.54385,-0.73701)
+ New Momentum Direction: (0.74648,-0.64458,-0.16515)
+ New Polarization:       (-0.59197,-0.52998,-0.60721)
+ *** FresnelRefraction *** 
+Track (trackID 618, parentID 1) is processed with stopping code 2
+### pop requested out of 32 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42223,0.28055,0.86198)
+ Old Polarization:       (-0.89345,0.28954,0.3434)
+ New Momentum Direction: (0.57369,0.38119,0.72496)
+ New Polarization:       (0.13649,0.82824,-0.5435)
+ *** FresnelRefraction *** 
+Track (trackID 617, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65999,0.67811,0.32339)
+ Old Polarization:       (-0.6339,0.73367,-0.24472)
+ New Momentum Direction: (0.89139,0.12108,0.43677)
+ New Polarization:       (0.093002,-0.99201,0.085208)
+ *** FresnelRefraction *** 
+Track (trackID 616, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 615, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.47863,0.49224,0.72706)
+Old Polarization: (-0.8315,0.52006,0.1953)
+New Polarization: (0.97909,-0.031324,0.20101)
+Polarization Change: (0.97909,-0.031324,0.20101)
+New Momentum Direction: (-0.093027,0.80978,0.57932)
+Momentum Change: (-0.093027,0.80978,0.57932)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.093027,0.80978,0.57932)
+ Old Polarization:       (0.97909,-0.031324,0.20101)
+ New Momentum Direction: (-0.093027,-0.80978,0.57932)
+ New Polarization:       (-0.9875,0.00066346,-0.15765)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.093027,-0.80978,0.57932)
+ Old Polarization:       (-0.9875,0.00066346,-0.15765)
+ New Momentum Direction: (-0.093027,-0.80978,-0.57932)
+ New Polarization:       (0.9875,-0.00066346,-0.15765)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.093027,-0.80978,-0.57932)
+ Old Polarization:       (0.9875,-0.00066346,-0.15765)
+ New Momentum Direction: (-0.12648,-0.603,-0.78765)
+ New Polarization:       (0.9872,0.0012824,-0.15951)
+ *** FresnelRefraction *** 
+Track (trackID 614, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.78375,0.61978,0.040146)
+ Old Polarization:       (-0.49755,0.66524,-0.55669)
+ New Momentum Direction: (0.54103,0.83924,0.054361)
+ New Polarization:       (-0.74549,0.5085,-0.43089)
+ *** FresnelRefraction *** 
+Track (trackID 613, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.87389,0.45884,-0.16055)
+ Old Polarization:       (-0.39862,0.48736,-0.77691)
+ New Momentum Direction: (0.75243,0.62172,-0.21753)
+ New Polarization:       (-0.58827,0.48573,-0.64653)
+ *** FresnelRefraction *** 
+Track (trackID 612, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 611, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.91313,0.32307,-0.24863)
+ Old Polarization:       (-0.35646,0.33681,-0.87149)
+ New Momentum Direction: (0.83298,0.43849,-0.33746)
+ New Polarization:       (-0.51316,0.38415,-0.76752)
+ *** FresnelRefraction *** 
+Track (trackID 610, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 609, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42395,-0.24649,0.8715)
+ Old Polarization:       (-0.89105,-0.2858,0.35262)
+ New Momentum Direction: (0.57652,-0.3352,0.74516)
+ New Polarization:       (0.24266,-0.80059,-0.54788)
+ *** FresnelRefraction *** 
+Track (trackID 608, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.79373,0.60816,0.011644)
+ Old Polarization:       (-0.48753,0.6475,-0.58571)
+ New Momentum Direction: (0.56298,0.82632,0.015821)
+ New Polarization:       (-0.73283,0.50795,-0.45271)
+ *** FresnelRefraction *** 
+Track (trackID 607, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 606, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.46158,0.42148,0.78057)
+ Old Polarization:       (-0.85379,0.44993,0.26193)
+ New Momentum Direction: (0.62317,0.56903,0.53652)
+ New Polarization:       (-0.34529,0.81572,-0.46409)
+ *** FresnelRefraction *** 
+Track (trackID 605, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6364,-0.65068,0.41426)
+ Old Polarization:       (-0.66001,-0.7373,-0.14415)
+ New Momentum Direction: (0.6364,0.65068,0.41426)
+ New Polarization:       (0.66001,-0.7373,0.14415)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6364,0.65068,0.41426)
+ Old Polarization:       (0.66001,-0.7373,0.14415)
+ New Momentum Direction: (-0.6364,0.65068,0.41426)
+ New Polarization:       (0.66001,0.7373,-0.14415)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6364,0.65068,0.41426)
+ Old Polarization:       (0.66001,0.7373,-0.14415)
+ New Momentum Direction: (-0.6364,0.65068,-0.41426)
+ New Polarization:       (-0.66001,-0.7373,-0.14415)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 604, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 603, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 602, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 601, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.92268,-0.29844,-0.24412)
+ Old Polarization:       (-0.34323,-0.34733,-0.87267)
+ New Momentum Direction: (0.85362,-0.40319,-0.3298)
+ New Polarization:       (-0.48782,-0.39676,-0.77757)
+ *** FresnelRefraction *** 
+Track (trackID 600, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 599, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.60971,0.6609,0.43756)
+ Old Polarization:       (-0.68956,0.71449,-0.11834)
+ New Momentum Direction: (0.60971,-0.6609,0.43756)
+ New Polarization:       (0.68956,0.71449,0.11834)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.60971,-0.6609,0.43756)
+ Old Polarization:       (0.68956,0.71449,0.11834)
+ New Momentum Direction: (-0.60971,-0.6609,0.43756)
+ New Polarization:       (0.68956,-0.71449,-0.11834)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.60971,-0.6609,0.43756)
+ Old Polarization:       (0.68956,-0.71449,-0.11834)
+ New Momentum Direction: (-0.60971,-0.6609,-0.43756)
+ New Polarization:       (-0.68956,0.71449,-0.11834)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.60971,-0.6609,-0.43756)
+ Old Polarization:       (-0.68956,0.71449,-0.11834)
+ New Momentum Direction: (-0.60971,0.6609,-0.43756)
+ New Polarization:       (0.68956,0.71449,0.11834)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.60971,0.6609,-0.43756)
+ Old Polarization:       (0.68956,0.71449,0.11834)
+ New Momentum Direction: (0.60971,0.6609,-0.43756)
+ New Polarization:       (0.68956,-0.71449,-0.11834)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 598, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 597, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5907,0.64647,0.48286)
+ Old Polarization:       (-0.71082,0.7001,-0.067743)
+ New Momentum Direction: (0.5907,-0.64647,0.48286)
+ New Polarization:       (0.71082,0.7001,0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5907,-0.64647,0.48286)
+ Old Polarization:       (0.71082,0.7001,0.067743)
+ New Momentum Direction: (-0.5907,-0.64647,0.48286)
+ New Polarization:       (0.71082,-0.7001,-0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5907,-0.64647,0.48286)
+ Old Polarization:       (0.71082,-0.7001,-0.067743)
+ New Momentum Direction: (-0.5907,-0.64647,-0.48286)
+ New Polarization:       (-0.71082,0.7001,-0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5907,-0.64647,-0.48286)
+ Old Polarization:       (-0.71082,0.7001,-0.067743)
+ New Momentum Direction: (-0.5907,0.64647,-0.48286)
+ New Polarization:       (0.71082,0.7001,0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5907,0.64647,-0.48286)
+ Old Polarization:       (0.71082,0.7001,0.067743)
+ New Momentum Direction: (0.5907,0.64647,-0.48286)
+ New Polarization:       (0.71082,-0.7001,-0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5907,0.64647,-0.48286)
+ Old Polarization:       (0.71082,-0.7001,-0.067743)
+ New Momentum Direction: (0.5907,0.64647,0.48286)
+ New Polarization:       (-0.71082,0.7001,-0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5907,0.64647,0.48286)
+ Old Polarization:       (-0.71082,0.7001,-0.067743)
+ New Momentum Direction: (0.5907,-0.64647,0.48286)
+ New Polarization:       (0.71082,0.7001,0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5907,-0.64647,0.48286)
+ Old Polarization:       (0.71082,0.7001,0.067743)
+ New Momentum Direction: (-0.5907,-0.64647,0.48286)
+ New Polarization:       (0.71082,-0.7001,-0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5907,-0.64647,0.48286)
+ Old Polarization:       (0.71082,-0.7001,-0.067743)
+ New Momentum Direction: (-0.5907,-0.64647,-0.48286)
+ New Polarization:       (-0.71082,0.7001,-0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5907,-0.64647,-0.48286)
+ Old Polarization:       (-0.71082,0.7001,-0.067743)
+ New Momentum Direction: (-0.5907,0.64647,-0.48286)
+ New Polarization:       (0.71082,0.7001,0.067743)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5907,0.64647,-0.48286)
+ Old Polarization:       (0.71082,0.7001,0.067743)
+ New Momentum Direction: (0.5907,0.64647,-0.48286)
+ New Polarization:       (0.71082,-0.7001,-0.067743)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 596, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49303,0.50027,0.71179)
+ Old Polarization:       (-0.82011,0.54034,0.18829)
+ New Momentum Direction: (0.66395,0.6737,0.3245)
+ New Polarization:       (-0.56908,0.73674,-0.36518)
+ *** FresnelRefraction *** 
+Track (trackID 595, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40276,0.11214,0.90841)
+ Old Polarization:       (-0.91385,0.1052,0.39218)
+ New Momentum Direction: (0.54797,0.15257,0.82247)
+ New Polarization:       (0.69615,0.46197,-0.54951)
+ *** FresnelRefraction *** 
+Track (trackID 594, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40261,0.083666,0.91154)
+ Old Polarization:       (-0.91472,0.074371,0.39718)
+ New Momentum Direction: (0.54717,0.11371,0.82926)
+ New Polarization:       (0.75816,0.35249,-0.54858)
+ *** FresnelRefraction *** 
+Track (trackID 593, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 592, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40666,0.1025,0.90781)
+ Old Polarization:       (-0.91242,0.095685,0.39792)
+ New Momentum Direction: (0.55087,0.13886,0.82296)
+ New Polarization:       (0.71808,0.42366,-0.55215)
+ *** FresnelRefraction *** 
+Track (trackID 591, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40535,0.031928,0.91361)
+ Old Polarization:       (-0.91416,0.018082,0.40496)
+ New Momentum Direction: (0.54885,0.043232,0.8348)
+ New Polarization:       (0.82529,0.13077,-0.54936)
+ *** FresnelRefraction *** 
+Track (trackID 590, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49029,0.52094,0.69874)
+ Old Polarization:       (-0.81852,0.55063,0.16381)
+ New Momentum Direction: (0.49029,0.52094,-0.69874)
+ New Polarization:       (0.65077,-0.7521,-0.10409)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49029,0.52094,-0.69874)
+ Old Polarization:       (0.65077,-0.7521,-0.10409)
+ New Momentum Direction: (0.49029,-0.52094,-0.69874)
+ New Polarization:       (-0.65077,-0.7521,0.10409)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49029,-0.52094,-0.69874)
+ Old Polarization:       (-0.65077,-0.7521,0.10409)
+ New Momentum Direction: (-0.49029,-0.52094,-0.69874)
+ New Polarization:       (-0.65077,0.7521,-0.10409)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49029,-0.52094,-0.69874)
+ Old Polarization:       (-0.65077,0.7521,-0.10409)
+ New Momentum Direction: (-0.49029,-0.52094,0.69874)
+ New Polarization:       (0.76899,-0.63589,0.065503)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49029,-0.52094,0.69874)
+ Old Polarization:       (0.76899,-0.63589,0.065503)
+ New Momentum Direction: (-0.49029,0.52094,0.69874)
+ New Polarization:       (-0.76899,-0.63589,-0.065503)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49029,0.52094,0.69874)
+ Old Polarization:       (-0.76899,-0.63589,-0.065503)
+ New Momentum Direction: (0.49029,0.52094,0.69874)
+ New Polarization:       (-0.76899,0.63589,0.065503)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49029,0.52094,0.69874)
+ Old Polarization:       (-0.76899,0.63589,0.065503)
+ New Momentum Direction: (0.66702,0.70872,0.22979)
+ New Polarization:       (-0.69781,0.70234,-0.14061)
+ *** FresnelRefraction *** 
+Track (trackID 589, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 588, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,-0.55255,0.63964)
+ Old Polarization:       (-0.7724,-0.62657,0.10402)
+ New Momentum Direction: (0.53436,-0.55255,-0.63964)
+ New Polarization:       (0.7724,0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,-0.55255,-0.63964)
+ Old Polarization:       (0.7724,0.62657,0.10402)
+ New Momentum Direction: (0.53436,0.55255,-0.63964)
+ New Polarization:       (-0.7724,0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,0.55255,-0.63964)
+ Old Polarization:       (-0.7724,0.62657,-0.10402)
+ New Momentum Direction: (-0.53436,0.55255,-0.63964)
+ New Polarization:       (-0.7724,-0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,0.55255,-0.63964)
+ Old Polarization:       (-0.7724,-0.62657,0.10402)
+ New Momentum Direction: (-0.53436,0.55255,0.63964)
+ New Polarization:       (0.7724,0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,0.55255,0.63964)
+ Old Polarization:       (0.7724,0.62657,0.10402)
+ New Momentum Direction: (-0.53436,-0.55255,0.63964)
+ New Polarization:       (-0.7724,0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,-0.55255,0.63964)
+ Old Polarization:       (-0.7724,0.62657,-0.10402)
+ New Momentum Direction: (0.53436,-0.55255,0.63964)
+ New Polarization:       (-0.7724,-0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,-0.55255,0.63964)
+ Old Polarization:       (-0.7724,-0.62657,0.10402)
+ New Momentum Direction: (0.53436,-0.55255,-0.63964)
+ New Polarization:       (0.7724,0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,-0.55255,-0.63964)
+ Old Polarization:       (0.7724,0.62657,0.10402)
+ New Momentum Direction: (0.53436,0.55255,-0.63964)
+ New Polarization:       (-0.7724,0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,0.55255,-0.63964)
+ Old Polarization:       (-0.7724,0.62657,-0.10402)
+ New Momentum Direction: (-0.53436,0.55255,-0.63964)
+ New Polarization:       (-0.7724,-0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,0.55255,-0.63964)
+ Old Polarization:       (-0.7724,-0.62657,0.10402)
+ New Momentum Direction: (-0.53436,0.55255,0.63964)
+ New Polarization:       (0.7724,0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,0.55255,0.63964)
+ Old Polarization:       (0.7724,0.62657,0.10402)
+ New Momentum Direction: (-0.53436,-0.55255,0.63964)
+ New Polarization:       (-0.7724,0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,-0.55255,0.63964)
+ Old Polarization:       (-0.7724,0.62657,-0.10402)
+ New Momentum Direction: (0.53436,-0.55255,0.63964)
+ New Polarization:       (-0.7724,-0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,-0.55255,0.63964)
+ Old Polarization:       (-0.7724,-0.62657,0.10402)
+ New Momentum Direction: (0.53436,-0.55255,-0.63964)
+ New Polarization:       (0.7724,0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,-0.55255,-0.63964)
+ Old Polarization:       (0.7724,0.62657,0.10402)
+ New Momentum Direction: (0.53436,0.55255,-0.63964)
+ New Polarization:       (-0.7724,0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,0.55255,-0.63964)
+ Old Polarization:       (-0.7724,0.62657,-0.10402)
+ New Momentum Direction: (-0.53436,0.55255,-0.63964)
+ New Polarization:       (-0.7724,-0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,0.55255,-0.63964)
+ Old Polarization:       (-0.7724,-0.62657,0.10402)
+ New Momentum Direction: (-0.53436,0.55255,0.63964)
+ New Polarization:       (0.7724,0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,0.55255,0.63964)
+ Old Polarization:       (0.7724,0.62657,0.10402)
+ New Momentum Direction: (-0.53436,-0.55255,0.63964)
+ New Polarization:       (-0.7724,0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,-0.55255,0.63964)
+ Old Polarization:       (-0.7724,0.62657,-0.10402)
+ New Momentum Direction: (-0.53436,-0.55255,-0.63964)
+ New Polarization:       (0.7724,-0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53436,-0.55255,-0.63964)
+ Old Polarization:       (0.7724,-0.62657,-0.10402)
+ New Momentum Direction: (0.53436,-0.55255,-0.63964)
+ New Polarization:       (0.7724,0.62657,0.10402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53436,-0.55255,-0.63964)
+ Old Polarization:       (0.7724,0.62657,0.10402)
+ New Momentum Direction: (0.53436,0.55255,-0.63964)
+ New Polarization:       (-0.7724,0.62657,-0.10402)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 587, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 196
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 198 stacked tracks.
+Track (trackID 1065, parentID 1) is processed with stopping code 2
+### pop requested out of 197 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1064, parentID 1) is processed with stopping code 2
+### pop requested out of 196 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29957,-0.64737,0.70084)
+ Old Polarization:       (-0.74792,-0.61541,-0.24876)
+ New Momentum Direction: (0.40751,-0.88063,0.24174)
+ New Polarization:       (-0.73107,-0.47323,-0.49153)
+ *** FresnelRefraction *** 
+Track (trackID 1063, parentID 1) is processed with stopping code 2
+### pop requested out of 195 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.89956,0.40625,0.16048)
+ Old Polarization:       (-0.092269,0.53584,-0.83926)
+ New Momentum Direction: (0.80443,0.5525,0.21825)
+ New Polarization:       (-0.17016,0.56631,-0.80644)
+ *** FresnelRefraction *** 
+Track (trackID 1062, parentID 1) is processed with stopping code 2
+### pop requested out of 194 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29455,0.48789,0.82171)
+ Old Polarization:       (-0.76052,0.64034,-0.10759)
+ New Momentum Direction: (0.39597,0.65588,0.64267)
+ New Polarization:       (-0.74098,0.64159,-0.19825)
+ *** FresnelRefraction *** 
+Track (trackID 1061, parentID 1) is processed with stopping code 2
+### pop requested out of 193 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93141,-0.359,0.059891)
+ Old Polarization:       (-0.055314,-0.30227,-0.95162)
+ New Momentum Direction: (0.86953,-0.48715,0.081269)
+ New Polarization:       (-0.10189,-0.33795,-0.93563)
+ *** FresnelRefraction *** 
+Track (trackID 1060, parentID 1) is processed with stopping code 2
+### pop requested out of 192 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.31453,-0.64911,0.69262)
+ Old Polarization:       (-0.7355,-0.62792,-0.25448)
+ New Momentum Direction: (0.31453,-0.64911,-0.69262)
+ New Polarization:       (0.80473,0.56933,-0.16813)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.31453,-0.64911,-0.69262)
+ Old Polarization:       (0.80473,0.56933,-0.16813)
+ New Momentum Direction: (0.31453,0.64911,-0.69262)
+ New Polarization:       (-0.80473,0.56933,0.16813)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.31453,0.64911,-0.69262)
+ Old Polarization:       (-0.80473,0.56933,0.16813)
+ New Momentum Direction: (-0.31453,0.64911,-0.69262)
+ New Polarization:       (-0.80473,-0.56933,-0.16813)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.31453,0.64911,-0.69262)
+ Old Polarization:       (-0.80473,-0.56933,-0.16813)
+ New Momentum Direction: (-0.42478,0.87665,-0.22594)
+ New Polarization:       (-0.87686,-0.33636,0.34347)
+ *** FresnelRefraction *** 
+Track (trackID 1059, parentID 1) is processed with stopping code 2
+### pop requested out of 191 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57057,0.62621,0.53132)
+ Old Polarization:       (-0.45168,0.77962,-0.43381)
+ New Momentum Direction: (0.57057,-0.62621,0.53132)
+ New Polarization:       (0.45168,0.77962,0.43381)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57057,-0.62621,0.53132)
+ Old Polarization:       (0.45168,0.77962,0.43381)
+ New Momentum Direction: (-0.57057,-0.62621,0.53132)
+ New Polarization:       (0.45168,-0.77962,-0.43381)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57057,-0.62621,0.53132)
+ Old Polarization:       (0.45168,-0.77962,-0.43381)
+ New Momentum Direction: (-0.57057,-0.62621,-0.53132)
+ New Polarization:       (-0.45168,0.77962,-0.43381)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57057,-0.62621,-0.53132)
+ Old Polarization:       (-0.45168,0.77962,-0.43381)
+ New Momentum Direction: (-0.57057,0.62621,-0.53132)
+ New Polarization:       (0.45168,0.77962,0.43381)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.57057,0.62621,-0.53132)
+Old Polarization: (0.45168,0.77962,0.43381)
+New Polarization: (0.29037,-0.90343,-0.31542)
+Polarization Change: (0.29037,-0.90343,-0.31542)
+New Momentum Direction: (-0.93418,-0.19621,-0.298)
+Momentum Change: (-0.93418,-0.19621,-0.298)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.93418,-0.19621,-0.298)
+ Old Polarization:       (0.29037,-0.90343,-0.31542)
+ New Momentum Direction: (-0.87493,-0.2663,-0.40445)
+ New Polarization:       (0.42947,-0.81259,-0.39404)
+ *** FresnelRefraction *** 
+Track (trackID 1058, parentID 1) is processed with stopping code 2
+### pop requested out of 190 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.20001,-0.54274,0.81574)
+ Old Polarization:       (-0.85661,-0.50102,-0.12331)
+ New Momentum Direction: (0.27211,-0.73837,0.61707)
+ New Polarization:       (-0.83319,-0.5016,-0.23279)
+ *** FresnelRefraction *** 
+Track (trackID 1057, parentID 1) is processed with stopping code 2
+### pop requested out of 189 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93795,-0.34264,0.053458)
+ Old Polarization:       (-0.04903,-0.28363,-0.95768)
+ New Momentum Direction: (-0.93795,-0.34264,0.053458)
+ New Polarization:       (0.033046,0.065141,0.99733)
+ *** FresnelReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.93795,-0.34264,0.053458)
+Old Polarization: (0.033046,0.065141,0.99733)
+New Polarization: (-0.78297,0.1327,-0.60773)
+Polarization Change: (-0.78297,0.1327,-0.60773)
+New Momentum Direction: (-0.5819,0.18909,0.79098)
+Momentum Change: (-0.5819,0.18909,0.79098)
+Scattering Photon!
+Old Momentum Direction: (-0.5819,0.18909,0.79098)
+Old Polarization: (-0.78297,0.1327,-0.60773)
+New Polarization: (0.35069,0.84899,0.39526)
+Polarization Change: (0.35069,0.84899,0.39526)
+New Momentum Direction: (-0.70114,0.51782,-0.49017)
+Momentum Change: (-0.70114,0.51782,-0.49017)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70114,0.51782,-0.49017)
+ Old Polarization:       (0.35069,0.84899,0.39526)
+ New Momentum Direction: (-0.70114,-0.51782,-0.49017)
+ New Polarization:       (-0.35069,0.84899,-0.39526)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70114,-0.51782,-0.49017)
+ Old Polarization:       (-0.35069,0.84899,-0.39526)
+ New Momentum Direction: (0.70114,-0.51782,-0.49017)
+ New Polarization:       (0.2275,-0.48905,0.84207)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70114,-0.51782,-0.49017)
+ Old Polarization:       (0.2275,-0.48905,0.84207)
+ New Momentum Direction: (0.70114,-0.51782,0.49017)
+ New Polarization:       (-0.2275,0.48905,0.84207)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70114,-0.51782,0.49017)
+ Old Polarization:       (-0.2275,0.48905,0.84207)
+ New Momentum Direction: (-0.70114,-0.51782,0.49017)
+ New Polarization:       (-0.14027,-0.57384,-0.80686)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70114,-0.51782,0.49017)
+ Old Polarization:       (-0.14027,-0.57384,-0.80686)
+ New Momentum Direction: (-0.70114,0.51782,0.49017)
+ New Polarization:       (0.14027,-0.57384,0.80686)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70114,0.51782,0.49017)
+ Old Polarization:       (0.14027,-0.57384,0.80686)
+ New Momentum Direction: (-0.70114,0.51782,-0.49017)
+ New Polarization:       (-0.14027,0.57384,0.80686)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.70114,0.51782,-0.49017)
+Old Polarization: (-0.14027,0.57384,0.80686)
+New Polarization: (-0.30262,0.9531,-0.0050685)
+Polarization Change: (-0.30262,0.9531,-0.0050685)
+New Momentum Direction: (-0.045444,-0.01974,-0.99877)
+Momentum Change: (-0.045444,-0.01974,-0.99877)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.045444,-0.01974,-0.99877)
+ Old Polarization:       (-0.30262,0.9531,-0.0050685)
+ New Momentum Direction: (0.045444,-0.01974,-0.99877)
+ New Polarization:       (-0.30262,-0.9531,0.0050685)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.045444,-0.01974,-0.99877)
+ Old Polarization:       (-0.30262,-0.9531,0.0050685)
+ New Momentum Direction: (0.061722,-0.026811,-0.99773)
+ New Polarization:       (-0.26798,-0.96338,0.0093102)
+ *** FresnelRefraction *** 
+Track (trackID 1056, parentID 1) is processed with stopping code 2
+### pop requested out of 188 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.28364,-0.62155,0.73022)
+ Old Polarization:       (-0.77117,-0.60046,-0.21155)
+ New Momentum Direction: (0.28364,-0.62155,-0.73022)
+ New Polarization:       (0.86611,0.4929,-0.083122)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.28364,-0.62155,-0.73022)
+ Old Polarization:       (0.86611,0.4929,-0.083122)
+ New Momentum Direction: (0.28364,0.62155,-0.73022)
+ New Polarization:       (-0.86611,0.4929,0.083122)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.28364,0.62155,-0.73022)
+ Old Polarization:       (-0.86611,0.4929,0.083122)
+ New Momentum Direction: (-0.28364,0.62155,-0.73022)
+ New Polarization:       (-0.86611,-0.4929,-0.083122)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1055, parentID 1) is processed with stopping code 2
+### pop requested out of 187 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1054, parentID 1) is processed with stopping code 2
+### pop requested out of 186 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93553,-0.34904,0.054319)
+ Old Polarization:       (-0.052672,-0.28989,-0.95561)
+ New Momentum Direction: (0.87712,-0.47455,0.073852)
+ New Polarization:       (-0.097372,-0.3263,-0.94024)
+ *** FresnelRefraction *** 
+Track (trackID 1053, parentID 1) is processed with stopping code 2
+### pop requested out of 185 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1052, parentID 1) is processed with stopping code 2
+### pop requested out of 184 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1051, parentID 1) is processed with stopping code 2
+### pop requested out of 183 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.98786,-0.1543,0.017954)
+ Old Polarization:       (0.0060496,-0.077274,-0.99699)
+ New Momentum Direction: (0.9775,-0.20951,0.024377)
+ New Polarization:       (-0.011163,-0.1668,-0.98593)
+ *** FresnelRefraction *** 
+Track (trackID 1050, parentID 1) is processed with stopping code 2
+### pop requested out of 182 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1049, parentID 1) is processed with stopping code 2
+### pop requested out of 181 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6991,0.5981,0.39184)
+ Old Polarization:       (-0.31082,0.74772,-0.58678)
+ New Momentum Direction: (0.23881,0.81227,0.53215)
+ New Polarization:       (-0.58811,0.55705,-0.58636)
+ *** FresnelRefraction *** 
+Track (trackID 1048, parentID 1) is processed with stopping code 2
+### pop requested out of 180 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.92662,-0.36992,0.067315)
+ Old Polarization:       (-0.057654,-0.3167,-0.94677)
+ New Momentum Direction: (0.86098,-0.50043,0.091062)
+ New Polarization:       (-0.1056,-0.35099,-0.93041)
+ *** FresnelRefraction *** 
+Track (trackID 1047, parentID 1) is processed with stopping code 2
+### pop requested out of 179 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.96589,0.24369,0.087553)
+ Old Polarization:       (-0.0080261,0.36613,-0.93053)
+ New Momentum Direction: (0.9374,0.32774,0.11775)
+ New Polarization:       (-0.014576,0.37474,-0.92701)
+ *** FresnelRefraction *** 
+Track (trackID 1046, parentID 1) is processed with stopping code 2
+### pop requested out of 178 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.88059,0.43714,0.18295)
+ Old Polarization:       (-0.11333,0.56914,-0.81439)
+ New Momentum Direction: (0.76441,0.59474,0.24891)
+ New Polarization:       (-0.20886,0.59368,-0.77712)
+ *** FresnelRefraction *** 
+Track (trackID 1045, parentID 1) is processed with stopping code 2
+### pop requested out of 177 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1044, parentID 1) is processed with stopping code 2
+### pop requested out of 176 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.091552,0.045105,0.99478)
+ Old Polarization:       (-0.98609,0.14329,0.084255)
+ New Momentum Direction: (0.1233,0.060749,0.99051)
+ New Polarization:       (0.59249,0.7962,-0.12259)
+ *** FresnelRefraction *** 
+Track (trackID 1043, parentID 1) is processed with stopping code 2
+### pop requested out of 175 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1042, parentID 1) is processed with stopping code 2
+### pop requested out of 174 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29343,-0.64218,0.70816)
+ Old Polarization:       (-0.75481,-0.61022,-0.2406)
+ New Momentum Direction: (0.29343,-0.64218,-0.70816)
+ New Polarization:       (0.83478,0.53312,-0.13755)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29343,-0.64218,-0.70816)
+ Old Polarization:       (0.83478,0.53312,-0.13755)
+ New Momentum Direction: (0.29343,0.64218,-0.70816)
+ New Polarization:       (-0.83478,0.53312,0.13755)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.29343,0.64218,-0.70816)
+Old Polarization: (-0.83478,0.53312,0.13755)
+New Polarization: (0.038412,-0.87421,0.48402)
+Polarization Change: (0.038412,-0.87421,0.48402)
+New Momentum Direction: (-0.90701,0.17277,0.38403)
+Momentum Change: (-0.90701,0.17277,0.38403)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.90701,0.17277,0.38403)
+ Old Polarization:       (0.038412,-0.87421,0.48402)
+ New Momentum Direction: (-0.90701,0.17277,-0.38403)
+ New Polarization:       (-0.038412,0.87421,0.48402)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.90701,0.17277,-0.38403)
+ Old Polarization:       (-0.038412,0.87421,0.48402)
+ New Momentum Direction: (-0.8198,0.23494,-0.52223)
+ New Polarization:       (0.071866,0.94696,0.31321)
+ *** FresnelRefraction *** 
+Track (trackID 1041, parentID 1) is processed with stopping code 2
+### pop requested out of 173 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.37093,-0.67984,0.63264)
+ Old Polarization:       (-0.67389,-0.66578,-0.32033)
+ New Momentum Direction: (0.49976,-0.15388,0.85238)
+ New Polarization:       (-0.16102,0.95043,0.26599)
+ *** FresnelRefraction *** 
+Track (trackID 1040, parentID 1) is processed with stopping code 2
+### pop requested out of 172 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.89488,0.41266,0.17003)
+ Old Polarization:       (-0.094169,0.54696,-0.83185)
+ New Momentum Direction: (0.79643,0.55913,0.23038)
+ New Polarization:       (-0.17252,0.5752,-0.79961)
+ *** FresnelRefraction *** 
+Track (trackID 1039, parentID 1) is processed with stopping code 2
+### pop requested out of 171 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18204,0.35267,0.91787)
+ Old Polarization:       (-0.87787,0.4788,-0.0098654)
+ New Momentum Direction: (0.24718,0.47887,0.84237)
+ New Polarization:       (-0.87488,0.48399,-0.018422)
+ *** FresnelRefraction *** 
+Track (trackID 1038, parentID 1) is processed with stopping code 2
+### pop requested out of 170 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1037, parentID 1) is processed with stopping code 2
+### pop requested out of 169 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1036, parentID 1) is processed with stopping code 2
+### pop requested out of 168 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.55092,-0.71559,0.42945)
+Old Polarization: (-0.4733,-0.69172,-0.54544)
+New Polarization: (-0.53239,-0.47656,-0.6996)
+Polarization Change: (-0.53239,-0.47656,-0.6996)
+New Momentum Direction: (0.14707,-0.86597,0.47798)
+Momentum Change: (0.14707,-0.86597,0.47798)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.14707,-0.86597,0.47798)
+ Old Polarization:       (-0.53239,-0.47656,-0.6996)
+ New Momentum Direction: (0.19984,-0.73365,0.64948)
+ New Polarization:       (-0.0023591,0.66249,0.74907)
+ *** FresnelRefraction *** 
+Track (trackID 1035, parentID 1) is processed with stopping code 2
+### pop requested out of 167 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.22423,0.41726,0.88069)
+ Old Polarization:       (-0.83279,0.5514,-0.049216)
+ New Momentum Direction: (0.30398,0.56568,0.76655)
+ New Polarization:       (-0.81986,0.56514,-0.091916)
+ *** FresnelRefraction *** 
+Track (trackID 1034, parentID 1) is processed with stopping code 2
+### pop requested out of 166 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71626,-0.6455,0.26514)
+ Old Polarization:       (-0.29038,-0.62118,-0.72788)
+ New Momentum Direction: (-0.71626,-0.6455,0.26514)
+ New Polarization:       (-0.14753,0.51143,0.84657)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.71626,-0.6455,0.26514)
+ Old Polarization:       (-0.14753,0.51143,0.84657)
+ New Momentum Direction: (-0.71626,0.6455,0.26514)
+ New Polarization:       (0.14753,0.51143,-0.84657)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1033, parentID 1) is processed with stopping code 2
+### pop requested out of 165 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1032, parentID 1) is processed with stopping code 2
+### pop requested out of 164 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.72537,-0.64091,0.25113)
+Old Polarization: (-0.28233,-0.60973,-0.74062)
+New Polarization: (0.47392,0.5276,0.70501)
+Polarization Change: (0.47392,0.5276,0.70501)
+New Momentum Direction: (-0.8607,0.44666,0.24432)
+Momentum Change: (-0.8607,0.44666,0.24432)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.8607,0.44666,0.24432)
+ Old Polarization:       (0.47392,0.5276,0.70501)
+ New Momentum Direction: (-0.722,0.60701,0.33204)
+ New Polarization:       (0.66607,0.47988,0.57102)
+ *** FresnelRefraction *** 
+Track (trackID 1031, parentID 1) is processed with stopping code 2
+### pop requested out of 163 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.46229,0.61143,0.64221)
+Old Polarization: (-0.57015,0.75965,-0.31282)
+New Polarization: (0.53435,0.60706,-0.58817)
+Polarization Change: (0.53435,0.60706,-0.58817)
+New Momentum Direction: (-0.79988,0.5881,-0.11971)
+Momentum Change: (-0.79988,0.5881,-0.11971)
+
+** Photon absorbed! **
+Track (trackID 1030, parentID 1) is processed with stopping code 2
+### pop requested out of 162 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1029, parentID 1) is processed with stopping code 2
+### pop requested out of 161 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44616,-0.70894,0.54621)
+ Old Polarization:       (-0.58907,-0.6921,-0.41712)
+ New Momentum Direction: (0.60338,-0.30046,0.73869)
+ New Polarization:       (0.089914,0.94603,0.31135)
+ *** FresnelRefraction *** 
+Track (trackID 1028, parentID 1) is processed with stopping code 2
+### pop requested out of 160 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.078474,-0.019115,0.99673)
+ Old Polarization:       (-0.99428,0.071187,0.079646)
+ New Momentum Direction: (0.10629,-0.025889,0.994)
+ New Polarization:       (0.92918,-0.35333,-0.10856)
+ *** FresnelRefraction *** 
+Track (trackID 1027, parentID 1) is processed with stopping code 2
+### pop requested out of 159 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1026, parentID 1) is processed with stopping code 2
+### pop requested out of 158 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71707,0.59038,0.37049)
+ Old Polarization:       (-0.29176,0.73698,-0.6097)
+ New Momentum Direction: (0.31831,0.80297,0.5039)
+ New Polarization:       (-0.54632,0.58978,-0.59472)
+ *** FresnelRefraction *** 
+Track (trackID 1025, parentID 1) is processed with stopping code 2
+### pop requested out of 157 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.91622,-0.39291,0.078458)
+ Old Polarization:       (-0.06726,-0.34387,-0.93661)
+ New Momentum Direction: (0.84108,-0.53045,0.10592)
+ New Polarization:       (-0.12266,-0.37776,-0.91774)
+ *** FresnelRefraction *** 
+Track (trackID 1024, parentID 1) is processed with stopping code 2
+### pop requested out of 156 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1023, parentID 1) is processed with stopping code 2
+### pop requested out of 155 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1022, parentID 1) is processed with stopping code 2
+### pop requested out of 154 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18391,0.35574,0.91631)
+ Old Polarization:       (-0.87593,0.48231,-0.011439)
+ New Momentum Direction: (0.18391,0.35574,-0.91631)
+ New Polarization:       (0.89491,-0.44619,0.0063924)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18391,0.35574,-0.91631)
+ Old Polarization:       (0.89491,-0.44619,0.0063924)
+ New Momentum Direction: (0.18391,-0.35574,-0.91631)
+ New Polarization:       (-0.89491,-0.44619,-0.0063924)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18391,-0.35574,-0.91631)
+ Old Polarization:       (-0.89491,-0.44619,-0.0063924)
+ New Momentum Direction: (0.24969,-0.48297,-0.83928)
+ New Polarization:       (-0.87963,-0.4755,0.011939)
+ *** FresnelRefraction *** 
+Track (trackID 1021, parentID 1) is processed with stopping code 2
+### pop requested out of 153 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.31913,0.52688,0.78775)
+ Old Polarization:       (-0.72723,0.66914,-0.15294)
+ New Momentum Direction: (0.43355,0.7158,0.54742)
+ New Polarization:       (-0.70486,0.64786,-0.28888)
+ *** FresnelRefraction *** 
+Track (trackID 1020, parentID 1) is processed with stopping code 2
+### pop requested out of 152 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.079072,-0.17938,0.9806)
+ Old Polarization:       (-0.99258,-0.10528,0.060779)
+ New Momentum Direction: (0.10719,-0.24318,0.96404)
+ New Polarization:       (-0.67899,-0.72621,-0.10769)
+ *** FresnelRefraction *** 
+Track (trackID 1019, parentID 1) is processed with stopping code 2
+### pop requested out of 151 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.39301,0.57353,0.71876)
+ Old Polarization:       (-0.64794,0.72736,-0.2261)
+ New Momentum Direction: (0.53142,0.77551,0.34085)
+ New Polarization:       (-0.64408,0.63126,-0.43206)
+ *** FresnelRefraction *** 
+Track (trackID 1018, parentID 1) is processed with stopping code 2
+### pop requested out of 150 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 753, parentID 1) is processed with stopping code 2
-### pop requested out of 143 stacked tracks.
+Track (trackID 1017, parentID 1) is processed with stopping code 2
+### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73957,0.18379,-0.6475)
- Old Polarization:       (-0.67301,0.18777,-0.7154)
- New Momentum Direction: (0.40839,0.24925,-0.87812)
- New Polarization:       (-0.91276,0.10194,-0.39557)
+ Old Momentum Direction: (0.12508,-0.39933,0.90823)
+ Old Polarization:       (-0.93854,-0.34446,-0.022198)
+ New Momentum Direction: (0.17015,-0.54322,0.82217)
+ New Polarization:       (-0.93374,-0.35551,-0.041652)
  *** FresnelRefraction *** 
-Track (trackID 752, parentID 1) is processed with stopping code 2
-### pop requested out of 142 stacked tracks.
+Track (trackID 1016, parentID 1) is processed with stopping code 2
+### pop requested out of 148 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40024,-0.69739,0.59452)
+ Old Polarization:       (-0.63945,-0.67724,-0.36394)
+ New Momentum Direction: (0.40024,0.69739,0.59452)
+ New Polarization:       (0.070374,0.62344,-0.7787)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40024,0.69739,0.59452)
+ Old Polarization:       (0.070374,0.62344,-0.7787)
+ New Momentum Direction: (0.40024,0.69739,-0.59452)
+ New Polarization:       (-0.070374,-0.62344,-0.7787)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1015, parentID 1) is processed with stopping code 2
+### pop requested out of 147 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73693,0.25146,0.62746)
- Old Polarization:       (-0.67593,0.26364,0.6882)
- New Momentum Direction: (0.40504,0.34012,0.84868)
- New Polarization:       (-0.91427,0.14357,0.37881)
+ Old Momentum Direction: (0.48476,-0.71838,0.49894)
+ Old Polarization:       (-0.54571,-0.69421,-0.46934)
+ New Momentum Direction: (0.65893,-0.32535,0.6782)
+ New Polarization:       (0.19622,0.94475,0.26258)
  *** FresnelRefraction *** 
-Track (trackID 751, parentID 1) is processed with stopping code 2
-### pop requested out of 141 stacked tracks.
+Track (trackID 1014, parentID 1) is processed with stopping code 2
+### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74125,-0.53996,0.39874)
- Old Polarization:       (-0.67119,-0.60336,0.43066)
- New Momentum Direction: (0.40881,-0.73414,0.54214)
- New Polarization:       (-0.91259,-0.33365,0.23635)
+ Old Momentum Direction: (0.87299,-0.47451,0.11282)
+ Old Polarization:       (-0.11839,-0.43055,-0.89477)
+ New Momentum Direction: (0.75043,-0.64303,0.15289)
+ New Polarization:       (-0.21661,-0.4578,-0.86226)
  *** FresnelRefraction *** 
-Track (trackID 750, parentID 1) is processed with stopping code 2
-### pop requested out of 140 stacked tracks.
+Track (trackID 1013, parentID 1) is processed with stopping code 2
+### pop requested out of 145 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.84743,0.47921,0.22853)
+Old Polarization: (-0.14493,0.6229,-0.76876)
+New Polarization: (0.59944,-0.68983,0.40596)
+Polarization Change: (0.59944,-0.68983,0.40596)
+New Momentum Direction: (0.6285,0.091584,-0.7724)
+Momentum Change: (0.6285,0.091584,-0.7724)
+Scattering Photon!
+Old Momentum Direction: (0.6285,0.091584,-0.7724)
+Old Polarization: (0.59944,-0.68983,0.40596)
+New Polarization: (-0.42529,0.44448,-0.7884)
+Polarization Change: (-0.42529,0.44448,-0.7884)
+New Momentum Direction: (0.47565,-0.63133,-0.61251)
+Momentum Change: (0.47565,-0.63133,-0.61251)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.47565,-0.63133,-0.61251)
+ Old Polarization:       (-0.42529,0.44448,-0.7884)
+ New Momentum Direction: (0.47565,-0.63133,0.61251)
+ New Polarization:       (0.42529,-0.44448,-0.7884)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1012, parentID 1) is processed with stopping code 2
+### pop requested out of 144 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1011, parentID 1) is processed with stopping code 2
+### pop requested out of 143 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73182,0.39887,0.55258)
- Old Polarization:       (-0.68148,0.42133,0.59839)
- New Momentum Direction: (0.37575,0.5424,0.75141)
- New Polarization:       (-0.92671,0.21527,0.30802)
+ Old Momentum Direction: (0.79207,0.53797,0.28848)
+ Old Polarization:       (-0.20853,0.68261,-0.7004)
+ New Momentum Direction: (0.55993,0.73018,0.39155)
+ New Polarization:       (-0.38208,0.64689,-0.65996)
  *** FresnelRefraction *** 
-Track (trackID 749, parentID 1) is processed with stopping code 2
-### pop requested out of 139 stacked tracks.
+Track (trackID 1010, parentID 1) is processed with stopping code 2
+### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74653,-0.66224,-0.064319)
- Old Polarization:       (-0.66535,-0.74271,-0.075409)
- New Momentum Direction: (0.4331,-0.89712,-0.087131)
- New Polarization:       (-0.90134,-0.43086,-0.044077)
+ Old Momentum Direction: (0.15813,-0.44753,0.88018)
+ Old Polarization:       (-0.91221,-0.40743,-0.043275)
+ New Momentum Direction: (0.15813,-0.44753,-0.88018)
+ New Polarization:       (0.95253,0.304,0.01656)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.15813,-0.44753,-0.88018)
+ Old Polarization:       (0.95253,0.304,0.01656)
+ New Momentum Direction: (0.15813,0.44753,-0.88018)
+ New Polarization:       (-0.95253,0.304,-0.01656)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.15813,0.44753,-0.88018)
+ Old Polarization:       (-0.95253,0.304,-0.01656)
+ New Momentum Direction: (0.21287,0.60244,-0.76926)
+ New Polarization:       (-0.92952,0.3675,0.030593)
  *** FresnelRefraction *** 
-Track (trackID 748, parentID 1) is processed with stopping code 2
+Track (trackID 1009, parentID 1) is processed with stopping code 2
+### pop requested out of 141 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1008, parentID 1) is processed with stopping code 2
+### pop requested out of 140 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1007, parentID 1) is processed with stopping code 2
+### pop requested out of 139 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1006, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73408,0.63835,0.23159)
- Old Polarization:       (-0.67907,0.68992,0.25075)
- New Momentum Direction: (0.3942,0.86393,0.31343)
- New Polarization:       (-0.91903,0.37047,0.13471)
+ Old Momentum Direction: (0.1223,-0.38522,0.91469)
+ Old Polarization:       (-0.94363,-0.33073,-0.01311)
+ New Momentum Direction: (0.16603,-0.52293,0.83605)
+ New Polarization:       (-0.94088,-0.33786,-0.024478)
  *** FresnelRefraction *** 
-Track (trackID 747, parentID 1) is processed with stopping code 2
+Track (trackID 1005, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73128,0.61537,0.2942)
- Old Polarization:       (-0.68208,0.65895,0.31709)
- New Momentum Direction: (0.37597,0.836,0.39969)
- New Polarization:       (-0.92663,0.33867,0.16329)
- *** FresnelRefraction *** 
-Track (trackID 746, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1004, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73753,-0.22975,0.63503)
- Old Polarization:       (-0.67524,-0.26469,0.68847)
- New Momentum Direction: (0.39603,-0.3124,0.86346)
- New Polarization:       (-0.91819,-0.14399,0.36904)
+ Old Momentum Direction: (0.39919,-0.69249,0.60092)
+ Old Polarization:       (-0.64215,-0.67897,-0.35586)
+ New Momentum Direction: (0.53815,-0.23265,0.8101)
+ New Polarization:       (-0.061101,0.94785,0.3128)
  *** FresnelRefraction *** 
-Track (trackID 745, parentID 1) is processed with stopping code 2
+Track (trackID 1003, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 744, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.08992,0.016954,0.9958)
+ Old Polarization:       (-0.98984,0.11212,0.087472)
+ New Momentum Direction: (0.1209,0.022795,0.9924)
+ New Polarization:       (0.90952,0.39797,-0.11995)
+ *** FresnelRefraction *** 
+Track (trackID 1002, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 743, parentID 1) is processed with stopping code 2
+Track (trackID 1001, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73684,-0.023686,0.67566)
-Old Polarization: (-0.676,-0.039924,0.73582)
-New Polarization: (-0.53209,0.58607,0.3734)
-Polarization Change: (-0.60794,0.66962,0.42663)
-New Momentum Direction: (0.074033,0.52737,-0.72224)
-Momentum Change: (0.082502,0.5877,-0.80486)
 
 ** Photon absorbed! **
-Track (trackID 742, parentID 1) is processed with stopping code 2
+Track (trackID 1000, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73674,0.55195,0.3906)
-Old Polarization: (-0.67617,0.59888,0.42911)
-New Polarization: (-0.51624,0.66472,0.40044)
-Polarization Change: (-0.55388,0.71318,0.42964)
-New Momentum Direction: (0.093259,0.53651,-0.77036)
-Momentum Change: (0.098854,0.5687,-0.81658)
  Photon at Boundary! 
- Old Momentum Direction: (0.098854,0.5687,-0.81658)
- Old Polarization:       (-0.55388,0.71318,0.42964)
- New Momentum Direction: (0.098854,-0.5687,-0.81658)
- New Polarization:       (0.55388,0.71318,-0.42964)
+ Old Momentum Direction: (0.6937,-0.66047,0.28733)
+ Old Polarization:       (-0.31545,-0.63722,-0.70317)
+ New Momentum Direction: (-0.6937,-0.66047,0.28733)
+ New Polarization:       (-0.21415,0.57002,0.79323)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6937,-0.66047,0.28733)
+ Old Polarization:       (-0.21415,0.57002,0.79323)
+ New Momentum Direction: (-0.6937,0.66047,0.28733)
+ New Polarization:       (0.21415,0.57002,-0.79323)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 741, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (-0.6937,0.66047,0.28733)
+Old Polarization: (0.21415,0.57002,-0.79323)
+New Polarization: (0.12498,0.96221,-0.24192)
+Polarization Change: (0.12498,0.96221,-0.24192)
+New Momentum Direction: (0.18438,-0.26211,-0.94726)
+Momentum Change: (0.18438,-0.26211,-0.94726)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18438,-0.26211,-0.94726)
+ Old Polarization:       (0.12498,0.96221,-0.24192)
+ New Momentum Direction: (0.24956,-0.35477,-0.90103)
+ New Polarization:       (0.87669,-0.3124,0.36582)
+ *** FresnelRefraction *** 
+Track (trackID 999, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7331,0.54801,0.4028)
- Old Polarization:       (-0.68011,0.588,0.43784)
- New Momentum Direction: (0.38707,0.74295,0.54609)
- New Polarization:       (-0.92205,0.31007,0.2317)
+ Old Momentum Direction: (0.85785,-0.49582,0.13507)
+ Old Polarization:       (-0.12914,-0.46239,-0.87722)
+ New Momentum Direction: (0.72268,-0.66689,0.18167)
+ New Polarization:       (-0.23302,-0.48252,-0.84432)
  *** FresnelRefraction *** 
-Track (trackID 740, parentID 1) is processed with stopping code 2
+Track (trackID 998, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73989,0.32607,-0.58843)
- Old Polarization:       (-0.67266,0.34589,-0.65413)
- New Momentum Direction: (0.41447,0.44111,-0.79602)
- New Polarization:       (-0.91002,0.19226,-0.36729)
- *** FresnelRefraction *** 
-Track (trackID 739, parentID 1) is processed with stopping code 2
-### pop requested out of 129 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 738, parentID 1) is processed with stopping code 2
-### pop requested out of 128 stacked tracks.
+Track (trackID 997, parentID 1) is processed with stopping code 2
+### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74662,-0.5421,-0.3856)
- Old Polarization:       (-0.66525,-0.61091,-0.42922)
- New Momentum Direction: (0.43395,-0.73415,-0.52221)
- New Polarization:       (-0.90093,-0.35533,-0.24912)
+ Old Momentum Direction: (0.079813,-0.064096,0.99475)
+ Old Polarization:       (-0.99646,0.02143,0.081331)
+ New Momentum Direction: (0.10775,-0.086532,0.9904)
+ New Polarization:       (0.3638,-0.92368,-0.12028)
  *** FresnelRefraction *** 
-Track (trackID 737, parentID 1) is processed with stopping code 2
-### pop requested out of 127 stacked tracks.
+Track (trackID 996, parentID 1) is processed with stopping code 2
+### pop requested out of 128 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74298,-0.53089,0.4076)
- Old Polarization:       (-0.66926,-0.59669,0.44277)
- New Momentum Direction: (0.41955,-0.72,0.55279)
- New Polarization:       (-0.9077,-0.3378,0.24894)
+ Old Momentum Direction: (0.091342,-0.2814,0.95523)
+ Old Polarization:       (-0.97596,-0.21592,0.029717)
+ New Momentum Direction: (0.12419,-0.38259,0.91553)
+ New Polarization:       (-0.90351,-0.42501,-0.055046)
  *** FresnelRefraction *** 
-Track (trackID 736, parentID 1) is processed with stopping code 2
-### pop requested out of 126 stacked tracks.
+Track (trackID 995, parentID 1) is processed with stopping code 2
+### pop requested out of 127 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 735, parentID 1) is processed with stopping code 2
-### pop requested out of 125 stacked tracks.
+Track (trackID 994, parentID 1) is processed with stopping code 2
+### pop requested out of 126 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74025,-0.095729,0.66548)
- Old Polarization:       (-0.67226,-0.11979,0.73056)
- New Momentum Direction: (0.41645,-0.12945,0.8999)
- New Polarization:       (-0.90911,-0.069084,0.41078)
- *** FresnelRefraction *** 
-Track (trackID 734, parentID 1) is processed with stopping code 2
-### pop requested out of 124 stacked tracks.
+ Old Momentum Direction: (0.44785,0.59872,0.66405)
+ Old Polarization:       (-0.58747,0.75692,-0.28626)
+ New Momentum Direction: (0.44785,0.59872,-0.66405)
+ New Polarization:       (0.58747,-0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,0.59872,-0.66405)
+ Old Polarization:       (0.58747,-0.75692,-0.28626)
+ New Momentum Direction: (0.44785,-0.59872,-0.66405)
+ New Polarization:       (-0.58747,-0.75692,0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,-0.59872,-0.66405)
+ Old Polarization:       (-0.58747,-0.75692,0.28626)
+ New Momentum Direction: (-0.44785,-0.59872,-0.66405)
+ New Polarization:       (-0.58747,0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44785,-0.59872,-0.66405)
+ Old Polarization:       (-0.58747,0.75692,-0.28626)
+ New Momentum Direction: (-0.44785,-0.59872,0.66405)
+ New Polarization:       (0.58747,-0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44785,-0.59872,0.66405)
+ Old Polarization:       (0.58747,-0.75692,-0.28626)
+ New Momentum Direction: (-0.44785,0.59872,0.66405)
+ New Polarization:       (-0.58747,-0.75692,0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44785,0.59872,0.66405)
+ Old Polarization:       (-0.58747,-0.75692,0.28626)
+ New Momentum Direction: (0.44785,0.59872,0.66405)
+ New Polarization:       (-0.58747,0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,0.59872,0.66405)
+ Old Polarization:       (-0.58747,0.75692,-0.28626)
+ New Momentum Direction: (0.44785,0.59872,-0.66405)
+ New Polarization:       (0.58747,-0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,0.59872,-0.66405)
+ Old Polarization:       (0.58747,-0.75692,-0.28626)
+ New Momentum Direction: (0.44785,-0.59872,-0.66405)
+ New Polarization:       (-0.58747,-0.75692,0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,-0.59872,-0.66405)
+ Old Polarization:       (-0.58747,-0.75692,0.28626)
+ New Momentum Direction: (0.44785,0.59872,-0.66405)
+ New Polarization:       (0.58747,-0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,0.59872,-0.66405)
+ Old Polarization:       (0.58747,-0.75692,-0.28626)
+ New Momentum Direction: (0.44785,-0.59872,-0.66405)
+ New Polarization:       (-0.58747,-0.75692,0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,-0.59872,-0.66405)
+ Old Polarization:       (-0.58747,-0.75692,0.28626)
+ New Momentum Direction: (0.44785,-0.59872,0.66405)
+ New Polarization:       (0.58747,0.75692,0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44785,-0.59872,0.66405)
+ Old Polarization:       (0.58747,0.75692,0.28626)
+ New Momentum Direction: (-0.44785,-0.59872,0.66405)
+ New Polarization:       (0.58747,-0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44785,-0.59872,0.66405)
+ Old Polarization:       (0.58747,-0.75692,-0.28626)
+ New Momentum Direction: (-0.44785,0.59872,0.66405)
+ New Polarization:       (-0.58747,-0.75692,0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44785,0.59872,0.66405)
+ Old Polarization:       (-0.58747,-0.75692,0.28626)
+ New Momentum Direction: (-0.44785,0.59872,-0.66405)
+ New Polarization:       (0.58747,0.75692,0.28626)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44785,0.59872,-0.66405)
+ Old Polarization:       (0.58747,0.75692,0.28626)
+ New Momentum Direction: (0.44785,0.59872,-0.66405)
+ New Polarization:       (0.58747,-0.75692,-0.28626)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.44785,0.59872,-0.66405)
+Old Polarization: (0.58747,-0.75692,-0.28626)
+New Polarization: (0.68998,-0.72272,0.040107)
+Polarization Change: (0.68998,-0.72272,0.040107)
+New Momentum Direction: (0.18228,0.22711,0.95666)
+Momentum Change: (0.18228,0.22711,0.95666)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18228,0.22711,0.95666)
+ Old Polarization:       (0.68998,-0.72272,0.040107)
+ New Momentum Direction: (0.18228,-0.22711,0.95666)
+ New Polarization:       (-0.68998,-0.72272,-0.040107)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 733, parentID 1) is processed with stopping code 2
-### pop requested out of 123 stacked tracks.
+Track (trackID 993, parentID 1) is processed with stopping code 2
+### pop requested out of 125 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73438,0.36577,0.57175)
- Old Polarization:       (-0.67871,0.38792,0.6236)
- New Momentum Direction: (0.39176,0.49582,0.77504)
- New Polarization:       (-0.92005,0.20585,0.33337)
+ Old Momentum Direction: (0.077073,-0.18179,0.98031)
+ Old Polarization:       (-0.99253,-0.10726,0.058142)
+ New Momentum Direction: (0.1047,-0.24694,0.96336)
+ New Polarization:       (-0.70343,-0.70314,-0.10379)
  *** FresnelRefraction *** 
-Track (trackID 732, parentID 1) is processed with stopping code 2
-### pop requested out of 122 stacked tracks.
+Track (trackID 992, parentID 1) is processed with stopping code 2
+### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7324,0.61906,0.28347)
- Old Polarization:       (-0.68087,0.66524,0.30639)
- New Momentum Direction: (0.3834,0.83973,0.38452)
- New Polarization:       (-0.92358,0.34814,0.16061)
+ Old Momentum Direction: (0.89521,-0.43515,0.096158)
+ Old Polarization:       (-0.091215,-0.39012,-0.91623)
+ New Momentum Direction: (0.79846,-0.58787,0.12991)
+ New Polarization:       (-0.16627,-0.4227,-0.89088)
  *** FresnelRefraction *** 
-Track (trackID 731, parentID 1) is processed with stopping code 2
-### pop requested out of 121 stacked tracks.
+Track (trackID 991, parentID 1) is processed with stopping code 2
+### pop requested out of 123 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 730, parentID 1) is processed with stopping code 2
-### pop requested out of 120 stacked tracks.
+Track (trackID 990, parentID 1) is processed with stopping code 2
+### pop requested out of 122 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 729, parentID 1) is processed with stopping code 2
-### pop requested out of 119 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73393,0.58602,0.34341)
-Old Polarization: (-0.67922,0.63165,0.37372)
-New Polarization: (-0.38612,0.58285,0.54792)
-Polarization Change: (-0.43469,0.65616,0.61684)
-New Momentum Direction: (-0.81412,-0.088398,-0.47967)
-Momentum Change: (-0.85783,-0.093143,-0.50542)
+Track (trackID 989, parentID 1) is processed with stopping code 2
+### pop requested out of 121 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.85783,-0.093143,-0.50542)
- Old Polarization:       (-0.43469,0.65616,0.61684)
- New Momentum Direction: (-0.71822,-0.12611,-0.6843)
- New Polarization:       (0.63366,0.28774,-0.7181)
+ Old Momentum Direction: (0.34112,0.5443,0.7664)
+ Old Polarization:       (-0.7033,0.68874,-0.17611)
+ New Momentum Direction: (0.46327,0.7392,0.48884)
+ New Polarization:       (-0.68357,0.64911,-0.33374)
  *** FresnelRefraction *** 
+Track (trackID 988, parentID 1) is processed with stopping code 2
+### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.71822,-0.12611,-0.6843)
- Old Polarization:       (0.63366,0.28774,-0.7181)
- New Momentum Direction: (-0.53048,-0.093143,-0.84256)
- New Polarization:       (-0.84749,0.080313,0.5247)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.50654,0.62203,0.59707)
+ Old Polarization:       (-0.52187,0.77242,-0.36197)
+ New Momentum Direction: (0.50654,-0.62203,0.59707)
+ New Polarization:       (0.52187,0.77242,0.36197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50654,-0.62203,0.59707)
+ Old Polarization:       (0.52187,0.77242,0.36197)
+ New Momentum Direction: (0.50654,-0.62203,-0.59707)
+ New Polarization:       (-0.52187,-0.77242,0.36197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50654,-0.62203,-0.59707)
+ Old Polarization:       (-0.52187,-0.77242,0.36197)
+ New Momentum Direction: (-0.50654,-0.62203,-0.59707)
+ New Polarization:       (-0.52187,0.77242,-0.36197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.50654,-0.62203,-0.59707)
+ Old Polarization:       (-0.52187,0.77242,-0.36197)
+ New Momentum Direction: (-0.50654,0.62203,-0.59707)
+ New Polarization:       (0.52187,0.77242,0.36197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.50654,0.62203,-0.59707)
+ Old Polarization:       (0.52187,0.77242,0.36197)
+ New Momentum Direction: (-0.50654,0.62203,0.59707)
+ New Polarization:       (-0.52187,-0.77242,0.36197)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 987, parentID 1) is processed with stopping code 2
+### pop requested out of 119 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.53048,-0.093143,-0.84256)
- Old Polarization:       (-0.84749,0.080313,0.5247)
- New Momentum Direction: (-0.71822,-0.12611,-0.6843)
- New Polarization:       (-0.6932,0.044395,0.71938)
+ Old Momentum Direction: (0.30309,-0.64018,0.70591)
+ Old Polarization:       (-0.74839,-0.61849,-0.23957)
+ New Momentum Direction: (0.4092,-0.8643,0.29246)
+ New Polarization:       (-0.73203,-0.50231,-0.46024)
  *** FresnelRefraction *** 
-Track (trackID 728, parentID 1) is processed with stopping code 2
+Track (trackID 986, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73279,0.21116,0.64686)
-Old Polarization: (-0.68041,0.21617,0.70022)
-New Polarization: (-0.74119,0.32756,0.35222)
-Polarization Change: (-0.83885,0.37072,0.39862)
-New Momentum Direction: (0.38542,0.013114,0.79886)
-Momentum Change: (0.43448,0.014784,0.90056)
- Photon at Boundary! 
- Old Momentum Direction: (0.43448,0.014784,0.90056)
- Old Polarization:       (-0.83885,0.37072,0.39862)
- New Momentum Direction: (0.59122,0.020117,0.80626)
- New Polarization:       (0.75848,0.32595,-0.56432)
+Old Momentum Direction: (0.07549,-0.018413,0.99698)
+Old Polarization: (-0.99447,0.071777,0.076626)
+New Polarization: (-0.93869,-0.09756,0.33067)
+Polarization Change: (-0.93869,-0.09756,0.33067)
+New Momentum Direction: (0.32939,-0.53697,0.77664)
+Momentum Change: (0.32939,-0.53697,0.77664)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.32939,-0.53697,0.77664)
+ Old Polarization:       (-0.93869,-0.09756,0.33067)
+ New Momentum Direction: (0.44737,-0.72929,0.51769)
+ New Polarization:       (-0.45674,-0.68397,-0.56884)
  *** FresnelRefraction *** 
-Track (trackID 727, parentID 1) is processed with stopping code 2
+Track (trackID 985, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 726, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63625,-0.68923,0.34662)
+ Old Polarization:       (-0.37868,-0.67045,-0.63804)
+ New Momentum Direction: (0.86037,-0.20018,0.46871)
+ New Polarization:       (0.28929,0.94895,-0.12574)
+ *** FresnelRefraction *** 
+Track (trackID 984, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73524,0.63544,-0.23587)
- Old Polarization:       (-0.67778,0.68605,-0.2645)
- New Momentum Direction: (0.39724,0.86035,-0.31936)
- New Polarization:       (-0.9177,0.37024,-0.14407)
+ Old Momentum Direction: (0.21334,-0.5587,0.80146)
+ Old Polarization:       (-0.84298,-0.51993,-0.13805)
+ New Momentum Direction: (0.28989,-0.75916,0.58278)
+ New Polarization:       (-0.81835,-0.51236,-0.26037)
  *** FresnelRefraction *** 
-Track (trackID 725, parentID 1) is processed with stopping code 2
+Track (trackID 983, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74477,-0.66309,0.075078)
- Old Polarization:       (-0.66731,-0.74072,0.077662)
- New Momentum Direction: (0.42404,-0.89989,0.10189)
- New Polarization:       (-0.90563,-0.42182,0.043553)
+ Old Momentum Direction: (0.26587,0.47624,0.83816)
+ Old Polarization:       (-0.78469,0.61196,-0.098807)
+ New Momentum Direction: (0.36169,0.64788,0.67039)
+ New Polarization:       (-0.7632,0.61875,-0.18621)
  *** FresnelRefraction *** 
-Track (trackID 724, parentID 1) is processed with stopping code 2
+Track (trackID 982, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74126,0.13054,0.6584)
- Old Polarization:       (-0.67116,0.13147,0.72956)
- New Momentum Direction: (0.42787,0.17578,0.88658)
- New Polarization:       (-0.90381,0.074509,0.42141)
+ Old Momentum Direction: (0.21137,-0.55767,0.8027)
+ Old Polarization:       (-0.84446,-0.51772,-0.13732)
+ New Momentum Direction: (0.28746,-0.75843,0.58494)
+ New Polarization:       (-0.81966,-0.51074,-0.25941)
  *** FresnelRefraction *** 
-Track (trackID 723, parentID 1) is processed with stopping code 2
+Track (trackID 981, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73893,0.6713,-0.057768)
- Old Polarization:       (-0.67377,0.7357,-0.069197)
- New Momentum Direction: (0.42189,0.90331,-0.077734)
- New Polarization:       (-0.90664,0.41999,-0.040179)
+ Old Momentum Direction: (0.75208,-0.6199,0.22384)
+ Old Polarization:       (-0.25352,-0.58559,-0.76995)
+ New Momentum Direction: (0.44318,-0.84315,0.30445)
+ New Polarization:       (-0.46868,-0.50744,-0.72308)
  *** FresnelRefraction *** 
-Track (trackID 722, parentID 1) is processed with stopping code 2
+Track (trackID 980, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73811,-0.087641,0.66897)
- Old Polarization:       (-0.67461,-0.11021,0.7299)
- New Momentum Direction: (0.40374,-0.11884,0.90712)
- New Polarization:       (-0.91483,-0.062124,0.39903)
+ Old Momentum Direction: (0.27537,-0.62332,0.73188)
+ Old Polarization:       (-0.77623,-0.59329,-0.21324)
+ New Momentum Direction: (0.37348,-0.84539,0.38187)
+ New Polarization:       (-0.75288,-0.51673,-0.40763)
  *** FresnelRefraction *** 
-Track (trackID 721, parentID 1) is processed with stopping code 2
+Track (trackID 979, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73344,0.67132,0.10678)
- Old Polarization:       (-0.67975,0.7247,0.11286)
- New Momentum Direction: (0.38992,0.90942,0.14465)
- New Polarization:       (-0.92085,0.38533,0.05967)
+ Old Momentum Direction: (0.088275,-0.2508,0.964)
+ Old Polarization:       (-0.98207,-0.18372,0.04213)
+ New Momentum Direction: (0.11971,-0.34012,0.93273)
+ New Polarization:       (-0.85533,-0.51233,-0.077044)
  *** FresnelRefraction *** 
-Track (trackID 720, parentID 1) is processed with stopping code 2
+Track (trackID 978, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73312,0.43245,0.5249)
- Old Polarization:       (-0.68008,0.46009,0.57079)
- New Momentum Direction: (0.38506,0.58683,0.71229)
- New Polarization:       (-0.92288,0.24078,0.30053)
+ Old Momentum Direction: (0.85654,-0.49873,0.1327)
+ Old Polarization:       (-0.13316,-0.462,-0.87683)
+ New Momentum Direction: (0.71768,-0.67296,0.17906)
+ New Polarization:       (-0.24161,-0.48179,-0.84232)
  *** FresnelRefraction *** 
-Track (trackID 719, parentID 1) is processed with stopping code 2
+Track (trackID 977, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73498,0.66794,-0.11688)
- Old Polarization:       (-0.67807,0.72276,-0.13357)
- New Momentum Direction: (0.39755,0.90384,-0.15816)
- New Polarization:       (-0.91757,0.39079,-0.073177)
+ Old Momentum Direction: (0.3034,0.51261,0.80323)
+ Old Polarization:       (-0.74451,0.65363,-0.13593)
+ New Momentum Direction: (0.41215,0.69636,0.58755)
+ New Polarization:       (-0.72156,0.64321,-0.25618)
  *** FresnelRefraction *** 
-Track (trackID 718, parentID 1) is processed with stopping code 2
+Track (trackID 976, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 717, parentID 1) is processed with stopping code 2
+Track (trackID 975, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73696,0.20023,-0.6456)
- Old Polarization:       (-0.67586,0.20428,-0.70815)
- New Momentum Direction: (0.39258,0.27245,-0.87844)
- New Polarization:       (-0.91967,0.10691,-0.37785)
- *** FresnelRefraction *** 
-Track (trackID 716, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.43983,0.59089,0.67631)
+ Old Polarization:       (-0.5974,0.75479,-0.27094)
+ New Momentum Direction: (0.43983,0.59089,-0.67631)
+ New Polarization:       (0.64786,-0.73028,-0.21671)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.43983,0.59089,-0.67631)
+ Old Polarization:       (0.64786,-0.73028,-0.21671)
+ New Momentum Direction: (0.43983,-0.59089,-0.67631)
+ New Polarization:       (-0.64786,-0.73028,0.21671)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.43983,-0.59089,-0.67631)
+ Old Polarization:       (-0.64786,-0.73028,0.21671)
+ New Momentum Direction: (-0.43983,-0.59089,-0.67631)
+ New Polarization:       (-0.64786,0.73028,-0.21671)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.43983,-0.59089,-0.67631)
+ Old Polarization:       (-0.64786,0.73028,-0.21671)
+ New Momentum Direction: (-0.43983,-0.59089,0.67631)
+ New Polarization:       (0.87417,-0.45429,0.1716)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.43983,-0.59089,0.67631)
+ Old Polarization:       (0.87417,-0.45429,0.1716)
+ New Momentum Direction: (-0.43983,0.59089,0.67631)
+ New Polarization:       (-0.87417,-0.45429,-0.1716)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 974, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74155,0.02119,-0.67057)
- Old Polarization:       (-0.67083,0.0092986,-0.74155)
- New Momentum Direction: (0.41594,0.028723,-0.90894)
- New Polarization:       (-0.90935,0.0035674,-0.41602)
+ Old Momentum Direction: (0.7509,0.56898,0.33528)
+ Old Polarization:       (-0.25355,0.71715,-0.64916)
+ New Momentum Direction: (0.44388,0.77202,0.45493)
+ New Polarization:       (-0.46655,0.63256,-0.61823)
  *** FresnelRefraction *** 
-Track (trackID 715, parentID 1) is processed with stopping code 2
+Track (trackID 973, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74164,0.4967,-0.45084)
- Old Polarization:       (-0.67074,0.54042,-0.50799)
- New Momentum Direction: (0.42999,0.66852,-0.60679)
- New Polarization:       (-0.9028,0.31241,-0.29557)
+ Old Momentum Direction: (0.13832,-0.42796,0.89315)
+ Old Polarization:       (-0.92544,-0.37705,-0.037341)
+ New Momentum Direction: (0.18789,-0.58133,0.79168)
+ New Polarization:       (-0.91739,-0.39178,-0.069953)
  *** FresnelRefraction *** 
-Track (trackID 714, parentID 1) is processed with stopping code 2
+Track (trackID 972, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74455,0.2763,-0.6077)
- Old Polarization:       (-0.66749,0.29467,-0.68383)
- New Momentum Direction: (0.43986,0.3717,-0.81754)
- New Polarization:       (-0.89802,0.17277,-0.40461)
- *** FresnelRefraction *** 
-Track (trackID 713, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (0.72354,0.58512,0.36622)
+Old Polarization: (-0.2834,0.73557,-0.61532)
+New Polarization: (-0.20101,0.64839,-0.73429)
+Polarization Change: (-0.20101,0.64839,-0.73429)
+New Momentum Direction: (0.50651,-0.57281,-0.64446)
+Momentum Change: (0.50651,-0.57281,-0.64446)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50651,-0.57281,-0.64446)
+ Old Polarization:       (-0.20101,0.64839,-0.73429)
+ New Momentum Direction: (-0.50651,-0.57281,-0.64446)
+ New Polarization:       (-0.20101,-0.64839,0.73429)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 971, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7466,-0.6567,0.10644)
- Old Polarization:       (-0.66526,-0.73806,0.11271)
- New Momentum Direction: (0.435,-0.88883,0.14406)
- New Polarization:       (-0.90042,-0.43013,0.064997)
+ Old Momentum Direction: (0.75359,-0.61436,0.23383)
+ Old Polarization:       (-0.24646,-0.59382,-0.76592)
+ New Momentum Direction: (0.46564,-0.8271,0.3148)
+ New Polarization:       (-0.44618,-0.5266,-0.72361)
  *** FresnelRefraction *** 
-Track (trackID 712, parentID 1) is processed with stopping code 2
+Track (trackID 970, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74464,-0.31748,0.58712)
- Old Polarization:       (-0.66739,-0.36699,0.648)
- New Momentum Direction: (0.43574,-0.42812,0.79173)
- New Polarization:       (-0.90003,-0.21606,0.37851)
- *** FresnelRefraction *** 
-Track (trackID 711, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 969, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74896,-0.63067,0.20327)
- Old Polarization:       (-0.66259,-0.71551,0.22141)
- New Momentum Direction: (0.44942,-0.85025,0.27404)
- New Polarization:       (-0.89331,-0.42959,0.13212)
- *** FresnelRefraction *** 
-Track (trackID 710, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 968, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74522,-0.32206,-0.58389)
- Old Polarization:       (-0.66679,-0.36869,-0.64766)
- New Momentum Direction: (0.42966,-0.43613,-0.79068)
- New Polarization:       (-0.90297,-0.21349,-0.37292)
+ Old Momentum Direction: (0.39195,0.57812,0.71565)
+ Old Polarization:       (-0.64759,0.7259,-0.23173)
+ New Momentum Direction: (0.53227,0.78509,0.31674)
+ New Polarization:       (-0.64508,0.61841,-0.44882)
  *** FresnelRefraction *** 
-Track (trackID 709, parentID 1) is processed with stopping code 2
+Track (trackID 967, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 708, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.99825,-0.055116,0.021651)
+ Old Polarization:       (0.023407,0.031415,-0.99923)
+ New Momentum Direction: (0.9968,-0.074438,0.029241)
+ New Polarization:       (-0.040193,-0.78237,-0.62152)
+ *** FresnelRefraction *** 
+Track (trackID 966, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74235,-0.1671,-0.64884)
- Old Polarization:       (-0.66996,-0.19711,-0.71575)
- New Momentum Direction: (0.41616,-0.22678,-0.88056)
- New Polarization:       (-0.90926,-0.11189,-0.4009)
+ Old Momentum Direction: (0.9797,0.19216,0.05708)
+ Old Polarization:       (-0.0037632,0.30233,-0.9532)
+ New Momentum Direction: (0.96219,0.26111,0.077563)
+ New Polarization:       (-0.0069666,0.30825,-0.95128)
  *** FresnelRefraction *** 
-Track (trackID 707, parentID 1) is processed with stopping code 2
+Track (trackID 965, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73351,0.67848,-0.040332)
- Old Polarization:       (-0.67967,0.73188,-0.04897)
- New Momentum Direction: (0.38923,0.91952,-0.054661)
- New Polarization:       (-0.92113,0.38833,-0.026759)
+ Old Momentum Direction: (0.98372,0.16902,0.061038)
+ Old Polarization:       (0.01107,0.28202,-0.95934)
+ New Momentum Direction: (0.97031,0.22749,0.082155)
+ New Polarization:       (-0.020063,0.4142,-0.90997)
  *** FresnelRefraction *** 
-Track (trackID 706, parentID 1) is processed with stopping code 2
+Track (trackID 964, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40956,0.57996,0.70421)
+ Old Polarization:       (-0.63033,0.73793,-0.24113)
+ New Momentum Direction: (0.40956,0.57996,-0.70421)
+ New Polarization:       (0.72367,-0.67655,-0.1363)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40956,0.57996,-0.70421)
+ Old Polarization:       (0.72367,-0.67655,-0.1363)
+ New Momentum Direction: (0.40956,-0.57996,-0.70421)
+ New Polarization:       (-0.72367,-0.67655,0.1363)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 705, parentID 1) is processed with stopping code 2
+Track (trackID 963, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73879,0.017678,-0.6737)
- Old Polarization:       (-0.67387,0.0053416,-0.73883)
- New Momentum Direction: (0.39896,0.024054,-0.91665)
- New Polarization:       (-0.91693,0.0010486,-0.39905)
+ Old Momentum Direction: (0.087087,0.056024,0.99462)
+ Old Polarization:       (-0.985,0.15411,0.077564)
+ New Momentum Direction: (0.11793,0.075863,0.99012)
+ New Polarization:       (0.40157,0.90827,-0.11742)
  *** FresnelRefraction *** 
-Track (trackID 704, parentID 1) is processed with stopping code 2
+Track (trackID 962, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.73356,0.56191,-0.38229)
-Old Polarization: (-0.67958,0.59991,-0.42224)
-New Polarization: (-0.27417,0.6895,-0.46657)
-Polarization Change: (-0.3128,0.78664,-0.53231)
-New Momentum Direction: (-0.3424,-0.56311,-0.63096)
-Momentum Change: (-0.37528,-0.61719,-0.69155)
  Photon at Boundary! 
- Old Momentum Direction: (-0.37528,-0.61719,-0.69155)
- Old Polarization:       (-0.3128,0.78664,-0.53231)
- New Momentum Direction: (-0.51006,-0.83885,-0.19019)
- New Polarization:       (-0.50758,0.11503,0.85389)
+ Old Momentum Direction: (0.99456,-0.1027,0.017565)
+ Old Polarization:       (0.015494,-0.020926,-0.99966)
+ New Momentum Direction: (0.98998,-0.13918,0.023804)
+ New Polarization:       (-0.028215,-0.36017,-0.93246)
  *** FresnelRefraction *** 
-Track (trackID 703, parentID 1) is processed with stopping code 2
+Track (trackID 961, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 702, parentID 1) is processed with stopping code 2
-### pop requested out of 92 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73483,0.64963,-0.19496)
- Old Polarization:       (-0.67823,0.70136,-0.21932)
- New Momentum Direction: (0.39539,0.87975,-0.26402)
- New Polarization:       (-0.9185,0.37705,-0.11912)
+ Old Momentum Direction: (0.91334,-0.39982,0.077209)
+ Old Polarization:       (-0.073601,-0.34857,-0.93439)
+ New Momentum Direction: (0.8341,-0.5416,0.10459)
+ New Polarization:       (-0.13498,-0.38424,-0.91331)
  *** FresnelRefraction *** 
-Track (trackID 701, parentID 1) is processed with stopping code 2
+Track (trackID 960, parentID 1) is processed with stopping code 2
+### pop requested out of 92 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.38056,-0.69414,0.61102)
+Old Polarization: (-0.65953,-0.66688,-0.34683)
+New Polarization: (-0.93706,0.11142,0.33091)
+Polarization Change: (-0.93706,0.11142,0.33091)
+New Momentum Direction: (-0.28515,-0.79116,-0.54108)
+Momentum Change: (-0.28515,-0.79116,-0.54108)
+
+** Photon absorbed! **
+Track (trackID 959, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75049,-0.66065,-0.017291)
- Old Polarization:       (-0.66087,-0.75012,-0.02393)
- New Momentum Direction: (0.45536,-0.89,-0.023294)
- New Polarization:       (-0.8903,-0.45512,-0.014879)
+ Old Momentum Direction: (0.43867,-0.70321,0.55952)
+ Old Polarization:       (-0.59849,-0.69307,-0.40183)
+ New Momentum Direction: (0.43867,0.70321,0.55952)
+ New Polarization:       (-0.092256,0.65458,-0.75034)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.43867,0.70321,0.55952)
+ Old Polarization:       (-0.092256,0.65458,-0.75034)
+ New Momentum Direction: (0.43867,0.70321,-0.55952)
+ New Polarization:       (0.092256,-0.65458,-0.75034)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.43867,0.70321,-0.55952)
+ Old Polarization:       (0.092256,-0.65458,-0.75034)
+ New Momentum Direction: (-0.43867,0.70321,-0.55952)
+ New Polarization:       (0.092256,0.65458,0.75034)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.43867,0.70321,-0.55952)
+ Old Polarization:       (0.092256,0.65458,0.75034)
+ New Momentum Direction: (-0.5906,0.28932,-0.75332)
+ New Polarization:       (-0.38303,-0.92216,-0.053872)
  *** FresnelRefraction *** 
-Track (trackID 700, parentID 1) is processed with stopping code 2
+Track (trackID 958, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 699, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.16739,0.32774,0.92982)
+ Old Polarization:       (-0.89285,0.45035,0.0019923)
+ New Momentum Direction: (0.22756,0.44556,0.86585)
+ New Polarization:       (-0.88762,0.46057,-0.0037224)
+ *** FresnelRefraction *** 
+Track (trackID 957, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 698, parentID 1) is processed with stopping code 2
-### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73289,0.39866,0.55131)
- Old Polarization:       (-0.68033,0.42246,0.59891)
- New Momentum Direction: (0.38283,0.54132,0.7486)
- New Polarization:       (-0.9238,0.21965,0.31359)
+ Old Momentum Direction: (0.080827,-0.10987,0.99065)
+ Old Polarization:       (-0.99651,-0.029586,0.078023)
+ New Momentum Direction: (0.10901,-0.14818,0.98294)
+ New Polarization:       (-0.18714,-0.97421,-0.12611)
  *** FresnelRefraction *** 
-Track (trackID 697, parentID 1) is processed with stopping code 2
-### pop requested out of 87 stacked tracks.
+Track (trackID 956, parentID 1) is processed with stopping code 2
+### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74932,-0.65481,0.098702)
- Old Polarization:       (-0.66219,-0.74194,0.10505)
- New Momentum Direction: (0.45006,-0.88302,0.1331)
- New Polarization:       (-0.89299,-0.44572,0.062515)
+ Old Momentum Direction: (0.19474,-0.53216,0.82394)
+ Old Polarization:       (-0.86363,-0.49126,-0.11317)
+ New Momentum Direction: (0.26452,-0.72286,0.63836)
+ New Polarization:       (-0.84182,-0.49603,-0.21285)
  *** FresnelRefraction *** 
-Track (trackID 696, parentID 1) is processed with stopping code 2
+Track (trackID 955, parentID 1) is processed with stopping code 2
+### pop requested out of 87 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 954, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73598,0.38434,-0.55733)
- Old Polarization:       (-0.67694,0.40616,-0.61383)
- New Momentum Direction: (-0.73598,0.38434,-0.55733)
- New Polarization:       (-0.67651,-0.38586,0.62726)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73598,0.38434,-0.55733)
- Old Polarization:       (-0.67651,-0.38586,0.62726)
- New Momentum Direction: (-0.73598,0.38434,0.55733)
- New Polarization:       (0.67651,0.38586,0.62726)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73598,0.38434,0.55733)
- Old Polarization:       (0.67651,0.38586,0.62726)
- New Momentum Direction: (-0.73598,-0.38434,0.55733)
- New Polarization:       (-0.67651,0.38586,-0.62726)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73598,-0.38434,0.55733)
- Old Polarization:       (-0.67651,0.38586,-0.62726)
- New Momentum Direction: (-0.39215,-0.52223,0.75729)
- New Polarization:       (0.91959,-0.24379,0.30808)
+ Old Momentum Direction: (0.48359,-0.71525,0.50453)
+ Old Polarization:       (-0.54747,-0.69692,-0.46323)
+ New Momentum Direction: (0.65487,-0.32304,0.68322)
+ New Polarization:       (0.18767,0.94524,0.26704)
  *** FresnelRefraction *** 
-Track (trackID 695, parentID 1) is processed with stopping code 2
+Track (trackID 953, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74596,-0.37061,-0.55335)
- Old Polarization:       (-0.66596,-0.42262,-0.61472)
- New Momentum Direction: (0.43297,-0.50161,-0.74895)
- New Polarization:       (-0.90139,-0.24607,-0.35629)
+ Old Momentum Direction: (0.96907,-0.24482,0.03121)
+ Old Polarization:       (-0.013084,-0.17725,-0.98408)
+ New Momentum Direction: (0.94236,-0.33193,0.042315)
+ New Polarization:       (-0.024125,-0.19353,-0.9808)
  *** FresnelRefraction *** 
-Track (trackID 694, parentID 1) is processed with stopping code 2
+Track (trackID 952, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73765,0.31292,-0.59829)
- Old Polarization:       (-0.67511,0.32897,-0.66031)
- New Momentum Direction: (0.40042,0.42468,-0.81198)
- New Polarization:       (-0.91629,0.1769,-0.35933)
+ Old Momentum Direction: (0.52377,-0.71587,0.46174)
+ Old Polarization:       (-0.50314,-0.69736,-0.51044)
+ New Momentum Direction: (0.70938,-0.32513,0.62536)
+ New Polarization:       (0.26565,0.94515,0.19005)
  *** FresnelRefraction *** 
-Track (trackID 693, parentID 1) is processed with stopping code 2
+Track (trackID 951, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74513,-0.54261,-0.38775)
- Old Polarization:       (-0.66691,-0.60878,-0.42968)
- New Momentum Direction: (0.42539,-0.73632,-0.52619)
- New Polarization:       (-0.90501,-0.34782,-0.24492)
+ Old Momentum Direction: (0.97098,-0.23674,0.033908)
+ Old Polarization:       (-0.0070602,-0.17009,-0.9854)
+ New Momentum Direction: (0.94638,-0.3198,0.045804)
+ New Polarization:       (-0.012928,-0.17915,-0.98374)
  *** FresnelRefraction *** 
-Track (trackID 692, parentID 1) is processed with stopping code 2
+Track (trackID 950, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73634,0.67591,0.030863)
- Old Polarization:       (-0.67661,0.73575,0.029583)
- New Momentum Direction: (0.40738,0.91231,0.041658)
- New Polarization:       (-0.91326,0.40708,0.015859)
+ Old Momentum Direction: (0.52071,0.62484,0.58176)
+ Old Polarization:       (-0.50635,0.77467,-0.37882)
+ New Momentum Direction: (0.52071,-0.62484,0.58176)
+ New Polarization:       (0.50635,0.77467,0.37882)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52071,-0.62484,0.58176)
+ Old Polarization:       (0.50635,0.77467,0.37882)
+ New Momentum Direction: (0.52071,-0.62484,-0.58176)
+ New Polarization:       (-0.50635,-0.77467,0.37882)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52071,-0.62484,-0.58176)
+ Old Polarization:       (-0.50635,-0.77467,0.37882)
+ New Momentum Direction: (-0.52071,-0.62484,-0.58176)
+ New Polarization:       (-0.50635,0.77467,-0.37882)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.52071,-0.62484,-0.58176)
+Old Polarization: (-0.50635,0.77467,-0.37882)
+New Polarization: (-0.75541,0.64829,0.095272)
+Polarization Change: (-0.75541,0.64829,0.095272)
+New Momentum Direction: (0.25464,0.42441,-0.86893)
+Momentum Change: (0.25464,0.42441,-0.86893)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.25464,0.42441,-0.86893)
+ Old Polarization:       (-0.75541,0.64829,0.095272)
+ New Momentum Direction: (0.34632,0.57723,-0.7395)
+ New Polarization:       (-0.72679,0.66351,0.17754)
  *** FresnelRefraction *** 
-Track (trackID 691, parentID 1) is processed with stopping code 2
+Track (trackID 949, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73362,0.53369,0.4207)
- Old Polarization:       (-0.67956,0.57302,0.4581)
- New Momentum Direction: (0.39012,0.72311,0.57002)
- New Polarization:       (-0.92076,0.30428,0.24416)
- *** FresnelRefraction *** 
-Track (trackID 690, parentID 1) is processed with stopping code 2
-### pop requested out of 80 stacked tracks.
+ Old Momentum Direction: (0.57816,0.62102,0.52921)
+ Old Polarization:       (-0.44276,0.7836,-0.43582)
+ New Momentum Direction: (0.57816,-0.62102,0.52921)
+ New Polarization:       (0.44276,0.7836,0.43582)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57816,-0.62102,0.52921)
+ Old Polarization:       (0.44276,0.7836,0.43582)
+ New Momentum Direction: (-0.57816,-0.62102,0.52921)
+ New Polarization:       (0.44276,-0.7836,-0.43582)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 689, parentID 1) is processed with stopping code 2
+Track (trackID 948, parentID 1) is processed with stopping code 2
+### pop requested out of 80 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.1098,-0.34708,0.93138)
+ Old Polarization:       (-0.95735,-0.28888,0.0052078)
+ New Momentum Direction: (0.14905,-0.47117,0.86936)
+ New Polarization:       (-0.9481,-0.31782,-0.009697)
+ *** FresnelRefraction *** 
+Track (trackID 947, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74455,-0.32901,0.58085)
- Old Polarization:       (-0.66749,-0.37957,0.64061)
- New Momentum Direction: (0.43493,-0.4438,0.78351)
- New Polarization:       (-0.90042,-0.22302,0.3735)
+ Old Momentum Direction: (0.074315,-0.057513,0.99558)
+ Old Polarization:       (-0.99668,0.02889,0.076066)
+ New Momentum Direction: (0.10085,-0.078047,0.99184)
+ New Polarization:       (0.40346,-0.90806,-0.11248)
  *** FresnelRefraction *** 
-Track (trackID 688, parentID 1) is processed with stopping code 2
+Track (trackID 946, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 687, parentID 1) is processed with stopping code 2
+Track (trackID 945, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7425,-0.5393,0.39731)
- Old Polarization:       (-0.6698,-0.60487,0.4307)
- New Momentum Direction: (0.41637,-0.732,0.53927)
- New Polarization:       (-0.90916,-0.34003,0.24042)
+ Old Momentum Direction: (0.17472,-0.49508,0.8511)
+ Old Polarization:       (-0.88767,-0.45323,-0.081416)
+ New Momentum Direction: (0.23676,-0.67089,0.70275)
+ New Polarization:       (-0.87117,-0.46682,-0.15215)
  *** FresnelRefraction *** 
-Track (trackID 686, parentID 1) is processed with stopping code 2
+Track (trackID 944, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7301,0.66972,0.13578)
- Old Polarization:       (-0.68334,0.71589,0.14335)
- New Momentum Direction: (0.36805,0.91127,0.18475)
- New Polarization:       (-0.9298,0.36095,0.07199)
- *** FresnelRefraction *** 
-Track (trackID 685, parentID 1) is processed with stopping code 2
-### pop requested out of 75 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 684, parentID 1) is processed with stopping code 2
+Track (trackID 943, parentID 1) is processed with stopping code 2
+### pop requested out of 75 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9689,-0.24566,0.029693)
+ Old Polarization:       (-0.014836,-0.17745,-0.98402)
+ New Momentum Direction: (0.94186,-0.33358,0.040319)
+ New Polarization:       (-0.02743,-0.19593,-0.98023)
+ *** FresnelRefraction *** 
+Track (trackID 942, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73432,0.49776,-0.46152)
- Old Polarization:       (-0.67874,0.52969,-0.50866)
- New Momentum Direction: (0.38553,0.67661,-0.62735)
- New Polarization:       (-0.92266,0.27684,-0.26843)
+ Old Momentum Direction: (0.98186,0.1812,0.055813)
+ Old Polarization:       (0.00060867,0.29135,-0.95662)
+ New Momentum Direction: (0.96637,0.24576,0.075699)
+ New Polarization:       (-0.0011224,0.29839,-0.95444)
  *** FresnelRefraction *** 
-Track (trackID 683, parentID 1) is processed with stopping code 2
+Track (trackID 941, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 682, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.2022,-0.52368,0.82757)
+ Old Polarization:       (-0.86372,-0.49368,-0.10137)
+ New Momentum Direction: (0.27194,-0.70431,0.65574)
+ New Polarization:       (-0.84538,-0.5004,-0.18689)
+ *** FresnelRefraction *** 
+Track (trackID 940, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74481,-0.49032,0.4526)
- Old Polarization:       (-0.66722,-0.55602,0.49564)
- New Momentum Direction: (0.43152,-0.66287,0.61187)
- New Polarization:       (-0.90207,-0.32307,0.28619)
+ Old Momentum Direction: (0.5872,-0.70231,0.40245)
+ Old Polarization:       (-0.43244,-0.69247,-0.57748)
+ New Momentum Direction: (0.79038,-0.28613,0.5417)
+ New Polarization:       (0.32053,0.94669,0.03237)
  *** FresnelRefraction *** 
-Track (trackID 681, parentID 1) is processed with stopping code 2
+Track (trackID 939, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 680, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.16916,0.31459,0.93403)
+ Old Polarization:       (-0.89696,0.4419,0.013619)
+ New Momentum Direction: (0.22844,0.42481,0.87599)
+ New Polarization:       (-0.858,0.51305,-0.025057)
+ *** FresnelRefraction *** 
+Track (trackID 938, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74525,-0.58206,0.3253)
- Old Polarization:       (-0.66675,-0.65582,0.35405)
- New Momentum Direction: (0.43081,-0.78776,0.44026)
- New Polarization:       (-0.90242,-0.37968,0.20369)
+ Old Momentum Direction: (0.0798,0.035478,0.99618)
+ Old Polarization:       (-0.98862,0.13066,0.074542)
+ New Momentum Direction: (0.10849,0.048234,0.99293)
+ New Polarization:       (0.66144,0.74213,-0.10832)
  *** FresnelRefraction *** 
-Track (trackID 679, parentID 1) is processed with stopping code 2
+Track (trackID 937, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74268,-0.23849,0.62574)
- Old Polarization:       (-0.66957,-0.27828,0.68864)
- New Momentum Direction: (0.42678,-0.32207,0.84506)
- New Polarization:       (-0.90431,-0.16142,0.39518)
+ Old Momentum Direction: (0.85289,-0.50595,0.12882)
+ Old Polarization:       (-0.14228,-0.46263,-0.87506)
+ New Momentum Direction: (0.7051,-0.68719,0.17496)
+ New Polarization:       (-0.26105,-0.48095,-0.83698)
  *** FresnelRefraction *** 
-Track (trackID 678, parentID 1) is processed with stopping code 2
+Track (trackID 936, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73556,0.64517,0.20666)
- Old Polarization:       (-0.67746,0.70055,0.22424)
- New Momentum Direction: (0.40338,0.87142,0.27913)
- New Polarization:       (-0.91503,0.38419,0.12296)
- *** FresnelRefraction *** 
-Track (trackID 677, parentID 1) is processed with stopping code 2
-### pop requested out of 67 stacked tracks.
+ Old Momentum Direction: (0.74237,-0.62325,0.24588)
+ Old Polarization:       (-0.25855,-0.60505,-0.75304)
+ New Momentum Direction: (-0.74237,-0.62325,0.24588)
+ New Polarization:       (-0.084723,0.45136,0.88831)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73828,0.31186,-0.59807)
- Old Polarization:       (-0.67442,0.32842,-0.66128)
- New Momentum Direction: (0.40429,0.42288,-0.811)
- New Polarization:       (-0.91459,0.17822,-0.36301)
- *** FresnelRefraction *** 
-Track (trackID 676, parentID 1) is processed with stopping code 2
-### pop requested out of 66 stacked tracks.
+ Old Momentum Direction: (-0.74237,-0.62325,0.24588)
+ Old Polarization:       (-0.084723,0.45136,0.88831)
+ New Momentum Direction: (-0.74237,0.62325,0.24588)
+ New Polarization:       (0.084723,0.45136,-0.88831)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 675, parentID 1) is processed with stopping code 2
-### pop requested out of 65 stacked tracks.
+Track (trackID 935, parentID 1) is processed with stopping code 2
+### pop requested out of 67 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 674, parentID 1) is processed with stopping code 2
+Track (trackID 934, parentID 1) is processed with stopping code 2
+### pop requested out of 66 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.22361,0.41661,0.88115)
+ Old Polarization:       (-0.83337,0.55055,-0.048825)
+ New Momentum Direction: (0.30318,0.56488,0.76746)
+ New Polarization:       (-0.82052,0.5643,-0.091205)
+ *** FresnelRefraction *** 
+Track (trackID 933, parentID 1) is processed with stopping code 2
+### pop requested out of 65 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.85615,0.47085,0.21285)
+ Old Polarization:       (-0.13935,0.60705,-0.78235)
+ New Momentum Direction: (0.71177,0.64005,0.28934)
+ New Polarization:       (-0.25607,0.62002,-0.74162)
+ *** FresnelRefraction *** 
+Track (trackID 932, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73708,-0.2015,0.64506)
- Old Polarization:       (-0.67573,-0.23376,0.69911)
- New Momentum Direction: (0.39406,-0.27404,0.87728)
- New Polarization:       (-0.91904,-0.12688,0.37318)
+ Old Momentum Direction: (0.2333,0.425,0.87461)
+ Old Polarization:       (-0.82476,0.56295,-0.053551)
+ New Momentum Direction: (0.31545,0.57466,0.75515)
+ New Polarization:       (-0.81127,0.57613,-0.09953)
  *** FresnelRefraction *** 
-Track (trackID 673, parentID 1) is processed with stopping code 2
+Track (trackID 931, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 672, parentID 1) is processed with stopping code 2
-### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73645,0.21373,0.64184)
- Old Polarization:       (-0.67645,0.22144,0.70241)
- New Momentum Direction: (0.40124,0.2894,0.86905)
- New Polarization:       (-0.91594,0.11918,0.3832)
+ Old Momentum Direction: (0.081491,-0.21839,0.97245)
+ Old Polarization:       (-0.98783,-0.14743,0.049671)
+ New Momentum Direction: (0.11068,-0.29663,0.94856)
+ New Polarization:       (-0.80353,-0.58839,-0.090237)
  *** FresnelRefraction *** 
-Track (trackID 671, parentID 1) is processed with stopping code 2
-### pop requested out of 61 stacked tracks.
+Track (trackID 930, parentID 1) is processed with stopping code 2
+### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74532,-0.6561,-0.11844)
- Old Polarization:       (-0.66671,-0.73309,-0.13444)
- New Momentum Direction: (0.42587,-0.89039,-0.16074)
- New Polarization:       (-0.90478,-0.41884,-0.077037)
+ Old Momentum Direction: (0.60386,-0.70298,0.37573)
+ Old Polarization:       (-0.41514,-0.67976,-0.60464)
+ New Momentum Direction: (0.81958,-0.26124,0.50995)
+ New Polarization:       (0.31985,0.94703,-0.028907)
  *** FresnelRefraction *** 
-Track (trackID 670, parentID 1) is processed with stopping code 2
-### pop requested out of 60 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.74317,-0.47206,0.47419)
-Old Polarization: (-0.66904,-0.53362,0.51733)
-New Polarization: (-0.33775,-0.73796,0.32567)
-Polarization Change: (-0.38623,-0.84388,0.37241)
-New Momentum Direction: (-0.37706,0.474,0.68302)
-Momentum Change: (-0.41304,0.51923,0.7482)
+Track (trackID 929, parentID 1) is processed with stopping code 2
+### pop requested out of 61 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 669, parentID 1) is processed with stopping code 2
+Track (trackID 928, parentID 1) is processed with stopping code 2
+### pop requested out of 60 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.14901,-0.43063,0.89014)
+ Old Polarization:       (-0.92129,-0.38745,-0.033214)
+ New Momentum Direction: (0.20082,-0.58035,0.78922)
+ New Polarization:       (-0.91456,-0.39978,-0.061263)
+ *** FresnelRefraction *** 
+Track (trackID 927, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73763,0.2624,-0.62213)
- Old Polarization:       (-0.67513,0.27313,-0.68528)
- New Momentum Direction: (0.39873,0.35639,-0.84499)
- New Polarization:       (-0.91702,0.14587,-0.3712)
+ Old Momentum Direction: (0.23924,-0.57968,0.77894)
+ Old Polarization:       (-0.81922,-0.55113,-0.15853)
+ New Momentum Direction: (0.32303,-0.78272,0.53198)
+ New Polarization:       (-0.79507,-0.52935,-0.29606)
  *** FresnelRefraction *** 
-Track (trackID 668, parentID 1) is processed with stopping code 2
+Track (trackID 926, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74653,-0.54055,0.38794)
- Old Polarization:       (-0.6653,-0.61344,0.42551)
- New Momentum Direction: (0.43952,-0.72975,0.52372)
- New Polarization:       (-0.8982,-0.36186,0.24958)
+Scattering Photon!
+Old Momentum Direction: (0.43009,0.59924,0.67523)
+Old Polarization: (-0.60531,0.74632,-0.27677)
+New Polarization: (-0.74886,0.026036,-0.66222)
+Polarization Change: (-0.74886,0.026036,-0.66222)
+New Momentum Direction: (-0.15112,0.9662,0.20888)
+Momentum Change: (-0.15112,0.9662,0.20888)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.15112,0.9662,0.20888)
+ Old Polarization:       (-0.74886,0.026036,-0.66222)
+ New Momentum Direction: (-0.20558,0.93648,0.28416)
+ New Polarization:       (-0.87795,-0.048201,-0.47632)
  *** FresnelRefraction *** 
-Track (trackID 667, parentID 1) is processed with stopping code 2
+Track (trackID 925, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 666, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45676,-0.71486,0.52948)
+ Old Polarization:       (-0.57644,-0.69117,-0.43589)
+ New Momentum Direction: (0.62056,-0.31215,0.71935)
+ New Polarization:       (0.12732,0.94529,0.30036)
+ *** FresnelRefraction *** 
+Track (trackID 924, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7416,0.48605,-0.46237)
- Old Polarization:       (-0.67078,0.52824,-0.52059)
- New Momentum Direction: (0.42943,0.65433,-0.62245)
- New Polarization:       (-0.90306,0.30492,-0.30249)
+ Old Momentum Direction: (0.82024,-0.54929,0.15964)
+ Old Polarization:       (-0.17798,-0.51029,-0.84138)
+ New Momentum Direction: (0.62972,-0.74596,0.21679)
+ New Polarization:       (-0.32621,-0.50721,-0.7977)
  *** FresnelRefraction *** 
-Track (trackID 665, parentID 1) is processed with stopping code 2
+Track (trackID 923, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73497,0.32396,0.59571)
- Old Polarization:       (-0.67807,0.34225,0.65045)
- New Momentum Direction: (0.39455,0.43899,0.80723)
- New Polarization:       (-0.91885,0.18252,0.34985)
+ Old Momentum Direction: (0.22705,-0.56683,0.79193)
+ Old Polarization:       (-0.83199,-0.53557,-0.1448)
+ New Momentum Direction: (0.30688,-0.76613,0.56469)
+ New Polarization:       (-0.80822,-0.5231,-0.27047)
  *** FresnelRefraction *** 
-Track (trackID 664, parentID 1) is processed with stopping code 2
+Track (trackID 922, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73862,0.095658,0.6673)
- Old Polarization:       (-0.67407,0.091702,0.73296)
- New Momentum Direction: (0.41159,0.12932,0.90215)
- New Polarization:       (-0.91133,0.049504,0.40868)
+ Old Momentum Direction: (0.82556,0.50697,0.24785)
+ Old Polarization:       (-0.17327,0.64571,-0.74367)
+ New Momentum Direction: (0.64093,0.6896,0.33713)
+ New Polarization:       (-0.31849,0.63852,-0.70061)
  *** FresnelRefraction *** 
-Track (trackID 663, parentID 1) is processed with stopping code 2
+Track (trackID 921, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 662, parentID 1) is processed with stopping code 2
+Track (trackID 920, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 661, parentID 1) is processed with stopping code 2
-### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7371,0.23691,-0.6329)
- Old Polarization:       (-0.67572,0.24463,-0.69539)
- New Momentum Direction: (0.39455,0.32212,-0.86056)
- New Polarization:       (-0.91883,0.12909,-0.37294)
+ Old Momentum Direction: (0.9893,-0.14432,0.021372)
+ Old Polarization:       (0.011746,-0.06722,-0.99767)
+ New Momentum Direction: (0.98033,-0.19522,0.028909)
+ New Polarization:       (-0.021464,-0.25109,-0.96773)
  *** FresnelRefraction *** 
-Track (trackID 660, parentID 1) is processed with stopping code 2
-### pop requested out of 50 stacked tracks.
+Track (trackID 919, parentID 1) is processed with stopping code 2
+### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74019,-0.50213,0.4472)
- Old Polarization:       (-0.67235,-0.56115,0.48276)
- New Momentum Direction: (0.4037,-0.68321,0.60848)
- New Polarization:       (-0.91486,-0.30714,0.26211)
+ Old Momentum Direction: (0.42423,-0.70337,0.57035)
+ Old Polarization:       (-0.61344,-0.68653,-0.39035)
+ New Momentum Direction: (0.57352,-0.27669,0.77105)
+ New Polarization:       (0.024933,0.94669,0.32117)
  *** FresnelRefraction *** 
-Track (trackID 659, parentID 1) is processed with stopping code 2
+Track (trackID 918, parentID 1) is processed with stopping code 2
+### pop requested out of 50 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 917, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74539,-0.25265,-0.61689)
- Old Polarization:       (-0.66658,-0.29287,-0.68549)
- New Momentum Direction: (0.43207,-0.3418,-0.83456)
- New Polarization:       (-0.90181,-0.17083,-0.39692)
- *** FresnelRefraction *** 
-Track (trackID 658, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 916, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 915, parentID 1) is processed with stopping code 2
+### pop requested out of 47 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 914, parentID 1) is processed with stopping code 2
+### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.734,0.4754,0.48502)
- Old Polarization:       (-0.67913,0.50896,0.5289)
- New Momentum Direction: (0.39154,0.6441,0.65713)
- New Polarization:       (-0.92015,0.27083,0.2828)
+ Old Momentum Direction: (0.08337,0.043862,0.99555)
+ Old Polarization:       (-0.98715,0.14031,0.076484)
+ New Momentum Direction: (0.11309,0.0595,0.9918)
+ New Polarization:       (0.55766,0.82236,-0.11292)
  *** FresnelRefraction *** 
-Track (trackID 657, parentID 1) is processed with stopping code 2
-### pop requested out of 47 stacked tracks.
+Track (trackID 913, parentID 1) is processed with stopping code 2
+### pop requested out of 45 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 912, parentID 1) is processed with stopping code 2
+### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74756,-0.50187,-0.43507)
- Old Polarization:       (-0.66419,-0.56857,-0.48538)
- New Momentum Direction: (0.43981,-0.67859,-0.58828)
- New Polarization:       (-0.89808,-0.33487,-0.28515)
+ Old Momentum Direction: (0.94862,-0.31265,0.048726)
+ Old Polarization:       (-0.033749,-0.25308,-0.96686)
+ New Momentum Direction: (0.90367,-0.42312,0.065943)
+ New Polarization:       (-0.061963,-0.28157,-0.95754)
  *** FresnelRefraction *** 
-Track (trackID 656, parentID 1) is processed with stopping code 2
-### pop requested out of 46 stacked tracks.
+Track (trackID 911, parentID 1) is processed with stopping code 2
+### pop requested out of 43 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 655, parentID 1) is processed with stopping code 2
-### pop requested out of 45 stacked tracks.
+Track (trackID 910, parentID 1) is processed with stopping code 2
+### pop requested out of 42 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.23679,0.43143,0.87052)
+Old Polarization: (-0.82022,0.569,-0.05889)
+New Polarization: (0.78473,-0.15638,-0.59978)
+Polarization Change: (0.78473,-0.15638,-0.59978)
+New Momentum Direction: (0.3809,-0.64171,0.66567)
+Momentum Change: (0.3809,-0.64171,0.66567)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.3809,-0.64171,0.66567)
+ Old Polarization:       (0.78473,-0.15638,-0.59978)
+ New Momentum Direction: (0.3809,-0.64171,-0.66567)
+ New Polarization:       (-0.78473,0.15638,-0.59978)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.3809,-0.64171,-0.66567)
+ Old Polarization:       (-0.78473,0.15638,-0.59978)
+ New Momentum Direction: (0.3809,0.64171,-0.66567)
+ New Polarization:       (0.78473,0.15638,0.59978)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.3809,0.64171,-0.66567)
+ Old Polarization:       (0.78473,0.15638,0.59978)
+ New Momentum Direction: (-0.3809,0.64171,-0.66567)
+ New Polarization:       (0.78473,-0.15638,-0.59978)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 654, parentID 1) is processed with stopping code 2
-### pop requested out of 44 stacked tracks.
+Track (trackID 909, parentID 1) is processed with stopping code 2
+### pop requested out of 41 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49279,0.61599,0.61458)
+ Old Polarization:       (-0.53725,0.77099,-0.34197)
+ New Momentum Direction: (0.49279,-0.61599,0.61458)
+ New Polarization:       (0.53725,0.77099,0.34197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49279,-0.61599,0.61458)
+ Old Polarization:       (0.53725,0.77099,0.34197)
+ New Momentum Direction: (0.49279,-0.61599,-0.61458)
+ New Polarization:       (-0.53725,-0.77099,0.34197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49279,-0.61599,-0.61458)
+ Old Polarization:       (-0.53725,-0.77099,0.34197)
+ New Momentum Direction: (-0.49279,-0.61599,-0.61458)
+ New Polarization:       (-0.53725,0.77099,-0.34197)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74841,-0.2584,-0.61083)
- Old Polarization:       (-0.66319,-0.30185,-0.68488)
- New Momentum Direction: (0.44876,-0.34817,-0.82304)
- New Polarization:       (-0.89363,-0.18192,-0.41029)
- *** FresnelRefraction *** 
-Track (trackID 653, parentID 1) is processed with stopping code 2
-### pop requested out of 43 stacked tracks.
+ Old Momentum Direction: (-0.49279,-0.61599,-0.61458)
+ Old Polarization:       (-0.53725,0.77099,-0.34197)
+ New Momentum Direction: (-0.49279,0.61599,-0.61458)
+ New Polarization:       (0.53725,0.77099,0.34197)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.74166,-0.58811,0.32261)
- Old Polarization:       (-0.67074,-0.65538,0.34726)
- New Momentum Direction: (0.40942,-0.7999,0.43879)
- New Polarization:       (-0.91232,-0.36242,0.19056)
- *** FresnelRefraction *** 
-Track (trackID 652, parentID 1) is processed with stopping code 2
-### pop requested out of 42 stacked tracks.
+ Old Momentum Direction: (-0.49279,0.61599,-0.61458)
+ Old Polarization:       (0.53725,0.77099,0.34197)
+ New Momentum Direction: (-0.49279,0.61599,0.61458)
+ New Polarization:       (-0.53725,-0.77099,0.34197)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73101,0.44845,0.51431)
- Old Polarization:       (-0.68235,0.47478,0.55586)
- New Momentum Direction: (0.37138,0.6102,0.69981)
- New Polarization:       (-0.92847,0.24032,0.28317)
- *** FresnelRefraction *** 
-Track (trackID 651, parentID 1) is processed with stopping code 2
-### pop requested out of 41 stacked tracks.
+ Old Momentum Direction: (-0.49279,0.61599,0.61458)
+ Old Polarization:       (-0.53725,-0.77099,0.34197)
+ New Momentum Direction: (0.49279,0.61599,0.61458)
+ New Polarization:       (-0.53725,0.77099,-0.34197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49279,0.61599,0.61458)
+ Old Polarization:       (-0.53725,0.77099,-0.34197)
+ New Momentum Direction: (0.49279,-0.61599,0.61458)
+ New Polarization:       (0.53725,0.77099,0.34197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49279,-0.61599,0.61458)
+ Old Polarization:       (0.53725,0.77099,0.34197)
+ New Momentum Direction: (0.49279,-0.61599,-0.61458)
+ New Polarization:       (-0.53725,-0.77099,0.34197)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49279,-0.61599,-0.61458)
+ Old Polarization:       (-0.53725,-0.77099,0.34197)
+ New Momentum Direction: (-0.49279,-0.61599,-0.61458)
+ New Polarization:       (-0.53725,0.77099,-0.34197)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 650, parentID 1) is processed with stopping code 2
+Track (trackID 908, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74331,-0.23633,0.62581)
- Old Polarization:       (-0.66887,-0.27642,0.69007)
- New Momentum Direction: (0.43046,-0.31888,0.8444)
- New Polarization:       (-0.90256,-0.16155,0.3991)
+ Old Momentum Direction: (0.083375,-0.186,0.97901)
+ Old Polarization:       (-0.99153,-0.1137,0.062839)
+ New Momentum Direction: (0.083375,-0.186,-0.97901)
+ New Polarization:       (0.98765,0.14619,0.056336)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.083375,-0.186,-0.97901)
+ Old Polarization:       (0.98765,0.14619,0.056336)
+ New Momentum Direction: (0.11266,-0.25133,-0.96132)
+ New Polarization:       (0.99301,0.062642,0.099993)
  *** FresnelRefraction *** 
-Track (trackID 649, parentID 1) is processed with stopping code 2
+Track (trackID 907, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74633,-0.56296,-0.35505)
- Old Polarization:       (-0.66557,-0.63316,-0.39513)
- New Momentum Direction: (0.43207,-0.7628,-0.48109)
- New Polarization:       (-0.90184,-0.36674,-0.22844)
+ Old Momentum Direction: (0.754,-0.61543,0.22963)
+ Old Polarization:       (-0.24779,-0.59024,-0.76826)
+ New Momentum Direction: (0.46115,-0.83134,0.31019)
+ New Polarization:       (-0.45161,-0.52082,-0.72443)
  *** FresnelRefraction *** 
-Track (trackID 648, parentID 1) is processed with stopping code 2
+Track (trackID 906, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73649,0.66022,0.14724)
- Old Polarization:       (-0.67644,0.71916,0.15887)
- New Momentum Direction: (0.40893,0.89069,0.19864)
- New Polarization:       (-0.91257,0.39934,0.088026)
+ Old Momentum Direction: (0.7393,-0.62987,0.23813)
+ Old Polarization:       (-0.26673,-0.59863,-0.75531)
+ New Momentum Direction: (0.40461,-0.8554,0.32339)
+ New Polarization:       (-0.49315,-0.5019,-0.71056)
  *** FresnelRefraction *** 
-Track (trackID 647, parentID 1) is processed with stopping code 2
+Track (trackID 905, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 646, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.07693,-0.060771,0.99518)
+ Old Polarization:       (-0.99659,0.025221,0.078579)
+ New Momentum Direction: (0.10414,-0.082265,0.99115)
+ New Polarization:       (0.38219,-0.91674,-0.11624)
+ *** FresnelRefraction *** 
+Track (trackID 904, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 645, parentID 1) is processed with stopping code 2
+Track (trackID 903, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74171,0.090875,0.66453)
- Old Polarization:       (-0.67066,0.087267,0.73661)
- New Momentum Direction: (0.42952,0.12236,0.89473)
- New Polarization:       (-0.90302,0.049119,0.42678)
+ Old Momentum Direction: (0.13601,-0.40927,0.90222)
+ Old Polarization:       (-0.93244,-0.3606,-0.023013)
+ New Momentum Direction: (0.18391,-0.55341,0.81235)
+ New Polarization:       (-0.92767,-0.37095,-0.04269)
  *** FresnelRefraction *** 
-Track (trackID 644, parentID 1) is processed with stopping code 2
+Track (trackID 902, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73101,0.5197,0.44221)
- Old Polarization:       (-0.68236,0.55315,0.47792)
- New Momentum Direction: (0.37277,0.70671,0.60133)
- New Polarization:       (-0.92792,0.28152,0.24437)
+ Old Momentum Direction: (0.99835,0.05093,0.026647)
+ Old Polarization:       (0.018834,0.14813,-0.98879)
+ New Momentum Direction: (0.99696,0.069071,0.036138)
+ New Polarization:       (-0.033184,0.79552,-0.60502)
  *** FresnelRefraction *** 
-Track (trackID 643, parentID 1) is processed with stopping code 2
+Track (trackID 901, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74512,-0.65791,-0.10933)
- Old Polarization:       (-0.66693,-0.73466,-0.12439)
- New Momentum Direction: (0.42471,-0.89308,-0.14841)
- New Polarization:       (-0.90533,-0.41871,-0.071143)
+ Old Momentum Direction: (0.095102,-0.27088,0.9579)
+ Old Polarization:       (-0.97752,-0.20731,0.038425)
+ New Momentum Direction: (0.12862,-0.36635,0.92154)
+ New Polarization:       (-0.87285,-0.48292,-0.070159)
  *** FresnelRefraction *** 
-Track (trackID 642, parentID 1) is processed with stopping code 2
+Track (trackID 900, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74199,-0.071468,-0.6666)
- Old Polarization:       (-0.67036,-0.09242,-0.73626)
- New Momentum Direction: (0.41626,-0.096928,-0.90407)
- New Polarization:       (-0.90921,-0.053399,-0.4129)
+ Old Momentum Direction: (0.92306,-0.37736,0.074577)
+ Old Polarization:       (-0.057948,-0.32808,-0.94287)
+ New Momentum Direction: (0.85515,-0.50854,0.1005)
+ New Polarization:       (-0.10541,-0.36042,-0.92681)
  *** FresnelRefraction *** 
-Track (trackID 641, parentID 1) is processed with stopping code 2
+Track (trackID 899, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7476,-0.1278,-0.65174)
- Old Polarization:       (-0.6641,-0.15654,-0.73107)
- New Momentum Direction: (0.44696,-0.17213,-0.87784)
- New Polarization:       (-0.89452,-0.094751,-0.43688)
+ Old Momentum Direction: (0.54522,-0.71073,0.44452)
+ Old Polarization:       (-0.47941,-0.69935,-0.53017)
+ New Momentum Direction: (0.73499,-0.31732,0.59925)
+ New Polarization:       (0.29063,0.94587,0.14441)
  *** FresnelRefraction *** 
-Track (trackID 640, parentID 1) is processed with stopping code 2
+Track (trackID 898, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73946,-0.1908,0.64559)
- Old Polarization:       (-0.67312,-0.22368,0.70489)
- New Momentum Direction: (0.40914,-0.25861,0.87505)
- New Polarization:       (-0.91242,-0.12551,0.38952)
+ Old Momentum Direction: (0.1046,0.11377,0.98799)
+ Old Polarization:       (-0.97235,0.22028,0.077577)
+ New Momentum Direction: (0.14077,0.15311,0.97813)
+ New Polarization:       (-0.17193,0.97674,-0.12815)
  *** FresnelRefraction *** 
-Track (trackID 639, parentID 1) is processed with stopping code 2
+Track (trackID 897, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73853,0.31034,0.59856)
- Old Polarization:       (-0.67419,0.33073,0.66037)
- New Momentum Direction: (0.41593,0.41858,0.80734)
- New Polarization:       (-0.90937,0.18517,0.37249)
+ Old Momentum Direction: (0.28312,-0.63255,0.72092)
+ Old Polarization:       (-0.76662,-0.60093,-0.22621)
+ New Momentum Direction: (0.38467,-0.85943,0.33676)
+ New Polarization:       (-0.74461,-0.50453,-0.43705)
  *** FresnelRefraction *** 
-Track (trackID 638, parentID 1) is processed with stopping code 2
+Track (trackID 896, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7343,0.65929,0.16167)
- Old Polarization:       (-0.67883,0.71345,0.17374)
- New Momentum Direction: (0.39553,0.89203,0.21874)
- New Polarization:       (-0.91845,0.38434,0.093433)
+ Old Momentum Direction: (0.96581,0.2472,0.078096)
+ Old Polarization:       (-0.017714,0.36346,-0.93144)
+ New Momentum Direction: (0.93606,0.3355,0.10599)
+ New Polarization:       (-0.032719,0.38294,-0.92319)
  *** FresnelRefraction *** 
-Track (trackID 637, parentID 1) is processed with stopping code 2
+Track (trackID 895, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 636, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.096894,0.10913,0.98929)
+ Old Polarization:       (-0.97444,0.21281,0.071963)
+ New Momentum Direction: (0.13118,0.14775,0.98029)
+ New Polarization:       (-0.1964,0.97311,-0.12038)
+ *** FresnelRefraction *** 
+Track (trackID 894, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73987,-0.017119,0.67254)
- Old Polarization:       (-0.67269,-0.032972,0.73919)
- New Momentum Direction: (0.41622,-0.023138,0.90897)
- New Polarization:       (-0.90922,-0.020218,0.41582)
+ Old Momentum Direction: (0.93594,0.33228,0.11666)
+ Old Polarization:       (-0.051228,0.45621,-0.8884)
+ New Momentum Direction: (0.87819,0.45131,0.15845)
+ New Polarization:       (-0.094542,0.48851,-0.86742)
  *** FresnelRefraction *** 
-Track (trackID 635, parentID 1) is processed with stopping code 2
+Track (trackID 893, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73992,-0.021145,-0.67236)
- Old Polarization:       (-0.67263,-0.037039,-0.73905)
- New Momentum Direction: (0.40498,-0.02874,-0.91387)
- New Polarization:       (-0.91429,-0.022006,-0.40447)
+ Old Momentum Direction: (0.76263,0.56034,0.32314)
+ Old Polarization:       (-0.24012,0.70912,-0.66294)
+ New Momentum Direction: (0.48089,0.75953,0.43802)
+ New Polarization:       (-0.44005,0.64118,-0.62869)
  *** FresnelRefraction *** 
-Track (trackID 634, parentID 1) is processed with stopping code 2
+Track (trackID 892, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73434,0.54321,-0.40703)
- Old Polarization:       (-0.67873,0.58039,-0.44997)
- New Momentum Direction: (0.38743,0.73777,-0.55281)
- New Polarization:       (-0.92187,0.30519,-0.23878)
+ Old Momentum Direction: (0.74235,-0.62408,0.24382)
+ Old Polarization:       (-0.2595,-0.60331,-0.75411)
+ New Momentum Direction: (0.42987,-0.84098,0.32857)
+ New Polarization:       (-0.47166,-0.51947,-0.71252)
  *** FresnelRefraction *** 
-Track (trackID 633, parentID 1) is processed with stopping code 2
+Track (trackID 891, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73903,0.098889,-0.66638)
- Old Polarization:       (-0.6736,0.094152,-0.73307)
- New Momentum Direction: (0.40267,0.13436,-0.90543)
- New Polarization:       (-0.9153,0.04947,-0.39972)
+ Old Momentum Direction: (0.074026,-0.16798,0.98301)
+ Old Polarization:       (-0.99403,-0.091646,0.059195)
+ New Momentum Direction: (0.10072,-0.22857,0.9683)
+ New Polarization:       (-0.66536,-0.73906,-0.10524)
  *** FresnelRefraction *** 
-Track (trackID 632, parentID 1) is processed with stopping code 2
+Track (trackID 890, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 631, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9989,-0.039595,0.025119)
+ Old Polarization:       (0.027037,0.048684,-0.99845)
+ New Momentum Direction: (0.998,-0.05334,0.033838)
+ New Polarization:       (-0.043527,-0.96891,-0.24354)
+ *** FresnelRefraction *** 
+Track (trackID 889, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74076,-0.025392,0.67129)
- Old Polarization:       (-0.6717,-0.04221,0.73962)
- New Momentum Direction: (0.42127,-0.034282,0.90629)
- New Polarization:       (-0.90689,-0.025622,0.42058)
+ Old Momentum Direction: (0.15916,0.3129,0.93636)
+ Old Polarization:       (-0.90114,0.43345,0.0083258)
+ New Momentum Direction: (0.21654,0.42572,0.87856)
+ New Polarization:       (-0.87788,0.47864,-0.015559)
  *** FresnelRefraction *** 
-Track (trackID 630, parentID 1) is processed with stopping code 2
+Track (trackID 888, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73705,0.27153,0.6189)
- Old Polarization:       (-0.6758,0.28605,0.67932)
- New Momentum Direction: (0.40624,0.36712,0.83677)
- New Polarization:       (-0.91374,0.15639,0.37499)
+ Old Momentum Direction: (0.18272,0.34427,0.92092)
+ Old Polarization:       (-0.88075,0.47358,-0.0022877)
+ New Momentum Direction: (0.24706,0.4655,0.84986)
+ New Polarization:       (-0.88007,0.47482,-0.0042332)
  *** FresnelRefraction *** 
-Track (trackID 629, parentID 1) is processed with stopping code 2
+Track (trackID 887, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 628, parentID 1) is processed with stopping code 2
+Track (trackID 886, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73458,0.60018,0.31651)
- Old Polarization:       (-0.67852,0.64863,0.34481)
- New Momentum Direction: (0.39709,0.81181,0.42811)
- New Polarization:       (-0.91778,0.35048,0.18669)
- *** FresnelRefraction *** 
-Track (trackID 627, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 885, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74616,-0.64793,-0.15308)
- Old Polarization:       (-0.66577,-0.72587,-0.17282)
- New Momentum Direction: (0.43064,-0.87834,-0.20752)
- New Polarization:       (-0.90252,-0.4189,-0.099873)
- *** FresnelRefraction *** 
-Track (trackID 626, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+ Old Momentum Direction: (0.5736,0.6263,0.52796)
+ Old Polarization:       (-0.44837,0.77946,-0.43751)
+ New Momentum Direction: (0.5736,-0.6263,0.52796)
+ New Polarization:       (0.44837,0.77946,0.43751)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5736,-0.6263,0.52796)
+ Old Polarization:       (0.44837,0.77946,0.43751)
+ New Momentum Direction: (-0.5736,-0.6263,0.52796)
+ New Polarization:       (0.44837,-0.77946,-0.43751)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5736,-0.6263,0.52796)
+ Old Polarization:       (0.44837,-0.77946,-0.43751)
+ New Momentum Direction: (-0.5736,-0.6263,-0.52796)
+ New Polarization:       (-0.44837,0.77946,-0.43751)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 625, parentID 1) is processed with stopping code 2
+Track (trackID 884, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73011,-0.63721,0.2468)
+ Old Polarization:       (-0.27699,-0.60614,-0.74557)
+ New Momentum Direction: (0.3717,-0.86569,0.3353)
+ New Polarization:       (-0.51411,-0.49268,-0.70211)
+ *** FresnelRefraction *** 
+Track (trackID 883, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74743,-0.57061,0.34023)
- Old Polarization:       (-0.6643,-0.64767,0.37313)
- New Momentum Direction: (0.44343,-0.76984,0.45903)
- New Polarization:       (-0.89628,-0.3848,0.22048)
+ Old Momentum Direction: (0.084806,0.074054,0.99364)
+ Old Polarization:       (-0.98242,0.17266,0.070981)
+ New Momentum Direction: (0.11537,0.10075,0.9882)
+ New Polarization:       (0.11095,0.98731,-0.11361)
  *** FresnelRefraction *** 
-Track (trackID 624, parentID 1) is processed with stopping code 2
+Track (trackID 882, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75022,-0.64592,-0.14128)
- Old Polarization:       (-0.66119,-0.73256,-0.16181)
- New Momentum Direction: (0.4533,-0.87078,-0.19046)
- New Polarization:       (-0.89136,-0.4426,-0.097896)
+ Old Momentum Direction: (0.9988,0.036097,0.033063)
+ Old Polarization:       (0.027974,0.13337,-0.99067)
+ New Momentum Direction: (0.99783,0.048584,0.044501)
+ New Polarization:       (-0.045059,0.99601,-0.077053)
  *** FresnelRefraction *** 
-Track (trackID 623, parentID 1) is processed with stopping code 2
+Track (trackID 881, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73495,0.57208,-0.36409)
- Old Polarization:       (-0.67807,0.61387,-0.40421)
- New Momentum Direction: (0.39255,0.77592,-0.49382)
- New Polarization:       (-0.9197,0.32704,-0.21724)
- *** FresnelRefraction *** 
-Track (trackID 622, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+ Old Momentum Direction: (0.41547,0.58692,0.69492)
+ Old Polarization:       (-0.62274,0.74039,-0.25301)
+ New Momentum Direction: (0.41547,0.58692,-0.69492)
+ New Polarization:       (0.70178,-0.69288,-0.16563)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.41547,0.58692,-0.69492)
+ Old Polarization:       (0.70178,-0.69288,-0.16563)
+ New Momentum Direction: (0.41547,-0.58692,-0.69492)
+ New Polarization:       (-0.70178,-0.69288,0.16563)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.41547,-0.58692,-0.69492)
+ Old Polarization:       (-0.70178,-0.69288,0.16563)
+ New Momentum Direction: (-0.41547,-0.58692,-0.69492)
+ New Polarization:       (-0.70178,0.69288,-0.16563)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 621, parentID 1) is processed with stopping code 2
+Track (trackID 880, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.10319,-0.33187,0.93767)
+ Old Polarization:       (-0.96257,-0.27083,0.010075)
+ New Momentum Direction: (0.14036,-0.45139,0.88122)
+ New Polarization:       (-0.94374,-0.33017,-0.01881)
+ *** FresnelRefraction *** 
+Track (trackID 879, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73146,0.66479,0.15171)
- Old Polarization:       (-0.68188,0.71344,0.16137)
- New Momentum Direction: (0.37727,0.90289,0.20604)
- New Polarization:       (-0.9261,0.36802,0.083025)
+ Old Momentum Direction: (0.71306,0.58907,0.38018)
+ Old Polarization:       (-0.29394,0.74349,-0.60069)
+ New Momentum Direction: (0.31626,0.79709,0.51443)
+ New Polarization:       (-0.54487,0.59652,-0.58931)
  *** FresnelRefraction *** 
-Track (trackID 620, parentID 1) is processed with stopping code 2
+Track (trackID 878, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73104,0.62451,0.27489)
- Old Polarization:       (-0.68233,0.66853,0.29578)
- New Momentum Direction: (0.37446,0.84867,0.37355)
- New Polarization:       (-0.92724,0.34235,0.15171)
+ Old Momentum Direction: (0.71125,0.59034,0.3816)
+ Old Polarization:       (-0.29618,0.74401,-0.59895)
+ New Momentum Direction: (0.30707,0.79924,0.51664)
+ New Polarization:       (-0.55035,0.59202,-0.58875)
  *** FresnelRefraction *** 
-Track (trackID 619, parentID 1) is processed with stopping code 2
+Track (trackID 877, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73889,0.49091,-0.46158)
- Old Polarization:       (-0.67377,0.52935,-0.51558)
- New Momentum Direction: (0.41378,0.66324,-0.62362)
- New Polarization:       (-0.91034,0.29538,-0.28988)
+ Old Momentum Direction: (0.99963,-0.0085539,0.025946)
+ Old Polarization:       (0.026569,0.083229,-0.99618)
+ New Momentum Direction: (0.99932,-0.011536,0.034993)
+ New Polarization:       (-0.036278,-0.47408,0.87973)
  *** FresnelRefraction *** 
-Track (trackID 618, parentID 1) is processed with stopping code 2
+Track (trackID 876, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 617, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.34977,-0.676,0.6486)
+ Old Polarization:       (-0.69457,-0.65172,-0.3047)
+ New Momentum Direction: (0.34977,0.676,0.6486)
+ New Polarization:       (0.15719,0.64017,-0.75198)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.34977,0.676,0.6486)
+ Old Polarization:       (0.15719,0.64017,-0.75198)
+ New Momentum Direction: (0.34977,0.676,-0.6486)
+ New Polarization:       (-0.15719,-0.64017,-0.75198)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.34977,0.676,-0.6486)
+ Old Polarization:       (-0.15719,-0.64017,-0.75198)
+ New Momentum Direction: (-0.34977,0.676,-0.6486)
+ New Polarization:       (-0.15719,0.64017,0.75198)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.34977,0.676,-0.6486)
+ Old Polarization:       (-0.15719,0.64017,0.75198)
+ New Momentum Direction: (-0.34977,-0.676,-0.6486)
+ New Polarization:       (0.7348,-0.62743,0.25768)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.34977,-0.676,-0.6486)
+ Old Polarization:       (0.7348,-0.62743,0.25768)
+ New Momentum Direction: (-0.34977,-0.676,0.6486)
+ New Polarization:       (-0.7348,0.62743,0.25768)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.34977,-0.676,0.6486)
+ Old Polarization:       (-0.7348,0.62743,0.25768)
+ New Momentum Direction: (-0.47423,-0.042077,0.87939)
+ New Polarization:       (-0.3077,0.94379,-0.12078)
+ *** FresnelRefraction *** 
+Track (trackID 875, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 616, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74045,-0.52268,0.42254)
- Old Polarization:       (-0.67206,-0.58354,0.45587)
- New Momentum Direction: (0.40457,-0.71118,0.57492)
- New Polarization:       (-0.91447,-0.31983,0.24789)
+ Old Momentum Direction: (0.0872,-0.2599,0.96169)
+ Old Polarization:       (-0.98061,-0.19246,0.036903)
+ New Momentum Direction: (0.11854,-0.35331,0.92796)
+ New Polarization:       (-0.87824,-0.47336,-0.068038)
  *** FresnelRefraction *** 
-Track (trackID 615, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
+Track (trackID 874, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74885,-0.62238,-0.22777)
- Old Polarization:       (-0.66275,-0.70339,-0.25693)
- New Momentum Direction: (-0.74885,-0.62238,-0.22777)
- New Polarization:       (-0.66274,0.7038,0.25581)
+ Old Momentum Direction: (0.91505,-0.39456,0.083713)
+ Old Polarization:       (-0.064979,-0.34904,-0.93485)
+ New Momentum Direction: (-0.91505,-0.39456,0.083713)
+ New Polarization:       (0.036513,0.12566,0.9914)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74885,-0.62238,-0.22777)
- Old Polarization:       (-0.66274,0.7038,0.25581)
- New Momentum Direction: (-0.74885,0.62238,-0.22777)
- New Polarization:       (0.66274,0.7038,-0.25581)
+ Old Momentum Direction: (-0.91505,-0.39456,0.083713)
+ Old Polarization:       (0.036513,0.12566,0.9914)
+ New Momentum Direction: (-0.91505,0.39456,0.083713)
+ New Polarization:       (-0.036513,0.12566,-0.9914)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74885,0.62238,-0.22777)
- Old Polarization:       (0.66274,0.7038,-0.25581)
- New Momentum Direction: (-0.44574,0.84064,-0.30764)
- New Polarization:       (0.89516,0.41898,-0.15213)
+ Old Momentum Direction: (-0.91505,0.39456,0.083713)
+ Old Polarization:       (-0.036513,0.12566,-0.9914)
+ New Momentum Direction: (-0.84009,0.53064,0.11258)
+ New Polarization:       (0.066644,0.30694,-0.94939)
  *** FresnelRefraction *** 
-Track (trackID 614, parentID 1) is processed with stopping code 2
+Track (trackID 873, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.082542,-0.17137,0.98174)
+ Old Polarization:       (-0.993,-0.097632,0.066446)
+ New Momentum Direction: (0.11148,-0.23145,0.96644)
+ New Polarization:       (-0.61537,-0.77969,-0.11574)
+ *** FresnelRefraction *** 
+Track (trackID 872, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65538,0.6135,0.44057)
+ Old Polarization:       (-0.35849,0.76607,-0.5335)
+ New Momentum Direction: (-0.65538,0.6135,0.44057)
+ New Polarization:       (-0.35849,-0.76607,0.5335)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65538,0.6135,0.44057)
+ Old Polarization:       (-0.35849,-0.76607,0.5335)
+ New Momentum Direction: (-0.65538,-0.6135,0.44057)
+ New Polarization:       (0.35849,-0.76607,-0.5335)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65538,-0.6135,0.44057)
+ Old Polarization:       (0.35849,-0.76607,-0.5335)
+ New Momentum Direction: (-0.65538,-0.6135,-0.44057)
+ New Polarization:       (-0.35849,0.76607,-0.5335)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 613, parentID 1) is processed with stopping code 2
+Track (trackID 871, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74507,-0.42032,-0.51788)
- Old Polarization:       (-0.66696,-0.47568,-0.57349)
- New Momentum Direction: (0.42696,-0.56986,-0.70212)
- New Polarization:       (-0.90426,-0.27325,-0.32811)
+ Old Momentum Direction: (0.88276,0.4334,0.1814)
+ Old Polarization:       (-0.11013,0.56621,-0.81687)
+ New Momentum Direction: (0.76955,0.58907,0.24655)
+ New Polarization:       (-0.20265,0.59141,-0.7805)
  *** FresnelRefraction *** 
-Track (trackID 612, parentID 1) is processed with stopping code 2
+Track (trackID 870, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73682,0.57514,0.35541)
- Old Polarization:       (-0.67608,0.62499,0.39025)
- New Momentum Direction: (0.41047,0.77571,0.47935)
- New Polarization:       (-0.91187,0.34795,0.21777)
+Scattering Photon!
+Old Momentum Direction: (0.57435,-0.70834,0.41034)
+Old Polarization: (-0.44722,-0.69136,-0.56747)
+New Polarization: (-0.25014,0.78354,0.56877)
+Polarization Change: (-0.25014,0.78354,0.56877)
+New Momentum Direction: (0.96506,0.1544,0.21172)
+Momentum Change: (0.96506,0.1544,0.21172)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.96506,0.1544,0.21172)
+ Old Polarization:       (-0.25014,0.78354,0.56877)
+ New Momentum Direction: (0.93509,0.20882,0.28634)
+ New Polarization:       (-0.34541,0.71787,0.60445)
  *** FresnelRefraction *** 
-Track (trackID 611, parentID 1) is processed with stopping code 2
+Track (trackID 869, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 207
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 197
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 208 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78002,0.069942,-0.62184)
- Old Polarization:       (-0.62494,0.13789,-0.7684)
- New Momentum Direction: (0.5305,0.094748,-0.84238)
- New Polarization:       (-0.84715,0.094701,-0.52285)
- *** FresnelRefraction *** 
-Track (trackID 1105, parentID 1) is processed with stopping code 2
-### pop requested out of 207 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.72945,0.38984,0.56207)
- Old Polarization:       (-0.68081,0.49346,0.5413)
- New Momentum Direction: (0.38152,0.52681,0.75955)
- New Polarization:       (-0.92238,0.2708,0.27548)
- *** FresnelRefraction *** 
-Track (trackID 1104, parentID 1) is processed with stopping code 2
-### pop requested out of 206 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.77135,0.62861,-0.099355)
- Old Polarization:       (-0.63479,0.74881,-0.1906)
- New Momentum Direction: (0.50152,0.85454,-0.13507)
- New Polarization:       (-0.86409,0.48708,-0.12687)
- *** FresnelRefraction *** 
-Track (trackID 1103, parentID 1) is processed with stopping code 2
-### pop requested out of 205 stacked tracks.
+### pop requested out of 198 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1262, parentID 1) is processed with stopping code 2
+### pop requested out of 197 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74312,0.5555,0.37309)
- Old Polarization:       (-0.66569,0.67042,0.32771)
- New Momentum Direction: (0.41767,0.75427,0.50659)
- New Polarization:       (-0.90643,0.38438,0.17503)
+ Old Momentum Direction: (0.20906,-0.67284,0.70963)
+ Old Polarization:       (-0.73075,-0.58972,-0.34385)
+ New Momentum Direction: (0.28162,-0.90633,0.31504)
+ New Polarization:       (-0.66943,-0.42081,-0.6122)
  *** FresnelRefraction *** 
-Track (trackID 1102, parentID 1) is processed with stopping code 2
-### pop requested out of 204 stacked tracks.
+Track (trackID 1261, parentID 1) is processed with stopping code 2
+### pop requested out of 196 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.20717,-0.68236,0.70104)
+Old Polarization: (-0.72685,-0.58699,-0.35655)
+New Polarization: (0.2654,0.77176,0.57789)
+Polarization Change: (0.2654,0.77176,0.57789)
+New Momentum Direction: (-0.95635,0.13469,0.25934)
+Momentum Change: (-0.95635,0.13469,0.25934)
 
 ** Photon absorbed! **
-Track (trackID 1101, parentID 1) is processed with stopping code 2
-### pop requested out of 203 stacked tracks.
+Track (trackID 1260, parentID 1) is processed with stopping code 2
+### pop requested out of 195 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72082,0.30297,0.6234)
- Old Polarization:       (-0.69027,0.3952,0.60609)
- New Momentum Direction: (0.34455,0.41034,0.84433)
- New Polarization:       (-0.93706,0.2045,0.28301)
+ Old Momentum Direction: (0.94216,0.25512,0.21736)
+ Old Polarization:       (0.084879,0.44577,-0.89111)
+ New Momentum Direction: (0.89116,0.34534,0.29423)
+ New Polarization:       (-0.15266,0.83898,-0.52232)
  *** FresnelRefraction *** 
-Track (trackID 1100, parentID 1) is processed with stopping code 2
-### pop requested out of 202 stacked tracks.
+Track (trackID 1259, parentID 1) is processed with stopping code 2
+### pop requested out of 194 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.99066,-0.027114,0.13364)
+Old Polarization: (0.13607,0.13277,-0.98176)
+New Polarization: (-0.16051,-0.10129,0.98182)
+Polarization Change: (-0.16051,-0.10129,0.98182)
+New Momentum Direction: (-0.61013,0.7921,-0.018026)
+Momentum Change: (-0.61013,0.7921,-0.018026)
  Photon at Boundary! 
- Old Momentum Direction: (0.78917,0.25179,-0.56019)
- Old Polarization:       (-0.61403,0.34341,-0.71066)
- New Momentum Direction: (0.56325,0.33875,-0.75366)
- New Polarization:       (-0.82619,0.24501,-0.50733)
+ Old Momentum Direction: (-0.61013,0.7921,-0.018026)
+ Old Polarization:       (-0.16051,-0.10129,0.98182)
+ New Momentum Direction: (-0.82757,0.56084,-0.02445)
+ New Polarization:       (-0.15973,-0.19349,0.96801)
  *** FresnelRefraction *** 
-Track (trackID 1099, parentID 1) is processed with stopping code 2
-### pop requested out of 201 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78699,0.4293,-0.44312)
- Old Polarization:       (-0.61691,0.53777,-0.57465)
- New Momentum Direction: (0.55274,0.57986,-0.59853)
- New Polarization:       (-0.83331,0.37772,-0.40363)
+ Old Momentum Direction: (-0.82757,0.56084,-0.02445)
+ Old Polarization:       (-0.15973,-0.19349,0.96801)
+ New Momentum Direction: (-0.91033,0.41348,-0.018026)
+ New Polarization:       (0.089693,0.23962,0.96672)
  *** FresnelRefraction *** 
-Track (trackID 1098, parentID 1) is processed with stopping code 2
-### pop requested out of 200 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75388,0.61056,0.24265)
- Old Polarization:       (-0.6538,0.73361,0.18536)
- New Momentum Direction: (0.45493,0.82757,0.32889)
- New Polarization:       (-0.88848,0.44682,0.10468)
+ Old Momentum Direction: (-0.91033,0.41348,-0.018026)
+ Old Polarization:       (0.089693,0.23962,0.96672)
+ New Momentum Direction: (-0.82757,0.56084,-0.02445)
+ New Polarization:       (0.164,0.28319,0.94494)
  *** FresnelRefraction *** 
-Track (trackID 1097, parentID 1) is processed with stopping code 2
-### pop requested out of 199 stacked tracks.
+Track (trackID 1258, parentID 1) is processed with stopping code 2
+### pop requested out of 193 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69145,-0.26976,0.67017)
- Old Polarization:       (-0.72219,-0.23446,0.65075)
- New Momentum Direction: (0.18391,-0.36704,0.91184)
- New Polarization:       (-0.98282,-0.054109,0.17645)
+ Old Momentum Direction: (0.01608,0.15789,0.98733)
+ Old Polarization:       (-0.94049,0.33761,-0.038672)
+ New Momentum Direction: (0.021783,0.21388,0.97662)
+ New Polarization:       (-0.90971,0.4094,-0.069368)
  *** FresnelRefraction *** 
-Track (trackID 1096, parentID 1) is processed with stopping code 2
-### pop requested out of 198 stacked tracks.
+Track (trackID 1257, parentID 1) is processed with stopping code 2
+### pop requested out of 192 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69371,-0.55864,0.45463)
- Old Polarization:       (-0.72002,-0.55388,0.41807)
- New Momentum Direction: (0.21255,-0.75789,0.61679)
- New Polarization:       (-0.97703,-0.17488,0.1218)
+ Old Momentum Direction: (0.029395,-0.44098,0.89704)
+ Old Polarization:       (-0.93408,-0.3316,-0.1324)
+ New Momentum Direction: (0.039526,-0.59295,0.80427)
+ New Polarization:       (-0.89586,-0.37753,-0.23431)
  *** FresnelRefraction *** 
-Track (trackID 1095, parentID 1) is processed with stopping code 2
-### pop requested out of 197 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1094, parentID 1) is processed with stopping code 2
-### pop requested out of 196 stacked tracks.
+Track (trackID 1256, parentID 1) is processed with stopping code 2
+### pop requested out of 191 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77755,0.57495,-0.25464)
- Old Polarization:       (-0.62802,0.68968,-0.36047)
- New Momentum Direction: (0.51855,0.7818,-0.34626)
- New Polarization:       (-0.85453,0.45974,-0.24171)
+ Old Momentum Direction: (0.82724,0.44676,0.34071)
+ Old Polarization:       (-0.043907,0.65596,-0.75352)
+ New Momentum Direction: (0.64779,0.60576,0.46197)
+ New Polarization:       (-0.083495,0.65921,-0.74731)
  *** FresnelRefraction *** 
-Track (trackID 1093, parentID 1) is processed with stopping code 2
-### pop requested out of 195 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1092, parentID 1) is processed with stopping code 2
-### pop requested out of 194 stacked tracks.
+Track (trackID 1255, parentID 1) is processed with stopping code 2
+### pop requested out of 190 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1091, parentID 1) is processed with stopping code 2
-### pop requested out of 193 stacked tracks.
+Track (trackID 1254, parentID 1) is processed with stopping code 2
+### pop requested out of 189 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65568,-0.68081,0.32648)
+ Old Polarization:       (-0.23203,-0.59316,-0.77093)
+ New Momentum Direction: (0.88646,-0.13919,0.44139)
+ New Polarization:       (0.2934,0.90658,-0.30335)
+ *** FresnelRefraction *** 
+Track (trackID 1253, parentID 1) is processed with stopping code 2
+### pop requested out of 188 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1090, parentID 1) is processed with stopping code 2
-### pop requested out of 192 stacked tracks.
+Track (trackID 1252, parentID 1) is processed with stopping code 2
+### pop requested out of 187 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69518,-0.56976,0.43829)
- Old Polarization:       (-0.71855,-0.56793,0.40143)
- New Momentum Direction: (0.22701,-0.77192,0.5938)
- New Polarization:       (-0.97374,-0.19075,0.12429)
- *** FresnelRefraction *** 
-Track (trackID 1089, parentID 1) is processed with stopping code 2
-### pop requested out of 191 stacked tracks.
+ Old Momentum Direction: (0.70815,0.54156,0.45304)
+ Old Polarization:       (-0.17668,0.75714,-0.62891)
+ New Momentum Direction: (-0.70815,0.54156,0.45304)
+ New Polarization:       (-0.098531,-0.71116,0.69609)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.76153,-0.27282,-0.58791)
- Old Polarization:       (-0.64554,-0.23832,-0.72559)
- New Momentum Direction: (0.47297,-0.37088,-0.79922)
- New Polarization:       (-0.87942,-0.14314,-0.45401)
- *** FresnelRefraction *** 
-Track (trackID 1088, parentID 1) is processed with stopping code 2
-### pop requested out of 190 stacked tracks.
+ Old Momentum Direction: (-0.70815,0.54156,0.45304)
+ Old Polarization:       (-0.098531,-0.71116,0.69609)
+ New Momentum Direction: (-0.70815,-0.54156,0.45304)
+ New Polarization:       (0.098531,-0.71116,-0.69609)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70815,-0.54156,0.45304)
+ Old Polarization:       (0.098531,-0.71116,-0.69609)
+ New Momentum Direction: (-0.70815,-0.54156,-0.45304)
+ New Polarization:       (-0.098531,0.71116,-0.69609)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70815,-0.54156,-0.45304)
+ Old Polarization:       (-0.098531,0.71116,-0.69609)
+ New Momentum Direction: (0.70815,-0.54156,-0.45304)
+ New Polarization:       (0.054098,-0.59814,0.79957)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70815,-0.54156,-0.45304)
+ Old Polarization:       (0.054098,-0.59814,0.79957)
+ New Momentum Direction: (0.70815,0.54156,-0.45304)
+ New Polarization:       (-0.054098,-0.59814,-0.79957)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70815,0.54156,-0.45304)
+ Old Polarization:       (-0.054098,-0.59814,-0.79957)
+ New Momentum Direction: (0.70815,0.54156,0.45304)
+ New Polarization:       (0.054098,0.59814,-0.79957)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70815,0.54156,0.45304)
+ Old Polarization:       (0.054098,0.59814,-0.79957)
+ New Momentum Direction: (-0.70815,0.54156,0.45304)
+ New Polarization:       (-0.02956,-0.66382,0.74731)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.7487,-0.48047,-0.45672)
- Old Polarization:       (-0.65949,-0.46999,-0.58667)
- New Momentum Direction: (0.44071,-0.65061,-0.61845)
- New Polarization:       (-0.89548,-0.2708,-0.35325)
- *** FresnelRefraction *** 
-Track (trackID 1087, parentID 1) is processed with stopping code 2
-### pop requested out of 189 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1086, parentID 1) is processed with stopping code 2
-### pop requested out of 188 stacked tracks.
+ Old Momentum Direction: (-0.70815,0.54156,0.45304)
+ Old Polarization:       (-0.02956,-0.66382,0.74731)
+ New Momentum Direction: (-0.70815,-0.54156,0.45304)
+ New Polarization:       (0.02956,-0.66382,-0.74731)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.70554,0.10149,0.70136)
- Old Polarization:       (-0.70685,0.17158,0.68624)
- New Momentum Direction: (0.26813,0.13797,0.95345)
- New Polarization:       (-0.96236,0.083834,0.25851)
+ Old Momentum Direction: (-0.70815,-0.54156,0.45304)
+ Old Polarization:       (0.02956,-0.66382,-0.74731)
+ New Momentum Direction: (-0.28153,-0.73598,0.61569)
+ New Polarization:       (0.062184,-0.65428,-0.75369)
  *** FresnelRefraction *** 
-Track (trackID 1085, parentID 1) is processed with stopping code 2
-### pop requested out of 187 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1084, parentID 1) is processed with stopping code 2
+Track (trackID 1251, parentID 1) is processed with stopping code 2
 ### pop requested out of 186 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70387,0.0073452,0.71029)
- Old Polarization:       (-0.70898,0.068812,0.70187)
- New Momentum Direction: (0.95343,0.0099493,0.30146)
- New Polarization:       (0.30055,0.053028,-0.95229)
+ Old Momentum Direction: (0.8354,0.43724,0.33305)
+ Old Polarization:       (-0.034333,0.64627,-0.76233)
+ New Momentum Direction: (0.6673,0.59248,0.4513)
+ New Polarization:       (-0.06508,0.65001,-0.75713)
  *** FresnelRefraction *** 
-Track (trackID 1083, parentID 1) is processed with stopping code 2
+Track (trackID 1250, parentID 1) is processed with stopping code 2
 ### pop requested out of 185 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78282,0.33798,-0.52247)
- Old Polarization:       (-0.62224,0.43048,-0.65383)
- New Momentum Direction: (0.53323,0.45949,-0.71031)
- New Polarization:       (-0.84596,0.29331,-0.44533)
- *** FresnelRefraction *** 
-Track (trackID 1082, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1249, parentID 1) is processed with stopping code 2
 ### pop requested out of 184 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73949,0.53223,0.41217)
- Old Polarization:       (-0.66968,0.64393,0.36999)
- New Momentum Direction: (0.40418,0.72318,0.56005)
- New Polarization:       (-0.91252,0.36085,0.19259)
+ Old Momentum Direction: (0.60493,-0.70678,0.36678)
+ Old Polarization:       (-0.28808,-0.62367,-0.72667)
+ New Momentum Direction: (0.81697,-0.29527,0.49535)
+ New Polarization:       (0.40983,0.90158,-0.13852)
  *** FresnelRefraction *** 
-Track (trackID 1081, parentID 1) is processed with stopping code 2
+Track (trackID 1248, parentID 1) is processed with stopping code 2
 ### pop requested out of 183 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78253,0.42303,-0.45683)
- Old Polarization:       (-0.62257,0.52342,-0.58175)
- New Momentum Direction: (0.53222,0.57522,-0.62118)
- New Polarization:       (-0.84658,0.35589,-0.39578)
+ Old Momentum Direction: (0.1414,0.38038,0.91396)
+ Old Polarization:       (-0.80249,0.58464,-0.11917)
+ New Momentum Direction: (0.19139,0.51486,0.83563)
+ New Polarization:       (-0.75068,0.62528,-0.21332)
  *** FresnelRefraction *** 
-Track (trackID 1080, parentID 1) is processed with stopping code 2
+Track (trackID 1247, parentID 1) is processed with stopping code 2
 ### pop requested out of 182 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.77956,0.56668,-0.26677)
-Old Polarization: (-0.62559,0.68388,-0.37541)
-New Polarization: (-0.23269,0.74306,-0.40812)
-Polarization Change: (-0.26469,0.84524,-0.46424)
-New Momentum Direction: (-0.70369,-0.46998,-0.45448)
-Momentum Change: (-0.73261,-0.48929,-0.47315)
  Photon at Boundary! 
- Old Momentum Direction: (-0.73261,-0.48929,-0.47315)
- Old Polarization:       (-0.26469,0.84524,-0.46424)
- New Momentum Direction: (-0.38375,-0.66383,-0.64193)
- New Polarization:       (0.49196,0.44132,-0.75047)
+ Old Momentum Direction: (0.10722,0.3413,0.93382)
+ Old Polarization:       (-0.83716,0.53766,-0.10039)
+ New Momentum Direction: (0.14564,0.46361,0.87399)
+ New Polarization:       (-0.78792,0.5886,-0.18092)
  *** FresnelRefraction *** 
-Track (trackID 1079, parentID 1) is processed with stopping code 2
+Track (trackID 1246, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1078, parentID 1) is processed with stopping code 2
-### pop requested out of 180 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70922,-0.70409,0.035521)
- Old Polarization:       (-0.7028,-0.71009,-0.042896)
- New Momentum Direction: (0.28455,-0.95744,0.048302)
- New Polarization:       (-0.95742,-0.28638,-0.03645)
+ Old Momentum Direction: (0.76,-0.59953,0.25091)
+ Old Polarization:       (-0.1153,-0.50432,-0.85578)
+ New Momentum Direction: (0.47926,-0.80962,0.33884)
+ New Polarization:       (-0.22122,-0.48504,-0.84605)
  *** FresnelRefraction *** 
-Track (trackID 1077, parentID 1) is processed with stopping code 2
-### pop requested out of 179 stacked tracks.
+Track (trackID 1245, parentID 1) is processed with stopping code 2
+### pop requested out of 180 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69414,-0.4602,0.55351)
- Old Polarization:       (-0.71982,-0.44827,0.53001)
- New Momentum Direction: (0.22601,-0.62277,0.74905)
- New Polarization:       (-0.97412,-0.14735,0.17142)
+ Old Momentum Direction: (0.70626,0.54083,0.45683)
+ Old Polarization:       (-0.17743,0.75991,-0.62535)
+ New Momentum Direction: (0.28051,0.73327,0.61938)
+ New Polarization:       (-0.35643,0.67872,-0.6421)
  *** FresnelRefraction *** 
-Track (trackID 1076, parentID 1) is processed with stopping code 2
+Track (trackID 1244, parentID 1) is processed with stopping code 2
+### pop requested out of 179 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1243, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69978,-0.076241,0.71028)
- Old Polarization:       (-0.71341,-0.023349,0.70036)
- New Momentum Direction: (0.94875,-0.10337,0.29865)
- New Polarization:       (0.28914,-0.09759,-0.9523)
+ Old Momentum Direction: (0.34833,0.54003,0.76618)
+ Old Polarization:       (-0.57467,0.76878,-0.2806)
+ New Momentum Direction: (0.4693,0.72757,0.5004)
+ New Polarization:       (-0.53487,0.68511,-0.49451)
  *** FresnelRefraction *** 
-Track (trackID 1075, parentID 1) is processed with stopping code 2
+Track (trackID 1242, parentID 1) is processed with stopping code 2
 ### pop requested out of 177 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78499,0.48679,-0.38318)
- Old Polarization:       (-0.61928,0.59986,-0.50662)
- New Momentum Direction: (0.54576,0.65843,-0.51829)
- New Polarization:       (-0.83779,0.41703,-0.3524)
+ Old Momentum Direction: (0.94035,-0.31136,0.13714)
+ Old Polarization:       (0.08269,-0.18184,-0.97984)
+ New Momentum Direction: (0.8876,-0.42153,0.18567)
+ New Polarization:       (-0.14912,-0.64436,-0.75004)
  *** FresnelRefraction *** 
-Track (trackID 1074, parentID 1) is processed with stopping code 2
+Track (trackID 1241, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77547,0.60443,-0.18252)
- Old Polarization:       (-0.63021,0.72338,-0.28204)
- New Momentum Direction: (0.51411,0.8211,-0.24796)
- New Polarization:       (-0.85696,0.47953,-0.18887)
+ Old Momentum Direction: (0.98332,0.095755,0.15465)
+ Old Polarization:       (0.12429,0.26703,-0.95564)
+ New Momentum Direction: (0.9689,0.13027,0.21039)
+ New Polarization:       (-0.19477,0.9259,0.3237)
  *** FresnelRefraction *** 
-Track (trackID 1073, parentID 1) is processed with stopping code 2
+Track (trackID 1240, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72243,0.27081,0.6362)
- Old Polarization:       (-0.68872,0.36333,0.62742)
- New Momentum Direction: (0.3626,0.365,0.85749)
- New Polarization:       (-0.93028,0.19668,0.30966)
+ Old Momentum Direction: (0.13531,0.36373,0.92162)
+ Old Polarization:       (-0.81352,0.57175,-0.10621)
+ New Momentum Direction: (0.18224,0.48988,0.85253)
+ New Polarization:       (-0.76644,0.6139,-0.18893)
  *** FresnelRefraction *** 
-Track (trackID 1072, parentID 1) is processed with stopping code 2
+Track (trackID 1239, parentID 1) is processed with stopping code 2
 ### pop requested out of 174 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72057,-0.68363,-0.11586)
- Old Polarization:       (-0.6905,-0.69228,-0.20966)
- New Momentum Direction: (0.34075,-0.92694,-0.1571)
- New Polarization:       (-0.93844,-0.32525,-0.11638)
+ Old Momentum Direction: (0.15378,-0.6408,0.75215)
+ Old Polarization:       (-0.78538,-0.54119,-0.3005)
+ New Momentum Direction: (0.20905,-0.8711,0.44439)
+ New Polarization:       (-0.71429,-0.44639,-0.53901)
  *** FresnelRefraction *** 
-Track (trackID 1071, parentID 1) is processed with stopping code 2
+Track (trackID 1238, parentID 1) is processed with stopping code 2
 ### pop requested out of 173 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69897,-0.21016,0.68357)
- Old Polarization:       (-0.71474,-0.17277,0.67772)
- New Momentum Direction: (0.2606,-0.28371,0.92282)
- New Polarization:       (-0.96521,-0.055538,0.2555)
- *** FresnelRefraction *** 
-Track (trackID 1070, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.63035,0.56636,0.53094)
+ Old Polarization:       (-0.25888,0.79813,-0.54403)
+ New Momentum Direction: (-0.63035,0.56636,0.53094)
+ New Polarization:       (-0.25888,-0.79813,0.54403)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63035,0.56636,0.53094)
+ Old Polarization:       (-0.25888,-0.79813,0.54403)
+ New Momentum Direction: (-0.63035,-0.56636,0.53094)
+ New Polarization:       (0.25888,-0.79813,-0.54403)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63035,-0.56636,0.53094)
+ Old Polarization:       (0.25888,-0.79813,-0.54403)
+ New Momentum Direction: (-0.63035,-0.56636,-0.53094)
+ New Polarization:       (-0.25888,0.79813,-0.54403)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63035,-0.56636,-0.53094)
+ Old Polarization:       (-0.25888,0.79813,-0.54403)
+ New Momentum Direction: (0.63035,-0.56636,-0.53094)
+ New Polarization:       (-0.25888,-0.79813,0.54403)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63035,-0.56636,-0.53094)
+ Old Polarization:       (-0.25888,-0.79813,0.54403)
+ New Momentum Direction: (0.63035,0.56636,-0.53094)
+ New Polarization:       (0.25888,-0.79813,-0.54403)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63035,0.56636,-0.53094)
+ Old Polarization:       (0.25888,-0.79813,-0.54403)
+ New Momentum Direction: (0.63035,0.56636,0.53094)
+ New Polarization:       (-0.25888,0.79813,-0.54403)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1237, parentID 1) is processed with stopping code 2
 ### pop requested out of 172 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1069, parentID 1) is processed with stopping code 2
+Track (trackID 1236, parentID 1) is processed with stopping code 2
 ### pop requested out of 171 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1068, parentID 1) is processed with stopping code 2
+Track (trackID 1235, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72906,-0.63357,-0.25896)
- Old Polarization:       (-0.68111,-0.63424,-0.36582)
- New Momentum Direction: (0.36783,-0.86077,-0.35182)
- New Polarization:       (-0.92787,-0.31483,-0.19984)
+ Old Momentum Direction: (0.81366,0.45654,0.35991)
+ Old Polarization:       (-0.053546,0.67532,-0.73558)
+ New Momentum Direction: (0.62176,0.61506,0.48488)
+ New Polarization:       (-0.1007,0.67674,-0.7293)
  *** FresnelRefraction *** 
-Track (trackID 1067, parentID 1) is processed with stopping code 2
+Track (trackID 1234, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1066, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.90269,-0.3996,0.15962)
+ Old Polarization:       (0.044514,-0.28224,-0.95831)
+ New Momentum Direction: (0.81418,-0.53918,0.21538)
+ New Polarization:       (-0.081915,-0.47391,-0.87675)
+ *** FresnelRefraction *** 
+Track (trackID 1233, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71519,0.21688,0.66443)
- Old Polarization:       (-0.6965,0.30028,0.65171)
- New Momentum Direction: (0.3229,0.29368,0.89972)
- New Polarization:       (-0.945,0.15229,0.28944)
+ Old Momentum Direction: (0.91096,0.32637,0.25226)
+ Old Polarization:       (0.048338,0.52288,-0.85104)
+ New Momentum Direction: (-0.91096,0.32637,0.25226)
+ New Polarization:       (0.025837,-0.56521,0.82454)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.91096,0.32637,0.25226)
+ Old Polarization:       (0.025837,-0.56521,0.82454)
+ New Momentum Direction: (-0.91096,-0.32637,0.25226)
+ New Polarization:       (-0.025837,-0.56521,-0.82454)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.91096,-0.32637,0.25226)
+ Old Polarization:       (-0.025837,-0.56521,-0.82454)
+ New Momentum Direction: (-0.8289,-0.4426,0.3421)
+ New Polarization:       (0.048116,-0.6657,-0.74467)
  *** FresnelRefraction *** 
-Track (trackID 1065, parentID 1) is processed with stopping code 2
+Track (trackID 1232, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71626,-0.69248,-0.086279)
- Old Polarization:       (-0.69509,-0.69702,-0.17611)
- New Momentum Direction: (0.31479,-0.94188,-0.11735)
- New Polarization:       (-0.94757,-0.30468,-0.096364)
+ Old Momentum Direction: (0.78125,-0.58089,0.2285)
+ Old Polarization:       (-0.09706,-0.47465,-0.87481)
+ New Momentum Direction: (0.52824,-0.79016,0.31081)
+ New Polarization:       (-0.18806,-0.46584,-0.86465)
  *** FresnelRefraction *** 
-Track (trackID 1064, parentID 1) is processed with stopping code 2
+Track (trackID 1231, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69616,-0.14208,0.70368)
- Old Polarization:       (-0.71722,-0.095401,0.69029)
- New Momentum Direction: (0.94549,-0.19297,0.26232)
- New Polarization:       (0.22307,-0.20307,-0.95341)
+ Old Momentum Direction: (0.98561,-0.10222,0.13463)
+ Old Polarization:       (0.14021,0.049511,-0.98888)
+ New Momentum Direction: (0.97377,-0.13759,0.18121)
+ New Polarization:       (-0.20355,-0.88267,0.42362)
  *** FresnelRefraction *** 
-Track (trackID 1063, parentID 1) is processed with stopping code 2
+Track (trackID 1230, parentID 1) is processed with stopping code 2
 ### pop requested out of 165 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.72522,-0.67568,-0.13232)
- Old Polarization:       (-0.68555,-0.69083,-0.22974)
- New Momentum Direction: (0.36937,-0.91196,-0.17859)
- New Polarization:       (-0.92746,-0.34977,-0.13217)
- *** FresnelRefraction *** 
-Track (trackID 1062, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1229, parentID 1) is processed with stopping code 2
 ### pop requested out of 164 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.76657,0.64214,-0.0049328)
-Old Polarization: (-0.64003,0.76339,-0.087182)
-New Polarization: (0.10735,0.87037,-0.032031)
-Polarization Change: (0.12233,0.99182,-0.036501)
-New Momentum Direction: (0.28474,-0.0041664,0.84109)
-Momentum Change: (0.32065,-0.004692,0.94719)
- Photon at Boundary! 
- Old Momentum Direction: (0.32065,-0.004692,0.94719)
- Old Polarization:       (0.12233,0.99182,-0.036501)
- New Momentum Direction: (-0.32065,-0.004692,0.94719)
- New Polarization:       (0.12233,-0.99182,0.036501)
- *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.32065,-0.004692,0.94719)
- Old Polarization:       (0.12233,-0.99182,0.036501)
- New Momentum Direction: (-0.43597,-0.0063794,0.89994)
- New Polarization:       (-0.1251,-0.98984,-0.067619)
+ Old Momentum Direction: (0.14074,-0.62762,0.76569)
+ Old Polarization:       (-0.80019,-0.52752,-0.28532)
+ New Momentum Direction: (0.1912,-0.85266,0.48622)
+ New Polarization:       (-0.72985,-0.45473,-0.51044)
  *** FresnelRefraction *** 
-Track (trackID 1061, parentID 1) is processed with stopping code 2
+Track (trackID 1228, parentID 1) is processed with stopping code 2
 ### pop requested out of 163 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78587,0.48864,-0.379)
- Old Polarization:       (-0.61815,0.60369,-0.50343)
- New Momentum Direction: (0.54984,0.66001,-0.51192)
- New Polarization:       (-0.83511,0.42242,-0.35236)
+ Old Momentum Direction: (0.62118,-0.70172,0.34889)
+ Old Polarization:       (-0.27174,-0.61045,-0.74398)
+ New Momentum Direction: (0.84309,-0.2549,0.47353)
+ New Polarization:       (0.38327,0.90248,-0.19658)
  *** FresnelRefraction *** 
-Track (trackID 1060, parentID 1) is processed with stopping code 2
+Track (trackID 1227, parentID 1) is processed with stopping code 2
 ### pop requested out of 162 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7312,-0.63163,-0.25765)
- Old Polarization:       (-0.67881,-0.63633,-0.36647)
- New Momentum Direction: (0.38213,-0.85566,-0.34903)
- New Polarization:       (-0.92206,-0.32786,-0.20573)
+ Old Momentum Direction: (0.18531,0.43152,0.88287)
+ Old Polarization:       (-0.75291,0.6397,-0.15463)
+ New Momentum Direction: (0.25114,0.58483,0.7713)
+ New Polarization:       (-0.6954,0.6633,-0.27651)
  *** FresnelRefraction *** 
-Track (trackID 1059, parentID 1) is processed with stopping code 2
+Track (trackID 1226, parentID 1) is processed with stopping code 2
 ### pop requested out of 161 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1058, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.78737,-0.57397,0.22496)
+ Old Polarization:       (-0.089849,-0.46786,-0.87922)
+ New Momentum Direction: (0.54565,-0.78023,0.30581)
+ New Polarization:       (-0.17351,-0.46219,-0.86964)
+ *** FresnelRefraction *** 
+Track (trackID 1225, parentID 1) is processed with stopping code 2
 ### pop requested out of 160 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56018,0.58364,0.58784)
+ Old Polarization:       (-0.33849,0.80897,-0.48062)
+ New Momentum Direction: (0.56018,0.58364,-0.58784)
+ New Polarization:       (0.33849,-0.80897,-0.48062)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56018,0.58364,-0.58784)
+ Old Polarization:       (0.33849,-0.80897,-0.48062)
+ New Momentum Direction: (0.56018,-0.58364,-0.58784)
+ New Polarization:       (-0.33849,-0.80897,0.48062)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56018,-0.58364,-0.58784)
+ Old Polarization:       (-0.33849,-0.80897,0.48062)
+ New Momentum Direction: (-0.56018,-0.58364,-0.58784)
+ New Polarization:       (-0.33849,0.80897,-0.48062)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56018,-0.58364,-0.58784)
+ Old Polarization:       (-0.33849,0.80897,-0.48062)
+ New Momentum Direction: (-0.56018,-0.58364,0.58784)
+ New Polarization:       (0.33849,-0.80897,-0.48062)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56018,-0.58364,0.58784)
+ Old Polarization:       (0.33849,-0.80897,-0.48062)
+ New Momentum Direction: (-0.56018,0.58364,0.58784)
+ New Polarization:       (-0.33849,-0.80897,0.48062)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56018,0.58364,0.58784)
+ Old Polarization:       (-0.33849,-0.80897,0.48062)
+ New Momentum Direction: (0.56018,0.58364,0.58784)
+ New Polarization:       (-0.33849,0.80897,-0.48062)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56018,0.58364,0.58784)
+ Old Polarization:       (-0.33849,0.80897,-0.48062)
+ New Momentum Direction: (0.56018,0.58364,-0.58784)
+ New Polarization:       (0.33849,-0.80897,-0.48062)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56018,0.58364,-0.58784)
+ Old Polarization:       (0.33849,-0.80897,-0.48062)
+ New Momentum Direction: (0.56018,-0.58364,-0.58784)
+ New Polarization:       (-0.33849,-0.80897,0.48062)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1057, parentID 1) is processed with stopping code 2
+Track (trackID 1224, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1056, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.98397,0.090242,0.15385)
+ Old Polarization:       (0.12568,0.26122,-0.95706)
+ New Momentum Direction: (0.97015,0.1227,0.20918)
+ New Polarization:       (-0.19504,0.90739,0.37229)
+ *** FresnelRefraction *** 
+Track (trackID 1223, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70087,-0.66487,0.25832)
- Old Polarization:       (-0.71222,-0.67208,0.2026)
- New Momentum Direction: (0.25531,-0.90123,0.35015)
- New Polarization:       (-0.96627,-0.25051,0.059798)
+ Old Momentum Direction: (0.97423,0.14083,0.17621)
+ Old Polarization:       (0.12353,0.32053,-0.93915)
+ New Momentum Direction: (0.95249,0.19015,0.23792)
+ New Polarization:       (-0.20207,0.97901,0.026502)
  *** FresnelRefraction *** 
-Track (trackID 1055, parentID 1) is processed with stopping code 2
+Track (trackID 1222, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7834,0.32959,-0.52694)
- Old Polarization:       (-0.6215,0.42209,-0.65998)
- New Momentum Direction: (0.53603,0.44767,-0.71573)
- New Polarization:       (-0.84419,0.28889,-0.45154)
+ Old Momentum Direction: (9.3594e-06,-0.37681,0.92629)
+ Old Polarization:       (-0.96114,-0.25571,-0.10401)
+ New Momentum Direction: (1.2648e-05,-0.50919,0.86066)
+ New Polarization:       (-0.9309,-0.31439,-0.18599)
  *** FresnelRefraction *** 
-Track (trackID 1054, parentID 1) is processed with stopping code 2
+Track (trackID 1221, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69217,-0.33788,0.63776)
- Old Polarization:       (-0.72165,-0.31062,0.61865)
- New Momentum Direction: (0.20024,-0.45866,0.86576)
- New Polarization:       (-0.9797,-0.085401,0.18135)
+ Old Momentum Direction: (0.98519,0.070457,0.1563)
+ Old Polarization:       (0.13513,0.24192,-0.96084)
+ New Momentum Direction: (0.97281,0.095179,0.21114)
+ New Polarization:       (-0.20061,0.80185,0.56284)
  *** FresnelRefraction *** 
-Track (trackID 1053, parentID 1) is processed with stopping code 2
+Track (trackID 1220, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1052, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.43937,0.57332,0.69156)
+ Old Polarization:       (-0.47248,0.80225,-0.3649)
+ New Momentum Direction: (0.59334,0.77423,0.22028)
+ New Polarization:       (-0.49255,0.56565,-0.66139)
+ *** FresnelRefraction *** 
+Track (trackID 1219, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1051, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.98946,-0.069367,0.1271)
+ Old Polarization:       (0.13287,0.086114,-0.98739)
+ New Momentum Direction: (0.98046,-0.094229,0.17266)
+ New Polarization:       (-0.18743,-0.71387,0.67473)
+ *** FresnelRefraction *** 
+Track (trackID 1218, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1050, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.84213,-0.50281,0.19494)
+ Old Polarization:       (-0.024118,-0.39623,-0.91784)
+ New Momentum Direction: (0.68505,-0.67924,0.26333)
+ New Polarization:       (-0.045341,-0.40053,-0.91516)
+ *** FresnelRefraction *** 
+Track (trackID 1217, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70564,0.11335,0.69944)
- Old Polarization:       (-0.7067,0.18434,0.68308)
- New Momentum Direction: (0.26629,0.1542,0.95148)
- New Polarization:       (-0.96285,0.088562,0.25512)
+ Old Momentum Direction: (0.97655,-0.17747,0.12191)
+ Old Polarization:       (0.11797,-0.032612,-0.99248)
+ New Momentum Direction: (0.95622,-0.24122,0.1657)
+ New Polarization:       (-0.19494,-0.94732,-0.25415)
  *** FresnelRefraction *** 
-Track (trackID 1049, parentID 1) is processed with stopping code 2
+Track (trackID 1216, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.70648,0.12591,0.69645)
-Old Polarization: (-0.7058,0.19815,0.68014)
-New Polarization: (-0.059776,0.47244,0.73023)
-Polarization Change: (-0.068568,0.54192,0.83763)
-New Momentum Direction: (0.78101,0.5008,-0.26007)
-Momentum Change: (0.81056,0.51975,-0.26991)
  Photon at Boundary! 
- Old Momentum Direction: (0.81056,0.51975,-0.26991)
- Old Polarization:       (-0.068568,0.54192,0.83763)
- New Momentum Direction: (0.60463,0.70688,-0.36709)
- New Polarization:       (-0.13167,0.54323,0.82919)
+ Old Momentum Direction: (0.43263,0.57413,0.69513)
+ Old Polarization:       (-0.47974,0.7994,-0.36167)
+ New Momentum Direction: (0.58558,0.7771,0.2307)
+ New Polarization:       (-0.49501,0.56817,-0.65738)
  *** FresnelRefraction *** 
-Track (trackID 1048, parentID 1) is processed with stopping code 2
+Track (trackID 1215, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77949,0.55967,-0.28135)
- Old Polarization:       (-0.62575,0.67504,-0.39084)
- New Momentum Direction: (0.52592,0.75991,-0.38202)
- New Polarization:       (-0.8501,0.4553,-0.26465)
+ Old Momentum Direction: (0.41014,-0.74955,0.51958)
+ Old Polarization:       (-0.50402,-0.66108,-0.55582)
+ New Momentum Direction: (0.55736,-0.43679,0.70609)
+ New Polarization:       (0.24314,0.89902,0.36421)
  *** FresnelRefraction *** 
-Track (trackID 1047, parentID 1) is processed with stopping code 2
+Track (trackID 1214, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73872,0.4741,0.47908)
- Old Polarization:       (-0.67054,0.58904,0.45102)
- New Momentum Direction: (0.41611,0.63961,0.64633)
- New Polarization:       (-0.90712,0.34131,0.24625)
+ Old Momentum Direction: (0.51103,-0.73965,0.43791)
+ Old Polarization:       (-0.39298,-0.65414,-0.64627)
+ New Momentum Direction: (0.51103,0.73965,0.43791)
+ New Polarization:       (-0.83501,0.54808,0.048679)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.51103,0.73965,0.43791)
+ Old Polarization:       (-0.83501,0.54808,0.048679)
+ New Momentum Direction: (-0.51103,0.73965,0.43791)
+ New Polarization:       (-0.83501,-0.54808,-0.048679)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51103,0.73965,0.43791)
+ Old Polarization:       (-0.83501,-0.54808,-0.048679)
+ New Momentum Direction: (-0.51103,0.73965,-0.43791)
+ New Polarization:       (0.83501,0.54808,-0.048679)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51103,0.73965,-0.43791)
+ Old Polarization:       (0.83501,0.54808,-0.048679)
+ New Momentum Direction: (-0.69277,0.40946,-0.59365)
+ New Polarization:       (0.0023931,-0.82187,-0.56967)
  *** FresnelRefraction *** 
-Track (trackID 1046, parentID 1) is processed with stopping code 2
+Track (trackID 1213, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1045, parentID 1) is processed with stopping code 2
-### pop requested out of 147 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73899,0.48171,0.47101)
- Old Polarization:       (-0.67023,0.59668,0.44132)
- New Momentum Direction: (0.41568,0.65031,0.63585)
- New Polarization:       (-0.90732,0.34503,0.24027)
+ Old Momentum Direction: (0.043916,-0.50002,0.8649)
+ Old Polarization:       (-0.90532,-0.38601,-0.17719)
+ New Momentum Direction: (0.059738,-0.68016,0.73062)
+ New Polarization:       (-0.85164,-0.41653,-0.31813)
  *** FresnelRefraction *** 
-Track (trackID 1044, parentID 1) is processed with stopping code 2
+Track (trackID 1212, parentID 1) is processed with stopping code 2
+### pop requested out of 147 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1211, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69515,-0.35467,0.62528)
- Old Polarization:       (-0.71881,-0.33225,0.61068)
- New Momentum Direction: (0.23523,-0.47953,0.84541)
- New Polarization:       (-0.97191,-0.10923,0.20847)
- *** FresnelRefraction *** 
-Track (trackID 1043, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1210, parentID 1) is processed with stopping code 2
 ### pop requested out of 145 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1042, parentID 1) is processed with stopping code 2
+Track (trackID 1209, parentID 1) is processed with stopping code 2
 ### pop requested out of 144 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75135,-0.4926,-0.43911)
- Old Polarization:       (-0.65643,-0.48974,-0.57381)
- New Momentum Direction: (0.45859,-0.66335,-0.59132)
- New Polarization:       (-0.8864,-0.2942,-0.3574)
+ Old Momentum Direction: (0.013694,-0.40744,0.91313)
+ Old Polarization:       (-0.9493,-0.29215,-0.11612)
+ New Momentum Direction: (0.018451,-0.54899,0.83563)
+ New Polarization:       (-0.91558,-0.34508,-0.20649)
  *** FresnelRefraction *** 
-Track (trackID 1041, parentID 1) is processed with stopping code 2
+Track (trackID 1208, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1040, parentID 1) is processed with stopping code 2
+Track (trackID 1207, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7339,0.42577,0.52925)
- Old Polarization:       (-0.6759,0.5351,0.50678)
- New Momentum Direction: (0.40008,0.57447,0.71409)
- New Polarization:       (-0.91439,0.30287,0.26865)
+ Old Momentum Direction: (0.22397,0.47152,0.85294)
+ Old Polarization:       (-0.70834,0.67986,-0.18984)
+ New Momentum Direction: (0.30446,0.64097,0.7046)
+ New Polarization:       (-0.64775,0.68167,-0.34021)
  *** FresnelRefraction *** 
-Track (trackID 1039, parentID 1) is processed with stopping code 2
+Track (trackID 1206, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72972,-0.65072,-0.20993)
- Old Polarization:       (-0.68052,-0.66137,-0.31541)
- New Momentum Direction: (0.38272,-0.87924,-0.28365)
- New Polarization:       (-0.92187,-0.3433,-0.17973)
+ Old Momentum Direction: (0.95583,0.21463,0.20083)
+ Old Polarization:       (0.10108,0.40156,-0.91024)
+ New Momentum Direction: (0.91759,0.29027,0.27161)
+ New Polarization:       (-0.17731,0.91036,-0.3739)
  *** FresnelRefraction *** 
-Track (trackID 1038, parentID 1) is processed with stopping code 2
+Track (trackID 1205, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70456,-0.6876,0.17553)
- Old Polarization:       (-0.70817,-0.6972,0.11138)
- New Momentum Direction: (0.27344,-0.932,0.23792)
- New Polarization:       (-0.96105,-0.27503,0.027149)
+ Old Momentum Direction: (0.91466,-0.37524,0.15029)
+ Old Polarization:       (0.054897,-0.25305,-0.96589)
+ New Momentum Direction: (0.83718,-0.50771,0.20335)
+ New Polarization:       (-0.10102,-0.50897,-0.85484)
  *** FresnelRefraction *** 
-Track (trackID 1037, parentID 1) is processed with stopping code 2
+Track (trackID 1204, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69057,-0.43768,0.5758)
- Old Polarization:       (-0.72327,-0.41899,0.54893)
- New Momentum Direction: (0.18315,-0.59491,0.78265)
- New Polarization:       (-0.98309,-0.11151,0.14529)
+ Old Momentum Direction: (0.18939,0.435,0.88029)
+ Old Polarization:       (-0.74867,0.64404,-0.15718)
+ New Momentum Direction: (0.25658,0.58933,0.76607)
+ New Polarization:       (-0.6911,0.66596,-0.28085)
  *** FresnelRefraction *** 
-Track (trackID 1036, parentID 1) is processed with stopping code 2
+Track (trackID 1203, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69371,-0.18021,0.69734)
- Old Polarization:       (-0.71973,-0.13664,0.68067)
- New Momentum Direction: (0.94375,-0.24517,0.2219)
- New Polarization:       (0.15936,-0.25077,-0.95484)
- *** FresnelRefraction *** 
-Track (trackID 1035, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1202, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72744,0.3577,0.58557)
- Old Polarization:       (-0.68307,0.45856,0.56845)
- New Momentum Direction: (-0.72744,0.3577,0.58557)
- New Polarization:       (-0.66727,-0.56769,-0.48216)
+ Old Momentum Direction: (0.63016,-0.69635,0.34351)
+ Old Polarization:       (-0.26129,-0.60677,-0.7507)
+ New Momentum Direction: (0.63016,0.69635,0.34351)
+ New Polarization:       (-0.77016,0.50426,0.39061)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.72744,0.3577,0.58557)
- Old Polarization:       (-0.66727,-0.56769,-0.48216)
- New Momentum Direction: (-0.72744,0.3577,-0.58557)
- New Polarization:       (0.66727,0.56769,-0.48216)
+ Old Momentum Direction: (0.63016,0.69635,0.34351)
+ Old Polarization:       (-0.77016,0.50426,0.39061)
+ New Momentum Direction: (-0.63016,0.69635,0.34351)
+ New Polarization:       (-0.77016,-0.50426,-0.39061)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1034, parentID 1) is processed with stopping code 2
+Track (trackID 1201, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77122,0.63371,-0.060171)
- Old Polarization:       (-0.63473,0.75837,-0.14829)
- New Momentum Direction: (0.50482,0.85936,-0.081596)
- New Polarization:       (-0.86203,0.49689,-0.10007)
+ Old Momentum Direction: (0.86243,0.39931,0.31106)
+ Old Polarization:       (0.0017859,0.61213,-0.79076)
+ New Momentum Direction: (0.73188,0.53758,0.41876)
+ New Polarization:       (-0.003316,0.61734,-0.78669)
  *** FresnelRefraction *** 
-Track (trackID 1033, parentID 1) is processed with stopping code 2
+Track (trackID 1200, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69229,-0.49509,0.525)
- Old Polarization:       (-0.72156,-0.48379,0.49527)
- New Momentum Direction: (0.20303,-0.67179,0.71238)
- New Polarization:       (-0.97914,-0.14482,0.14249)
- *** FresnelRefraction *** 
-Track (trackID 1032, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1199, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1031, parentID 1) is processed with stopping code 2
+Track (trackID 1198, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75029,-0.46623,-0.46871)
- Old Polarization:       (-0.65772,-0.45476,-0.60049)
- New Momentum Direction: (0.44647,-0.63104,-0.6344)
- New Polarization:       (-0.89264,-0.26492,-0.3647)
+ Old Momentum Direction: (0.38788,-0.74789,0.5387)
+ Old Polarization:       (-0.52848,-0.65931,-0.53482)
+ New Momentum Direction: (0.5271,-0.43158,0.73206)
+ New Polarization:       (0.18711,0.89924,0.39542)
  *** FresnelRefraction *** 
-Track (trackID 1030, parentID 1) is processed with stopping code 2
+Track (trackID 1197, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76965,0.63636,-0.051899)
- Old Polarization:       (-0.63659,0.75861,-0.13881)
- New Momentum Direction: (0.49788,0.86437,-0.070496)
- New Polarization:       (-0.86603,0.49123,-0.093217)
+ Old Momentum Direction: (0.11619,0.35485,0.92767)
+ Old Polarization:       (-0.82685,0.55203,-0.1076)
+ New Momentum Direction: (0.15791,0.48227,0.86167)
+ New Polarization:       (-0.77572,0.60053,-0.19395)
  *** FresnelRefraction *** 
-Track (trackID 1029, parentID 1) is processed with stopping code 2
+Track (trackID 1196, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70493,0.069796,0.70584)
- Old Polarization:       (-0.70762,0.13717,0.69315)
- New Momentum Direction: (0.26948,0.094764,0.95833)
- New Polarization:       (-0.96207,0.070255,0.26359)
+ Old Momentum Direction: (0.70273,0.53948,0.46383)
+ Old Polarization:       (-0.17894,0.765,-0.61867)
+ New Momentum Direction: (0.27832,0.72831,0.62618)
+ New Polarization:       (-0.35606,0.68373,-0.63698)
  *** FresnelRefraction *** 
-Track (trackID 1028, parentID 1) is processed with stopping code 2
+Track (trackID 1195, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69818,-0.16302,0.69712)
- Old Polarization:       (-0.71534,-0.11947,0.68849)
- New Momentum Direction: (0.24688,-0.22065,0.94359)
- New Polarization:       (-0.96872,-0.030987,0.24621)
+ Old Momentum Direction: (0.13583,0.37869,0.9155)
+ Old Polarization:       (-0.80616,0.57939,-0.12006)
+ New Momentum Direction: (0.18441,0.51412,0.83766)
+ New Polarization:       (-0.75289,0.62174,-0.21586)
  *** FresnelRefraction *** 
-Track (trackID 1027, parentID 1) is processed with stopping code 2
+Track (trackID 1194, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69708,-0.56238,0.44476)
- Old Polarization:       (-0.71674,-0.56322,0.41117)
- New Momentum Direction: (0.24761,-0.75993,0.60099)
- New Polarization:       (-0.96872,-0.20489,0.14005)
+ Old Momentum Direction: (0.55694,-0.72308,0.40863)
+ Old Polarization:       (-0.34082,-0.64763,-0.68148)
+ New Momentum Direction: (0.74947,-0.36869,0.54988)
+ New Polarization:       (0.43211,0.90169,0.015622)
  *** FresnelRefraction *** 
-Track (trackID 1026, parentID 1) is processed with stopping code 2
+Track (trackID 1193, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.62263,0.57426,0.53156)
+ Old Polarization:       (-0.27012,0.79527,-0.54276)
+ New Momentum Direction: (-0.62263,0.57426,0.53156)
+ New Polarization:       (-0.27012,-0.79527,0.54276)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62263,0.57426,0.53156)
+ Old Polarization:       (-0.27012,-0.79527,0.54276)
+ New Momentum Direction: (-0.62263,-0.57426,0.53156)
+ New Polarization:       (0.27012,-0.79527,-0.54276)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62263,-0.57426,0.53156)
+ Old Polarization:       (0.27012,-0.79527,-0.54276)
+ New Momentum Direction: (-0.62263,-0.57426,-0.53156)
+ New Polarization:       (-0.27012,0.79527,-0.54276)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1025, parentID 1) is processed with stopping code 2
+Track (trackID 1192, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7861,0.27556,-0.55327)
- Old Polarization:       (-0.618,0.36629,-0.69564)
- New Momentum Direction: (0.54927,0.37254,-0.74801)
- New Polarization:       (-0.83558,0.256,-0.48607)
+ Old Momentum Direction: (0.95222,0.22816,0.20303)
+ Old Polarization:       (0.093724,0.4144,-0.90526)
+ New Momentum Direction: (0.91017,0.30945,0.27537)
+ New Polarization:       (-0.16693,0.88241,-0.43987)
  *** FresnelRefraction *** 
-Track (trackID 1024, parentID 1) is processed with stopping code 2
+Track (trackID 1191, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1023, parentID 1) is processed with stopping code 2
+Track (trackID 1190, parentID 1) is processed with stopping code 2
 ### pop requested out of 125 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.76945,0.63608,-0.057852)
- Old Polarization:       (-0.63686,0.75719,-0.14518)
- New Momentum Direction: (0.49628,0.8646,-0.078635)
- New Polarization:       (-0.86697,0.48881,-0.097106)
- *** FresnelRefraction *** 
-Track (trackID 1022, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1189, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69547,-0.23861,0.67778)
- Old Polarization:       (-0.71823,-0.20258,0.66566)
- New Momentum Direction: (0.22866,-0.32328,0.91826)
- New Polarization:       (-0.97333,-0.057999,0.22195)
- *** FresnelRefraction *** 
-Track (trackID 1021, parentID 1) is processed with stopping code 2
-### pop requested out of 123 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1020, parentID 1) is processed with stopping code 2
+Track (trackID 1188, parentID 1) is processed with stopping code 2
+### pop requested out of 123 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.89349,-0.41902,0.16153)
+ Old Polarization:       (0.031003,-0.30128,-0.95303)
+ New Momentum Direction: (0.79405,-0.56717,0.21864)
+ New Polarization:       (-0.057693,-0.42839,-0.90175)
+ *** FresnelRefraction *** 
+Track (trackID 1187, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1019, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.24883,0.48293,0.83956)
+ Old Polarization:       (-0.6845,0.70095,-0.20032)
+ New Momentum Direction: (0.24883,0.48293,-0.83956)
+ New Polarization:       (0.91369,-0.40463,0.03805)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.24883,0.48293,-0.83956)
+ Old Polarization:       (0.91369,-0.40463,0.03805)
+ New Momentum Direction: (0.24883,-0.48293,-0.83956)
+ New Polarization:       (-0.91369,-0.40463,-0.03805)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.24883,-0.48293,-0.83956)
+ Old Polarization:       (-0.91369,-0.40463,-0.03805)
+ New Momentum Direction: (0.33617,-0.65243,-0.6792)
+ New Polarization:       (-0.8544,-0.51468,0.071508)
+ *** FresnelRefraction *** 
+Track (trackID 1186, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76356,-0.33951,-0.54928)
- Old Polarization:       (-0.64278,-0.31839,-0.69675)
- New Momentum Direction: (0.49352,-0.45728,-0.73982)
- New Polarization:       (-0.8678,-0.20217,-0.45393)
+ Old Momentum Direction: (-0.033582,-0.12826,0.99117)
+ Old Polarization:       (-0.9993,0.02068,-0.031181)
+ New Momentum Direction: (-0.045352,-0.17322,0.98384)
+ New Polarization:       (-0.99692,-0.055187,-0.055671)
  *** FresnelRefraction *** 
-Track (trackID 1018, parentID 1) is processed with stopping code 2
+Track (trackID 1185, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69841,-0.48886,0.52272)
- Old Polarization:       (-0.71564,-0.48569,0.50195)
- New Momentum Direction: (0.26708,-0.65825,0.70383)
- New Polarization:       (-0.96365,-0.18807,0.18978)
+ Old Momentum Direction: (0.96477,-0.23206,0.12396)
+ Old Polarization:       (0.10496,-0.092524,-0.99016)
+ New Momentum Direction: (0.93387,-0.31543,0.16849)
+ New Polarization:       (-0.18271,-0.82588,-0.53342)
  *** FresnelRefraction *** 
-Track (trackID 1017, parentID 1) is processed with stopping code 2
+Track (trackID 1184, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75344,-0.38715,-0.53145)
- Old Polarization:       (-0.65442,-0.36317,-0.66321)
- New Momentum Direction: (0.44766,-0.52652,-0.72276)
- New Polarization:       (-0.89225,-0.20955,-0.39998)
+ Old Momentum Direction: (0.26619,-0.70718,0.65501)
+ Old Polarization:       (-0.66606,-0.62615,-0.40534)
+ New Momentum Direction: (0.35903,-0.30098,0.88346)
+ New Polarization:       (-0.19496,0.90151,0.38635)
  *** FresnelRefraction *** 
-Track (trackID 1016, parentID 1) is processed with stopping code 2
+Track (trackID 1183, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1015, parentID 1) is processed with stopping code 2
+Track (trackID 1182, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1014, parentID 1) is processed with stopping code 2
-### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78403,0.33767,-0.52084)
- Old Polarization:       (-0.62071,0.43173,-0.65447)
- New Momentum Direction: (0.53887,0.45826,-0.70684)
- New Polarization:       (-0.84238,0.29678,-0.4498)
+ Old Momentum Direction: (0.35603,-0.7379,0.57336)
+ Old Polarization:       (-0.56536,-0.65863,-0.49657)
+ New Momentum Direction: (0.48075,-0.41169,0.7742)
+ New Polarization:       (0.086839,0.90094,0.42516)
  *** FresnelRefraction *** 
-Track (trackID 1013, parentID 1) is processed with stopping code 2
+Track (trackID 1181, parentID 1) is processed with stopping code 2
+### pop requested out of 116 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1180, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72312,0.36372,0.58719)
- Old Polarization:       (-0.68762,0.45945,0.56221)
- New Momentum Direction: (0.34589,0.49408,0.79765)
- New Polarization:       (-0.93643,0.23506,0.26047)
- *** FresnelRefraction *** 
-Track (trackID 1012, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.59093,0.5743,0.56655)
+ Old Polarization:       (-0.3027,0.80883,-0.50415)
+ New Momentum Direction: (-0.59093,0.5743,0.56655)
+ New Polarization:       (-0.3027,-0.80883,0.50415)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.59093,0.5743,0.56655)
+ Old Polarization:       (-0.3027,-0.80883,0.50415)
+ New Momentum Direction: (-0.59093,-0.5743,0.56655)
+ New Polarization:       (0.3027,-0.80883,-0.50415)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.59093,-0.5743,0.56655)
+ Old Polarization:       (0.3027,-0.80883,-0.50415)
+ New Momentum Direction: (-0.59093,-0.5743,-0.56655)
+ New Polarization:       (-0.3027,0.80883,-0.50415)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1179, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77311,0.6302,-0.071736)
- Old Polarization:       (-0.6325,0.75753,-0.16154)
- New Momentum Direction: (0.51279,0.853,-0.097097)
- New Polarization:       (-0.85735,0.50292,-0.10968)
+ Old Momentum Direction: (0.98802,-0.076778,0.13384)
+ Old Polarization:       (0.13978,0.078038,-0.9871)
+ New Momentum Direction: (0.97809,-0.1036,0.18059)
+ New Polarization:       (-0.19676,-0.74351,0.63912)
  *** FresnelRefraction *** 
-Track (trackID 1011, parentID 1) is processed with stopping code 2
+Track (trackID 1178, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69545,-0.1468,0.70342)
- Old Polarization:       (-0.71792,-0.10037,0.68885)
- New Momentum Direction: (0.9452,-0.19951,0.25842)
- New Polarization:       (0.21645,-0.20962,-0.95352)
- *** FresnelRefraction *** 
-Track (trackID 1010, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1177, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71697,0.18138,0.67309)
- Old Polarization:       (-0.69484,0.26368,0.66908)
- New Momentum Direction: (0.34314,0.24439,0.90693)
- New Polarization:       (-0.93792,0.14122,0.3168)
+ Old Momentum Direction: (0.52695,-0.73519,0.42639)
+ Old Polarization:       (-0.37522,-0.65141,-0.65945)
+ New Momentum Direction: (0.71339,-0.39733,0.57724)
+ New Polarization:       (0.42322,0.90082,0.097009)
  *** FresnelRefraction *** 
-Track (trackID 1009, parentID 1) is processed with stopping code 2
+Track (trackID 1176, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71922,-0.69401,-0.032747)
- Old Polarization:       (-0.69225,-0.71178,-0.11901)
- New Momentum Direction: (0.34816,-0.93639,-0.044183)
- New Polarization:       (-0.9359,-0.34451,-0.073464)
- *** FresnelRefraction *** 
-Track (trackID 1008, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1175, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.78168,0.25227,-0.57038)
-Old Polarization: (-0.62353,0.33639,-0.70573)
-New Polarization: (-0.448,0.20432,-0.77191)
-Polarization Change: (-0.4893,0.22316,-0.84308)
-New Momentum Direction: (-0.55262,0.56934,0.47142)
-Momentum Change: (-0.59877,0.6169,0.5108)
-Scattering Photon!
-Old Momentum Direction: (-0.59877,0.6169,0.5108)
-Old Polarization: (-0.4893,0.22316,-0.84308)
-New Polarization: (-0.4615,0.12321,-0.82906)
-Polarization Change: (-0.48232,0.12877,-0.86648)
-New Momentum Direction: (-0.46112,-0.87486,0.12667)
-Momentum Change: (-0.4625,-0.87747,0.12705)
 
 ** Photon absorbed! **
-Track (trackID 1007, parentID 1) is processed with stopping code 2
+Track (trackID 1174, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75548,0.62266,0.20382)
- Old Polarization:       (-0.6521,0.74471,0.14201)
- New Momentum Direction: (0.45733,0.84517,0.27666)
- New Polarization:       (-0.88734,0.4543,0.078949)
+ Old Momentum Direction: (0.45494,0.5795,0.67617)
+ Old Polarization:       (-0.45497,0.80397,-0.38292)
+ New Momentum Direction: (0.6163,0.78504,0.06235)
+ New Polarization:       (-0.51174,0.4594,-0.726)
  *** FresnelRefraction *** 
-Track (trackID 1006, parentID 1) is processed with stopping code 2
+Track (trackID 1173, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1005, parentID 1) is processed with stopping code 2
-### pop requested out of 107 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1004, parentID 1) is processed with stopping code 2
-### pop requested out of 106 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72816,0.40876,0.55018)
- Old Polarization:       (-0.68214,0.51051,0.52352)
- New Momentum Direction: (0.36853,0.55441,0.7462)
- New Polarization:       (-0.92763,0.27174,0.25623)
+ Old Momentum Direction: (0.98267,-0.14029,0.12117)
+ Old Polarization:       (0.12355,0.0083481,-0.9923)
+ New Momentum Direction: (0.96768,-0.19087,0.16484)
+ New Polarization:       (-0.19498,-0.98076,0.0090207)
  *** FresnelRefraction *** 
-Track (trackID 1003, parentID 1) is processed with stopping code 2
-### pop requested out of 105 stacked tracks.
+Track (trackID 1172, parentID 1) is processed with stopping code 2
+### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7227,0.30051,0.62242)
- Old Polarization:       (-0.68832,0.39458,0.60871)
- New Momentum Direction: (0.35804,0.40596,0.84084)
- New Polarization:       (-0.93198,0.21016,0.29539)
+ Old Momentum Direction: (0.93947,-0.31523,0.13428)
+ Old Polarization:       (0.078183,-0.18435,-0.97975)
+ New Momentum Direction: (0.88514,-0.42811,0.18237)
+ New Polarization:       (-0.14229,-0.62215,-0.76986)
  *** FresnelRefraction *** 
-Track (trackID 1002, parentID 1) is processed with stopping code 2
-### pop requested out of 104 stacked tracks.
+Track (trackID 1171, parentID 1) is processed with stopping code 2
+### pop requested out of 106 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1001, parentID 1) is processed with stopping code 2
-### pop requested out of 103 stacked tracks.
+Track (trackID 1170, parentID 1) is processed with stopping code 2
+### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70413,0.046362,0.70855)
- Old Polarization:       (-0.70853,0.11152,0.69681)
- New Momentum Direction: (0.95562,0.06292,0.28781)
- New Polarization:       (0.27889,0.12164,-0.95259)
+ Old Momentum Direction: (0.6145,-0.70494,0.35419)
+ Old Polarization:       (-0.27907,-0.61416,-0.7382)
+ New Momentum Direction: (0.83393,-0.27113,0.48067)
+ New Polarization:       (0.39426,0.90216,-0.17514)
  *** FresnelRefraction *** 
-Track (trackID 1000, parentID 1) is processed with stopping code 2
-### pop requested out of 102 stacked tracks.
+Track (trackID 1169, parentID 1) is processed with stopping code 2
+### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75256,-0.4577,-0.47346)
- Old Polarization:       (-0.65515,-0.44768,-0.60857)
- New Momentum Direction: (0.45729,-0.61811,-0.63939)
- New Polarization:       (-0.88715,-0.26687,-0.37649)
+ Old Momentum Direction: (0.41156,-0.74363,0.52691)
+ Old Polarization:       (-0.50372,-0.66741,-0.54847)
+ New Momentum Direction: (0.55492,-0.43281,0.71045)
+ New Polarization:       (0.23409,0.90074,0.36588)
  *** FresnelRefraction *** 
-Track (trackID 999, parentID 1) is processed with stopping code 2
+Track (trackID 1168, parentID 1) is processed with stopping code 2
+### pop requested out of 103 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1167, parentID 1) is processed with stopping code 2
+### pop requested out of 102 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1166, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7273,0.3898,0.56488)
- Old Polarization:       (-0.68311,0.49064,0.54096)
- New Momentum Direction: (0.36771,0.52817,0.7654)
- New Polarization:       (-0.92799,0.26168,0.26525)
- *** FresnelRefraction *** 
-Track (trackID 998, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1165, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.16184,-0.64714,0.745)
+Old Polarization: (-0.77699,-0.54898,-0.30807)
+New Polarization: (-0.85153,0.14659,0.50339)
+Polarization Change: (-0.85153,0.14659,0.50339)
+New Momentum Direction: (-0.45781,-0.67586,-0.57761)
+Momentum Change: (-0.45781,-0.67586,-0.57761)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45781,-0.67586,-0.57761)
+ Old Polarization:       (-0.85153,0.14659,0.50339)
+ New Momentum Direction: (-0.45781,0.67586,-0.57761)
+ New Polarization:       (0.85153,0.14659,-0.50339)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45781,0.67586,-0.57761)
+ Old Polarization:       (0.85153,0.14659,-0.50339)
+ New Momentum Direction: (-0.45781,0.67586,0.57761)
+ New Polarization:       (-0.85153,-0.14659,-0.50339)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45781,0.67586,0.57761)
+ Old Polarization:       (-0.85153,-0.14659,-0.50339)
+ New Momentum Direction: (0.45781,0.67586,0.57761)
+ New Polarization:       (-0.85153,0.14659,0.50339)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45781,0.67586,0.57761)
+ Old Polarization:       (-0.85153,0.14659,0.50339)
+ New Momentum Direction: (0.45781,-0.67586,0.57761)
+ New Polarization:       (0.85153,0.14659,-0.50339)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 997, parentID 1) is processed with stopping code 2
+Track (trackID 1164, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.717,0.27973,0.63848)
- Old Polarization:       (-0.69435,0.36747,0.61875)
- New Momentum Direction: (0.32208,0.37991,0.86714)
- New Polarization:       (-0.94512,0.18219,0.27122)
+ Old Momentum Direction: (0.9897,-0.029406,0.14012)
+ Old Polarization:       (0.14279,0.13103,-0.98104)
+ New Momentum Direction: (0.9812,-0.039643,0.1889)
+ New Polarization:       (-0.19273,-0.25441,0.9477)
  *** FresnelRefraction *** 
-Track (trackID 996, parentID 1) is processed with stopping code 2
+Track (trackID 1163, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69522,-0.14408,0.70421)
- Old Polarization:       (-0.71814,-0.09729,0.68907)
- New Momentum Direction: (0.94527,-0.19591,0.26093)
- New Polarization:       (0.22052,-0.20581,-0.95342)
+ Old Momentum Direction: (0.96132,-0.24033,0.13456)
+ Old Polarization:       (0.11202,-0.10517,-0.98813)
+ New Momentum Direction: (0.92863,-0.32373,0.18125)
+ New Polarization:       (-0.19152,-0.83668,-0.51311)
  *** FresnelRefraction *** 
-Track (trackID 995, parentID 1) is processed with stopping code 2
+Track (trackID 1162, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77561,0.6025,-0.18823)
- Old Polarization:       (-0.63007,0.72106,-0.28823)
- New Momentum Direction: (0.5143,0.81859,-0.25574)
- New Polarization:       (-0.85687,0.47806,-0.19296)
+ Old Momentum Direction: (0.43606,-0.75023,0.497)
+ Old Polarization:       (-0.4755,-0.66096,-0.58055)
+ New Momentum Direction: (0.5929,-0.43797,0.67576)
+ New Polarization:       (0.3018,0.89886,0.31777)
  *** FresnelRefraction *** 
-Track (trackID 994, parentID 1) is processed with stopping code 2
+Track (trackID 1161, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75317,-0.40199,-0.5207)
- Old Polarization:       (-0.65466,-0.38053,-0.65316)
- New Momentum Direction: (0.44906,-0.54602,-0.70726)
- New Polarization:       (-0.8915,-0.22082,-0.39556)
+ Old Momentum Direction: (0.8938,0.35918,0.26853)
+ Old Polarization:       (0.026275,0.55581,-0.8309)
+ New Momentum Direction: (0.79236,0.4886,0.36528)
+ New Polarization:       (-0.049444,0.64824,-0.75983)
  *** FresnelRefraction *** 
-Track (trackID 993, parentID 1) is processed with stopping code 2
+Track (trackID 1160, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69797,-0.57003,0.43347)
- Old Polarization:       (-0.71583,-0.57276,0.39942)
- New Momentum Direction: (0.25508,-0.76966,0.58528)
- New Polarization:       (-0.96675,-0.21423,0.13961)
+ Old Momentum Direction: (0.29004,-0.71913,0.63145)
+ Old Polarization:       (-0.63864,-0.63685,-0.43193)
+ New Momentum Direction: (0.39185,-0.34448,0.85311)
+ New Polarization:       (-0.11569,0.90145,0.41714)
  *** FresnelRefraction *** 
-Track (trackID 992, parentID 1) is processed with stopping code 2
+Track (trackID 1159, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73152,0.42725,0.53135)
- Old Polarization:       (-0.67848,0.53321,0.50533)
- New Momentum Direction: (0.38527,0.57826,0.71915)
- New Polarization:       (-0.92074,0.2929,0.25776)
+ Old Momentum Direction: (-0.037706,-0.10037,0.99424)
+ Old Polarization:       (-0.99812,0.051962,-0.032607)
+ New Momentum Direction: (-0.051153,-0.13617,0.98936)
+ New Polarization:       (-0.99728,-0.045639,-0.057844)
  *** FresnelRefraction *** 
-Track (trackID 991, parentID 1) is processed with stopping code 2
+Track (trackID 1158, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77003,-0.21203,-0.60174)
- Old Polarization:       (-0.6357,-0.17489,-0.75186)
- New Momentum Direction: (0.50824,-0.28621,-0.81226)
- New Polarization:       (-0.8597,-0.11268,-0.49822)
+ Old Momentum Direction: (0.17126,0.42123,0.89064)
+ Old Polarization:       (-0.76642,0.62501,-0.14822)
+ New Momentum Direction: (0.23274,0.57244,0.78622)
+ New Polarization:       (-0.70833,0.65373,-0.26629)
  *** FresnelRefraction *** 
-Track (trackID 990, parentID 1) is processed with stopping code 2
+Track (trackID 1157, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70612,-0.69367,0.1422)
- Old Polarization:       (-0.70644,-0.70382,0.074627)
- New Momentum Direction: (-0.70612,-0.69367,0.1422)
- New Polarization:       (-0.70266,0.71126,-0.019512)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70612,-0.69367,0.1422)
- Old Polarization:       (-0.70266,0.71126,-0.019512)
- New Momentum Direction: (-0.95714,-0.21616,0.19275)
- New Polarization:       (-0.23061,0.97145,-0.055679)
+ Old Momentum Direction: (0.47106,-0.74442,0.47322)
+ Old Polarization:       (-0.43715,-0.66297,-0.60776)
+ New Momentum Direction: (0.6372,-0.42922,0.64011)
+ New Polarization:       (0.35952,0.9002,0.24573)
  *** FresnelRefraction *** 
-Track (trackID 989, parentID 1) is processed with stopping code 2
+Track (trackID 1156, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 988, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.37864,-0.74632,0.54739)
+ Old Polarization:       (-0.53878,-0.65862,-0.52529)
+ New Momentum Direction: (0.51421,-0.42776,0.74338)
+ New Polarization:       (0.16124,0.89951,0.40606)
+ *** FresnelRefraction *** 
+Track (trackID 1155, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 987, parentID 1) is processed with stopping code 2
+Track (trackID 1154, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72076,0.30989,0.62006)
- Old Polarization:       (-0.69031,0.40225,0.60139)
- New Momentum Direction: (0.34249,0.42001,0.84041)
- New Polarization:       (-0.93781,0.20687,0.27879)
- *** FresnelRefraction *** 
-Track (trackID 986, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.62701,0.57428,0.52636)
+ Old Polarization:       (-0.26585,0.79286,-0.54835)
+ New Momentum Direction: (-0.62701,0.57428,0.52636)
+ New Polarization:       (-0.26585,-0.79286,0.54835)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62701,0.57428,0.52636)
+ Old Polarization:       (-0.26585,-0.79286,0.54835)
+ New Momentum Direction: (-0.62701,-0.57428,0.52636)
+ New Polarization:       (0.26585,-0.79286,-0.54835)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62701,-0.57428,0.52636)
+ Old Polarization:       (0.26585,-0.79286,-0.54835)
+ New Momentum Direction: (-0.62701,-0.57428,-0.52636)
+ New Polarization:       (-0.26585,0.79286,-0.54835)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62701,-0.57428,-0.52636)
+ Old Polarization:       (-0.26585,0.79286,-0.54835)
+ New Momentum Direction: (0.62701,-0.57428,-0.52636)
+ New Polarization:       (-0.26585,-0.79286,0.54835)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.62701,-0.57428,-0.52636)
+ Old Polarization:       (-0.26585,-0.79286,0.54835)
+ New Momentum Direction: (0.62701,0.57428,-0.52636)
+ New Polarization:       (0.26585,-0.79286,-0.54835)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.62701,0.57428,-0.52636)
+Old Polarization: (0.26585,-0.79286,-0.54835)
+New Polarization: (0.75869,-0.52972,-0.37918)
+Polarization Change: (0.75869,-0.52972,-0.37918)
+New Momentum Direction: (0.65119,0.63295,0.41871)
+Momentum Change: (0.65119,0.63295,0.41871)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65119,0.63295,0.41871)
+ Old Polarization:       (0.75869,-0.52972,-0.37918)
+ New Momentum Direction: (-0.65119,0.63295,0.41871)
+ New Polarization:       (0.75869,0.52972,0.37918)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65119,0.63295,0.41871)
+ Old Polarization:       (0.75869,0.52972,0.37918)
+ New Momentum Direction: (-0.65119,-0.63295,0.41871)
+ New Polarization:       (-0.75869,0.52972,-0.37918)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65119,-0.63295,0.41871)
+ Old Polarization:       (-0.75869,0.52972,-0.37918)
+ New Momentum Direction: (-0.65119,-0.63295,-0.41871)
+ New Polarization:       (0.75869,-0.52972,-0.37918)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1153, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78237,0.038658,-0.62162)
- Old Polarization:       (-0.62185,0.10419,-0.77618)
- New Momentum Direction: (0.54322,0.052113,-0.83797)
- New Polarization:       (-0.83894,0.072895,-0.53932)
+ Old Momentum Direction: (0.88586,-0.43339,0.16562)
+ Old Polarization:       (0.022218,-0.31693,-0.94819)
+ New Momentum Direction: (0.77805,-0.58682,0.22425)
+ New Polarization:       (-0.041491,-0.40419,-0.91373)
  *** FresnelRefraction *** 
-Track (trackID 985, parentID 1) is processed with stopping code 2
+Track (trackID 1152, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71638,-0.69577,-0.052067)
- Old Polarization:       (-0.69511,-0.70527,-0.13934)
- New Momentum Direction: (-0.71638,-0.69577,-0.052067)
- New Polarization:       (-0.68664,0.68979,0.2296)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.71638,-0.69577,-0.052067)
- Old Polarization:       (-0.68664,0.68979,0.2296)
- New Momentum Direction: (-0.71638,0.69577,-0.052067)
- New Polarization:       (0.661,0.6529,-0.36988)
- *** FresnelReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 984, parentID 1) is processed with stopping code 2
+Track (trackID 1151, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75363,0.60386,0.2596)
- Old Polarization:       (-0.65403,0.72823,0.20473)
- New Momentum Direction: (0.45641,0.81743,0.35141)
- New Polarization:       (-0.88768,0.44537,0.11694)
+ Old Momentum Direction: (-0.0098013,0.041648,0.99908)
+ Old Polarization:       (-0.9773,0.21107,-0.018386)
+ New Momentum Direction: (-0.013188,0.05604,0.99834)
+ New Polarization:       (-0.94305,0.3312,-0.031049)
  *** FresnelRefraction *** 
-Track (trackID 983, parentID 1) is processed with stopping code 2
+Track (trackID 1150, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69811,-0.072766,0.71229)
- Old Polarization:       (-0.71503,-0.019282,0.69883)
- New Momentum Direction: (0.94866,-0.098882,0.30045)
- New Polarization:       (0.29197,-0.091578,-0.95203)
- *** FresnelRefraction *** 
-Track (trackID 982, parentID 1) is processed with stopping code 2
-### pop requested out of 84 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 981, parentID 1) is processed with stopping code 2
+Track (trackID 1149, parentID 1) is processed with stopping code 2
+### pop requested out of 84 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.038471,-0.21921,0.97492)
+ Old Polarization:       (-0.99532,-0.078097,-0.056836)
+ New Momentum Direction: (-0.052343,-0.29825,0.95305)
+ New Polarization:       (-0.98243,-0.15584,-0.10273)
+ *** FresnelRefraction *** 
+Track (trackID 1148, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78243,0.59192,-0.19347)
- Old Polarization:       (-0.62162,0.72384,-0.2994)
- New Momentum Direction: (0.54536,0.79672,-0.26042)
- New Polarization:       (-0.83746,0.50483,-0.20931)
+ Old Momentum Direction: (0.055542,-0.50892,0.85902)
+ Old Polarization:       (-0.8981,-0.40138,-0.17973)
+ New Momentum Direction: (0.075146,-0.68855,0.72129)
+ New Polarization:       (-0.84558,-0.42739,-0.31989)
  *** FresnelRefraction *** 
-Track (trackID 980, parentID 1) is processed with stopping code 2
+Track (trackID 1147, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 979, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9717,-0.19624,0.13148)
+ Old Polarization:       (0.12285,-0.05559,-0.99087)
+ New Momentum Direction: (0.94796,-0.26451,0.17722)
+ New Polarization:       (-0.20244,-0.93035,-0.30573)
+ *** FresnelRefraction *** 
+Track (trackID 1146, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 978, parentID 1) is processed with stopping code 2
-### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75214,0.60806,0.25407)
- Old Polarization:       (-0.65577,0.72874,0.19724)
- New Momentum Direction: (0.44716,0.8253,0.34484)
- New Polarization:       (-0.8924,0.43774,0.10956)
+ Old Momentum Direction: (0.37002,-0.74302,0.55768)
+ Old Polarization:       (-0.54893,-0.65915,-0.514)
+ New Momentum Direction: (0.50121,-0.42207,0.75541)
+ New Polarization:       (0.13282,0.90016,0.41482)
  *** FresnelRefraction *** 
-Track (trackID 977, parentID 1) is processed with stopping code 2
-### pop requested out of 79 stacked tracks.
+Track (trackID 1145, parentID 1) is processed with stopping code 2
+### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74341,-0.5413,-0.39286)
- Old Polarization:       (-0.66533,-0.5384,-0.51717)
- New Momentum Direction: (0.42583,-0.73226,-0.53147)
- New Polarization:       (-0.90259,-0.30273,-0.30609)
+ Old Momentum Direction: (0.98076,-0.14355,0.13229)
+ Old Polarization:       (0.13413,0.0032076,-0.99096)
+ New Momentum Direction: (0.96483,-0.19332,0.17815)
+ New Polarization:       (-0.20696,-0.97643,0.061272)
  *** FresnelRefraction *** 
-Track (trackID 976, parentID 1) is processed with stopping code 2
-### pop requested out of 78 stacked tracks.
+Track (trackID 1144, parentID 1) is processed with stopping code 2
+### pop requested out of 79 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 975, parentID 1) is processed with stopping code 2
+Track (trackID 1143, parentID 1) is processed with stopping code 2
+### pop requested out of 78 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.89449,-0.41769,0.15946)
+ Old Polarization:       (0.030612,-0.29861,-0.95389)
+ New Momentum Direction: (0.79542,-0.5662,0.21616)
+ New Polarization:       (-0.057132,-0.42512,-0.90333)
+ *** FresnelRefraction *** 
+Track (trackID 1142, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.97774,-0.17059,0.12216)
+Old Polarization: (0.11963,-0.025117,-0.9925)
+New Polarization: (-0.26653,-0.5244,-0.80868)
+Polarization Change: (-0.26653,-0.5244,-0.80868)
+New Momentum Direction: (0.52918,0.62164,-0.57752)
+Momentum Change: (0.52918,0.62164,-0.57752)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52918,0.62164,-0.57752)
+ Old Polarization:       (-0.26653,-0.5244,-0.80868)
+ New Momentum Direction: (-0.52918,0.62164,-0.57752)
+ New Polarization:       (-0.26653,0.5244,0.80868)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52918,0.62164,-0.57752)
+ Old Polarization:       (-0.26653,0.5244,0.80868)
+ New Momentum Direction: (-0.52918,-0.62164,-0.57752)
+ New Polarization:       (0.26653,0.5244,-0.80868)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52918,-0.62164,-0.57752)
+ Old Polarization:       (0.26653,0.5244,-0.80868)
+ New Momentum Direction: (-0.52918,-0.62164,0.57752)
+ New Polarization:       (-0.26653,-0.5244,-0.80868)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52918,-0.62164,0.57752)
+ Old Polarization:       (-0.26653,-0.5244,-0.80868)
+ New Momentum Direction: (0.52918,-0.62164,0.57752)
+ New Polarization:       (-0.26653,0.5244,0.80868)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52918,-0.62164,0.57752)
+ Old Polarization:       (-0.26653,0.5244,0.80868)
+ New Momentum Direction: (0.52918,0.62164,0.57752)
+ New Polarization:       (0.26653,0.5244,-0.80868)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52918,0.62164,0.57752)
+ Old Polarization:       (0.26653,0.5244,-0.80868)
+ New Momentum Direction: (0.52918,0.62164,-0.57752)
+ New Polarization:       (-0.26653,-0.5244,-0.80868)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 974, parentID 1) is processed with stopping code 2
+Track (trackID 1141, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74569,0.56743,0.34925)
- Old Polarization:       (-0.66284,0.68502,0.30231)
- New Momentum Direction: (0.42802,0.76966,0.47372)
- New Polarization:       (-0.9016,0.39992,0.16487)
+ Old Momentum Direction: (0.68621,0.55069,0.47524)
+ Old Polarization:       (-0.19956,0.7708,-0.60502)
+ New Momentum Direction: (0.16542,0.74664,0.64434)
+ New Polarization:       (-0.41623,0.64516,-0.64072)
  *** FresnelRefraction *** 
-Track (trackID 973, parentID 1) is processed with stopping code 2
+Track (trackID 1140, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78231,0.42761,-0.45293)
- Old Polarization:       (-0.62285,0.52813,-0.57718)
- New Momentum Direction: (0.53126,0.5816,-0.61605)
- New Polarization:       (-0.84718,0.35854,-0.39209)
+Scattering Photon!
+Old Momentum Direction: (0.88023,0.37458,0.29136)
+Old Polarization: (0.020656,0.58314,-0.81211)
+New Polarization: (-0.039476,-0.92869,0.36874)
+Polarization Change: (-0.039476,-0.92869,0.36874)
+New Momentum Direction: (-0.023301,-0.36807,-0.9295)
+Momentum Change: (-0.023301,-0.36807,-0.9295)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.023301,-0.36807,-0.9295)
+ Old Polarization:       (-0.039476,-0.92869,0.36874)
+ New Momentum Direction: (-0.031403,-0.49606,-0.86772)
+ New Polarization:       (-0.040685,-0.8668,0.497)
  *** FresnelRefraction *** 
-Track (trackID 972, parentID 1) is processed with stopping code 2
+Track (trackID 1139, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75091,-0.43199,-0.49952)
- Old Polarization:       (-0.65714,-0.41362,-0.63015)
- New Momentum Direction: (0.44236,-0.58665,-0.67836)
- New Polarization:       (-0.89478,-0.2374,-0.37818)
+ Old Momentum Direction: (-0.034666,-0.16938,0.98494)
+ Old Polarization:       (-0.99891,-0.024845,-0.039431)
+ New Momentum Direction: (-0.046875,-0.22903,0.97229)
+ New Polarization:       (-0.99277,-0.09701,-0.070713)
  *** FresnelRefraction *** 
-Track (trackID 971, parentID 1) is processed with stopping code 2
+Track (trackID 1138, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77403,-0.085904,-0.62729)
- Old Polarization:       (-0.63153,-0.034121,-0.7746)
- New Momentum Direction: (0.51432,-0.11636,-0.84967)
- New Polarization:       (-0.85654,-0.020558,-0.51567)
+ Old Momentum Direction: (0.81272,0.46282,0.35396)
+ Old Polarization:       (-0.061089,0.67183,-0.73819)
+ New Momentum Direction: (0.61164,0.62842,0.4806)
+ New Polarization:       (-0.11691,0.67262,-0.7307)
  *** FresnelRefraction *** 
-Track (trackID 970, parentID 1) is processed with stopping code 2
+Track (trackID 1137, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70552,-0.034192,0.70786)
- Old Polarization:       (-0.70754,0.022921,0.70631)
- New Momentum Direction: (0.29398,-0.046115,0.9547)
- New Polarization:       (-0.95514,0.023192,0.29524)
+ Old Momentum Direction: (0.084381,0.30434,0.94882)
+ Old Polarization:       (-0.86322,0.49796,-0.082956)
+ New Momentum Direction: (0.11451,0.413,0.9035)
+ New Polarization:       (-0.81893,0.55408,-0.14948)
  *** FresnelRefraction *** 
-Track (trackID 969, parentID 1) is processed with stopping code 2
+Track (trackID 1136, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75966,0.63535,0.13873)
- Old Polarization:       (-0.64751,0.75879,0.070507)
- New Momentum Direction: (0.47005,0.86232,0.18829)
- New Polarization:       (-0.88083,0.47193,0.037605)
+ Old Momentum Direction: (0.95055,-0.28305,0.12784)
+ Old Polarization:       (0.088374,-0.14809,-0.98502)
+ New Momentum Direction: (0.90635,-0.38507,0.17391)
+ New Polarization:       (-0.15919,-0.6925,-0.70364)
  *** FresnelRefraction *** 
-Track (trackID 968, parentID 1) is processed with stopping code 2
+Track (trackID 1135, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 967, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.99095,-0.0024176,0.13423)
+ Old Polarization:       (0.1329,0.15948,-0.97821)
+ New Momentum Direction: (0.98319,-0.0032884,0.18258)
+ New Polarization:       (-0.18161,0.087017,0.97951)
+ *** FresnelRefraction *** 
+Track (trackID 1134, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72377,0.33563,0.60292)
- Old Polarization:       (-0.68704,0.43184,0.58437)
- New Momentum Direction: (0.35728,0.45429,0.81607)
- New Polarization:       (-0.93219,0.22784,0.28129)
+ Old Momentum Direction: (0.84282,0.42703,0.32757)
+ Old Polarization:       (-0.024036,0.63789,-0.76975)
+ New Momentum Direction: (0.68601,0.5773,0.44284)
+ New Polarization:       (-0.045255,0.64131,-0.76594)
  *** FresnelRefraction *** 
-Track (trackID 966, parentID 1) is processed with stopping code 2
+Track (trackID 1133, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69124,-0.4273,0.58275)
- Old Polarization:       (-0.72263,-0.40844,0.55766)
- New Momentum Direction: (-0.69124,-0.4273,0.58275)
- New Polarization:       (-0.72263,0.4083,-0.55777)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69124,-0.4273,0.58275)
- Old Polarization:       (-0.72263,0.4083,-0.55777)
- New Momentum Direction: (-0.69124,-0.4273,-0.58275)
- New Polarization:       (0.72263,-0.4083,-0.55777)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69124,-0.4273,-0.58275)
- Old Polarization:       (0.72263,-0.4083,-0.55777)
- New Momentum Direction: (-0.69124,0.4273,-0.58275)
- New Polarization:       (-0.72263,-0.4083,0.55777)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 965, parentID 1) is processed with stopping code 2
+Track (trackID 1132, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76697,-0.19291,-0.612)
- Old Polarization:       (-0.6395,-0.15126,-0.75376)
- New Momentum Direction: (0.49069,-0.26195,-0.83103)
- New Polarization:       (-0.86993,-0.093078,-0.48432)
+ Old Momentum Direction: (0.0063007,0.14309,0.98969)
+ Old Polarization:       (-0.94687,0.31912,-0.040111)
+ New Momentum Direction: (0.0085683,0.19459,0.98085)
+ New Polarization:       (-0.91253,0.40264,-0.071908)
  *** FresnelRefraction *** 
-Track (trackID 964, parentID 1) is processed with stopping code 2
+Track (trackID 1131, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69618,-0.64744,0.3101)
- Old Polarization:       (-0.71705,-0.64774,0.25743)
- New Momentum Direction: (0.21589,-0.88062,0.42178)
- New Polarization:       (-0.97598,-0.20751,0.066313)
+ Old Momentum Direction: (0.94916,0.23215,0.21261)
+ Old Polarization:       (0.098011,0.4239,-0.90039)
+ New Momentum Direction: (0.90558,0.31281,0.28649)
+ New Polarization:       (-0.17231,0.88845,-0.42541)
  *** FresnelRefraction *** 
-Track (trackID 963, parentID 1) is processed with stopping code 2
+Track (trackID 1130, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72812,0.40296,0.5545)
- Old Polarization:       (-0.6822,0.50474,0.52901)
- New Momentum Direction: (0.36975,0.54621,0.75162)
- New Polarization:       (-0.92715,0.26967,0.26013)
+ Old Momentum Direction: (0.46614,-0.74856,0.47155)
+ Old Polarization:       (-0.44248,-0.65881,-0.60842)
+ New Momentum Direction: (0.63393,-0.43229,0.64129)
+ New Polarization:       (0.35767,0.89907,0.25249)
  *** FresnelRefraction *** 
-Track (trackID 962, parentID 1) is processed with stopping code 2
+Track (trackID 1129, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77156,0.62974,-0.090123)
- Old Polarization:       (-0.63448,0.7515,-0.18078)
- New Momentum Direction: (0.50347,0.8553,-0.1224)
- New Polarization:       (-0.86292,0.49067,-0.12087)
- *** FresnelRefraction *** 
-Track (trackID 961, parentID 1) is processed with stopping code 2
-### pop requested out of 63 stacked tracks.
+ Old Momentum Direction: (0.68223,0.55308,0.47818)
+ Old Polarization:       (-0.20436,0.77221,-0.60161)
+ New Momentum Direction: (-0.68223,0.55308,0.47818)
+ New Polarization:       (-0.16359,-0.75292,0.63746)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68223,0.55308,0.47818)
+ Old Polarization:       (-0.16359,-0.75292,0.63746)
+ New Momentum Direction: (-0.68223,-0.55308,0.47818)
+ New Polarization:       (0.16359,-0.75292,-0.63746)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68223,-0.55308,0.47818)
+ Old Polarization:       (0.16359,-0.75292,-0.63746)
+ New Momentum Direction: (-0.68223,-0.55308,-0.47818)
+ New Polarization:       (-0.16359,0.75292,-0.63746)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 960, parentID 1) is processed with stopping code 2
-### pop requested out of 62 stacked tracks.
+Track (trackID 1128, parentID 1) is processed with stopping code 2
+### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71063,0.067471,0.70032)
- Old Polarization:       (-0.7019,0.1364,0.69909)
- New Momentum Direction: (0.31761,0.090934,0.94385)
- New Polarization:       (-0.94724,0.075807,0.31144)
+ Old Momentum Direction: (0.13675,0.37655,0.91625)
+ Old Polarization:       (-0.8067,0.57914,-0.1176)
+ New Momentum Direction: (0.18531,0.51025,0.83982)
+ New Polarization:       (-0.75472,0.62122,-0.21091)
  *** FresnelRefraction *** 
-Track (trackID 959, parentID 1) is processed with stopping code 2
+Track (trackID 1127, parentID 1) is processed with stopping code 2
+### pop requested out of 62 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.0061102,0.090273,0.9959)
+Old Polarization: (-0.96445,0.2626,-0.02972)
+New Polarization: (0.94886,-0.11858,-0.29256)
+Polarization Change: (0.94886,-0.11858,-0.29256)
+New Momentum Direction: (0.21512,-0.43537,0.87417)
+Momentum Change: (0.21512,-0.43537,0.87417)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.21512,-0.43537,0.87417)
+ Old Polarization:       (0.94886,-0.11858,-0.29256)
+ New Momentum Direction: (0.29156,-0.59006,0.75288)
+ New Polarization:       (0.86055,-0.18187,-0.47579)
+ *** FresnelRefraction *** 
+Track (trackID 1126, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70762,-0.031235,0.70591)
- Old Polarization:       (-0.70543,0.026211,0.7083)
- New Momentum Direction: (0.31037,-0.042022,0.94969)
- New Polarization:       (-0.94993,0.02438,0.31153)
+ Old Momentum Direction: (0.37925,-0.73973,0.55585)
+ Old Polarization:       (-0.5401,-0.66475,-0.51614)
+ New Momentum Direction: (0.51084,-0.42247,0.74871)
+ New Polarization:       (0.14836,0.90117,0.40728)
  *** FresnelRefraction *** 
-Track (trackID 958, parentID 1) is processed with stopping code 2
+Track (trackID 1125, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.75145,0.60974,0.25206)
- Old Polarization:       (-0.65656,0.72878,0.19444)
- New Momentum Direction: (0.44293,0.82855,0.34252)
- New Polarization:       (-0.89452,0.43413,0.1066)
- *** FresnelRefraction *** 
-Track (trackID 957, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1124, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78312,0.10825,-0.61237)
- Old Polarization:       (-0.62122,0.18111,-0.76242)
- New Momentum Direction: (0.54245,0.14624,-0.82726)
- New Polarization:       (-0.83966,0.1259,-0.52832)
- *** FresnelRefraction *** 
-Track (trackID 956, parentID 1) is processed with stopping code 2
-### pop requested out of 58 stacked tracks.
+ Old Momentum Direction: (0.4725,0.57902,0.66444)
+ Old Polarization:       (-0.43558,0.80881,-0.39509)
+ New Momentum Direction: (0.4725,0.57902,-0.66444)
+ New Polarization:       (0.43558,-0.80881,-0.39509)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4725,0.57902,-0.66444)
+ Old Polarization:       (0.43558,-0.80881,-0.39509)
+ New Momentum Direction: (0.4725,-0.57902,-0.66444)
+ New Polarization:       (-0.43558,-0.80881,0.39509)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4725,-0.57902,-0.66444)
+ Old Polarization:       (-0.43558,-0.80881,0.39509)
+ New Momentum Direction: (-0.4725,-0.57902,-0.66444)
+ New Polarization:       (-0.43558,0.80881,-0.39509)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.4725,-0.57902,-0.66444)
+ Old Polarization:       (-0.43558,0.80881,-0.39509)
+ New Momentum Direction: (-0.4725,-0.57902,0.66444)
+ New Polarization:       (0.43558,-0.80881,-0.39509)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 955, parentID 1) is processed with stopping code 2
+Track (trackID 1123, parentID 1) is processed with stopping code 2
+### pop requested out of 58 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.27689,-0.71968,0.63671)
+ Old Polarization:       (-0.65035,-0.62814,-0.42717)
+ New Momentum Direction: (0.37631,-0.33106,0.86533)
+ New Polarization:       (-0.14507,0.90141,0.40795)
+ *** FresnelRefraction *** 
+Track (trackID 1122, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 954, parentID 1) is processed with stopping code 2
-### pop requested out of 56 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76482,-0.26429,-0.58753)
- Old Polarization:       (-0.64168,-0.23125,-0.73128)
- New Momentum Direction: (0.48896,-0.35785,-0.79553)
- New Polarization:       (-0.87064,-0.14392,-0.47039)
+ Old Momentum Direction: (0.9732,-0.19431,0.12295)
+ Old Polarization:       (0.11509,-0.051281,-0.99203)
+ New Momentum Direction: (0.94997,-0.26393,0.16701)
+ New Polarization:       (-0.19334,-0.91688,-0.34921)
  *** FresnelRefraction *** 
-Track (trackID 953, parentID 1) is processed with stopping code 2
+Track (trackID 1121, parentID 1) is processed with stopping code 2
+### pop requested out of 56 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1120, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75427,-0.39638,-0.5234)
- Old Polarization:       (-0.65341,-0.37524,-0.65745)
- New Momentum Direction: (0.45418,-0.53787,-0.71023)
- New Polarization:       (-0.88891,-0.22016,-0.4017)
+ Old Momentum Direction: (-0.016317,0.037072,0.99918)
+ Old Polarization:       (-0.97859,0.20449,-0.023568)
+ New Momentum Direction: (-0.022063,0.050126,0.9985)
+ New Polarization:       (-0.93749,0.34592,-0.03808)
  *** FresnelRefraction *** 
-Track (trackID 952, parentID 1) is processed with stopping code 2
+Track (trackID 1119, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75039,0.57486,0.32628)
- Old Polarization:       (-0.65756,0.69944,0.27998)
- New Momentum Direction: (0.45041,0.77647,0.44071)
- New Polarization:       (-0.89062,0.42536,0.1608)
+ Old Momentum Direction: (-0.01989,-0.0092412,0.99976)
+ Old Polarization:       (-0.98793,0.15382,-0.018233)
+ New Momentum Direction: (-0.026779,-0.012442,0.99956)
+ New Polarization:       (-0.99931,0.026102,-0.026447)
  *** FresnelRefraction *** 
-Track (trackID 951, parentID 1) is processed with stopping code 2
+Track (trackID 1118, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 950, parentID 1) is processed with stopping code 2
+Track (trackID 1117, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71176,-0.70031,0.054489)
- Old Polarization:       (-0.70032,-0.71349,-0.021984)
- New Momentum Direction: (0.3099,-0.9479,0.073754)
- New Polarization:       (-0.94954,-0.31251,-0.026638)
+ Old Momentum Direction: (0.13965,-0.622,0.77046)
+ Old Polarization:       (-0.80395,-0.52546,-0.27849)
+ New Momentum Direction: (0.18913,-0.84241,0.50456)
+ New Polarization:       (-0.73579,-0.46185,-0.49529)
  *** FresnelRefraction *** 
-Track (trackID 949, parentID 1) is processed with stopping code 2
+Track (trackID 1116, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75975,0.63018,0.16016)
- Old Polarization:       (-0.6473,0.75634,0.094637)
- New Momentum Direction: (0.47363,0.85359,0.21694)
- New Polarization:       (-0.87885,0.47414,0.053161)
+ Old Momentum Direction: (0.53432,-0.73432,0.41866)
+ Old Polarization:       (-0.3673,-0.64778,-0.66743)
+ New Momentum Direction: (0.72455,-0.3908,0.56771)
+ New Polarization:       (0.42809,0.90073,0.073672)
  *** FresnelRefraction *** 
-Track (trackID 948, parentID 1) is processed with stopping code 2
+Track (trackID 1115, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6473,0.56876,0.50746)
+ Old Polarization:       (-0.24396,0.78532,-0.569)
+ New Momentum Direction: (-0.6473,0.56876,0.50746)
+ New Polarization:       (-0.24396,-0.78532,0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6473,0.56876,0.50746)
+ Old Polarization:       (-0.24396,-0.78532,0.569)
+ New Momentum Direction: (-0.6473,-0.56876,0.50746)
+ New Polarization:       (0.24396,-0.78532,-0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6473,-0.56876,0.50746)
+ Old Polarization:       (0.24396,-0.78532,-0.569)
+ New Momentum Direction: (-0.6473,-0.56876,-0.50746)
+ New Polarization:       (-0.24396,0.78532,-0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6473,-0.56876,-0.50746)
+ Old Polarization:       (-0.24396,0.78532,-0.569)
+ New Momentum Direction: (0.6473,-0.56876,-0.50746)
+ New Polarization:       (-0.24396,-0.78532,0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6473,-0.56876,-0.50746)
+ Old Polarization:       (-0.24396,-0.78532,0.569)
+ New Momentum Direction: (0.6473,0.56876,-0.50746)
+ New Polarization:       (0.24396,-0.78532,-0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6473,0.56876,-0.50746)
+ Old Polarization:       (0.24396,-0.78532,-0.569)
+ New Momentum Direction: (0.6473,0.56876,0.50746)
+ New Polarization:       (-0.24396,0.78532,-0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6473,0.56876,0.50746)
+ Old Polarization:       (-0.24396,0.78532,-0.569)
+ New Momentum Direction: (-0.6473,0.56876,0.50746)
+ New Polarization:       (-0.24396,-0.78532,0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6473,0.56876,0.50746)
+ Old Polarization:       (-0.24396,-0.78532,0.569)
+ New Momentum Direction: (-0.6473,-0.56876,0.50746)
+ New Polarization:       (0.24396,-0.78532,-0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6473,-0.56876,0.50746)
+ Old Polarization:       (0.24396,-0.78532,-0.569)
+ New Momentum Direction: (-0.6473,-0.56876,-0.50746)
+ New Polarization:       (-0.24396,0.78532,-0.569)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6473,-0.56876,-0.50746)
+ Old Polarization:       (-0.24396,0.78532,-0.569)
+ New Momentum Direction: (0.6473,-0.56876,-0.50746)
+ New Polarization:       (-0.24396,-0.78532,0.569)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 947, parentID 1) is processed with stopping code 2
+Track (trackID 1114, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77315,0.62859,-0.084327)
- Old Polarization:       (-0.63252,0.75447,-0.17522)
- New Momentum Direction: (0.51176,0.8515,-0.11423)
- New Polarization:       (-0.85801,0.49978,-0.1185)
+ Old Momentum Direction: (0.93906,0.2604,0.22441)
+ Old Polarization:       (0.085726,0.4548,-0.88646)
+ New Momentum Direction: (0.88605,0.35117,0.30264)
+ New Polarization:       (-0.15326,0.83801,-0.52369)
  *** FresnelRefraction *** 
-Track (trackID 946, parentID 1) is processed with stopping code 2
+Track (trackID 1113, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.775,0.60423,-0.18517)
- Old Polarization:       (-0.63081,0.7219,-0.2845)
- New Momentum Direction: (0.5116,0.82151,-0.25176)
- New Polarization:       (-0.85847,0.47646,-0.18977)
+ Old Momentum Direction: (0.97721,0.12676,0.17026)
+ Old Polarization:       (0.1251,0.30411,-0.94439)
+ New Momentum Direction: (0.95793,0.17139,0.23022)
+ New Polarization:       (-0.20186,0.97254,0.11589)
  *** FresnelRefraction *** 
-Track (trackID 945, parentID 1) is processed with stopping code 2
+Track (trackID 1112, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71102,0.12154,0.69259)
- Old Polarization:       (-0.70124,0.19561,0.68557)
- New Momentum Direction: (0.31055,0.1643,0.93625)
- New Polarization:       (-0.94942,0.10175,0.29707)
- *** FresnelRefraction *** 
-Track (trackID 944, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1111, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78489,0.33668,-0.52019)
- Old Polarization:       (-0.61963,0.43176,-0.65547)
- New Momentum Direction: (0.5428,0.45633,-0.70507)
- New Polarization:       (-0.83985,0.29863,-0.45329)
+ Old Momentum Direction: (0.020848,0.17003,0.98522)
+ Old Polarization:       (-0.93543,0.35116,-0.040808)
+ New Momentum Direction: (0.028236,0.23028,0.97271)
+ New Polarization:       (-0.90438,0.42038,-0.073269)
  *** FresnelRefraction *** 
-Track (trackID 943, parentID 1) is processed with stopping code 2
+Track (trackID 1110, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74593,0.53094,0.40211)
- Old Polarization:       (-0.6625,0.65353,0.36606)
- New Momentum Direction: (0.44047,0.71568,0.54202)
- New Polarization:       (-0.89551,0.39301,0.20881)
+ Old Momentum Direction: (0.97093,0.16331,0.17497)
+ Old Polarization:       (0.11084,0.34113,-0.93346)
+ New Momentum Direction: (0.94551,0.22216,0.23801)
+ New Polarization:       (-0.18913,0.96982,-0.15389)
  *** FresnelRefraction *** 
-Track (trackID 942, parentID 1) is processed with stopping code 2
+Track (trackID 1109, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 941, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0071913,-0.41611,0.90929)
+ Old Polarization:       (-0.94695,-0.295,-0.12751)
+ New Momentum Direction: (0.0097701,-0.56533,0.82481)
+ New Polarization:       (-0.90811,-0.35034,-0.22937)
+ *** FresnelRefraction *** 
+Track (trackID 1108, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.75147,-0.45286,-0.4798)
-Old Polarization: (-0.65642,-0.44,-0.61279)
-New Polarization: (-0.21233,-0.57153,-0.62256)
-Polarization Change: (-0.24367,-0.65589,-0.71445)
-New Momentum Direction: (-0.93187,0.3623,-0.014789)
-Momentum Change: (-0.93193,0.36233,-0.01479)
  Photon at Boundary! 
- Old Momentum Direction: (-0.93193,0.36233,-0.01479)
- Old Polarization:       (-0.24367,-0.65589,-0.71445)
- New Momentum Direction: (-0.87127,0.4904,-0.020017)
- New Polarization:       (0.3821,0.65214,-0.65476)
+ Old Momentum Direction: (0.97467,-0.18463,0.12623)
+ Old Polarization:       (0.1206,-0.041441,-0.99184)
+ New Momentum Direction: (0.95305,-0.24998,0.17091)
+ New Polarization:       (-0.19874,-0.94218,-0.26981)
  *** FresnelRefraction *** 
-Track (trackID 940, parentID 1) is processed with stopping code 2
+Track (trackID 1107, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69718,-0.11132,0.7082)
- Old Polarization:       (-0.7161,-0.061651,0.69527)
- New Momentum Direction: (0.94686,-0.15119,0.2839)
- New Polarization:       (0.26067,-0.15641,-0.95267)
+ Old Momentum Direction: (0.317,-0.73121,0.60402)
+ Old Polarization:       (-0.60748,-0.64562,-0.46276)
+ New Momentum Direction: (0.42952,-0.38171,0.81842)
+ New Polarization:       (-0.024751,0.90096,0.4332)
  *** FresnelRefraction *** 
-Track (trackID 939, parentID 1) is processed with stopping code 2
+Track (trackID 1106, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75935,0.60613,0.23665)
- Old Polarization:       (-0.64747,0.73999,0.18221)
- New Momentum Direction: (0.48286,0.81573,0.31848)
- New Polarization:       (-0.87359,0.47393,0.11059)
+ Old Momentum Direction: (-0.022109,-0.30373,0.9525)
+ Old Polarization:       (-0.98189,-0.17271,-0.077864)
+ New Momentum Direction: (-0.02997,-0.41172,0.91082)
+ New Polarization:       (-0.96057,-0.24012,-0.14015)
  *** FresnelRefraction *** 
-Track (trackID 938, parentID 1) is processed with stopping code 2
+Track (trackID 1105, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72333,-0.67478,-0.14653)
- Old Polarization:       (-0.6875,-0.68401,-0.24386)
- New Momentum Direction: (0.35363,-0.91408,-0.19849)
- New Polarization:       (-0.93358,-0.33171,-0.13564)
+ Old Momentum Direction: (0.56398,0.58058,0.58724)
+ Old Polarization:       (-0.33362,0.8107,-0.4811)
+ New Momentum Direction: (0.56398,0.58058,-0.58724)
+ New Polarization:       (0.33362,-0.8107,-0.4811)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56398,0.58058,-0.58724)
+ Old Polarization:       (0.33362,-0.8107,-0.4811)
+ New Momentum Direction: (0.56398,-0.58058,-0.58724)
+ New Polarization:       (-0.33362,-0.8107,0.4811)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56398,-0.58058,-0.58724)
+ Old Polarization:       (-0.33362,-0.8107,0.4811)
+ New Momentum Direction: (-0.56398,-0.58058,-0.58724)
+ New Polarization:       (-0.33362,0.8107,-0.4811)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56398,-0.58058,-0.58724)
+ Old Polarization:       (-0.33362,0.8107,-0.4811)
+ New Momentum Direction: (-0.56398,-0.58058,0.58724)
+ New Polarization:       (0.33362,-0.8107,-0.4811)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56398,-0.58058,0.58724)
+ Old Polarization:       (0.33362,-0.8107,-0.4811)
+ New Momentum Direction: (-0.56398,0.58058,0.58724)
+ New Polarization:       (-0.33362,-0.8107,0.4811)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56398,0.58058,0.58724)
+ Old Polarization:       (-0.33362,-0.8107,0.4811)
+ New Momentum Direction: (0.56398,0.58058,0.58724)
+ New Polarization:       (-0.33362,0.8107,-0.4811)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.56398,0.58058,0.58724)
+Old Polarization: (-0.33362,0.8107,-0.4811)
+New Polarization: (0.20931,0.20788,-0.9555)
+Polarization Change: (0.20931,0.20788,-0.9555)
+New Momentum Direction: (-0.54304,0.83732,0.063206)
+Momentum Change: (-0.54304,0.83732,0.063206)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54304,0.83732,0.063206)
+ Old Polarization:       (0.20931,0.20788,-0.9555)
+ New Momentum Direction: (0.54304,0.83732,0.063206)
+ New Polarization:       (0.20931,-0.20788,0.9555)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54304,0.83732,0.063206)
+ Old Polarization:       (0.20931,-0.20788,0.9555)
+ New Momentum Direction: (0.54304,-0.83732,0.063206)
+ New Polarization:       (0.17219,0.037366,-0.98436)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54304,-0.83732,0.063206)
+ Old Polarization:       (0.17219,0.037366,-0.98436)
+ New Momentum Direction: (-0.54304,-0.83732,0.063206)
+ New Polarization:       (0.17219,-0.037366,0.98436)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54304,-0.83732,0.063206)
+ Old Polarization:       (0.17219,-0.037366,0.98436)
+ New Momentum Direction: (-0.54304,0.83732,0.063206)
+ New Polarization:       (-0.1251,-0.0062409,-0.99212)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.54304,0.83732,0.063206)
+ Old Polarization:       (-0.1251,-0.0062409,-0.99212)
+ New Momentum Direction: (-0.73317,0.67467,0.085335)
+ New Polarization:       (-0.12626,-0.011746,-0.99193)
  *** FresnelRefraction *** 
-Track (trackID 937, parentID 1) is processed with stopping code 2
+Track (trackID 1104, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71894,0.32737,0.61316)
- Old Polarization:       (-0.69215,0.4181,0.58832)
- New Momentum Direction: (0.3247,0.44546,0.83435)
- New Polarization:       (-0.9441,0.20576,0.25756)
+ Old Momentum Direction: (0.14769,-0.63542,0.75791)
+ Old Polarization:       (-0.79193,-0.53504,-0.29425)
+ New Momentum Direction: (0.2008,-0.86394,0.46183)
+ New Polarization:       (-0.7208,-0.44955,-0.52758)
  *** FresnelRefraction *** 
-Track (trackID 936, parentID 1) is processed with stopping code 2
+Track (trackID 1103, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 935, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.017005,-0.28291,0.959)
+ Old Polarization:       (-0.98611,-0.15373,-0.062836)
+ New Momentum Direction: (-0.022868,-0.38046,0.92452)
+ New Polarization:       (-0.97043,-0.21382,-0.11199)
+ *** FresnelRefraction *** 
+Track (trackID 1102, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 934, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.016509,-0.34036,0.94015)
+ Old Polarization:       (-0.97284,-0.21166,-0.093708)
+ New Momentum Direction: (-0.022432,-0.46247,0.88635)
+ New Polarization:       (-0.94556,-0.27811,-0.16904)
+ *** FresnelRefraction *** 
+Track (trackID 1101, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 933, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69743,-0.58573,0.41292)
- Old Polarization:       (-0.71628,-0.58831,0.37529)
- New Momentum Direction: (0.24718,-0.79196,0.5583)
- New Polarization:       (-0.96876,-0.2139,0.12549)
+ Old Momentum Direction: (0.37761,0.54989,0.74501)
+ Old Polarization:       (-0.54246,0.78342,-0.30329)
+ New Momentum Direction: (0.5076,0.7392,0.44264)
+ New Polarization:       (-0.5138,0.6721,-0.53318)
  *** FresnelRefraction *** 
-Track (trackID 932, parentID 1) is processed with stopping code 2
+Track (trackID 1100, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.56286,-0.72706,0.39316)
+Old Polarization: (-0.33631,-0.63595,-0.69459)
+New Polarization: (0.067486,-0.75232,-0.65533)
+Polarization Change: (0.067486,-0.75232,-0.65533)
+New Momentum Direction: (0.9642,-0.11964,0.23665)
+Momentum Change: (0.9642,-0.11964,0.23665)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9642,-0.11964,0.23665)
+ Old Polarization:       (0.067486,-0.75232,-0.65533)
+ New Momentum Direction: (0.93278,-0.16264,0.32168)
+ New Polarization:       (-0.12195,-0.98219,-0.14295)
+ *** FresnelRefraction *** 
+Track (trackID 1099, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 931, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.053895,-0.51052,0.85817)
+ Old Polarization:       (-0.89779,-0.40099,-0.18216)
+ New Momentum Direction: (0.073068,-0.69214,0.71806)
+ New Polarization:       (-0.84398,-0.42651,-0.32524)
+ *** FresnelRefraction *** 
+Track (trackID 1098, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70911,-0.7039,0.041046)
- Old Polarization:       (-0.70294,-0.71029,-0.036849)
- New Momentum Direction: (0.28484,-0.95695,0.055802)
- New Polarization:       (-0.95735,-0.28694,-0.033898)
+ Old Momentum Direction: (0.7896,0.48438,0.37672)
+ Old Polarization:       (-0.086487,0.69564,-0.71316)
+ New Momentum Direction: (0.55307,0.65765,0.51148)
+ New Polarization:       (-0.16646,0.68877,-0.70561)
  *** FresnelRefraction *** 
-Track (trackID 930, parentID 1) is processed with stopping code 2
+Track (trackID 1097, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72618,-0.65266,-0.21609)
- Old Polarization:       (-0.68428,-0.65573,-0.31903)
- New Momentum Direction: (0.35805,-0.88638,-0.29347)
- New Polarization:       (-0.93176,-0.31895,-0.17347)
+ Old Momentum Direction: (-0.0046688,0.081313,0.99668)
+ Old Polarization:       (-0.96686,0.25405,-0.025255)
+ New Momentum Direction: (-0.0063064,0.10983,0.99393)
+ New Polarization:       (-0.93654,0.34774,-0.044369)
  *** FresnelRefraction *** 
-Track (trackID 929, parentID 1) is processed with stopping code 2
+Track (trackID 1096, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78098,0.5941,-0.19265)
- Old Polarization:       (-0.62343,0.72315,-0.2973)
- New Momentum Direction: (0.53896,0.80126,-0.25982)
- New Polarization:       (-0.84159,0.49928,-0.20604)
- *** FresnelRefraction *** 
-Track (trackID 928, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (0.96399,-0.23541,0.12368)
+Old Polarization: (0.10356,-0.096035,-0.98998)
+New Polarization: (0.51341,0.28045,0.81102)
+Polarization Change: (0.51341,0.28045,0.81102)
+New Momentum Direction: (-0.7974,-0.19332,0.57164)
+Momentum Change: (-0.7974,-0.19332,0.57164)
+
+** Photon absorbed! **
+Track (trackID 1095, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77797,-0.086334,-0.62234)
- Old Polarization:       (-0.62667,-0.035385,-0.77848)
- New Momentum Direction: (0.53283,-0.11628,-0.83819)
- New Polarization:       (-0.84514,-0.023009,-0.53406)
+ Old Momentum Direction: (0.91144,-0.3815,0.15408)
+ Old Polarization:       (0.053477,-0.26148,-0.96373)
+ New Momentum Direction: (0.83147,-0.51514,0.20806)
+ New Polarization:       (-0.098129,-0.50479,-0.85765)
  *** FresnelRefraction *** 
-Track (trackID 927, parentID 1) is processed with stopping code 2
+Track (trackID 1094, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76587,-0.2878,-0.575)
- Old Polarization:       (-0.6403,-0.25952,-0.72295)
- New Momentum Direction: (0.49747,-0.38827,-0.77574)
- New Polarization:       (-0.86571,-0.16514,-0.47251)
+ Old Momentum Direction: (-0.01237,0.083401,0.99644)
+ Old Polarization:       (-0.96678,0.25346,-0.033216)
+ New Momentum Direction: (-0.01683,0.11347,0.9934)
+ New Polarization:       (-0.92784,0.36846,-0.057807)
  *** FresnelRefraction *** 
-Track (trackID 926, parentID 1) is processed with stopping code 2
+Track (trackID 1093, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.69123,-0.54458,0.47501)
-Old Polarization: (-0.72246,-0.53518,0.43776)
-New Polarization: (-0.73597,0.060819,0.45259)
-Polarization Change: (-0.84972,0.070218,0.52254)
-New Momentum Direction: (-0.033778,0.97392,-0.1858)
-Momentum Change: (-0.034049,0.98171,-0.18729)
- Photon at Boundary! 
- Old Momentum Direction: (-0.034049,0.98171,-0.18729)
- Old Polarization:       (-0.84972,0.070218,0.52254)
- New Momentum Direction: (-0.046314,0.9659,-0.25475)
- New Polarization:       (-0.94752,-0.12323,-0.29499)
- *** FresnelRefraction *** 
-Track (trackID 925, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1092, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78233,0.50893,-0.35909)
- Old Polarization:       (-0.62255,0.62041,-0.477)
- New Momentum Direction: (0.53474,0.69045,-0.48717)
- New Polarization:       (-0.84481,0.42394,-0.32646)
+ Old Momentum Direction: (0.9594,-0.24955,0.13142)
+ Old Polarization:       (0.10566,-0.11403,-0.98784)
+ New Momentum Direction: (0.92448,-0.33732,0.17765)
+ New Polarization:       (-0.18353,-0.8022,-0.56815)
  *** FresnelRefraction *** 
-Track (trackID 924, parentID 1) is processed with stopping code 2
+Track (trackID 1091, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78287,0.50815,-0.35902)
- Old Polarization:       (-0.62186,0.62058,-0.47767)
- New Momentum Direction: (0.53724,0.68885,-0.48668)
- New Polarization:       (-0.84322,0.42577,-0.32818)
+ Old Momentum Direction: (0.94223,0.25212,0.22055)
+ Old Polarization:       (0.089288,0.44556,-0.89079)
+ New Momentum Direction: (0.89215,0.34,0.29743)
+ New Polarization:       (-0.15898,0.85261,-0.49777)
  *** FresnelRefraction *** 
-Track (trackID 923, parentID 1) is processed with stopping code 2
+Track (trackID 1090, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70839,-0.68288,0.17848)
- Old Polarization:       (-0.70435,-0.70025,0.11637)
- New Momentum Direction: (0.30667,-0.92088,0.24069)
- New Polarization:       (-0.95095,-0.30719,0.036296)
+ Old Momentum Direction: (0.36938,0.55698,0.74386)
+ Old Polarization:       (-0.54919,0.77657,-0.30875)
+ New Momentum Direction: (0.50119,0.75573,0.42152)
+ New Polarization:       (-0.51881,0.65229,-0.55259)
  *** FresnelRefraction *** 
-Track (trackID 922, parentID 1) is processed with stopping code 2
+Track (trackID 1089, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7837,0.013502,-0.62099)
- Old Polarization:       (-0.62003,0.076484,-0.78084)
- New Momentum Direction: (0.5508,0.018143,-0.83444)
- New Polarization:       (-0.8339,0.054054,-0.54927)
+ Old Momentum Direction: (0.23257,-0.69822,0.67705)
+ Old Polarization:       (-0.69885,-0.60412,-0.38295)
+ New Momentum Direction: (0.31618,-0.22983,0.92044)
+ New Polarization:       (-0.28261,0.90335,0.32264)
  *** FresnelRefraction *** 
-Track (trackID 921, parentID 1) is processed with stopping code 2
+Track (trackID 1088, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.71452,0.26196,0.64872)
-Old Polarization: (-0.69699,0.34684,0.62762)
-New Polarization: (-0.45595,0.53727,0.54992)
-Polarization Change: (-0.5101,0.60108,0.61523)
-New Momentum Direction: (0.72382,0.6851,-0.069204)
-Momentum Change: (0.72452,0.68576,-0.069271)
  Photon at Boundary! 
- Old Momentum Direction: (0.72452,0.68576,-0.069271)
- Old Polarization:       (-0.5101,0.60108,0.61523)
- New Momentum Direction: (0.34769,0.93286,-0.094231)
- New Polarization:       (-0.804,0.34834,0.48192)
- *** FresnelRefraction *** 
-Track (trackID 920, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+ Old Momentum Direction: (0.65859,0.5634,0.49883)
+ Old Polarization:       (-0.23081,0.78219,-0.57871)
+ New Momentum Direction: (-0.65859,0.5634,0.49883)
+ New Polarization:       (-0.23081,-0.78219,0.57871)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.77797,0.58338,-0.23328)
- Old Polarization:       (-0.62739,0.70142,-0.33821)
- New Momentum Direction: (0.52209,0.79192,-0.31668)
- New Polarization:       (-0.8523,0.47061,-0.22828)
- *** FresnelRefraction *** 
-Track (trackID 919, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.65859,0.5634,0.49883)
+ Old Polarization:       (-0.23081,-0.78219,0.57871)
+ New Momentum Direction: (-0.65859,-0.5634,0.49883)
+ New Polarization:       (0.23081,-0.78219,-0.57871)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65859,-0.5634,0.49883)
+ Old Polarization:       (0.23081,-0.78219,-0.57871)
+ New Momentum Direction: (-0.65859,-0.5634,-0.49883)
+ New Polarization:       (-0.23081,0.78219,-0.57871)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1087, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1086, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76776,-0.17094,-0.61752)
- Old Polarization:       (-0.63868,-0.12694,-0.75893)
- New Momentum Direction: (0.49209,-0.23225,-0.83899)
- New Polarization:       (-0.86921,-0.077814,-0.48828)
+ Old Momentum Direction: (0.67744,0.55151,0.48673)
+ Old Polarization:       (-0.20725,0.77801,-0.59309)
+ New Momentum Direction: (0.11563,0.74473,0.65727)
+ New Polarization:       (-0.43719,0.63232,-0.63956)
  *** FresnelRefraction *** 
-Track (trackID 918, parentID 1) is processed with stopping code 2
+Track (trackID 1085, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69832,-0.66894,0.25469)
- Old Polarization:       (-0.71471,-0.67117,0.19679)
- New Momentum Direction: (-0.69832,-0.66894,0.25469)
- New Polarization:       (-0.71306,0.68117,-0.16601)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.74859,-0.61237,0.2542)
+ Old Polarization:       (-0.13112,-0.51254,-0.84859)
+ New Momentum Direction: (0.43685,-0.8308,0.34487)
+ New Polarization:       (-0.25563,-0.48223,-0.83792)
+ *** FresnelRefraction *** 
+Track (trackID 1084, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.69832,-0.66894,0.25469)
- Old Polarization:       (-0.71306,0.68117,-0.16601)
- New Momentum Direction: (-0.69832,0.66894,0.25469)
- New Polarization:       (0.71306,0.68117,0.16601)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.96395,-0.23442,0.1259)
+ Old Polarization:       (0.10599,-0.095726,-0.98975)
+ New Momentum Direction: (0.93253,-0.31813,0.17085)
+ New Polarization:       (-0.18402,-0.82576,-0.53316)
+ *** FresnelRefraction *** 
+Track (trackID 1083, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 917, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
+Track (trackID 1082, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 916, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
+Track (trackID 1081, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48762,0.58748,0.64583)
+ Old Polarization:       (-0.41892,0.80646,-0.41729)
+ New Momentum Direction: (0.48762,0.58748,-0.64583)
+ New Polarization:       (0.41892,-0.80646,-0.41729)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48762,0.58748,-0.64583)
+ Old Polarization:       (0.41892,-0.80646,-0.41729)
+ New Momentum Direction: (0.48762,-0.58748,-0.64583)
+ New Polarization:       (-0.41892,-0.80646,0.41729)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48762,-0.58748,-0.64583)
+ Old Polarization:       (-0.41892,-0.80646,0.41729)
+ New Momentum Direction: (-0.48762,-0.58748,-0.64583)
+ New Polarization:       (-0.41892,0.80646,-0.41729)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 915, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
+Track (trackID 1080, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71877,0.29514,0.6295)
- Old Polarization:       (-0.69245,0.38505,0.61012)
- New Momentum Direction: (0.33156,0.40049,0.85421)
- New Polarization:       (-0.94178,0.19411,0.27454)
+ Old Momentum Direction: (0.98097,0.10609,0.16259)
+ Old Polarization:       (0.12735,0.28044,-0.95139)
+ New Momentum Direction: (0.96482,0.14367,0.22018)
+ New Polarization:       (-0.20057,0.94369,0.26311)
  *** FresnelRefraction *** 
-Track (trackID 914, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+Track (trackID 1079, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.31034,-0.72678,0.61276)
+ Old Polarization:       (-0.61588,-0.64473,-0.45279)
+ New Momentum Direction: (0.41944,-0.37174,0.82818)
+ New Polarization:       (-0.050672,0.9013,0.43022)
+ *** FresnelRefraction *** 
+Track (trackID 1078, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48778,0.58571,0.64731)
+ Old Polarization:       (-0.41869,0.80762,-0.41527)
+ New Momentum Direction: (0.48778,0.58571,-0.64731)
+ New Polarization:       (0.41869,-0.80762,-0.41527)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48778,0.58571,-0.64731)
+ Old Polarization:       (0.41869,-0.80762,-0.41527)
+ New Momentum Direction: (0.48778,-0.58571,-0.64731)
+ New Polarization:       (-0.41869,-0.80762,0.41527)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48778,-0.58571,-0.64731)
+ Old Polarization:       (-0.41869,-0.80762,0.41527)
+ New Momentum Direction: (-0.48778,-0.58571,-0.64731)
+ New Polarization:       (-0.41869,0.80762,-0.41527)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.48778,-0.58571,-0.64731)
+ Old Polarization:       (-0.41869,0.80762,-0.41527)
+ New Momentum Direction: (-0.48778,-0.58571,0.64731)
+ New Polarization:       (0.41869,-0.80762,-0.41527)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.73852,0.45406,0.49842)
- Old Polarization:       (-0.67079,0.56946,0.47515)
- New Momentum Direction: (0.41993,0.61119,0.6709)
- New Polarization:       (-0.90537,0.33339,0.26297)
- *** FresnelRefraction *** 
-Track (trackID 913, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
+ Old Momentum Direction: (-0.48778,-0.58571,0.64731)
+ Old Polarization:       (0.41869,-0.80762,-0.41527)
+ New Momentum Direction: (-0.48778,0.58571,0.64731)
+ New Polarization:       (-0.41869,-0.80762,0.41527)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.77707,0.6237,-0.084584)
- Old Polarization:       (-0.6277,0.75802,-0.17722)
- New Momentum Direction: (0.53013,0.84022,-0.11395)
- New Polarization:       (-0.84677,0.51765,-0.12251)
- *** FresnelRefraction *** 
-Track (trackID 912, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
+ Old Momentum Direction: (-0.48778,0.58571,0.64731)
+ Old Polarization:       (-0.41869,-0.80762,0.41527)
+ New Momentum Direction: (0.48778,0.58571,0.64731)
+ New Polarization:       (-0.41869,0.80762,-0.41527)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.78652,0.49866,-0.36432)
- Old Polarization:       (-0.61727,0.61668,-0.48855)
- New Momentum Direction: (0.55332,0.67259,-0.49139)
- New Polarization:       (-0.83278,0.43393,-0.34379)
- *** FresnelRefraction *** 
-Track (trackID 911, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.76321,0.63546,0.11708)
-Old Polarization: (-0.64342,0.76405,0.047302)
-New Polarization: (-0.70913,-0.04813,-0.60446)
-Polarization Change: (-0.76002,-0.051585,-0.64785)
-New Momentum Direction: (0.11018,0.96666,-0.20623)
-Momentum Change: (0.11078,0.97197,-0.20736)
+ Old Momentum Direction: (0.48778,0.58571,0.64731)
+ Old Polarization:       (-0.41869,0.80762,-0.41527)
+ New Momentum Direction: (0.48778,0.58571,-0.64731)
+ New Polarization:       (0.41869,-0.80762,-0.41527)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.11078,0.97197,-0.20736)
- Old Polarization:       (-0.76002,-0.051585,-0.64785)
- New Momentum Direction: (0.14988,0.94807,-0.28054)
- New Polarization:       (-0.71305,-0.092908,-0.69493)
- *** FresnelRefraction *** 
-Track (trackID 910, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+ Old Momentum Direction: (0.48778,0.58571,-0.64731)
+ Old Polarization:       (0.41869,-0.80762,-0.41527)
+ New Momentum Direction: (0.48778,-0.58571,-0.64731)
+ New Polarization:       (-0.41869,-0.80762,0.41527)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.48778,-0.58571,-0.64731)
+Old Polarization: (-0.41869,-0.80762,0.41527)
+New Polarization: (0.88262,0.34448,-0.31987)
+Polarization Change: (0.88262,0.34448,-0.31987)
+New Momentum Direction: (0.4324,-0.86189,0.26491)
+Momentum Change: (0.4324,-0.86189,0.26491)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4324,-0.86189,0.26491)
+ Old Polarization:       (0.88262,0.34448,-0.31987)
+ New Momentum Direction: (-0.4324,-0.86189,0.26491)
+ New Polarization:       (0.88262,-0.34448,0.31987)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 909, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+Track (trackID 1077, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69316,-0.53898,0.47858)
- Old Polarization:       (-0.72063,-0.5322,0.44436)
- New Momentum Direction: (0.20894,-0.73126,0.64931)
- New Polarization:       (-0.97784,-0.16499,0.12884)
+ Old Momentum Direction: (0.98978,0.0062739,0.14247)
+ Old Polarization:       (0.13933,0.17032,-0.97549)
+ New Momentum Direction: (0.98124,0.0084813,0.1926)
+ New Polarization:       (-0.19033,0.20152,0.96081)
  *** FresnelRefraction *** 
-Track (trackID 908, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.74704,-0.47274,-0.46739)
-Old Polarization: (-0.6614,-0.45773,-0.59417)
-New Polarization: (-0.49502,-0.18503,-0.71469)
-Polarization Change: (-0.55692,-0.20817,-0.80406)
-New Momentum Direction: (0.74994,-0.096452,-0.49446)
-Momentum Change: (0.83009,-0.10676,-0.54731)
+Track (trackID 1076, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.83009,-0.10676,-0.54731)
- Old Polarization:       (-0.55692,-0.20817,-0.80406)
- New Momentum Direction: (0.6526,-0.14507,-0.74369)
- New Polarization:       (-0.75722,-0.15997,-0.63327)
+ Old Momentum Direction: (-0.037826,-0.18757,0.98152)
+ Old Polarization:       (-0.99793,-0.044122,-0.04689)
+ New Momentum Direction: (-0.05133,-0.25453,0.9657)
+ New Polarization:       (-0.98907,-0.12086,-0.084427)
  *** FresnelRefraction *** 
-Track (trackID 907, parentID 1) is processed with stopping code 2
+Track (trackID 1075, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1074, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70603,-0.68973,0.16059)
- Old Polarization:       (-0.70663,-0.70115,0.095206)
- New Momentum Direction: (0.28356,-0.93397,0.21746)
- New Polarization:       (-0.95806,-0.28569,0.022275)
+ Old Momentum Direction: (0.97804,-0.16467,0.12778)
+ Old Polarization:       (0.12627,-0.019664,-0.9918)
+ New Momentum Direction: (0.95948,-0.22261,0.17274)
+ New Polarization:       (-0.20238,-0.97101,-0.12722)
  *** FresnelRefraction *** 
-Track (trackID 906, parentID 1) is processed with stopping code 2
+Track (trackID 1073, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70136,-0.60647,0.37454)
- Old Polarization:       (-0.71228,-0.6164,0.33571)
- New Momentum Direction: (0.2788,-0.81709,0.50461)
- New Polarization:       (-0.96005,-0.25027,0.12518)
+ Old Momentum Direction: (0.39643,-0.74969,0.52992)
+ Old Polarization:       (-0.51883,-0.65915,-0.54437)
+ New Momentum Direction: (0.53943,-0.43484,0.72107)
+ New Polarization:       (0.21142,0.89885,0.38389)
  *** FresnelRefraction *** 
-Track (trackID 905, parentID 1) is processed with stopping code 2
+Track (trackID 1072, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71878,-0.69013,-0.084099)
- Old Polarization:       (-0.69249,-0.69994,-0.17477)
- New Momentum Direction: (0.33452,-0.93547,-0.114)
- New Polarization:       (-0.94076,-0.32438,-0.09878)
- *** FresnelRefraction *** 
-Track (trackID 904, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1071, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69869,-0.09667,0.70887)
- Old Polarization:       (-0.71457,-0.045779,0.69806)
- New Momentum Direction: (0.9477,-0.13112,0.291)
- New Polarization:       (0.27415,-0.13245,-0.95252)
+Scattering Photon!
+Old Momentum Direction: (0.9615,-0.24504,0.12437)
+Old Polarization: (0.10078,-0.10658,-0.98918)
+New Polarization: (-0.89995,0.1631,-0.40433)
+Polarization Change: (-0.89995,0.1631,-0.40433)
+New Momentum Direction: (-0.38,0.16121,0.91083)
+Momentum Change: (-0.38,0.16121,0.91083)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.38,0.16121,0.91083)
+ Old Polarization:       (-0.89995,0.1631,-0.40433)
+ New Momentum Direction: (-0.51679,0.21924,0.82756)
+ New Polarization:       (-0.81106,0.18406,-0.55525)
  *** FresnelRefraction *** 
-Track (trackID 903, parentID 1) is processed with stopping code 2
+Track (trackID 1070, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.70518,-0.68922,0.16643)
- Old Polarization:       (-0.7075,-0.6994,0.10143)
- New Momentum Direction: (0.27724,-0.93396,0.22553)
- New Polarization:       (-0.95993,-0.27922,0.023726)
- *** FresnelRefraction *** 
-Track (trackID 902, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1069, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78166,0.21191,-0.5866)
- Old Polarization:       (-0.62344,0.29281,-0.72498)
- New Momentum Direction: (0.53093,0.28792,-0.797)
- New Polarization:       (-0.84724,0.19935,-0.49238)
+ Old Momentum Direction: (0.91348,0.32313,0.24727)
+ Old Polarization:       (0.048509,0.5169,-0.85467)
+ New Momentum Direction: (0.83309,0.43928,0.33615)
+ New Polarization:       (-0.090341,0.70761,-0.7008)
  *** FresnelRefraction *** 
-Track (trackID 901, parentID 1) is processed with stopping code 2
+Track (trackID 1068, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 900, parentID 1) is processed with stopping code 2
+Track (trackID 1067, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 899, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.96009,-0.2497,0.12597)
+ Old Polarization:       (0.10055,-0.11215,-0.98859)
+ New Momentum Direction: (0.92502,-0.3392,0.17113)
+ New Polarization:       (-0.17696,-0.78325,-0.59599)
+ *** FresnelRefraction *** 
+Track (trackID 1066, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 154
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 159
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 155 stacked tracks.
+### pop requested out of 160 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.54512,0.67999,0.49037)
+ Old Polarization:       (-0.61361,0.72217,-0.3193)
+ New Momentum Direction: (0.54512,-0.67999,0.49037)
+ New Polarization:       (-0.351,-0.7163,-0.60309)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1421, parentID 1) is processed with stopping code 2
+### pop requested out of 159 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7882,-0.44387,0.42629)
- Old Polarization:       (-0.47101,0.010723,0.88206)
- New Momentum Direction: (0.55017,-0.60227,0.57842)
- New Polarization:       (-0.72007,0.008593,0.69385)
+ Old Momentum Direction: (0.34822,-0.44997,0.82235)
+ Old Polarization:       (-0.83759,-0.54327,0.057412)
+ New Momentum Direction: (0.46806,-0.60483,0.64428)
+ New Polarization:       (-0.72791,-0.67727,-0.10698)
  *** FresnelRefraction *** 
-Track (trackID 1259, parentID 1) is processed with stopping code 2
-### pop requested out of 154 stacked tracks.
+Track (trackID 1420, parentID 1) is processed with stopping code 2
+### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74316,-0.54823,0.38362)
- Old Polarization:       (-0.51928,-0.11099,0.84736)
- New Momentum Direction: (0.43536,-0.73761,0.51614)
- New Polarization:       (-0.78574,-0.031499,0.61775)
+ Old Momentum Direction: (0.37002,-0.49422,0.78666)
+ Old Polarization:       (-0.80978,-0.5866,0.012361)
+ New Momentum Direction: (0.49993,-0.66775,0.55152)
+ New Polarization:       (-0.79076,-0.61167,-0.023777)
  *** FresnelRefraction *** 
-Track (trackID 1258, parentID 1) is processed with stopping code 2
+Track (trackID 1419, parentID 1) is processed with stopping code 2
+### pop requested out of 157 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.32588,-0.414,0.84994)
+ Old Polarization:       (-0.86145,-0.50042,0.086538)
+ New Momentum Direction: (0.43888,-0.55756,0.70463)
+ New Polarization:       (-0.66779,-0.72709,-0.1594)
+ *** FresnelRefraction *** 
+Track (trackID 1418, parentID 1) is processed with stopping code 2
+### pop requested out of 156 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.96022,-0.27182,-0.063906)
+ Old Polarization:       (-0.15611,-0.33283,-0.92997)
+ New Momentum Direction: (0.925,-0.36989,-0.086962)
+ New Polarization:       (-0.25769,-0.44248,-0.85896)
+ *** FresnelRefraction *** 
+Track (trackID 1417, parentID 1) is processed with stopping code 2
+### pop requested out of 155 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.96382,-0.25908,-0.062744)
+ Old Polarization:       (-0.14753,-0.32238,-0.93504)
+ New Momentum Direction: (0.93262,-0.35071,-0.084934)
+ New Polarization:       (-0.24197,-0.43321,-0.86821)
+ *** FresnelRefraction *** 
+Track (trackID 1416, parentID 1) is processed with stopping code 2
+### pop requested out of 154 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1415, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56084,-0.64424,0.52002)
+ Old Polarization:       (-0.59613,-0.75009,-0.28635)
+ New Momentum Direction: (0.56084,0.64424,0.52002)
+ New Polarization:       (0.59613,-0.75009,0.28635)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56084,0.64424,0.52002)
+ Old Polarization:       (0.59613,-0.75009,0.28635)
+ New Momentum Direction: (-0.56084,0.64424,0.52002)
+ New Polarization:       (0.59613,0.75009,-0.28635)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56084,0.64424,0.52002)
+ Old Polarization:       (0.59613,0.75009,-0.28635)
+ New Momentum Direction: (-0.56084,0.64424,-0.52002)
+ New Polarization:       (-0.59613,-0.75009,-0.28635)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1257, parentID 1) is processed with stopping code 2
+Track (trackID 1414, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86633,0.37972,-0.32447)
- Old Polarization:       (-0.38455,0.92165,0.051844)
- New Momentum Direction: (0.73541,0.51517,-0.4402)
- New Polarization:       (-0.58208,0.81285,-0.02116)
+ Old Momentum Direction: (0.94106,-0.33673,-0.03191)
+ Old Polarization:       (-0.17565,-0.40589,-0.89688)
+ New Momentum Direction: (0.88823,-0.45736,-0.043341)
+ New Polarization:       (-0.29396,-0.4933,-0.81868)
  *** FresnelRefraction *** 
-Track (trackID 1256, parentID 1) is processed with stopping code 2
+Track (trackID 1413, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45531,-0.8804,-0.13262)
- Old Polarization:       (-0.83985,-0.47415,0.26427)
- New Momentum Direction: (0.61694,-0.76622,-0.1797)
- New Polarization:       (0.73939,0.64252,-0.20118)
- *** FresnelRefraction *** 
-Track (trackID 1255, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.56703,-0.64864,0.50768)
+ Old Polarization:       (-0.58896,-0.75016,-0.30064)
+ New Momentum Direction: (0.56703,0.64864,0.50768)
+ New Polarization:       (0.58896,-0.75016,0.30064)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56703,0.64864,0.50768)
+ Old Polarization:       (0.58896,-0.75016,0.30064)
+ New Momentum Direction: (-0.56703,0.64864,0.50768)
+ New Polarization:       (0.58896,0.75016,-0.30064)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56703,0.64864,0.50768)
+ Old Polarization:       (0.58896,0.75016,-0.30064)
+ New Momentum Direction: (-0.56703,0.64864,-0.50768)
+ New Polarization:       (-0.58896,-0.75016,-0.30064)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56703,0.64864,-0.50768)
+ Old Polarization:       (-0.58896,-0.75016,-0.30064)
+ New Momentum Direction: (-0.56703,-0.64864,-0.50768)
+ New Polarization:       (0.58896,-0.75016,0.30064)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1412, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46223,-0.28614,-0.83933)
- Old Polarization:       (-0.83285,0.18489,-0.5217)
- New Momentum Direction: (0.62549,-0.3872,-0.67737)
- New Polarization:       (0.45568,-0.52343,0.71998)
+ Old Momentum Direction: (0.21808,-0.020274,0.97572)
+ Old Polarization:       (-0.97463,-0.056182,0.21667)
+ New Momentum Direction: (0.2962,-0.027536,0.95473)
+ New Polarization:       (0.93511,-0.19519,-0.29574)
  *** FresnelRefraction *** 
-Track (trackID 1254, parentID 1) is processed with stopping code 2
+Track (trackID 1411, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.88516,0.37416,-0.27657)
- Old Polarization:       (-0.35966,0.92733,0.10347)
- New Momentum Direction: (0.77943,0.5038,-0.37239)
- New Polarization:       (-0.53763,0.84304,0.015245)
- *** FresnelRefraction *** 
-Track (trackID 1253, parentID 1) is processed with stopping code 2
-### pop requested out of 148 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1252, parentID 1) is processed with stopping code 2
-### pop requested out of 147 stacked tracks.
+Track (trackID 1410, parentID 1) is processed with stopping code 2
+### pop requested out of 148 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37882,-0.76086,-0.52686)
- Old Polarization:       (-0.92421,-0.34071,-0.17249)
- New Momentum Direction: (0.51365,-0.47522,-0.71438)
- New Polarization:       (-0.41916,0.58751,-0.6922)
+ Old Momentum Direction: (0.24438,0.24122,0.9392)
+ Old Polarization:       (-0.95321,0.23753,0.18702)
+ New Momentum Direction: (0.32914,0.32487,0.88664)
+ New Polarization:       (-0.10936,0.94575,-0.30593)
  *** FresnelRefraction *** 
-Track (trackID 1251, parentID 1) is processed with stopping code 2
+Track (trackID 1409, parentID 1) is processed with stopping code 2
+### pop requested out of 147 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1408, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62686,-0.74063,0.24189)
- Old Polarization:       (-0.6502,-0.32622,0.68616)
- New Momentum Direction: (0.8445,-0.42501,0.32587)
- New Polarization:       (-0.029974,0.57,0.8211)
+ Old Momentum Direction: (0.89577,-0.44196,0.047585)
+ Old Polarization:       (-0.21926,-0.53242,-0.81759)
+ New Momentum Direction: (0.8012,-0.59495,0.064057)
+ New Polarization:       (-0.36685,-0.57293,-0.73292)
  *** FresnelRefraction *** 
-Track (trackID 1250, parentID 1) is processed with stopping code 2
+Track (trackID 1407, parentID 1) is processed with stopping code 2
 ### pop requested out of 145 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1249, parentID 1) is processed with stopping code 2
-### pop requested out of 144 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48041,-0.23038,-0.84625)
- Old Polarization:       (-0.81233,0.24689,-0.52836)
- New Momentum Direction: (0.65051,-0.31195,-0.69248)
- New Polarization:       (0.58169,-0.3816,0.71834)
+ Old Momentum Direction: (0.73703,-0.61914,0.27103)
+ Old Polarization:       (-0.40011,-0.72289,-0.56333)
+ New Momentum Direction: (0.40322,-0.8383,0.36696)
+ New Polarization:       (-0.67323,-0.54336,-0.50153)
  *** FresnelRefraction *** 
-Track (trackID 1248, parentID 1) is processed with stopping code 2
+Track (trackID 1406, parentID 1) is processed with stopping code 2
+### pop requested out of 144 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1405, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37583,-0.74494,-0.5512)
- Old Polarization:       (-0.92622,-0.32086,-0.1979)
- New Momentum Direction: (0.51052,-0.42281,-0.74873)
- New Polarization:       (-0.49195,0.57055,-0.65762)
+ Old Momentum Direction: (0.87302,0.48656,0.033202)
+ Old Polarization:       (-0.25013,0.50516,-0.82598)
+ New Momentum Direction: (0.74979,0.66014,0.045047)
+ New Polarization:       (-0.42242,0.52997,-0.73532)
  *** FresnelRefraction *** 
-Track (trackID 1247, parentID 1) is processed with stopping code 2
+Track (trackID 1404, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1246, parentID 1) is processed with stopping code 2
+Track (trackID 1403, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8249,-0.36237,0.43385)
- Old Polarization:       (-0.42859,0.099502,0.898)
- New Momentum Direction: (0.64598,-0.48935,0.58587)
- New Polarization:       (-0.65048,0.048788,0.75796)
+ Old Momentum Direction: (0.94923,0.30845,-0.061785)
+ Old Polarization:       (-0.16201,0.311,-0.9365)
+ New Momentum Direction: (0.90521,0.41668,-0.083465)
+ New Polarization:       (-0.26895,0.40968,-0.87168)
  *** FresnelRefraction *** 
-Track (trackID 1245, parentID 1) is processed with stopping code 2
+Track (trackID 1402, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1244, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.23859,0.26443,0.93443)
+ Old Polarization:       (-0.95112,0.25788,0.16987)
+ New Momentum Direction: (0.32435,0.35948,0.87497)
+ New Polarization:       (-0.24511,0.92532,-0.2893)
+ *** FresnelRefraction *** 
+Track (trackID 1401, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89705,-0.14854,0.41621)
- Old Polarization:       (-0.34955,0.33778,0.87391)
- New Momentum Direction: (0.80114,-0.20116,0.56365)
- New Polarization:       (-0.52181,0.22639,0.82247)
+ Old Momentum Direction: (0.80886,-0.56269,0.17065)
+ Old Polarization:       (-0.31893,-0.66366,-0.67664)
+ New Momentum Direction: (0.60768,-0.76,0.23049)
+ New Polarization:       (-0.53443,-0.60601,-0.58919)
  *** FresnelRefraction *** 
-Track (trackID 1243, parentID 1) is processed with stopping code 2
+Track (trackID 1400, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74148,-0.54451,0.39208)
- Old Polarization:       (-0.52239,-0.10174,0.84662)
- New Momentum Direction: (0.41688,-0.73763,0.53114)
- New Polarization:       (-0.7975,-0.01646,0.60309)
+ Old Momentum Direction: (0.27758,0.38692,0.87934)
+ Old Polarization:       (-0.9111,0.39634,0.11321)
+ New Momentum Direction: (0.37597,0.52407,0.7642)
+ New Polarization:       (-0.62676,0.75126,-0.20685)
  *** FresnelRefraction *** 
-Track (trackID 1242, parentID 1) is processed with stopping code 2
+Track (trackID 1399, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.38326,-0.61337,-0.69057)
- Old Polarization:       (-0.9188,-0.17672,-0.35297)
- New Momentum Direction: (0.52004,-0.83225,-0.19213)
- New Polarization:       (-0.56207,-0.50281,0.6567)
- *** FresnelRefraction *** 
-Track (trackID 1241, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1398, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94367,0.33041,-0.017904)
- Old Polarization:       (-0.29737,0.87056,0.39205)
- New Momentum Direction: (0.89411,0.44719,-0.024232)
- New Polarization:       (-0.42168,0.85887,0.29073)
- *** FresnelRefraction *** 
-Track (trackID 1240, parentID 1) is processed with stopping code 2
-### pop requested out of 135 stacked tracks.
+ Old Momentum Direction: (0.6394,-0.64784,0.41408)
+ Old Polarization:       (-0.50849,-0.76026,-0.40427)
+ New Momentum Direction: (0.6394,0.64784,0.41408)
+ New Polarization:       (0.50849,-0.76026,0.40427)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6394,0.64784,0.41408)
+ Old Polarization:       (0.50849,-0.76026,0.40427)
+ New Momentum Direction: (-0.6394,0.64784,0.41408)
+ New Polarization:       (0.50849,0.76026,-0.40427)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6394,0.64784,0.41408)
+ Old Polarization:       (0.50849,0.76026,-0.40427)
+ New Momentum Direction: (-0.6394,0.64784,-0.41408)
+ New Polarization:       (-0.50849,-0.76026,-0.40427)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1239, parentID 1) is processed with stopping code 2
+Track (trackID 1397, parentID 1) is processed with stopping code 2
+### pop requested out of 135 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.72501,-0.62541,0.28846)
+ Old Polarization:       (-0.41342,-0.73017,-0.544)
+ New Momentum Direction: (0.36154,-0.84664,0.3905)
+ New Polarization:       (-0.69646,-0.52369,-0.49061)
+ *** FresnelRefraction *** 
+Track (trackID 1396, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96102,0.20373,0.18693)
- Old Polarization:       (-0.27631,0.73245,0.62223)
- New Momentum Direction: (0.92771,0.27506,0.25238)
- New Polarization:       (-0.37317,0.70161,0.60703)
+ Old Momentum Direction: (0.88783,0.45994,0.014683)
+ Old Polarization:       (-0.233,0.47682,-0.84756)
+ New Momentum Direction: (0.78166,0.62338,0.019901)
+ New Polarization:       (-0.39293,0.51697,-0.76049)
  *** FresnelRefraction *** 
-Track (trackID 1238, parentID 1) is processed with stopping code 2
+Track (trackID 1395, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.83024,0.36199,-0.42387)
- Old Polarization:       (-0.42402,0.90375,-0.058725)
- New Momentum Direction: (0.65529,0.49055,-0.57441)
- New Polarization:       (-0.64553,0.75858,-0.088587)
+ Old Momentum Direction: (0.35333,-0.46664,0.8108)
+ Old Polarization:       (-0.82928,-0.55736,0.040612)
+ New Momentum Direction: (0.47677,-0.62966,0.61337)
+ New Polarization:       (-0.75742,-0.64839,-0.076874)
  *** FresnelRefraction *** 
-Track (trackID 1237, parentID 1) is processed with stopping code 2
+Track (trackID 1394, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1236, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40172,-0.54446,0.73634)
+ Old Polarization:       (-0.77135,-0.63457,-0.048386)
+ New Momentum Direction: (0.54597,-0.73996,0.39291)
+ New Polarization:       (-0.77532,-0.62396,-0.097744)
+ *** FresnelRefraction *** 
+Track (trackID 1393, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1235, parentID 1) is processed with stopping code 2
+Track (trackID 1392, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.76693,-0.48961,0.41485)
-Old Polarization: (-0.49474,-0.039375,0.86815)
-New Polarization: (-0.67735,0.20212,0.50851)
-Polarization Change: (-0.77788,0.23211,0.58398)
-New Momentum Direction: (0.34924,0.92976,0.095648)
-Momentum Change: (0.35001,0.93183,0.09586)
-Scattering Photon!
-Old Momentum Direction: (0.35001,0.93183,0.09586)
-Old Polarization: (-0.77788,0.23211,0.58398)
-New Polarization: (-0.77987,0.22262,0.57489)
-Polarization Change: (-0.78449,0.22394,0.57829)
-New Momentum Direction: (0.60164,0.48697,0.62758)
-Momentum Change: (0.60376,0.48869,0.6298)
- Photon at Boundary! 
- Old Momentum Direction: (0.60376,0.48869,0.6298)
- Old Polarization:       (-0.78449,0.22394,0.57829)
- New Momentum Direction: (-0.60376,0.48869,0.6298)
- New Polarization:       (-0.78449,-0.22394,-0.57829)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.60376,0.48869,0.6298)
- Old Polarization:       (-0.78449,-0.22394,-0.57829)
- New Momentum Direction: (-0.60376,-0.48869,0.6298)
- New Polarization:       (0.78449,-0.22394,0.57829)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.60376,-0.48869,0.6298)
- Old Polarization:       (0.78449,-0.22394,0.57829)
- New Momentum Direction: (-0.60376,-0.48869,-0.6298)
- New Polarization:       (-0.78449,0.22394,0.57829)
- *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.60376,-0.48869,-0.6298)
- Old Polarization:       (-0.78449,0.22394,0.57829)
- New Momentum Direction: (0.60376,-0.48869,-0.6298)
- New Polarization:       (-0.78449,-0.22394,-0.57829)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.60376,-0.48869,-0.6298)
- Old Polarization:       (-0.78449,-0.22394,-0.57829)
- New Momentum Direction: (0.60376,-0.48869,0.6298)
- New Polarization:       (0.78449,0.22394,-0.57829)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.60376,-0.48869,0.6298)
- Old Polarization:       (0.78449,0.22394,-0.57829)
- New Momentum Direction: (0.60376,0.48869,0.6298)
- New Polarization:       (-0.78449,0.22394,0.57829)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.60376,0.48869,0.6298)
- Old Polarization:       (-0.78449,0.22394,0.57829)
- New Momentum Direction: (-0.60376,0.48869,0.6298)
- New Polarization:       (-0.78449,-0.22394,-0.57829)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.39115,0.58215,0.71282)
+ Old Polarization:       (-0.78538,0.6149,-0.071211)
+ New Momentum Direction: (0.39115,0.58215,-0.71282)
+ New Polarization:       (0.80892,-0.58685,-0.035385)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.60376,0.48869,0.6298)
- Old Polarization:       (-0.78449,-0.22394,-0.57829)
- New Momentum Direction: (-0.60376,0.48869,-0.6298)
- New Polarization:       (0.78449,0.22394,-0.57829)
+ Old Momentum Direction: (0.39115,0.58215,-0.71282)
+ Old Polarization:       (0.80892,-0.58685,-0.035385)
+ New Momentum Direction: (0.39115,-0.58215,-0.71282)
+ New Polarization:       (-0.80892,-0.58685,0.035385)
  *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.60376,0.48869,-0.6298)
-Old Polarization: (0.78449,0.22394,-0.57829)
-New Polarization: (0.77568,0.23402,-0.57579)
-Polarization Change: (0.78038,0.23543,-0.57928)
-New Momentum Direction: (0.50667,0.29543,0.80263)
-Momentum Change: (0.50968,0.29719,0.8074)
  Photon at Boundary! 
- Old Momentum Direction: (0.50968,0.29719,0.8074)
- Old Polarization:       (0.78038,0.23543,-0.57928)
- New Momentum Direction: (0.50968,-0.29719,0.8074)
- New Polarization:       (-0.78038,0.23543,0.57928)
+ Old Momentum Direction: (0.39115,-0.58215,-0.71282)
+ Old Polarization:       (-0.80892,-0.58685,0.035385)
+ New Momentum Direction: (-0.39115,-0.58215,-0.71282)
+ New Polarization:       (-0.80892,0.58685,-0.035385)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50968,-0.29719,0.8074)
- Old Polarization:       (-0.78038,0.23543,0.57928)
- New Momentum Direction: (0.69215,-0.40358,0.59837)
- New Polarization:       (0.44432,-0.41507,-0.79391)
- *** FresnelRefraction *** 
-Track (trackID 1234, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.39115,-0.58215,-0.71282)
+ Old Polarization:       (-0.80892,0.58685,-0.035385)
+ New Momentum Direction: (-0.39115,-0.58215,0.71282)
+ New Polarization:       (0.83972,-0.54274,0.017531)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1391, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.88215,-0.19057,0.43069)
-Old Polarization: (-0.36842,0.29046,0.88312)
-New Polarization: (0.22389,0.068492,0.83497)
-Polarization Change: (0.25818,0.078982,0.96286)
-New Momentum Direction: (0.74534,0.38537,-0.23146)
-Momentum Change: (0.85631,0.44274,-0.26592)
  Photon at Boundary! 
- Old Momentum Direction: (0.85631,0.44274,-0.26592)
- Old Polarization:       (0.25818,0.078982,0.96286)
- New Momentum Direction: (0.71168,0.60222,-0.36171)
- New Polarization:       (-0.44135,0.78388,0.43673)
+ Old Momentum Direction: (0.33782,0.51732,0.78629)
+ Old Polarization:       (-0.84259,0.5385,0.0077235)
+ New Momentum Direction: (0.45862,0.7023,0.54447)
+ New Polarization:       (-0.83181,0.55486,-0.01504)
  *** FresnelRefraction *** 
-Track (trackID 1233, parentID 1) is processed with stopping code 2
+Track (trackID 1390, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1232, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.68876,-0.63575,0.34847)
+ Old Polarization:       (-0.45246,-0.7525,-0.47857)
+ New Momentum Direction: (0.22203,-0.85502,0.46866)
+ New Polarization:       (-0.76122,-0.45236,-0.46466)
+ *** FresnelRefraction *** 
+Track (trackID 1389, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95792,0.17805,0.22515)
- Old Polarization:       (-0.28428,0.69705,0.65826)
- New Momentum Direction: (0.92082,0.24192,0.3059)
- New Polarization:       (-0.38798,0.64801,0.65541)
+ Old Momentum Direction: (0.96857,-0.23847,-0.070705)
+ Old Polarization:       (-0.14254,-0.2992,-0.94348)
+ New Momentum Direction: (0.94157,-0.32291,-0.095744)
+ New Polarization:       (-0.2321,-0.41609,-0.8792)
  *** FresnelRefraction *** 
-Track (trackID 1231, parentID 1) is processed with stopping code 2
+Track (trackID 1388, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43892,-0.87304,-0.21247)
- Old Polarization:       (-0.86175,-0.47598,0.17558)
- New Momentum Direction: (0.59095,-0.75429,-0.28607)
- New Polarization:       (0.60054,0.6481,-0.4683)
+ Old Momentum Direction: (0.88966,-0.45381,0.050661)
+ Old Polarization:       (-0.22947,-0.54023,-0.80963)
+ New Momentum Direction: (0.78651,-0.61376,0.068517)
+ New Polarization:       (-0.38601,-0.57518,-0.72123)
  *** FresnelRefraction *** 
-Track (trackID 1230, parentID 1) is processed with stopping code 2
+Track (trackID 1387, parentID 1) is processed with stopping code 2
 ### pop requested out of 125 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.88562,-0.19227,0.42274)
- Old Polarization:       (-0.36035,0.28972,0.88669)
- New Momentum Direction: (0.77925,-0.25947,0.57047)
- New Polarization:       (-0.5395,0.18547,0.8213)
- *** FresnelRefraction *** 
-Track (trackID 1229, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1386, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9573,0.26162,0.12297)
- Old Polarization:       (-0.28545,0.78832,0.54504)
- New Momentum Direction: (0.91952,0.35571,0.16719)
- New Polarization:       (-0.39038,0.77715,0.49359)
+ Old Momentum Direction: (0.95923,-0.27747,-0.053831)
+ Old Polarization:       (-0.15146,-0.34383,-0.92674)
+ New Momentum Direction: (0.92413,-0.3751,-0.072772)
+ New Polarization:       (-0.24961,-0.44846,-0.85824)
  *** FresnelRefraction *** 
-Track (trackID 1228, parentID 1) is processed with stopping code 2
+Track (trackID 1385, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.21781,0.018101,0.97582)
+ Old Polarization:       (-0.97584,-0.013768,0.21807)
+ New Momentum Direction: (0.29554,0.024561,0.95501)
+ New Polarization:       (0.94649,0.12817,-0.2962)
+ *** FresnelRefraction *** 
+Track (trackID 1384, parentID 1) is processed with stopping code 2
+### pop requested out of 122 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1383, parentID 1) is processed with stopping code 2
+### pop requested out of 121 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1382, parentID 1) is processed with stopping code 2
+### pop requested out of 120 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48821,-0.60543,0.62857)
+ Old Polarization:       (-0.67865,-0.71621,-0.16273)
+ New Momentum Direction: (0.48821,-0.60543,-0.62857)
+ New Polarization:       (0.67865,0.71621,-0.16273)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48821,-0.60543,-0.62857)
+ Old Polarization:       (0.67865,0.71621,-0.16273)
+ New Momentum Direction: (0.48821,0.60543,-0.62857)
+ New Polarization:       (-0.67865,0.71621,0.16273)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48821,0.60543,-0.62857)
+ Old Polarization:       (-0.67865,0.71621,0.16273)
+ New Momentum Direction: (-0.48821,0.60543,-0.62857)
+ New Polarization:       (-0.67865,-0.71621,-0.16273)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1381, parentID 1) is processed with stopping code 2
+### pop requested out of 119 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.94521,0.057855,0.3213)
-Old Polarization: (-0.29599,0.56708,0.76864)
-New Polarization: (-0.41197,-0.14807,0.75626)
-Polarization Change: (-0.47145,-0.16944,0.86546)
-New Momentum Direction: (0.63099,-0.71332,0.20407)
-Momentum Change: (0.64785,-0.73239,0.20952)
- Photon at Boundary! 
- Old Momentum Direction: (0.64785,-0.73239,0.20952)
- Old Polarization:       (-0.47145,-0.16944,0.86546)
- New Momentum Direction: (-0.64785,-0.73239,0.20952)
- New Polarization:       (-0.47145,0.16944,-0.86546)
+Old Momentum Direction: (0.22634,-0.11345,0.96742)
+Old Polarization: (-0.96528,-0.15908,0.20718)
+New Polarization: (0.67474,0.49584,-0.54669)
+Polarization Change: (0.67474,0.49584,-0.54669)
+New Momentum Direction: (0.73747,-0.48238,0.47269)
+Momentum Change: (0.73747,-0.48238,0.47269)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73747,-0.48238,0.47269)
+ Old Polarization:       (0.67474,0.49584,-0.54669)
+ New Momentum Direction: (0.73747,-0.48238,-0.47269)
+ New Polarization:       (-0.67474,-0.49584,-0.54669)
  *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.64785,-0.73239,0.20952)
- Old Polarization:       (-0.47145,0.16944,-0.86546)
- New Momentum Direction: (-0.87725,-0.38722,0.28371)
- New Polarization:       (-0.41888,0.32883,-0.84641)
- *** FresnelRefraction *** 
-Track (trackID 1227, parentID 1) is processed with stopping code 2
-### pop requested out of 122 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1226, parentID 1) is processed with stopping code 2
-### pop requested out of 121 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.46379,-0.27245,-0.84301)
- Old Polarization:       (-0.82963,0.20029,-0.52116)
- New Momentum Direction: (0.62945,-0.36977,-0.68342)
- New Polarization:       (0.48884,-0.49523,0.71818)
- *** FresnelRefraction *** 
-Track (trackID 1225, parentID 1) is processed with stopping code 2
-### pop requested out of 120 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.82592,-0.35385,0.43892)
- Old Polarization:       (-0.4292,0.11019,0.89646)
- New Momentum Direction: (0.64429,-0.47999,0.59539)
- New Polarization:       (-0.65438,0.056929,0.75402)
- *** FresnelRefraction *** 
-Track (trackID 1224, parentID 1) is processed with stopping code 2
-### pop requested out of 119 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73562,0.27388,-0.61956)
- Old Polarization:       (-0.52932,0.80315,-0.27344)
- New Momentum Direction: (0.39183,0.37198,-0.84149)
- New Polarization:       (-0.81092,0.57167,-0.12489)
- *** FresnelRefraction *** 
-Track (trackID 1223, parentID 1) is processed with stopping code 2
+Track (trackID 1380, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40286,-0.85502,-0.32657)
- Old Polarization:       (-0.89596,-0.44129,0.050095)
- New Momentum Direction: (0.54761,-0.70928,-0.4439)
- New Polarization:       (0.24977,0.64489,-0.72231)
+ Old Momentum Direction: (0.26854,0.33867,0.90177)
+ Old Polarization:       (-0.92632,0.34758,0.14531)
+ New Momentum Direction: (0.36153,0.45596,0.81326)
+ New Polarization:       (-0.48262,0.83783,-0.25519)
  *** FresnelRefraction *** 
-Track (trackID 1222, parentID 1) is processed with stopping code 2
+Track (trackID 1379, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82733,-0.36249,0.42911)
- Old Polarization:       (-0.42402,0.098042,0.90033)
- New Momentum Direction: (0.65575,-0.4872,0.57674)
- New Polarization:       (-0.64025,0.045965,0.76679)
+ Old Momentum Direction: (0.69343,-0.63873,0.33345)
+ Old Polarization:       (-0.44861,-0.74486,-0.4939)
+ New Momentum Direction: (0.2201,-0.86473,0.45143)
+ New Polarization:       (-0.76387,-0.4406,-0.47156)
  *** FresnelRefraction *** 
-Track (trackID 1221, parentID 1) is processed with stopping code 2
+Track (trackID 1378, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43501,-0.87356,-0.21832)
- Old Polarization:       (-0.86476,-0.47288,0.16907)
- New Momentum Direction: (0.58704,-0.75404,-0.29463)
- New Polarization:       (0.58559,0.64681,-0.48859)
+ Old Momentum Direction: (0.8784,0.47714,0.027392)
+ Old Polarization:       (-0.24342,0.49599,-0.83351)
+ New Momentum Direction: (0.76189,0.64665,0.037123)
+ New Polarization:       (-0.41055,0.52645,-0.74451)
  *** FresnelRefraction *** 
-Track (trackID 1220, parentID 1) is processed with stopping code 2
+Track (trackID 1377, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.38088,-0.79051,-0.47961)
- Old Polarization:       (-0.9208,-0.37142,-0.11907)
- New Momentum Direction: (0.51727,-0.55514,-0.65134)
- New Polarization:       (-0.27413,0.6135,-0.74059)
+ Old Momentum Direction: (0.93742,-0.34742,-0.023393)
+ Old Polarization:       (-0.17779,-0.41978,-0.89004)
+ New Momentum Direction: (0.88167,-0.47079,-0.031699)
+ New Polarization:       (-0.29747,-0.50242,-0.81184)
  *** FresnelRefraction *** 
-Track (trackID 1219, parentID 1) is processed with stopping code 2
+Track (trackID 1376, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39832,-0.82048,-0.41007)
- Old Polarization:       (-0.90761,-0.41718,-0.046889)
- New Momentum Direction: (0.53615,-0.63865,-0.55197)
- New Polarization:       (-0.030118,0.639,-0.76861)
- *** FresnelRefraction *** 
-Track (trackID 1218, parentID 1) is processed with stopping code 2
-### pop requested out of 113 stacked tracks.
+ Old Momentum Direction: (0.6759,0.67226,0.30204)
+ Old Polarization:       (-0.46876,0.70838,-0.52769)
+ New Momentum Direction: (-0.6759,0.67226,0.30204)
+ New Polarization:       (-0.46876,-0.70838,0.52769)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6759,0.67226,0.30204)
+ Old Polarization:       (-0.46876,-0.70838,0.52769)
+ New Momentum Direction: (-0.6759,-0.67226,0.30204)
+ New Polarization:       (0.46876,-0.70838,-0.52769)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6759,-0.67226,0.30204)
+ Old Polarization:       (0.46876,-0.70838,-0.52769)
+ New Momentum Direction: (-0.6759,-0.67226,-0.30204)
+ New Polarization:       (-0.46876,0.70838,-0.52769)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6759,-0.67226,-0.30204)
+ Old Polarization:       (-0.46876,0.70838,-0.52769)
+ New Momentum Direction: (0.6759,-0.67226,-0.30204)
+ New Polarization:       (-0.46876,-0.70838,0.52769)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6759,-0.67226,-0.30204)
+ Old Polarization:       (-0.46876,-0.70838,0.52769)
+ New Momentum Direction: (0.6759,0.67226,-0.30204)
+ New Polarization:       (0.46876,-0.70838,-0.52769)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1217, parentID 1) is processed with stopping code 2
-### pop requested out of 112 stacked tracks.
+Track (trackID 1375, parentID 1) is processed with stopping code 2
+### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56846,-0.80778,0.15603)
- Old Polarization:       (-0.71367,-0.38981,0.582)
- New Momentum Direction: (0.77239,-0.59873,0.212)
- New Polarization:       (0.28622,0.62606,0.72535)
+ Old Momentum Direction: (0.98217,0.15639,-0.10431)
+ Old Polarization:       (-0.12664,0.14037,-0.98197)
+ New Momentum Direction: (0.96711,0.2116,-0.14114)
+ New Polarization:       (-0.19775,0.27655,-0.94043)
  *** FresnelRefraction *** 
-Track (trackID 1216, parentID 1) is processed with stopping code 2
-### pop requested out of 111 stacked tracks.
+Track (trackID 1374, parentID 1) is processed with stopping code 2
+### pop requested out of 112 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1215, parentID 1) is processed with stopping code 2
+Track (trackID 1373, parentID 1) is processed with stopping code 2
+### pop requested out of 111 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.72968,0.64482,0.22754)
+ Old Polarization:       (-0.40932,0.67845,-0.61005)
+ New Momentum Direction: (0.37018,0.87602,0.30912)
+ New Polarization:       (-0.69332,0.48201,-0.5357)
+ *** FresnelRefraction *** 
+Track (trackID 1372, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1214, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.36004,0.55271,0.75159)
+ Old Polarization:       (-0.8171,0.57562,-0.031884)
+ New Momentum Direction: (0.48953,0.75149,0.4423)
+ New Polarization:       (-0.81864,0.57076,-0.063703)
+ *** FresnelRefraction *** 
+Track (trackID 1371, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79101,0.32712,-0.517)
- Old Polarization:       (-0.46669,0.86906,-0.16415)
- New Momentum Direction: (0.5625,0.44207,-0.69868)
- New Polarization:       (-0.7101,0.69116,-0.13438)
+ Old Momentum Direction: (0.23132,-0.14929,0.96135)
+ Old Polarization:       (-0.95946,-0.19853,0.20004)
+ New Momentum Direction: (0.31436,-0.20288,0.92737)
+ New Polarization:       (0.33216,-0.89164,-0.30766)
  *** FresnelRefraction *** 
-Track (trackID 1213, parentID 1) is processed with stopping code 2
+Track (trackID 1370, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.44347,-0.33396,-0.83175)
-Old Polarization: (-0.85156,0.1325,-0.50723)
-New Polarization: (-0.85474,0.14788,0.010731)
-Polarization Change: (-0.98529,0.17047,0.01237)
-New Momentum Direction: (0.12554,0.76535,-0.5476)
-Momentum Change: (0.13223,0.80613,-0.57678)
  Photon at Boundary! 
- Old Momentum Direction: (0.13223,0.80613,-0.57678)
- Old Polarization:       (-0.98529,0.17047,0.01237)
- New Momentum Direction: (0.13223,0.80613,0.57678)
- New Polarization:       (0.98529,-0.17047,0.01237)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.13223,0.80613,0.57678)
- Old Polarization:       (0.98529,-0.17047,0.01237)
- New Momentum Direction: (0.17963,0.59479,0.78355)
- New Polarization:       (0.94842,-0.31621,0.022611)
+ Old Momentum Direction: (0.99127,-0.085865,-0.10001)
+ Old Polarization:       (-0.11076,-0.13118,-0.98515)
+ New Momentum Direction: (0.98416,-0.11549,-0.13452)
+ New Polarization:       (-0.15988,-0.25021,-0.9549)
  *** FresnelRefraction *** 
-Track (trackID 1212, parentID 1) is processed with stopping code 2
+Track (trackID 1369, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1211, parentID 1) is processed with stopping code 2
+Track (trackID 1368, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1210, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42101,-0.55811,0.71502)
+ Old Polarization:       (-0.75197,-0.65558,-0.068952)
+ New Momentum Direction: (0.56981,-0.75536,0.32366)
+ New Polarization:       (-0.76051,-0.63393,-0.14057)
+ *** FresnelRefraction *** 
+Track (trackID 1367, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46292,-0.26956,-0.84442)
- Old Polarization:       (-0.82967,0.20358,-0.51982)
- New Momentum Direction: (0.62943,-0.36652,-0.68519)
- New Polarization:       (0.49514,-0.4904,0.71717)
+ Old Momentum Direction: (0.21891,-0.021442,0.97551)
+ Old Polarization:       (-0.97439,-0.057539,0.21739)
+ New Momentum Direction: (0.29711,-0.029101,0.9544)
+ New Polarization:       (0.93288,-0.20432,-0.29664)
  *** FresnelRefraction *** 
-Track (trackID 1209, parentID 1) is processed with stopping code 2
+Track (trackID 1366, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89205,-0.15888,0.4231)
- Old Polarization:       (-0.35728,0.32542,0.87548)
- New Momentum Direction: (0.78895,-0.21601,0.57523)
- New Polarization:       (-0.53629,0.21488,0.81623)
+ Old Momentum Direction: (0.84604,-0.52127,0.11176)
+ Old Polarization:       (-0.27955,-0.61228,-0.73957)
+ New Momentum Direction: (0.69112,-0.70668,0.15151)
+ New Polarization:       (-0.47147,-0.59971,-0.64658)
  *** FresnelRefraction *** 
-Track (trackID 1208, parentID 1) is processed with stopping code 2
+Track (trackID 1365, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.47894,-0.23112,-0.84687)
-Old Polarization: (-0.81339,0.24601,-0.52715)
-New Polarization: (-0.80507,-0.22484,-0.22719)
-Polarization Change: (-0.92942,-0.25957,-0.26228)
-New Momentum Direction: (0.31151,-0.92436,-0.18907)
-Momentum Change: (0.31352,-0.93032,-0.19029)
  Photon at Boundary! 
- Old Momentum Direction: (0.31352,-0.93032,-0.19029)
- Old Polarization:       (-0.92942,-0.25957,-0.26228)
- New Momentum Direction: (0.42504,-0.86763,-0.25798)
- New Polarization:       (0.29396,0.40187,-0.86723)
+ Old Momentum Direction: (0.27239,-0.29519,0.91579)
+ Old Polarization:       (-0.91842,-0.36356,0.15598)
+ New Momentum Direction: (0.36825,-0.39908,0.83972)
+ New Polarization:       (-0.35185,-0.89583,-0.27145)
  *** FresnelRefraction *** 
-Track (trackID 1207, parentID 1) is processed with stopping code 2
+Track (trackID 1364, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6319,0.11766,-0.76607)
- Old Polarization:       (-0.64371,0.63018,-0.43418)
- New Momentum Direction: (0.85882,0.15992,-0.48668)
- New Polarization:       (0.27281,0.66134,0.69871)
+ Old Momentum Direction: (0.91729,-0.39815,0.0074959)
+ Old Polarization:       (-0.19984,-0.47653,-0.85615)
+ New Momentum Direction: (0.84204,-0.53931,0.010154)
+ New Polarization:       (-0.33595,-0.53908,-0.77235)
  *** FresnelRefraction *** 
-Track (trackID 1206, parentID 1) is processed with stopping code 2
+Track (trackID 1363, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92116,-0.064226,0.38386)
- Old Polarization:       (-0.32088,0.43283,0.84244)
- New Momentum Direction: (0.85082,-0.086713,0.51826)
- New Polarization:       (-0.46953,0.31733,0.82392)
+ Old Momentum Direction: (0.91072,-0.41221,0.025793)
+ Old Polarization:       (-0.20213,-0.49929,-0.84253)
+ New Momentum Direction: (0.83132,-0.55471,0.034709)
+ New Polarization:       (-0.33781,-0.55387,-0.76099)
  *** FresnelRefraction *** 
-Track (trackID 1205, parentID 1) is processed with stopping code 2
+Track (trackID 1362, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.66978,0.16608,-0.72375)
- Old Polarization:       (-0.60197,0.69212,-0.39825)
- New Momentum Direction: (0.90278,0.22386,-0.36725)
- New Polarization:       (0.092029,0.73355,0.67338)
- *** FresnelRefraction *** 
-Track (trackID 1204, parentID 1) is processed with stopping code 2
-### pop requested out of 99 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1203, parentID 1) is processed with stopping code 2
+Track (trackID 1361, parentID 1) is processed with stopping code 2
+### pop requested out of 99 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.22411,-0.037381,0.97385)
+ Old Polarization:       (-0.97236,-0.075712,0.22086)
+ New Momentum Direction: (0.30297,-0.050536,0.95166)
+ New Polarization:       (0.89535,-0.32696,-0.30241)
+ *** FresnelRefraction *** 
+Track (trackID 1360, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1202, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (0.50559,-0.62569,0.59405)
+Old Polarization: (-0.65693,-0.72553,-0.20507)
+New Polarization: (-0.062525,-0.99713,0.042679)
+Polarization Change: (-0.062525,-0.99713,0.042679)
+New Momentum Direction: (-0.93103,0.042869,-0.36241)
+Momentum Change: (-0.93103,0.042869,-0.36241)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.93103,0.042869,-0.36241)
+ Old Polarization:       (-0.062525,-0.99713,0.042679)
+ New Momentum Direction: (-0.86857,0.058213,-0.49214)
+ New Polarization:       (0.11504,-0.94227,-0.31449)
+ *** FresnelRefraction *** 
+Track (trackID 1359, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37464,-0.69028,-0.619)
- Old Polarization:       (-0.92678,-0.25943,-0.27162)
- New Momentum Direction: (0.37464,0.69028,-0.619)
- New Polarization:       (0.73246,0.18898,0.65405)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.37464,0.69028,-0.619)
- Old Polarization:       (0.73246,0.18898,0.65405)
- New Momentum Direction: (0.37464,0.69028,0.619)
- New Polarization:       (-0.73246,-0.18898,0.65405)
+ Old Momentum Direction: (0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (0.44802,0.6317,-0.63264)
+ New Polarization:       (0.72262,-0.67253,-0.15978)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1201, parentID 1) is processed with stopping code 2
-### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39665,-0.8267,-0.39904)
- Old Polarization:       (-0.9072,-0.41941,-0.032861)
- New Momentum Direction: (0.53566,-0.65014,-0.53888)
- New Polarization:       (0.0043566,0.64028,-0.76813)
- *** FresnelRefraction *** 
-Track (trackID 1200, parentID 1) is processed with stopping code 2
-### pop requested out of 95 stacked tracks.
+ Old Momentum Direction: (0.44802,0.6317,-0.63264)
+ Old Polarization:       (0.72262,-0.67253,-0.15978)
+ New Momentum Direction: (0.44802,-0.6317,-0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.43144,-0.39049,-0.81325)
- Old Polarization:       (-0.86726,0.068709,-0.49309)
- New Momentum Direction: (0.58368,-0.52827,-0.61664)
- New Polarization:       (0.1452,-0.67928,0.71937)
- *** FresnelRefraction *** 
-Track (trackID 1199, parentID 1) is processed with stopping code 2
-### pop requested out of 94 stacked tracks.
+ Old Momentum Direction: (0.44802,-0.6317,-0.63264)
+ Old Polarization:       (-0.72262,-0.67253,0.15978)
+ New Momentum Direction: (-0.44802,-0.6317,-0.63264)
+ New Polarization:       (-0.72262,0.67253,-0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.42074,-0.86645,-0.26877)
- Old Polarization:       (-0.87959,-0.46214,0.11289)
- New Momentum Direction: (0.56882,-0.73784,-0.36336)
- New Polarization:       (0.44395,0.64736,-0.61955)
- *** FresnelRefraction *** 
-Track (trackID 1198, parentID 1) is processed with stopping code 2
-### pop requested out of 93 stacked tracks.
+ Old Momentum Direction: (-0.44802,-0.6317,-0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (-0.44802,-0.6317,0.63264)
+ New Polarization:       (0.72262,-0.67253,-0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.72951,0.26695,-0.62973)
- Old Polarization:       (-0.53614,0.79487,-0.28413)
- New Momentum Direction: (0.36897,0.36276,-0.85573)
- New Polarization:       (-0.82208,0.55693,-0.11837)
- *** FresnelRefraction *** 
-Track (trackID 1197, parentID 1) is processed with stopping code 2
-### pop requested out of 92 stacked tracks.
+ Old Momentum Direction: (-0.44802,-0.6317,0.63264)
+ Old Polarization:       (0.72262,-0.67253,-0.15978)
+ New Momentum Direction: (-0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5166,-0.85546,0.036069)
- Old Polarization:       (-0.77203,-0.44718,0.45166)
- New Momentum Direction: (0.69968,-0.71279,0.048851)
- New Polarization:       (0.62873,0.64676,0.43174)
- *** FresnelRefraction *** 
-Track (trackID 1196, parentID 1) is processed with stopping code 2
-### pop requested out of 91 stacked tracks.
+ Old Momentum Direction: (-0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,-0.67253,0.15978)
+ New Momentum Direction: (0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,0.67253,-0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.95255,0.30234,0.035259)
- Old Polarization:       (-0.28484,0.84455,0.45344)
- New Momentum Direction: (0.9119,0.40766,0.047542)
- New Polarization:       (-0.39547,0.84177,0.36747)
- *** FresnelRefraction *** 
-Track (trackID 1195, parentID 1) is processed with stopping code 2
-### pop requested out of 90 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.66682,-0.67474,0.31634)
-Old Polarization: (-0.60523,-0.24268,0.75816)
-New Polarization: (0.2777,0.12138,0.86219)
-Polarization Change: (0.30387,0.13282,0.94341)
-New Momentum Direction: (-0.7171,0.65745,0.13841)
-Momentum Change: (-0.72975,0.66905,0.14085)
- Photon at Boundary! 
- Old Momentum Direction: (-0.72975,0.66905,0.14085)
- Old Polarization:       (0.30387,0.13282,0.94341)
- New Momentum Direction: (0.72975,0.66905,0.14085)
- New Polarization:       (0.13458,0.06142,-0.989)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (0.44802,0.6317,-0.63264)
+ New Polarization:       (0.72262,-0.67253,-0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.72975,0.66905,0.14085)
- Old Polarization:       (0.13458,0.06142,-0.989)
- New Momentum Direction: (0.72975,-0.66905,0.14085)
- New Polarization:       (-0.13458,0.06142,0.989)
+ Old Momentum Direction: (0.44802,0.6317,-0.63264)
+ Old Polarization:       (0.72262,-0.67253,-0.15978)
+ New Momentum Direction: (0.44802,-0.6317,-0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.72975,-0.66905,0.14085)
- Old Polarization:       (-0.13458,0.06142,0.989)
- New Momentum Direction: (-0.72975,-0.66905,0.14085)
- New Polarization:       (-0.055366,-0.14751,-0.98751)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.44802,-0.6317,-0.63264)
+ Old Polarization:       (-0.72262,-0.67253,0.15978)
+ New Momentum Direction: (0.44802,-0.6317,0.63264)
+ New Polarization:       (0.72262,0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.72975,-0.66905,0.14085)
- Old Polarization:       (-0.055366,-0.14751,-0.98751)
- New Momentum Direction: (-0.72975,0.66905,0.14085)
- New Polarization:       (0.055366,-0.14751,0.98751)
+ Old Momentum Direction: (0.44802,-0.6317,0.63264)
+ Old Polarization:       (0.72262,0.67253,0.15978)
+ New Momentum Direction: (0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,0.67253,-0.15978)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1194, parentID 1) is processed with stopping code 2
-### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54188,-0.83501,0.095515)
- Old Polarization:       (-0.74376,-0.4235,0.51717)
- New Momentum Direction: (0.7344,-0.66626,0.12945)
- New Polarization:       (0.47633,0.64181,0.60099)
- *** FresnelRefraction *** 
-Track (trackID 1193, parentID 1) is processed with stopping code 2
-### pop requested out of 88 stacked tracks.
+ Old Momentum Direction: (0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (-0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.94145,0.33606,-0.02719)
- Old Polarization:       (-0.30106,0.87422,0.38093)
- New Momentum Direction: (0.88939,0.45566,-0.036866)
- New Polarization:       (-0.42893,0.85966,0.27748)
- *** FresnelRefraction *** 
-Track (trackID 1192, parentID 1) is processed with stopping code 2
-### pop requested out of 87 stacked tracks.
+ Old Momentum Direction: (-0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,-0.67253,0.15978)
+ New Momentum Direction: (-0.44802,0.6317,-0.63264)
+ New Polarization:       (0.72262,0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.45217,-0.33039,-0.82848)
- Old Polarization:       (-0.84614,0.1349,-0.5156)
- New Momentum Direction: (0.60955,-0.44539,-0.6558)
- New Polarization:       (0.33516,-0.6049,0.72233)
- *** FresnelRefraction *** 
-Track (trackID 1191, parentID 1) is processed with stopping code 2
-### pop requested out of 86 stacked tracks.
+ Old Momentum Direction: (-0.44802,0.6317,-0.63264)
+ Old Polarization:       (0.72262,0.67253,0.15978)
+ New Momentum Direction: (-0.44802,-0.6317,-0.63264)
+ New Polarization:       (-0.72262,0.67253,-0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.41781,-0.43158,-0.79948)
- Old Polarization:       (-0.88056,0.024333,-0.47332)
- New Momentum Direction: (0.56695,-0.58562,-0.57932)
- New Polarization:       (0.0076668,-0.69949,0.7146)
- *** FresnelRefraction *** 
-Track (trackID 1190, parentID 1) is processed with stopping code 2
-### pop requested out of 85 stacked tracks.
+ Old Momentum Direction: (-0.44802,-0.6317,-0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (0.44802,-0.6317,-0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.70529,-0.61182,0.35812)
- Old Polarization:       (-0.56262,-0.17573,0.80782)
- New Momentum Direction: (0.27609,-0.82948,0.48553)
- New Polarization:       (-0.86125,0.010725,0.50807)
- *** FresnelRefraction *** 
-Track (trackID 1189, parentID 1) is processed with stopping code 2
-### pop requested out of 84 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1188, parentID 1) is processed with stopping code 2
-### pop requested out of 83 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1187, parentID 1) is processed with stopping code 2
-### pop requested out of 82 stacked tracks.
+ Old Momentum Direction: (0.44802,-0.6317,-0.63264)
+ Old Polarization:       (-0.72262,-0.67253,0.15978)
+ New Momentum Direction: (0.44802,-0.6317,0.63264)
+ New Polarization:       (0.72262,0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.44188,-0.34017,-0.83008)
- Old Polarization:       (-0.85346,0.12559,-0.50579)
- New Momentum Direction: (0.60013,-0.462,-0.653)
- New Polarization:       (0.30042,-0.6264,0.71928)
- *** FresnelRefraction *** 
-Track (trackID 1186, parentID 1) is processed with stopping code 2
-### pop requested out of 81 stacked tracks.
+ Old Momentum Direction: (0.44802,-0.6317,0.63264)
+ Old Polarization:       (0.72262,0.67253,0.15978)
+ New Momentum Direction: (0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,0.67253,-0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38261,-0.63399,-0.67206)
- Old Polarization:       (-0.92071,-0.20113,-0.33444)
- New Momentum Direction: (0.38261,-0.63399,0.67206)
- New Polarization:       (0.92071,0.20113,-0.33444)
+ Old Momentum Direction: (0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (-0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38261,-0.63399,0.67206)
- Old Polarization:       (0.92071,0.20113,-0.33444)
- New Momentum Direction: (0.38261,0.63399,0.67206)
- New Polarization:       (-0.92071,0.20113,0.33444)
+ Old Momentum Direction: (-0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,-0.67253,0.15978)
+ New Momentum Direction: (-0.44802,0.6317,-0.63264)
+ New Polarization:       (0.72262,0.67253,0.15978)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38261,0.63399,0.67206)
- Old Polarization:       (-0.92071,0.20113,0.33444)
- New Momentum Direction: (-0.38261,0.63399,0.67206)
- New Polarization:       (-0.92071,-0.20113,-0.33444)
+ Old Momentum Direction: (-0.44802,0.6317,-0.63264)
+ Old Polarization:       (0.72262,0.67253,0.15978)
+ New Momentum Direction: (-0.44802,-0.6317,-0.63264)
+ New Polarization:       (-0.72262,0.67253,-0.15978)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.38261,0.63399,0.67206)
- Old Polarization:       (-0.92071,-0.20113,-0.33444)
- New Momentum Direction: (-0.38261,0.63399,-0.67206)
- New Polarization:       (0.92071,0.20113,-0.33444)
+ Old Momentum Direction: (-0.44802,-0.6317,-0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (-0.44802,-0.6317,0.63264)
+ New Polarization:       (0.72262,-0.67253,-0.15978)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1185, parentID 1) is processed with stopping code 2
-### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.44136,-0.87944,-0.17828)
- Old Polarization:       (-0.85509,-0.47244,0.2136)
- New Momentum Direction: (0.59829,-0.76397,-0.24167)
- New Polarization:       (0.6724,0.64272,-0.36714)
- *** FresnelRefraction *** 
-Track (trackID 1184, parentID 1) is processed with stopping code 2
-### pop requested out of 79 stacked tracks.
+ Old Momentum Direction: (-0.44802,-0.6317,0.63264)
+ Old Polarization:       (0.72262,-0.67253,-0.15978)
+ New Momentum Direction: (-0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38495,-0.72776,-0.56761)
- Old Polarization:       (-0.92283,-0.31305,-0.22447)
- New Momentum Direction: (0.38495,0.72776,-0.56761)
- New Polarization:       (0.73238,0.13338,0.6677)
- *** FresnelReflection *** 
+ Old Momentum Direction: (-0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,-0.67253,0.15978)
+ New Momentum Direction: (0.44802,0.6317,0.63264)
+ New Polarization:       (-0.72262,0.67253,-0.15978)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38495,0.72776,-0.56761)
- Old Polarization:       (0.73238,0.13338,0.6677)
- New Momentum Direction: (0.38495,0.72776,0.56761)
- New Polarization:       (-0.73238,-0.13338,0.6677)
+ Old Momentum Direction: (0.44802,0.6317,0.63264)
+ Old Polarization:       (-0.72262,0.67253,-0.15978)
+ New Momentum Direction: (0.44802,0.6317,-0.63264)
+ New Polarization:       (0.72262,-0.67253,-0.15978)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38495,0.72776,0.56761)
- Old Polarization:       (-0.73238,-0.13338,0.6677)
- New Momentum Direction: (-0.38495,0.72776,0.56761)
- New Polarization:       (-0.73238,0.13338,-0.6677)
+ Old Momentum Direction: (0.44802,0.6317,-0.63264)
+ Old Polarization:       (0.72262,-0.67253,-0.15978)
+ New Momentum Direction: (0.44802,-0.6317,-0.63264)
+ New Polarization:       (-0.72262,-0.67253,0.15978)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1183, parentID 1) is processed with stopping code 2
-### pop requested out of 78 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.55231,-0.82431,0.12434)
- Old Polarization:       (-0.73138,-0.40756,0.54679)
- New Momentum Direction: (0.7507,-0.63866,0.16901)
- New Polarization:       (0.39083,0.63559,0.66579)
- *** FresnelRefraction *** 
-Track (trackID 1182, parentID 1) is processed with stopping code 2
-### pop requested out of 77 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.48936,-0.19775,-0.84936)
- Old Polarization:       (-0.80116,0.28278,-0.52743)
- New Momentum Direction: (0.66447,-0.26851,-0.69741)
- New Polarization:       (0.6362,-0.28638,0.71641)
- *** FresnelRefraction *** 
-Track (trackID 1181, parentID 1) is processed with stopping code 2
-### pop requested out of 76 stacked tracks.
+Track (trackID 1358, parentID 1) is processed with stopping code 2
+### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72631,0.2613,-0.63577)
- Old Polarization:       (-0.53953,0.78979,-0.29177)
- New Momentum Direction: (0.35938,0.35474,-0.86314)
- New Polarization:       (-0.82634,0.55073,-0.11771)
+ Old Momentum Direction: (0.9923,0.032513,-0.11948)
+ Old Polarization:       (-0.11961,0.0021302,-0.99282)
+ New Momentum Direction: (0.98574,0.044187,-0.16238)
+ New Polarization:       (-0.16512,0.06763,-0.98395)
  *** FresnelRefraction *** 
-Track (trackID 1180, parentID 1) is processed with stopping code 2
-### pop requested out of 75 stacked tracks.
+Track (trackID 1357, parentID 1) is processed with stopping code 2
+### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89588,-0.15821,0.41517)
- Old Polarization:       (-0.34897,0.32781,0.87793)
- New Momentum Direction: (0.80024,-0.21353,0.56037)
- New Polarization:       (-0.52006,0.21814,0.8258)
+ Old Momentum Direction: (0.81125,-0.56048,0.16652)
+ Old Polarization:       (-0.31652,-0.66043,-0.68092)
+ New Momentum Direction: (0.61294,-0.75741,0.22503)
+ New Polarization:       (-0.53083,-0.60569,-0.59276)
  *** FresnelRefraction *** 
-Track (trackID 1179, parentID 1) is processed with stopping code 2
-### pop requested out of 74 stacked tracks.
+Track (trackID 1356, parentID 1) is processed with stopping code 2
+### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41326,-0.44193,-0.79619)
- Old Polarization:       (-0.88431,0.013852,-0.46669)
- New Momentum Direction: (0.56192,-0.60091,-0.56846)
- New Polarization:       (-0.028567,-0.70091,0.71268)
+ Old Momentum Direction: (0.2347,0.22787,0.94498)
+ Old Polarization:       (-0.958,0.21904,0.18511)
+ New Momentum Direction: (0.31816,0.30891,0.8963)
+ New Polarization:       (-0.068213,0.95043,-0.30335)
  *** FresnelRefraction *** 
-Track (trackID 1178, parentID 1) is processed with stopping code 2
-### pop requested out of 73 stacked tracks.
+Track (trackID 1355, parentID 1) is processed with stopping code 2
+### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79718,-0.42859,0.42522)
- Old Polarization:       (-0.4597,0.02568,0.8877)
- New Momentum Direction: (0.57856,-0.57902,0.57446)
- New Polarization:       (-0.6991,0.010773,0.71494)
+ Old Momentum Direction: (0.70759,0.65614,0.26228)
+ Old Polarization:       (-0.43292,0.69591,-0.57297)
+ New Momentum Direction: (0.29022,0.88859,0.35521)
+ New Polarization:       (-0.73284,0.44507,-0.51464)
  *** FresnelRefraction *** 
-Track (trackID 1177, parentID 1) is processed with stopping code 2
-### pop requested out of 72 stacked tracks.
+Track (trackID 1354, parentID 1) is processed with stopping code 2
+### pop requested out of 92 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74745,0.28088,-0.60202)
- Old Polarization:       (-0.51536,0.817,-0.25867)
- New Momentum Direction: (0.43984,0.37971,-0.81385)
- New Polarization:       (-0.78465,0.60332,-0.14258)
+ Old Momentum Direction: (0.97734,-0.19201,-0.089098)
+ Old Polarization:       (-0.13579,-0.24583,-0.95975)
+ New Momentum Direction: (0.95776,-0.26086,-0.12105)
+ New Polarization:       (-0.21616,-0.3754,-0.90131)
  *** FresnelRefraction *** 
-Track (trackID 1176, parentID 1) is processed with stopping code 2
-### pop requested out of 71 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1175, parentID 1) is processed with stopping code 2
-### pop requested out of 70 stacked tracks.
+Track (trackID 1353, parentID 1) is processed with stopping code 2
+### pop requested out of 91 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1174, parentID 1) is processed with stopping code 2
-### pop requested out of 69 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.59325,-0.78268,0.18831)
- Old Polarization:       (-0.6876,-0.37102,0.62414)
- New Momentum Direction: (0.80068,-0.54251,0.25415)
- New Polarization:       (0.16784,0.61037,0.77413)
- *** FresnelRefraction *** 
-Track (trackID 1173, parentID 1) is processed with stopping code 2
-### pop requested out of 68 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.43251,-0.87792,-0.20542)
- Old Polarization:       (-0.86411,-0.46865,0.18353)
- New Momentum Direction: (0.58709,-0.75999,-0.27884)
- New Polarization:       (0.61478,0.64266,-0.4572)
- *** FresnelRefraction *** 
-Track (trackID 1172, parentID 1) is processed with stopping code 2
-### pop requested out of 67 stacked tracks.
+Track (trackID 1352, parentID 1) is processed with stopping code 2
+### pop requested out of 90 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45508,-0.31415,-0.8332)
- Old Polarization:       (-0.84175,0.15345,-0.5176)
- New Momentum Direction: (0.61474,-0.42437,-0.66483)
- New Polarization:       (0.38068,-0.57859,0.72133)
+ Old Momentum Direction: (0.32144,-0.41514,0.85108)
+ Old Polarization:       (-0.86353,-0.49732,0.083563)
+ New Momentum Direction: (0.43464,-0.56134,0.70426)
+ New Polarization:       (-0.67719,-0.71923,-0.15534)
  *** FresnelRefraction *** 
-Track (trackID 1171, parentID 1) is processed with stopping code 2
-### pop requested out of 66 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.37526,-0.67913,-0.63084)
-Old Polarization: (-0.92616,-0.24727,-0.28475)
-New Polarization: (-0.53673,0.76037,-0.15616)
-Polarization Change: (-0.56873,0.80571,-0.16547)
-New Momentum Direction: (0.74845,0.43072,-0.47518)
-Momentum Change: (0.75935,0.437,-0.4821)
+Track (trackID 1351, parentID 1) is processed with stopping code 2
+### pop requested out of 89 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.75935,0.437,-0.4821)
-Old Polarization: (-0.56873,0.80571,-0.16547)
-New Polarization: (-0.59874,0.74211,-0.092031)
-Polarization Change: (-0.62502,0.77468,-0.09607)
-New Momentum Direction: (-0.15993,-0.011817,0.94519)
-Momentum Change: (-0.16682,-0.012326,0.98591)
-
-** Photon absorbed! **
-Track (trackID 1170, parentID 1) is processed with stopping code 2
-### pop requested out of 65 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.44301,-0.3331,-0.83234)
- Old Polarization:       (-0.85167,0.13361,-0.50677)
- New Momentum Direction: (0.60227,-0.45284,-0.65743)
- New Polarization:       (0.32102,-0.61663,0.71882)
+Old Momentum Direction: (0.57327,-0.64601,0.50401)
+Old Polarization: (-0.5824,-0.75395,-0.30394)
+New Polarization: (-0.69795,-0.57996,-0.42015)
+Polarization Change: (-0.69795,-0.57996,-0.42015)
+New Momentum Direction: (-0.40291,0.80301,-0.43913)
+Momentum Change: (-0.40291,0.80301,-0.43913)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.40291,0.80301,-0.43913)
+ Old Polarization:       (-0.69795,-0.57996,-0.42015)
+ New Momentum Direction: (-0.54516,0.59142,-0.59416)
+ New Polarization:       (-0.51579,-0.79534,-0.31842)
  *** FresnelRefraction *** 
-Track (trackID 1169, parentID 1) is processed with stopping code 2
-### pop requested out of 64 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1168, parentID 1) is processed with stopping code 2
-### pop requested out of 63 stacked tracks.
+Track (trackID 1350, parentID 1) is processed with stopping code 2
+### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57562,-0.006153,-0.81769)
- Old Polarization:       (-0.70733,0.49799,-0.50168)
- New Momentum Direction: (0.77688,-0.0083043,-0.62959)
- New Polarization:       (0.58828,0.36602,0.72108)
- *** FresnelRefraction *** 
-Track (trackID 1167, parentID 1) is processed with stopping code 2
-### pop requested out of 62 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1166, parentID 1) is processed with stopping code 2
-### pop requested out of 61 stacked tracks.
+ Old Momentum Direction: (0.70269,0.6596,0.26675)
+ Old Polarization:       (-0.43881,0.69688,-0.56728)
+ New Momentum Direction: (-0.70269,0.6596,0.26675)
+ New Polarization:       (-0.29365,-0.61035,0.73569)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38188,-0.76815,-0.51393)
- Old Polarization:       (-0.9224,-0.35161,-0.15986)
- New Momentum Direction: (0.51665,-0.49963,-0.6953)
- New Polarization:       (-0.37776,0.59574,-0.70879)
- *** FresnelRefraction *** 
-Track (trackID 1165, parentID 1) is processed with stopping code 2
-### pop requested out of 60 stacked tracks.
+ Old Momentum Direction: (-0.70269,0.6596,0.26675)
+ Old Polarization:       (-0.29365,-0.61035,0.73569)
+ New Momentum Direction: (-0.70269,-0.6596,0.26675)
+ New Polarization:       (0.29365,-0.61035,-0.73569)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.91582,-0.083972,0.39271)
- Old Polarization:       (-0.32733,0.41041,0.85113)
- New Momentum Direction: (0.83997,-0.11346,0.53063)
- New Polarization:       (-0.48158,0.29475,0.82535)
- *** FresnelRefraction *** 
-Track (trackID 1164, parentID 1) is processed with stopping code 2
-### pop requested out of 59 stacked tracks.
+ Old Momentum Direction: (-0.70269,-0.6596,0.26675)
+ Old Polarization:       (0.29365,-0.61035,-0.73569)
+ New Momentum Direction: (-0.70269,-0.6596,-0.26675)
+ New Polarization:       (-0.29365,0.61035,-0.73569)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.37656,-0.68257,-0.62634)
- Old Polarization:       (-0.92577,-0.2526,-0.28131)
- New Momentum Direction: (0.51125,-0.12444,-0.85037)
- New Polarization:       (-0.69559,0.52121,-0.49447)
+ Old Momentum Direction: (-0.70269,-0.6596,-0.26675)
+ Old Polarization:       (-0.29365,0.61035,-0.73569)
+ New Momentum Direction: (-0.26113,-0.89489,-0.36191)
+ New Polarization:       (0.55692,0.16656,-0.81369)
  *** FresnelRefraction *** 
-Track (trackID 1163, parentID 1) is processed with stopping code 2
-### pop requested out of 58 stacked tracks.
+Track (trackID 1349, parentID 1) is processed with stopping code 2
+### pop requested out of 87 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95912,0.23843,0.15242)
- Old Polarization:       (-0.28217,0.76493,0.57902)
- New Momentum Direction: (0.92331,0.3236,0.20686)
- New Polarization:       (-0.38347,0.74676,0.54342)
+ Old Momentum Direction: (0.32794,-0.42823,0.84207)
+ Old Polarization:       (-0.85608,-0.51162,0.073221)
+ New Momentum Direction: (0.44356,-0.57919,0.68395)
+ New Polarization:       (-0.70172,-0.69916,-0.13698)
  *** FresnelRefraction *** 
-Track (trackID 1162, parentID 1) is processed with stopping code 2
-### pop requested out of 57 stacked tracks.
+Track (trackID 1348, parentID 1) is processed with stopping code 2
+### pop requested out of 86 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1161, parentID 1) is processed with stopping code 2
-### pop requested out of 56 stacked tracks.
+Track (trackID 1347, parentID 1) is processed with stopping code 2
+### pop requested out of 85 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9756,-0.20238,-0.085086)
+ Old Polarization:       (-0.13689,-0.25777,-0.95646)
+ New Momentum Direction: (0.95457,-0.2747,-0.11549)
+ New Polarization:       (-0.21923,-0.38486,-0.89656)
+ *** FresnelRefraction *** 
+Track (trackID 1346, parentID 1) is processed with stopping code 2
+### pop requested out of 84 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1160, parentID 1) is processed with stopping code 2
-### pop requested out of 55 stacked tracks.
+Track (trackID 1345, parentID 1) is processed with stopping code 2
+### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47709,-0.87684,-0.059533)
- Old Polarization:       (-0.8146,-0.46662,0.34451)
- New Momentum Direction: (0.64795,-0.75738,-0.080854)
- New Polarization:       (0.76161,0.64278,0.082356)
+ Old Momentum Direction: (0.99009,0.083346,-0.11299)
+ Old Polarization:       (-0.11808,0.058914,-0.99125)
+ New Momentum Direction: (0.98178,0.1128,-0.15292)
+ New Polarization:       (-0.17166,0.18138,-0.96832)
  *** FresnelRefraction *** 
-Track (trackID 1159, parentID 1) is processed with stopping code 2
-### pop requested out of 54 stacked tracks.
+Track (trackID 1344, parentID 1) is processed with stopping code 2
+### pop requested out of 82 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1343, parentID 1) is processed with stopping code 2
+### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74864,0.29084,-0.59577)
- Old Polarization:       (-0.51509,0.82092,-0.24651)
- New Momentum Direction: (0.43364,0.39529,-0.80975)
- New Polarization:       (-0.78964,0.5996,-0.13017)
- *** FresnelRefraction *** 
-Track (trackID 1158, parentID 1) is processed with stopping code 2
-### pop requested out of 53 stacked tracks.
+ Old Momentum Direction: (0.47084,-0.5955,0.65091)
+ Old Polarization:       (-0.69773,-0.70288,-0.13834)
+ New Momentum Direction: (0.47084,-0.5955,-0.65091)
+ New Polarization:       (0.69773,0.70288,-0.13834)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.41767,-0.45913,-0.78406)
- Old Polarization:       (-0.88486,-0.0095637,-0.46577)
- New Momentum Direction: (0.56304,-0.61893,-0.54764)
- New Polarization:       (-0.076532,-0.69886,0.71116)
- *** FresnelRefraction *** 
-Track (trackID 1157, parentID 1) is processed with stopping code 2
-### pop requested out of 52 stacked tracks.
+ Old Momentum Direction: (0.47084,-0.5955,-0.65091)
+ Old Polarization:       (0.69773,0.70288,-0.13834)
+ New Momentum Direction: (0.47084,0.5955,-0.65091)
+ New Polarization:       (-0.69773,0.70288,0.13834)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.95002,0.31056,0.031807)
- Old Polarization:       (-0.29152,0.84606,0.44631)
- New Momentum Direction: (0.90601,0.42106,0.043124)
- New Polarization:       (-0.40753,0.84026,0.35762)
- *** FresnelRefraction *** 
-Track (trackID 1156, parentID 1) is processed with stopping code 2
-### pop requested out of 51 stacked tracks.
+ Old Momentum Direction: (0.47084,0.5955,-0.65091)
+ Old Polarization:       (-0.69773,0.70288,0.13834)
+ New Momentum Direction: (-0.47084,0.5955,-0.65091)
+ New Polarization:       (-0.69773,-0.70288,-0.13834)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.42393,-0.86881,-0.25584)
- Old Polarization:       (-0.87612,-0.46498,0.12729)
- New Momentum Direction: (0.57305,-0.74298,-0.34583)
- New Polarization:       (0.48283,0.64706,-0.59007)
- *** FresnelRefraction *** 
-Track (trackID 1155, parentID 1) is processed with stopping code 2
-### pop requested out of 50 stacked tracks.
+ Old Momentum Direction: (-0.47084,0.5955,-0.65091)
+ Old Polarization:       (-0.69773,-0.70288,-0.13834)
+ New Momentum Direction: (-0.47084,0.5955,0.65091)
+ New Polarization:       (0.69773,0.70288,-0.13834)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1342, parentID 1) is processed with stopping code 2
+### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9479,0.31856,-0.0024572)
- Old Polarization:       (-0.28936,0.86418,0.41165)
- New Momentum Direction: (0.90325,0.4291,-0.0033099)
- New Polarization:       (-0.40634,0.85776,0.31484)
- *** FresnelRefraction *** 
-Track (trackID 1154, parentID 1) is processed with stopping code 2
-### pop requested out of 49 stacked tracks.
+ Old Momentum Direction: (0.60018,-0.65285,0.46215)
+ Old Polarization:       (-0.55236,-0.75617,-0.35086)
+ New Momentum Direction: (0.60018,0.65285,0.46215)
+ New Polarization:       (0.55236,-0.75617,0.35086)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.58638,-0.79239,0.16818)
- Old Polarization:       (-0.69607,-0.3867,0.60494)
- New Momentum Direction: (0.78863,-0.57175,0.22619)
- New Polarization:       (0.23531,0.62051,0.74807)
- *** FresnelRefraction *** 
-Track (trackID 1153, parentID 1) is processed with stopping code 2
-### pop requested out of 48 stacked tracks.
+ Old Momentum Direction: (0.60018,0.65285,0.46215)
+ Old Polarization:       (0.55236,-0.75617,0.35086)
+ New Momentum Direction: (-0.60018,0.65285,0.46215)
+ New Polarization:       (0.55236,0.75617,-0.35086)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.95743,0.27017,0.10166)
- Old Polarization:       (-0.28233,0.80309,0.52473)
- New Momentum Direction: (0.92046,0.36579,0.13763)
- New Polarization:       (-0.38613,0.79675,0.46485)
- *** FresnelRefraction *** 
-Track (trackID 1152, parentID 1) is processed with stopping code 2
-### pop requested out of 47 stacked tracks.
+ Old Momentum Direction: (-0.60018,0.65285,0.46215)
+ Old Polarization:       (0.55236,0.75617,-0.35086)
+ New Momentum Direction: (-0.60018,0.65285,-0.46215)
+ New Polarization:       (-0.55236,-0.75617,-0.35086)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.79146,-0.44758,0.41625)
- Old Polarization:       (-0.46458,0.0020061,0.88553)
- New Momentum Direction: (0.57,-0.60167,0.55955)
- New Polarization:       (-0.7026,-0.0038516,0.71157)
- *** FresnelRefraction *** 
-Track (trackID 1151, parentID 1) is processed with stopping code 2
-### pop requested out of 46 stacked tracks.
+ Old Momentum Direction: (-0.60018,0.65285,-0.46215)
+ Old Polarization:       (-0.55236,-0.75617,-0.35086)
+ New Momentum Direction: (-0.60018,-0.65285,-0.46215)
+ New Polarization:       (0.55236,-0.75617,0.35086)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.67558,-0.66683,0.31452)
- Old Polarization:       (-0.59546,-0.24194,0.76609)
- New Momentum Direction: (-0.67558,-0.66683,0.31452)
- New Polarization:       (-0.55196,0.17462,-0.81538)
- *** FresnelReflection *** 
+ Old Momentum Direction: (-0.60018,-0.65285,-0.46215)
+ Old Polarization:       (0.55236,-0.75617,0.35086)
+ New Momentum Direction: (0.60018,-0.65285,-0.46215)
+ New Polarization:       (0.55236,0.75617,-0.35086)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67558,-0.66683,0.31452)
- Old Polarization:       (-0.55196,0.17462,-0.81538)
- New Momentum Direction: (-0.67558,0.66683,0.31452)
- New Polarization:       (0.55196,0.17462,0.81538)
+ Old Momentum Direction: (0.60018,-0.65285,-0.46215)
+ Old Polarization:       (0.55236,0.75617,-0.35086)
+ New Momentum Direction: (0.60018,-0.65285,0.46215)
+ New Polarization:       (-0.55236,-0.75617,-0.35086)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67558,0.66683,0.31452)
- Old Polarization:       (0.55196,0.17462,0.81538)
- New Momentum Direction: (-0.67558,0.66683,-0.31452)
- New Polarization:       (-0.55196,-0.17462,0.81538)
+ Old Momentum Direction: (0.60018,-0.65285,0.46215)
+ Old Polarization:       (-0.55236,-0.75617,-0.35086)
+ New Momentum Direction: (0.60018,0.65285,0.46215)
+ New Polarization:       (0.55236,-0.75617,0.35086)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67558,0.66683,-0.31452)
- Old Polarization:       (-0.55196,-0.17462,0.81538)
- New Momentum Direction: (0.67558,0.66683,-0.31452)
- New Polarization:       (0.50238,-0.72858,-0.4656)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.60018,0.65285,0.46215)
+ Old Polarization:       (0.55236,-0.75617,0.35086)
+ New Momentum Direction: (-0.60018,0.65285,0.46215)
+ New Polarization:       (0.55236,0.75617,-0.35086)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.60018,0.65285,0.46215)
+ Old Polarization:       (0.55236,0.75617,-0.35086)
+ New Momentum Direction: (-0.60018,-0.65285,0.46215)
+ New Polarization:       (-0.55236,0.75617,0.35086)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.67558,0.66683,-0.31452)
- Old Polarization:       (0.50238,-0.72858,-0.4656)
- New Momentum Direction: (0.67558,-0.66683,-0.31452)
- New Polarization:       (-0.50238,-0.72858,0.4656)
+ Old Momentum Direction: (-0.60018,-0.65285,0.46215)
+ Old Polarization:       (-0.55236,0.75617,0.35086)
+ New Momentum Direction: (-0.60018,-0.65285,-0.46215)
+ New Polarization:       (0.55236,-0.75617,0.35086)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1150, parentID 1) is processed with stopping code 2
-### pop requested out of 45 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.90775,-0.10418,0.40638)
- Old Polarization:       (-0.33972,0.3858,0.85776)
- New Momentum Direction: (0.82157,-0.14157,0.55225)
- New Polarization:       (-0.50474,0.26973,0.82005)
- *** FresnelRefraction *** 
-Track (trackID 1149, parentID 1) is processed with stopping code 2
-### pop requested out of 44 stacked tracks.
+Track (trackID 1341, parentID 1) is processed with stopping code 2
+### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90614,-0.1142,0.40728)
- Old Polarization:       (-0.34018,0.37551,0.86213)
- New Momentum Direction: (0.81919,-0.15484,0.55223)
- New Polarization:       (-0.50532,0.26053,0.82266)
+ Old Momentum Direction: (0.91066,-0.41229,0.026741)
+ Old Polarization:       (-0.20168,-0.5001,-0.84215)
+ New Momentum Direction: (0.83144,-0.55444,0.035961)
+ New Polarization:       (-0.33683,-0.55448,-0.76099)
  *** FresnelRefraction *** 
-Track (trackID 1148, parentID 1) is processed with stopping code 2
-### pop requested out of 43 stacked tracks.
+Track (trackID 1340, parentID 1) is processed with stopping code 2
+### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95594,0.27423,0.10481)
- Old Polarization:       (-0.28741,0.80139,0.52457)
- New Momentum Direction: (0.91678,0.37308,0.1426)
- New Polarization:       (-0.39486,0.79293,0.46405)
+ Old Momentum Direction: (0.75334,0.62505,0.20441)
+ Old Polarization:       (-0.38048,0.6678,-0.63975)
+ New Momentum Direction: (0.46206,0.84292,0.27566)
+ New Polarization:       (-0.63545,0.5315,-0.56011)
  *** FresnelRefraction *** 
-Track (trackID 1147, parentID 1) is processed with stopping code 2
-### pop requested out of 42 stacked tracks.
+Track (trackID 1339, parentID 1) is processed with stopping code 2
+### pop requested out of 77 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1338, parentID 1) is processed with stopping code 2
+### pop requested out of 76 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1337, parentID 1) is processed with stopping code 2
+### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.803,0.33335,-0.49403)
- Old Polarization:       (-0.45225,0.8807,-0.14083)
- New Momentum Direction: (0.59618,0.44907,-0.66551)
- New Polarization:       (-0.68544,0.7163,-0.1307)
+ Old Momentum Direction: (0.98996,-0.090899,-0.10828)
+ Old Polarization:       (-0.11995,-0.13469,-0.9836)
+ New Momentum Direction: (0.98146,-0.12324,-0.14681)
+ New Polarization:       (-0.17418,-0.25363,-0.95149)
  *** FresnelRefraction *** 
-Track (trackID 1146, parentID 1) is processed with stopping code 2
-### pop requested out of 41 stacked tracks.
+Track (trackID 1336, parentID 1) is processed with stopping code 2
+### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.38857,-0.61795,-0.68349)
- Old Polarization:       (-0.91705,-0.18717,-0.35213)
- New Momentum Direction: (0.38857,-0.61795,0.68349)
- New Polarization:       (0.65426,0.70735,0.26758)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.46943,-0.6062,0.642)
+ Old Polarization:       (-0.69632,-0.70124,-0.15299)
+ New Momentum Direction: (0.46943,-0.6062,-0.642)
+ New Polarization:       (0.69632,0.70124,-0.15299)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38857,-0.61795,0.68349)
- Old Polarization:       (0.65426,0.70735,0.26758)
- New Momentum Direction: (0.38857,0.61795,0.68349)
- New Polarization:       (-0.65426,0.70735,-0.26758)
+ Old Momentum Direction: (0.46943,-0.6062,-0.642)
+ Old Polarization:       (0.69632,0.70124,-0.15299)
+ New Momentum Direction: (0.46943,0.6062,-0.642)
+ New Polarization:       (-0.69632,0.70124,0.15299)
  *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1335, parentID 1) is processed with stopping code 2
+### pop requested out of 73 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.39988,0.58589,0.70486)
+ Old Polarization:       (-0.77749,0.62408,-0.07767)
+ New Momentum Direction: (0.53916,0.78997,0.29198)
+ New Polarization:       (-0.78729,0.59589,-0.15843)
+ *** FresnelRefraction *** 
+Track (trackID 1334, parentID 1) is processed with stopping code 2
+### pop requested out of 72 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.90431,-0.426,0.027533)
+Old Polarization: (-0.21391,-0.50802,-0.83436)
+New Polarization: (0.29484,0.90693,0.30091)
+Polarization Change: (0.29484,0.90693,0.30091)
+New Momentum Direction: (-0.023019,-0.30808,0.95108)
+Momentum Change: (-0.023019,-0.30808,0.95108)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.023019,-0.30808,0.95108)
+ Old Polarization:       (0.29484,0.90693,0.30091)
+ New Momentum Direction: (-0.031165,-0.41711,0.90832)
+ New Polarization:       (0.10092,-0.90543,-0.41232)
+ *** FresnelRefraction *** 
+Track (trackID 1333, parentID 1) is processed with stopping code 2
+### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.38857,0.61795,0.68349)
- Old Polarization:       (-0.65426,0.70735,-0.26758)
- New Momentum Direction: (-0.38857,0.61795,0.68349)
- New Polarization:       (-0.65426,-0.70735,0.26758)
+ Old Momentum Direction: (0.57264,-0.64995,0.49965)
+ Old Polarization:       (-0.58276,-0.75139,-0.30953)
+ New Momentum Direction: (0.57264,0.64995,0.49965)
+ New Polarization:       (0.58276,-0.75139,0.30953)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.38857,0.61795,0.68349)
- Old Polarization:       (-0.65426,-0.70735,0.26758)
- New Momentum Direction: (-0.38857,0.61795,-0.68349)
- New Polarization:       (0.9135,0.35537,-0.19804)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.57264,0.64995,0.49965)
+ Old Polarization:       (0.58276,-0.75139,0.30953)
+ New Momentum Direction: (-0.57264,0.64995,0.49965)
+ New Polarization:       (0.58276,0.75139,-0.30953)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.38857,0.61795,-0.68349)
- Old Polarization:       (0.9135,0.35537,-0.19804)
- New Momentum Direction: (-0.38857,-0.61795,-0.68349)
- New Polarization:       (-0.9135,0.35537,0.19804)
+ Old Momentum Direction: (-0.57264,0.64995,0.49965)
+ Old Polarization:       (0.58276,0.75139,-0.30953)
+ New Momentum Direction: (-0.57264,0.64995,-0.49965)
+ New Polarization:       (-0.58276,-0.75139,-0.30953)
  *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1332, parentID 1) is processed with stopping code 2
+### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.38857,-0.61795,-0.68349)
- Old Polarization:       (-0.9135,0.35537,0.19804)
- New Momentum Direction: (-0.52415,-0.83357,-0.17446)
- New Polarization:       (-0.80928,0.42373,0.40684)
+ Old Momentum Direction: (0.25205,0.3095,0.91689)
+ Old Polarization:       (-0.93846,0.3094,0.15354)
+ New Momentum Direction: (0.34179,0.4197,0.84085)
+ New Polarization:       (-0.4091,0.87196,-0.26894)
  *** FresnelRefraction *** 
-Track (trackID 1145, parentID 1) is processed with stopping code 2
-### pop requested out of 40 stacked tracks.
+Track (trackID 1331, parentID 1) is processed with stopping code 2
+### pop requested out of 69 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1330, parentID 1) is processed with stopping code 2
+### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39293,-0.8387,-0.37708)
- Old Polarization:       (-0.90644,-0.42231,-0.0052484)
- New Momentum Direction: (0.53448,-0.67174,-0.51292)
- New Polarization:       (0.072653,0.64115,-0.76397)
+ Old Momentum Direction: (0.35749,-0.48861,0.7959)
+ Old Polarization:       (-0.81985,-0.57232,0.0169)
+ New Momentum Direction: (0.48611,-0.66439,0.5677)
+ New Polarization:       (-0.79302,-0.60831,-0.03287)
  *** FresnelRefraction *** 
-Track (trackID 1144, parentID 1) is processed with stopping code 2
-### pop requested out of 39 stacked tracks.
+Track (trackID 1329, parentID 1) is processed with stopping code 2
+### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93066,-0.016129,0.36553)
- Old Polarization:       (-0.31249,0.48459,0.81702)
- New Momentum Direction: (0.86849,-0.021851,0.49522)
- New Polarization:       (-0.45291,0.37107,0.81067)
- *** FresnelRefraction *** 
-Track (trackID 1143, parentID 1) is processed with stopping code 2
-### pop requested out of 38 stacked tracks.
+ Old Momentum Direction: (0.44561,0.63462,0.63143)
+ Old Polarization:       (-0.72391,0.67039,-0.1629)
+ New Momentum Direction: (0.44561,-0.63462,0.63143)
+ New Polarization:       (0.72391,0.67039,0.1629)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65624,0.15835,-0.73775)
- Old Polarization:       (-0.61691,0.67559,-0.40374)
- New Momentum Direction: (0.89138,0.21509,-0.39897)
- New Polarization:       (0.1311,0.72026,0.6812)
- *** FresnelRefraction *** 
-Track (trackID 1142, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
+ Old Momentum Direction: (0.44561,-0.63462,0.63143)
+ Old Polarization:       (0.72391,0.67039,0.1629)
+ New Momentum Direction: (0.44561,-0.63462,-0.63143)
+ New Polarization:       (-0.72391,-0.67039,0.1629)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.81977,-0.36568,0.44075)
- Old Polarization:       (-0.43705,0.097893,0.8941)
- New Momentum Direction: (0.62698,-0.49743,0.59955)
- New Polarization:       (-0.66869,0.051208,0.74178)
- *** FresnelRefraction *** 
-Track (trackID 1141, parentID 1) is processed with stopping code 2
-### pop requested out of 36 stacked tracks.
+ Old Momentum Direction: (0.44561,-0.63462,-0.63143)
+ Old Polarization:       (-0.72391,-0.67039,0.1629)
+ New Momentum Direction: (-0.44561,-0.63462,-0.63143)
+ New Polarization:       (-0.72391,0.67039,-0.1629)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44561,-0.63462,-0.63143)
+ Old Polarization:       (-0.72391,0.67039,-0.1629)
+ New Momentum Direction: (-0.44561,0.63462,-0.63143)
+ New Polarization:       (0.72391,0.67039,0.1629)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44561,0.63462,-0.63143)
+ Old Polarization:       (0.72391,0.67039,0.1629)
+ New Momentum Direction: (-0.44561,0.63462,0.63143)
+ New Polarization:       (-0.72391,-0.67039,0.1629)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44561,0.63462,0.63143)
+ Old Polarization:       (-0.72391,-0.67039,0.1629)
+ New Momentum Direction: (0.44561,0.63462,0.63143)
+ New Polarization:       (-0.72391,0.67039,-0.1629)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1140, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
+Track (trackID 1328, parentID 1) is processed with stopping code 2
+### pop requested out of 66 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.23382,0.15747,0.95944)
+ Old Polarization:       (-0.96664,0.14378,0.21198)
+ New Momentum Direction: (0.31441,0.21174,0.92537)
+ New Polarization:       (0.34005,0.88499,-0.31804)
+ *** FresnelRefraction *** 
+Track (trackID 1327, parentID 1) is processed with stopping code 2
+### pop requested out of 65 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.83741,0.37063,-0.40172)
-Old Polarization: (-0.4175,0.90809,-0.032498)
-New Polarization: (-0.35207,0.90557,-0.031777)
-Polarization Change: (-0.36216,0.93154,-0.032688)
-New Momentum Direction: (-0.92019,-0.3519,0.16673)
-Momentum Change: (-0.92094,-0.35218,0.16686)
+Old Momentum Direction: (0.69201,-0.64226,0.32958)
+Old Polarization: (-0.45118,-0.74119,-0.49706)
+New Polarization: (-0.30386,-0.78575,0.53876)
+Polarization Change: (-0.30386,-0.78575,0.53876)
+New Momentum Direction: (-0.35188,-0.43296,-0.8299)
+Momentum Change: (-0.35188,-0.43296,-0.8299)
 
 ** Photon absorbed! **
-Track (trackID 1139, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
+Track (trackID 1326, parentID 1) is processed with stopping code 2
+### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7779,-0.47402,0.41253)
- Old Polarization:       (-0.48072,-0.026116,0.87648)
- New Momentum Direction: (0.53107,-0.63918,0.55625)
- New Polarization:       (-0.72967,-0.011241,0.68371)
+ Old Momentum Direction: (0.29638,-0.3721,0.8796)
+ Old Polarization:       (-0.88843,-0.44541,0.11093)
+ New Momentum Direction: (0.40236,-0.50516,0.76349)
+ New Polarization:       (-0.5921,-0.77966,-0.20382)
  *** FresnelRefraction *** 
-Track (trackID 1138, parentID 1) is processed with stopping code 2
-### pop requested out of 33 stacked tracks.
+Track (trackID 1325, parentID 1) is processed with stopping code 2
+### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37897,-0.76579,-0.51957)
- Old Polarization:       (-0.92383,-0.34579,-0.16419)
- New Momentum Direction: (0.514,-0.48909,-0.70469)
- New Polarization:       (-0.39753,0.59215,-0.70095)
- *** FresnelRefraction *** 
-Track (trackID 1137, parentID 1) is processed with stopping code 2
-### pop requested out of 32 stacked tracks.
+ Old Momentum Direction: (0.52171,-0.63025,0.57499)
+ Old Polarization:       (-0.63968,-0.73493,-0.22515)
+ New Momentum Direction: (0.52171,0.63025,0.57499)
+ New Polarization:       (0.63968,-0.73493,0.22515)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52171,0.63025,0.57499)
+ Old Polarization:       (0.63968,-0.73493,0.22515)
+ New Momentum Direction: (0.52171,0.63025,-0.57499)
+ New Polarization:       (-0.63968,0.73493,0.22515)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52171,0.63025,-0.57499)
+ Old Polarization:       (-0.63968,0.73493,0.22515)
+ New Momentum Direction: (-0.52171,0.63025,-0.57499)
+ New Polarization:       (-0.63968,-0.73493,-0.22515)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52171,0.63025,-0.57499)
+ Old Polarization:       (-0.63968,-0.73493,-0.22515)
+ New Momentum Direction: (-0.52171,-0.63025,-0.57499)
+ New Polarization:       (0.63968,-0.73493,0.22515)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1324, parentID 1) is processed with stopping code 2
+### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93408,0.34911,-0.074917)
- Old Polarization:       (-0.30734,0.89292,0.32899)
- New Momentum Direction: (0.87576,0.47201,-0.10129)
- New Polarization:       (-0.44298,0.86911,0.22004)
+ Old Momentum Direction: (0.93673,0.34657,-0.049215)
+ Old Polarization:       (-0.17828,0.35135,-0.91911)
+ New Momentum Direction: (0.88043,0.46948,-0.066669)
+ New Polarization:       (-0.29829,0.43904,-0.84751)
  *** FresnelRefraction *** 
-Track (trackID 1136, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
+Track (trackID 1323, parentID 1) is processed with stopping code 2
+### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.84207,-0.30929,0.44188)
- Old Polarization:       (-0.41206,0.15975,0.89705)
- New Momentum Direction: (0.68034,-0.42026,0.60043)
- New Polarization:       (-0.62795,0.088188,0.77324)
+ Old Momentum Direction: (0.30679,0.46662,0.82955)
+ Old Polarization:       (-0.87549,0.48024,0.053645)
+ New Momentum Direction: (0.4173,0.63471,0.65038)
+ New Polarization:       (-0.77971,0.61769,-0.10252)
  *** FresnelRefraction *** 
-Track (trackID 1135, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
+Track (trackID 1322, parentID 1) is processed with stopping code 2
+### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93697,0.022321,0.34871)
- Old Polarization:       (-0.30784,0.52489,0.79355)
- New Momentum Direction: (0.87995,0.030347,0.4741)
- New Polarization:       (-0.44242,0.41595,0.79452)
+ Old Momentum Direction: (0.28417,0.40555,0.86878)
+ Old Polarization:       (-0.90344,0.41665,0.10101)
+ New Momentum Direction: (0.38506,0.54953,0.74145)
+ New Polarization:       (-0.66854,0.71994,-0.18639)
  *** FresnelRefraction *** 
-Track (trackID 1134, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
+Track (trackID 1321, parentID 1) is processed with stopping code 2
+### pop requested out of 59 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1320, parentID 1) is processed with stopping code 2
+### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89388,-0.15913,0.41912)
- Old Polarization:       (-0.35315,0.32599,0.87694)
- New Momentum Direction: (0.79455,-0.21552,0.56767)
- New Polarization:       (-0.52815,0.21598,0.82123)
+ Old Momentum Direction: (0.26188,-0.28167,0.92308)
+ Old Polarization:       (-0.92551,-0.34444,0.15747)
+ New Momentum Direction: (0.35598,-0.38288,0.85245)
+ New Polarization:       (-0.31819,-0.90737,-0.27467)
  *** FresnelRefraction *** 
-Track (trackID 1133, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
+Track (trackID 1319, parentID 1) is processed with stopping code 2
+### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95928,0.21309,0.18541)
- Old Polarization:       (-0.28241,0.73627,0.61494)
- New Momentum Direction: (0.92351,0.28937,0.25179)
- New Polarization:       (-0.38354,0.70594,0.59543)
+ Old Momentum Direction: (0.85651,-0.50777,0.092513)
+ Old Polarization:       (-0.26984,-0.59334,-0.75838)
+ New Momentum Direction: (0.7123,-0.69051,0.12581)
+ New Polarization:       (-0.45696,-0.59228,-0.66362)
  *** FresnelRefraction *** 
-Track (trackID 1132, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
+Track (trackID 1318, parentID 1) is processed with stopping code 2
+### pop requested out of 56 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.60503,0.057209,-0.79414)
- Old Polarization:       (-0.67413,0.56753,-0.47271)
- New Momentum Direction: (0.81802,0.077348,-0.56997)
- New Polarization:       (0.44666,0.53893,0.71418)
+ Old Momentum Direction: (0.27349,-0.29908,0.9142)
+ Old Polarization:       (-0.91707,-0.36778,0.15403)
+ New Momentum Direction: (0.3698,-0.4044,0.83649)
+ New Polarization:       (-0.36611,-0.89089,-0.26885)
  *** FresnelRefraction *** 
-Track (trackID 1131, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
+Track (trackID 1317, parentID 1) is processed with stopping code 2
+### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93947,0.33912,-0.048914)
- Old Polarization:       (-0.30038,0.88387,0.35853)
- New Momentum Direction: (0.88658,0.45785,-0.06604)
- New Polarization:       (-0.42907,0.86727,0.25249)
+ Old Momentum Direction: (0.26332,-0.28697,0.92104)
+ Old Polarization:       (-0.92378,-0.35016,0.155)
+ New Momentum Direction: (0.358,-0.39016,0.8483)
+ New Polarization:       (-0.33852,-0.90094,-0.27151)
  *** FresnelRefraction *** 
-Track (trackID 1130, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
+Track (trackID 1316, parentID 1) is processed with stopping code 2
+### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49054,-0.18871,-0.85074)
- Old Polarization:       (-0.79893,0.29245,-0.52553)
- New Momentum Direction: (0.66751,-0.25679,-0.69892)
- New Polarization:       (0.64872,-0.26019,0.71517)
+ Old Momentum Direction: (0.72192,-0.62744,0.29181)
+ Old Polarization:       (-0.41711,-0.73106,-0.53997)
+ New Momentum Direction: (0.34786,-0.8501,0.39537)
+ New Polarization:       (-0.70412,-0.51533,-0.48852)
  *** FresnelRefraction *** 
-Track (trackID 1129, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
+Track (trackID 1315, parentID 1) is processed with stopping code 2
+### pop requested out of 53 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1128, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
+Track (trackID 1314, parentID 1) is processed with stopping code 2
+### pop requested out of 52 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.58076,0.68552,0.43907)
+ Old Polarization:       (-0.57394,0.72729,-0.37636)
+ New Momentum Direction: (0.58076,-0.68552,0.43907)
+ New Polarization:       (-0.50797,-0.72662,-0.46258)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.58076,-0.68552,0.43907)
+ Old Polarization:       (-0.50797,-0.72662,-0.46258)
+ New Momentum Direction: (-0.58076,-0.68552,0.43907)
+ New Polarization:       (-0.50797,0.72662,0.46258)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58076,-0.68552,0.43907)
+ Old Polarization:       (-0.50797,0.72662,0.46258)
+ New Momentum Direction: (-0.58076,-0.68552,-0.43907)
+ New Polarization:       (0.50797,-0.72662,0.46258)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.8491,-0.29425,0.4387)
- Old Polarization:       (-0.40302,0.17601,0.89811)
- New Momentum Direction: (0.69841,-0.39867,0.59438)
- New Polarization:       (-0.61174,0.09855,0.7849)
+ Old Momentum Direction: (-0.58076,-0.68552,-0.43907)
+ Old Polarization:       (0.50797,-0.72662,0.46258)
+ New Momentum Direction: (-0.78713,-0.1622,-0.59508)
+ New Polarization:       (-0.15244,0.98603,-0.067111)
  *** FresnelRefraction *** 
-Track (trackID 1127, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+Track (trackID 1313, parentID 1) is processed with stopping code 2
+### pop requested out of 51 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49438,-0.61828,0.61099)
+ Old Polarization:       (-0.66962,-0.71908,-0.18583)
+ New Momentum Direction: (0.49438,0.61828,0.61099)
+ New Polarization:       (0.66962,-0.71908,0.18583)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49438,0.61828,0.61099)
+ Old Polarization:       (0.66962,-0.71908,0.18583)
+ New Momentum Direction: (0.49438,0.61828,-0.61099)
+ New Polarization:       (-0.66962,0.71908,0.18583)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49438,0.61828,-0.61099)
+ Old Polarization:       (-0.66962,0.71908,0.18583)
+ New Momentum Direction: (-0.49438,0.61828,-0.61099)
+ New Polarization:       (-0.66962,-0.71908,-0.18583)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49438,0.61828,-0.61099)
+ Old Polarization:       (-0.66962,-0.71908,-0.18583)
+ New Momentum Direction: (-0.49438,-0.61828,-0.61099)
+ New Polarization:       (0.66962,-0.71908,0.18583)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49438,-0.61828,-0.61099)
+ Old Polarization:       (0.66962,-0.71908,0.18583)
+ New Momentum Direction: (-0.49438,-0.61828,0.61099)
+ New Polarization:       (-0.66962,0.71908,0.18583)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1126, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
+Track (trackID 1312, parentID 1) is processed with stopping code 2
+### pop requested out of 50 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65424,-0.64589,0.39344)
+ Old Polarization:       (-0.49182,-0.75855,-0.42744)
+ New Momentum Direction: (-0.65424,-0.64589,0.39344)
+ New Polarization:       (-0.49182,0.75855,0.42744)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65424,-0.64589,0.39344)
+ Old Polarization:       (-0.49182,0.75855,0.42744)
+ New Momentum Direction: (-0.65424,0.64589,0.39344)
+ New Polarization:       (0.49182,0.75855,-0.42744)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65424,0.64589,0.39344)
+ Old Polarization:       (0.49182,0.75855,-0.42744)
+ New Momentum Direction: (-0.65424,0.64589,-0.39344)
+ New Polarization:       (-0.49182,-0.75855,-0.42744)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65424,0.64589,-0.39344)
+ Old Polarization:       (-0.49182,-0.75855,-0.42744)
+ New Momentum Direction: (0.65424,0.64589,-0.39344)
+ New Polarization:       (-0.49182,0.75855,0.42744)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65424,0.64589,-0.39344)
+ Old Polarization:       (-0.49182,0.75855,0.42744)
+ New Momentum Direction: (0.65424,-0.64589,-0.39344)
+ New Polarization:       (0.49182,0.75855,-0.42744)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1125, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.93256,-0.0024734,0.361)
- Old Polarization:       (-0.31182,0.4984,0.80893)
- New Momentum Direction: (0.87163,-0.0033584,0.49016)
- New Polarization:       (-0.45107,0.38587,0.80476)
- *** FresnelRefraction *** 
-Track (trackID 1124, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
+Track (trackID 1311, parentID 1) is processed with stopping code 2
+### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64082,0.118,-0.75857)
- Old Polarization:       (-0.63444,0.63776,-0.43675)
- New Momentum Direction: (0.86411,0.15912,-0.47749)
- New Polarization:       (0.26227,0.66737,0.69702)
- *** FresnelRefraction *** 
-Track (trackID 1123, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
+ Old Momentum Direction: (0.52133,-0.62225,0.58397)
+ Old Polarization:       (-0.6416,-0.73701,-0.21254)
+ New Momentum Direction: (0.52133,0.62225,0.58397)
+ New Polarization:       (0.6416,-0.73701,0.21254)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.43306,-0.38525,-0.81489)
- Old Polarization:       (-0.86557,0.07448,-0.49521)
- New Momentum Direction: (0.58575,-0.52108,-0.62078)
- New Polarization:       (0.16232,-0.675,0.71974)
- *** FresnelRefraction *** 
-Track (trackID 1122, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
+ Old Momentum Direction: (0.52133,0.62225,0.58397)
+ Old Polarization:       (0.6416,-0.73701,0.21254)
+ New Momentum Direction: (0.52133,0.62225,-0.58397)
+ New Polarization:       (-0.6416,0.73701,0.21254)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.67655,0.17373,-0.71561)
- Old Polarization:       (-0.59435,0.70256,-0.39135)
- New Momentum Direction: (0.91034,0.23377,-0.3415)
- New Polarization:       (0.060107,0.74175,0.66798)
- *** FresnelRefraction *** 
-Track (trackID 1121, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.91927,0.36962,-0.13539)
-Old Polarization: (-0.32684,0.90839,0.26075)
-New Polarization: (-0.053957,0.88289,0.022333)
-Polarization Change: (-0.06098,0.99782,0.025241)
-New Momentum Direction: (-0.68267,-0.025376,-0.64612)
-Momentum Change: (-0.72602,-0.026988,-0.68715)
-Scattering Photon!
-Old Momentum Direction: (-0.72602,-0.026988,-0.68715)
-Old Polarization: (-0.06098,0.99782,0.025241)
-New Polarization: (0.37754,0.78288,-0.010083)
-Polarization Change: (0.43435,0.90067,-0.0116)
-New Momentum Direction: (-0.057446,0.016529,-0.86765)
-Momentum Change: (-0.066052,0.019005,-0.99764)
- Photon at Boundary! 
- Old Momentum Direction: (-0.066052,0.019005,-0.99764)
- Old Polarization:       (0.43435,0.90067,-0.0116)
- New Momentum Direction: (-0.089735,0.025819,-0.99563)
- New Polarization:       (0.052458,0.9984,0.021163)
- *** FresnelRefraction *** 
-Track (trackID 1120, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
+ Old Momentum Direction: (0.52133,0.62225,-0.58397)
+ Old Polarization:       (-0.6416,0.73701,0.21254)
+ New Momentum Direction: (-0.52133,0.62225,-0.58397)
+ New Polarization:       (-0.6416,-0.73701,-0.21254)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1310, parentID 1) is processed with stopping code 2
+### pop requested out of 48 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1309, parentID 1) is processed with stopping code 2
+### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93767,0.34376,-0.051096)
- Old Polarization:       (-0.30472,0.88391,0.35475)
- New Momentum Direction: (0.88222,0.46572,-0.069225)
- New Polarization:       (-0.43699,0.86465,0.24784)
+ Old Momentum Direction: (0.8709,0.48986,0.039587)
+ Old Polarization:       (-0.25066,0.51204,-0.82157)
+ New Momentum Direction: (0.74689,0.66279,0.053563)
+ New Polarization:       (-0.42193,0.53464,-0.73221)
  *** FresnelRefraction *** 
-Track (trackID 1119, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
+Track (trackID 1308, parentID 1) is processed with stopping code 2
+### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88917,0.37451,-0.2629)
- Old Polarization:       (-0.35535,0.92714,0.1189)
- New Momentum Direction: (0.78749,0.50445,-0.35412)
- New Polarization:       (-0.53046,0.84727,0.027313)
+ Old Momentum Direction: (0.88064,-0.47013,0.058727)
+ Old Polarization:       (-0.24233,-0.55347,-0.79684)
+ New Momentum Direction: (0.76551,-0.63846,0.079754)
+ New Polarization:       (-0.40967,-0.57923,-0.70475)
  *** FresnelRefraction *** 
-Track (trackID 1118, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.45297,-0.88195,-0.13035)
-Old Polarization: (-0.84087,-0.47122,0.26625)
-New Polarization: (-0.26499,-0.77687,0.28236)
-Polarization Change: (-0.30528,-0.89498,0.32529)
-New Momentum Direction: (-0.27756,-0.1977,-0.80443)
-Momentum Change: (-0.31771,-0.2263,-0.92079)
+Track (trackID 1307, parentID 1) is processed with stopping code 2
+### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.31771,-0.2263,-0.92079)
- Old Polarization:       (-0.30528,-0.89498,0.32529)
- New Momentum Direction: (-0.43178,-0.30755,-0.84793)
- New Polarization:       (-0.37101,-0.79631,0.47775)
+ Old Momentum Direction: (0.21873,0.017561,0.97563)
+ Old Polarization:       (-0.97562,-0.014366,0.21899)
+ New Momentum Direction: (0.29654,0.023808,0.95472)
+ New Polarization:       (0.94686,0.12309,-0.29717)
  *** FresnelRefraction *** 
-Track (trackID 1117, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+Track (trackID 1306, parentID 1) is processed with stopping code 2
+### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43486,-0.38072,-0.81606)
- Old Polarization:       (-0.8639,0.079337,-0.49737)
- New Momentum Direction: (0.58785,-0.51467,-0.62414)
- New Polarization:       (0.17737,-0.67075,0.72016)
- *** FresnelRefraction *** 
-Track (trackID 1116, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+ Old Momentum Direction: (0.62498,-0.65495,0.42478)
+ Old Polarization:       (-0.52501,-0.75535,-0.39219)
+ New Momentum Direction: (0.62498,0.65495,0.42478)
+ New Polarization:       (0.52501,-0.75535,0.39219)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.44505,-0.87886,-0.17188)
- Old Polarization:       (-0.85202,-0.47465,0.22084)
- New Momentum Direction: (0.60219,-0.76373,-0.23257)
- New Polarization:       (0.68414,0.6438,-0.34274)
- *** FresnelRefraction *** 
-Track (trackID 1115, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
+ Old Momentum Direction: (0.62498,0.65495,0.42478)
+ Old Polarization:       (0.52501,-0.75535,0.39219)
+ New Momentum Direction: (-0.62498,0.65495,0.42478)
+ New Polarization:       (0.52501,0.75535,-0.39219)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1305, parentID 1) is processed with stopping code 2
+### pop requested out of 43 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1304, parentID 1) is processed with stopping code 2
+### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.58098,-0.79365,0.18052)
- Old Polarization:       (-0.6998,-0.37382,0.60871)
- New Momentum Direction: (0.78964,-0.56238,0.24536)
- New Polarization:       (0.20169,0.61557,0.76183)
+ Old Momentum Direction: (0.81672,0.56484,0.118)
+ Old Polarization:       (-0.30906,0.60088,-0.73718)
+ New Momentum Direction: (0.62854,0.76134,0.15905)
+ New Polarization:       (-0.51661,0.56153,-0.64638)
  *** FresnelRefraction *** 
-Track (trackID 1114, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
+Track (trackID 1303, parentID 1) is processed with stopping code 2
+### pop requested out of 41 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1113, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
+Track (trackID 1302, parentID 1) is processed with stopping code 2
+### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9567,0.14144,0.2544)
- Old Polarization:       (-0.28259,0.6608,0.69533)
- New Momentum Direction: (0.9192,0.19135,0.34418)
- New Polarization:       (-0.38747,0.59547,0.70377)
+ Old Momentum Direction: (0.73858,0.63928,0.21406)
+ Old Polarization:       (-0.39977,0.67098,-0.62448)
+ New Momentum Direction: (0.39961,0.86925,0.29106)
+ New Polarization:       (-0.67735,0.49394,-0.54518)
  *** FresnelRefraction *** 
-Track (trackID 1112, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+Track (trackID 1301, parentID 1) is processed with stopping code 2
+### pop requested out of 39 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.27492,0.39132,0.87823)
+ Old Polarization:       (-0.91108,0.39785,0.10793)
+ New Momentum Direction: (0.27492,0.39132,-0.87823)
+ New Polarization:       (0.85781,-0.51239,0.040218)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.494,-0.1908,-0.84827)
- Old Polarization:       (-0.79692,0.29076,-0.5295)
- New Momentum Direction: (0.66938,-0.25854,-0.69648)
- New Polarization:       (0.64555,-0.26156,0.71753)
+ Old Momentum Direction: (0.27492,0.39132,-0.87823)
+ Old Polarization:       (0.85781,-0.51239,0.040218)
+ New Momentum Direction: (0.27492,-0.39132,-0.87823)
+ New Polarization:       (-0.85781,-0.51239,-0.040218)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.27492,-0.39132,-0.87823)
+ Old Polarization:       (-0.85781,-0.51239,-0.040218)
+ New Momentum Direction: (0.37373,-0.53197,-0.75983)
+ New Polarization:       (-0.7618,-0.64337,0.07573)
  *** FresnelRefraction *** 
-Track (trackID 1111, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
+Track (trackID 1300, parentID 1) is processed with stopping code 2
+### pop requested out of 38 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.50729,-0.62798,0.59017)
+Old Polarization: (-0.65476,-0.72612,-0.20984)
+New Polarization: (-0.22522,-0.44006,-0.86927)
+Polarization Change: (-0.22522,-0.44006,-0.86927)
+New Momentum Direction: (-0.66869,-0.57907,0.4664)
+Momentum Change: (-0.66869,-0.57907,0.4664)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66869,-0.57907,0.4664)
+ Old Polarization:       (-0.22522,-0.44006,-0.86927)
+ New Momentum Direction: (-0.66869,0.57907,0.4664)
+ New Polarization:       (0.22522,-0.44006,0.86927)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1110, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
+Track (trackID 1299, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1109, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.50269,-0.86446,0.0018868)
- Old Polarization:       (-0.78743,-0.457,0.41364)
- New Momentum Direction: (0.68091,-0.73236,0.0025558)
- New Polarization:       (0.69429,0.64662,0.31598)
- *** FresnelRefraction *** 
-Track (trackID 1108, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
+Track (trackID 1298, parentID 1) is processed with stopping code 2
+### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8565,0.37858,-0.35084)
- Old Polarization:       (-0.39619,0.91788,0.023262)
- New Momentum Direction: (0.71276,0.51446,-0.47676)
- New Polarization:       (-0.60209,0.79745,-0.039617)
+ Old Momentum Direction: (0.29158,0.42755,0.85568)
+ Old Polarization:       (-0.89413,0.43968,0.084989)
+ New Momentum Direction: (0.39564,0.58015,0.71197)
+ New Polarization:       (-0.71399,0.68189,-0.15887)
  *** FresnelRefraction *** 
-Track (trackID 1107, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
+Track (trackID 1297, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79712,0.33143,-0.50473)
- Old Polarization:       (-0.45958,0.87518,-0.15113)
- New Momentum Direction: (0.57908,0.44749,-0.68148)
- New Polarization:       (-0.69846,0.70345,-0.13159)
+ Old Momentum Direction: (0.52817,0.67234,0.51865)
+ Old Polarization:       (-0.63308,0.71885,-0.28716)
+ New Momentum Direction: (0.71315,0.031823,0.70029)
+ New Polarization:       (-0.073679,-0.99003,0.12002)
  *** FresnelRefraction *** 
-Track (trackID 1106, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 33
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 35 stacked tracks.
-Track (trackID 1293, parentID 1) is processed with stopping code 2
+Track (trackID 1296, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51593,-0.10272,-0.85045)
- Old Polarization:       (-0.090652,0.98066,-0.17345)
- New Momentum Direction: (0.6952,-0.13842,-0.70536)
- New Polarization:       (0.47704,0.82289,0.30869)
+ Old Momentum Direction: (0.97757,-0.19189,-0.086787)
+ Old Polarization:       (-0.13365,-0.24676,-0.95982)
+ New Momentum Direction: (0.95837,-0.26016,-0.11766)
+ New Polarization:       (-0.2127,-0.37555,-0.90206)
  *** FresnelRefraction *** 
-Track (trackID 1292, parentID 1) is processed with stopping code 2
+Track (trackID 1295, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (-0.26464,-0.82261,-0.50327)
-Old Polarization: (-0.95961,0.17297,0.22188)
-New Polarization: (-0.76222,0.29123,0.38418)
-Polarization Change: (-0.84515,0.32291,0.42598)
-New Momentum Direction: (0.15038,-0.55794,0.7213)
-Momentum Change: (0.16271,-0.60369,0.78044)
- Photon at Boundary! 
- Old Momentum Direction: (0.16271,-0.60369,0.78044)
- Old Polarization:       (-0.84515,0.32291,0.42598)
- New Momentum Direction: (0.16271,0.60369,0.78044)
- New Polarization:       (0.84515,0.32291,-0.42598)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.16271,0.60369,0.78044)
- Old Polarization:       (0.84515,0.32291,-0.42598)
- New Momentum Direction: (0.22127,0.82099,0.52632)
- New Polarization:       (0.68646,0.25222,-0.68202)
- *** FresnelRefraction *** 
-Track (trackID 1291, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1294, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85623,-0.14034,-0.49716)
- Old Polarization:       (0.285,0.93101,0.22803)
- New Momentum Direction: (0.7132,-0.19042,-0.6746)
- New Polarization:       (-0.47533,0.57594,-0.6651)
+ Old Momentum Direction: (0.93032,0.36502,-0.035729)
+ Old Polarization:       (-0.18218,0.37535,-0.9088)
+ New Momentum Direction: (0.86898,0.4925,-0.048207)
+ New Polarization:       (-0.30436,0.45512,-0.8368)
  *** FresnelRefraction *** 
-Track (trackID 1290, parentID 1) is processed with stopping code 2
+Track (trackID 1293, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81422,-0.57616,0.071297)
- Old Polarization:       (0.23984,0.44566,0.86248)
- New Momentum Direction: (-0.81422,-0.57616,0.071297)
- New Polarization:       (0.012604,-0.14032,-0.99003)
- *** FresnelReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.81422,-0.57616,0.071297)
-Old Polarization: (0.012604,-0.14032,-0.99003)
-New Polarization: (-0.26943,-0.28854,-0.78935)
-Polarization Change: (-0.30528,-0.32693,-0.89438)
-New Momentum Direction: (0.21086,0.79749,-0.36349)
-Momentum Change: (0.23392,0.88469,-0.40323)
- Photon at Boundary! 
- Old Momentum Direction: (0.23392,0.88469,-0.40323)
- Old Polarization:       (-0.30528,-0.32693,-0.89438)
- New Momentum Direction: (-0.23392,0.88469,-0.40323)
- New Polarization:       (-0.30528,0.32693,0.89438)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.23392,0.88469,-0.40323)
- Old Polarization:       (-0.30528,0.32693,0.89438)
- New Momentum Direction: (-0.31698,0.77521,-0.54641)
- New Polarization:       (-0.82582,-0.50891,-0.24294)
+ Old Momentum Direction: (0.73832,0.63459,0.22843)
+ Old Polarization:       (-0.39654,0.68241,-0.61407)
+ New Momentum Direction: (0.42052,0.85366,0.30729)
+ New Polarization:       (-0.65996,0.52022,-0.54205)
  *** FresnelRefraction *** 
-Track (trackID 1289, parentID 1) is processed with stopping code 2
+Track (trackID 1292, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.58805,-0.78964,0.17511)
- Old Polarization:       (-0.012828,0.20736,0.97818)
- New Momentum Direction: (0.79698,-0.55543,0.23732)
- New Polarization:       (-0.010984,0.37952,0.92512)
- *** FresnelRefraction *** 
-Track (trackID 1288, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1287, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
+Track (trackID 1291, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51684,-0.094565,-0.85084)
- Old Polarization:       (-0.092937,0.98181,-0.16558)
- New Momentum Direction: (0.7014,-0.12833,-0.70112)
- New Polarization:       (0.45354,0.83919,0.30011)
+ Old Momentum Direction: (0.25492,0.33187,0.90823)
+ Old Polarization:       (-0.93277,0.33196,0.14051)
+ New Momentum Direction: (0.34669,0.45135,0.82225)
+ New Polarization:       (-0.49035,0.8345,-0.25132)
  *** FresnelRefraction *** 
-Track (trackID 1286, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
+Track (trackID 1290, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92624,-0.27258,-0.26035)
- Old Polarization:       (0.37029,0.78711,0.49329)
- New Momentum Direction: (0.86079,-0.36805,-0.35154)
- New Polarization:       (-0.50408,-0.52114,-0.6887)
+ Old Momentum Direction: (0.26421,0.34712,0.89983)
+ Old Polarization:       (-0.92601,0.35213,0.13605)
+ New Momentum Direction: (0.35784,0.47014,0.8068)
+ New Polarization:       (-0.52387,0.8163,-0.24333)
  *** FresnelRefraction *** 
-Track (trackID 1285, parentID 1) is processed with stopping code 2
+Track (trackID 1289, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1288, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.19841,-0.93651,-0.28911)
- Old Polarization:       (-0.88709,0.046153,0.45928)
- New Momentum Direction: (-0.26965,-0.87915,-0.39292)
- New Polarization:       (-0.90033,0.08542,0.42674)
+ Old Momentum Direction: (0.29531,0.41695,0.85962)
+ Old Polarization:       (-0.89533,0.43478,0.096687)
+ New Momentum Direction: (0.39798,0.56192,0.72516)
+ New Polarization:       (-0.6807,0.7108,-0.17721)
  *** FresnelRefraction *** 
-Track (trackID 1284, parentID 1) is processed with stopping code 2
+Track (trackID 1287, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.12499,-0.25734,-0.9582)
- Old Polarization:       (-0.52861,0.80002,-0.28381)
- New Momentum Direction: (0.16977,-0.34954,-0.92141)
- New Polarization:       (0.31761,-0.86569,0.38692)
+ Old Momentum Direction: (0.91928,-0.39353,0.0081526)
+ Old Polarization:       (-0.19543,-0.4743,-0.8584)
+ New Momentum Direction: (0.84695,-0.53156,0.011012)
+ New Polarization:       (-0.32754,-0.53797,-0.77673)
  *** FresnelRefraction *** 
-Track (trackID 1283, parentID 1) is processed with stopping code 2
+Track (trackID 1286, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1282, parentID 1) is processed with stopping code 2
+Track (trackID 1285, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.54376,-0.82043,0.17671)
- Old Polarization:       (-0.06103,0.17135,0.98332)
- New Momentum Direction: (0.73522,-0.63432,0.23893)
- New Polarization:       (-0.039191,0.31213,0.94923)
- *** FresnelRefraction *** 
-Track (trackID 1281, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1284, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.50522,-0.84556,0.17256)
- Old Polarization:       (-0.1024,0.13981,0.98487)
- New Momentum Direction: (0.68018,-0.69526,0.23232)
- New Polarization:       (-0.070992,0.25296,0.96487)
- *** FresnelRefraction *** 
-Track (trackID 1280, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1283, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68842,-0.083046,-0.72054)
- Old Polarization:       (0.098277,0.99494,-0.020775)
- New Momentum Direction: (0.934,-0.11267,-0.33905)
- New Polarization:       (0.13489,0.98994,0.042624)
- *** FresnelRefraction *** 
-Track (trackID 1279, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.4876,-0.6161,0.6186)
+ Old Polarization:       (-0.67672,-0.71438,-0.17808)
+ New Momentum Direction: (0.4876,-0.6161,-0.6186)
+ New Polarization:       (0.67672,0.71438,-0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4876,-0.6161,-0.6186)
+ Old Polarization:       (0.67672,0.71438,-0.17808)
+ New Momentum Direction: (0.4876,0.6161,-0.6186)
+ New Polarization:       (-0.67672,0.71438,0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4876,0.6161,-0.6186)
+ Old Polarization:       (-0.67672,0.71438,0.17808)
+ New Momentum Direction: (-0.4876,0.6161,-0.6186)
+ New Polarization:       (-0.67672,-0.71438,-0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.4876,0.6161,-0.6186)
+ Old Polarization:       (-0.67672,-0.71438,-0.17808)
+ New Momentum Direction: (-0.4876,0.6161,0.6186)
+ New Polarization:       (0.67672,0.71438,-0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.4876,0.6161,0.6186)
+ Old Polarization:       (0.67672,0.71438,-0.17808)
+ New Momentum Direction: (-0.4876,-0.6161,0.6186)
+ New Polarization:       (-0.67672,0.71438,0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.4876,-0.6161,0.6186)
+ Old Polarization:       (-0.67672,0.71438,0.17808)
+ New Momentum Direction: (0.4876,-0.6161,0.6186)
+ New Polarization:       (-0.67672,-0.71438,-0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4876,-0.6161,0.6186)
+ Old Polarization:       (-0.67672,-0.71438,-0.17808)
+ New Momentum Direction: (0.4876,-0.6161,-0.6186)
+ New Polarization:       (0.67672,0.71438,-0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4876,-0.6161,-0.6186)
+ Old Polarization:       (0.67672,0.71438,-0.17808)
+ New Momentum Direction: (0.4876,0.6161,-0.6186)
+ New Polarization:       (-0.67672,0.71438,0.17808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4876,0.6161,-0.6186)
+ Old Polarization:       (-0.67672,0.71438,0.17808)
+ New Momentum Direction: (-0.4876,0.6161,-0.6186)
+ New Polarization:       (-0.67672,-0.71438,-0.17808)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1282, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.080125,-0.98966,-0.11898)
- Old Polarization:       (-0.75945,-0.016703,0.65035)
- New Momentum Direction: (-0.10852,-0.98095,-0.16115)
- New Polarization:       (-0.90521,0.030506,0.42388)
+ Old Momentum Direction: (0.79046,0.59387,0.14998)
+ Old Polarization:       (-0.33998,0.62907,-0.69906)
+ New Momentum Direction: (0.56054,0.80292,0.20277)
+ New Polarization:       (-0.57016,0.55176,-0.60867)
  *** FresnelRefraction *** 
-Track (trackID 1278, parentID 1) is processed with stopping code 2
+Track (trackID 1281, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.26481,-0.77388,-0.57531)
- Old Polarization:       (-0.96408,0.22528,0.14072)
- New Momentum Direction: (-0.35909,-0.51228,-0.78014)
- New Polarization:       (-0.8994,0.4132,0.14265)
+ Old Momentum Direction: (0.34555,-0.47141,0.8114)
+ Old Polarization:       (-0.83268,-0.55273,0.033492)
+ New Momentum Direction: (0.47012,-0.64134,0.60636)
+ New Polarization:       (-0.77469,-0.62902,-0.064681)
  *** FresnelRefraction *** 
-Track (trackID 1277, parentID 1) is processed with stopping code 2
+Track (trackID 1280, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1276, parentID 1) is processed with stopping code 2
+Track (trackID 1279, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1275, parentID 1) is processed with stopping code 2
+Track (trackID 1278, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41391,-0.12504,-0.90169)
- Old Polarization:       (-0.20676,0.95172,-0.22688)
- New Momentum Direction: (0.55966,-0.16907,-0.8113)
- New Polarization:       (0.72256,0.57894,0.3778)
- *** FresnelRefraction *** 
-Track (trackID 1274, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.70293,-0.63717,0.31608)
+ Old Polarization:       (-0.43876,-0.73821,-0.51238)
+ New Momentum Direction: (-0.70293,-0.63717,0.31608)
+ New Polarization:       (-0.29473,0.66538,0.68586)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.70293,-0.63717,0.31608)
+ Old Polarization:       (-0.29473,0.66538,0.68586)
+ New Momentum Direction: (-0.70293,0.63717,0.31608)
+ New Polarization:       (0.29473,0.66538,-0.68586)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1277, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93065,-0.28974,-0.22348)
- Old Polarization:       (0.36554,0.7637,0.5321)
- New Momentum Direction: (0.86759,-0.39376,-0.30371)
- New Polarization:       (-0.49701,-0.66655,-0.5556)
+ Old Momentum Direction: (0.88862,0.45844,0.013756)
+ Old Polarization:       (-0.23205,0.47526,-0.84869)
+ New Momentum Direction: (0.78337,0.62128,0.018642)
+ New Polarization:       (-0.39127,0.5162,-0.76187)
  *** FresnelRefraction *** 
-Track (trackID 1273, parentID 1) is processed with stopping code 2
+Track (trackID 1276, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1272, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.24269,-0.21204,0.94665)
+ Old Polarization:       (-0.94614,-0.26729,0.18269)
+ New Momentum Direction: (0.3301,-0.28841,0.89881)
+ New Polarization:       (-0.014096,-0.95358,-0.3008)
+ *** FresnelRefraction *** 
+Track (trackID 1275, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1271, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.37142,-0.49976,0.78249)
+ Old Polarization:       (-0.80711,-0.59037,0.0060451)
+ New Momentum Direction: (0.50276,-0.6765,0.53812)
+ New Polarization:       (-0.79808,-0.60244,-0.01171)
+ *** FresnelRefraction *** 
+Track (trackID 1274, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.13062,-0.98929,0.065184)
- Old Polarization:       (-0.52224,-0.01277,0.8527)
- New Momentum Direction: (0.17747,-0.98013,0.08856)
- New Polarization:       (-0.33933,0.023528,0.94037)
+ Old Momentum Direction: (0.4391,-0.5823,0.68419)
+ Old Polarization:       (-0.72982,-0.67531,-0.10637)
+ New Momentum Direction: (0.4391,-0.5823,-0.68419)
+ New Polarization:       (0.74577,0.6609,-0.083862)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4391,-0.5823,-0.68419)
+ Old Polarization:       (0.74577,0.6609,-0.083862)
+ New Momentum Direction: (0.4391,0.5823,-0.68419)
+ New Polarization:       (-0.74577,0.6609,0.083862)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4391,0.5823,-0.68419)
+ Old Polarization:       (-0.74577,0.6609,0.083862)
+ New Momentum Direction: (-0.4391,0.5823,-0.68419)
+ New Polarization:       (-0.74577,-0.6609,-0.083862)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.4391,0.5823,-0.68419)
+ Old Polarization:       (-0.74577,-0.6609,-0.083862)
+ New Momentum Direction: (-0.59719,0.79195,-0.12721)
+ New Polarization:       (-0.79839,-0.57166,0.18915)
  *** FresnelRefraction *** 
-Track (trackID 1270, parentID 1) is processed with stopping code 2
+Track (trackID 1273, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.94429,0.3241,-0.057239)
+Old Polarization: (-0.16873,0.32742,-0.92969)
+New Polarization: (0.11452,-0.20847,-0.9713)
+Polarization Change: (0.11452,-0.20847,-0.9713)
+New Momentum Direction: (0.45281,-0.8593,0.23782)
+Momentum Change: (0.45281,-0.8593,0.23782)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45281,-0.8593,0.23782)
+ Old Polarization:       (0.11452,-0.20847,-0.9713)
+ New Momentum Direction: (-0.45281,-0.8593,0.23782)
+ New Polarization:       (0.11452,0.20847,0.9713)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.13498,-0.25499,-0.95748)
- Old Polarization:       (-0.51909,0.80491,-0.28753)
- New Momentum Direction: (0.18276,-0.34525,-0.92055)
- New Polarization:       (0.37647,-0.84038,0.38992)
+ Old Momentum Direction: (-0.45281,-0.8593,0.23782)
+ Old Polarization:       (0.11452,0.20847,0.9713)
+ New Momentum Direction: (-0.61256,-0.72198,0.32172)
+ New Polarization:       (0.058509,0.3645,0.92937)
  *** FresnelRefraction *** 
-Track (trackID 1269, parentID 1) is processed with stopping code 2
+Track (trackID 1272, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.21565,-0.9172,-0.33503)
- Old Polarization:       (-0.91035,0.064737,0.40873)
- New Momentum Direction: (-0.29219,-0.84175,-0.45395)
- New Polarization:       (-0.92062,0.11902,0.37188)
+Scattering Photon!
+Old Momentum Direction: (0.21734,0.10681,0.97024)
+Old Polarization: (-0.9743,0.083993,0.209)
+New Polarization: (0.91615,0.19221,-0.35174)
+Polarization Change: (0.91615,0.19221,-0.35174)
+New Momentum Direction: (-0.33292,0.85358,-0.4007)
+Momentum Change: (-0.33292,0.85358,-0.4007)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.33292,0.85358,-0.4007)
+ Old Polarization:       (0.91615,0.19221,-0.35174)
+ New Momentum Direction: (-0.45272,0.7058,-0.54488)
+ New Polarization:       (0.45327,-0.34407,-0.82229)
  *** FresnelRefraction *** 
-Track (trackID 1268, parentID 1) is processed with stopping code 2
+Track (trackID 1271, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23858,-0.96382,0.11886)
- Old Polarization:       (-0.4029,0.013128,0.91515)
- New Momentum Direction: (0.32341,-0.93244,0.16113)
- New Polarization:       (-0.38899,0.024219,0.92092)
+ Old Momentum Direction: (0.27492,0.35949,0.89173)
+ Old Polarization:       (-0.91898,0.3709,0.1338)
+ New Momentum Direction: (0.37019,0.48406,0.79287)
+ New Polarization:       (-0.54329,0.80514,-0.23789)
  *** FresnelRefraction *** 
-Track (trackID 1267, parentID 1) is processed with stopping code 2
+Track (trackID 1270, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90833,-0.21142,-0.36088)
- Old Polarization:       (0.35027,0.85605,0.38012)
- New Momentum Direction: (0.8253,-0.28544,-0.48724)
- New Polarization:       (-0.50978,-0.0054576,-0.86029)
- *** FresnelRefraction *** 
-Track (trackID 1266, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+ Old Momentum Direction: (0.23376,-0.10367,0.96675)
+ Old Polarization:       (-0.96446,-0.15066,0.21705)
+ New Momentum Direction: (0.31506,-0.13972,0.93873)
+ New Polarization:       (0.61009,-0.72784,-0.3131)
+ *** FresnelRefraction *** 
+Track (trackID 1269, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.33644,0.50905,0.79226)
+ Old Polarization:       (-0.84604,0.53285,0.016904)
+ New Momentum Direction: (0.45543,0.68909,0.56368)
+ New Polarization:       (-0.82135,0.56949,-0.032572)
+ *** FresnelRefraction *** 
+Track (trackID 1268, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1267, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48727,0.65853,0.5735)
+ Old Polarization:       (-0.67809,0.69915,-0.22669)
+ New Momentum Direction: (0.48727,-0.65853,0.5735)
+ New Polarization:       (0.67809,0.69915,0.22669)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48727,-0.65853,0.5735)
+ Old Polarization:       (0.67809,0.69915,0.22669)
+ New Momentum Direction: (0.48727,-0.65853,-0.5735)
+ New Polarization:       (-0.67809,-0.69915,0.22669)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48727,-0.65853,-0.5735)
+ Old Polarization:       (-0.67809,-0.69915,0.22669)
+ New Momentum Direction: (-0.48727,-0.65853,-0.5735)
+ New Polarization:       (-0.67809,0.69915,-0.22669)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.48727,-0.65853,-0.5735)
+ Old Polarization:       (-0.67809,0.69915,-0.22669)
+ New Momentum Direction: (-0.48727,0.65853,-0.5735)
+ New Polarization:       (0.67809,0.69915,0.22669)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.48727,0.65853,-0.5735)
+ Old Polarization:       (0.67809,0.69915,0.22669)
+ New Momentum Direction: (-0.48727,0.65853,0.5735)
+ New Polarization:       (-0.67809,-0.69915,0.22669)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.095851,-0.98675,-0.13093)
- Old Polarization:       (-0.77287,-0.0091127,0.6345)
- New Momentum Direction: (-0.13032,-0.97536,-0.17801)
- New Polarization:       (-0.84854,0.016853,0.52887)
- *** FresnelRefraction *** 
-Track (trackID 1265, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
+ Old Momentum Direction: (-0.48727,0.65853,0.5735)
+ Old Polarization:       (-0.67809,-0.69915,0.22669)
+ New Momentum Direction: (0.48727,0.65853,0.5735)
+ New Polarization:       (-0.67809,0.69915,-0.22669)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.2602,-0.95829,0.11825)
- Old Polarization:       (-0.38028,0.01086,0.92481)
- New Momentum Direction: (0.34992,-0.92318,0.15902)
- New Polarization:       (-0.37002,0.019735,0.92881)
- *** FresnelRefraction *** 
-Track (trackID 1264, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.20339,-0.9734,0.10549)
-Old Polarization: (-0.4414,0.0050139,0.89729)
-New Polarization: (-0.59479,-0.00035445,0.68425)
-Polarization Change: (-0.65605,-0.00039096,0.75472)
-New Momentum Direction: (-0.16019,0.97232,-0.13874)
-Momentum Change: (-0.16097,0.97706,-0.13942)
+ Old Momentum Direction: (0.48727,0.65853,0.5735)
+ Old Polarization:       (-0.67809,0.69915,-0.22669)
+ New Momentum Direction: (0.48727,-0.65853,0.5735)
+ New Polarization:       (0.67809,0.69915,0.22669)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.16097,0.97706,-0.13942)
- Old Polarization:       (-0.65605,-0.00039096,0.75472)
- New Momentum Direction: (-0.21872,0.95722,-0.18944)
- New Polarization:       (-0.6565,-0.00072408,0.75433)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.48727,-0.65853,0.5735)
+ Old Polarization:       (0.67809,0.69915,0.22669)
+ New Momentum Direction: (0.48727,-0.65853,-0.5735)
+ New Polarization:       (-0.67809,-0.69915,0.22669)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.21872,0.95722,-0.18944)
- Old Polarization:       (-0.6565,-0.00072408,0.75433)
- New Momentum Direction: (-0.16097,0.70447,-0.69124)
- New Polarization:       (-0.7836,0.33459,0.52347)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.48727,-0.65853,-0.5735)
+ Old Polarization:       (-0.67809,-0.69915,0.22669)
+ New Momentum Direction: (-0.48727,-0.65853,-0.5735)
+ New Polarization:       (-0.67809,0.69915,-0.22669)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.16097,0.70447,-0.69124)
- Old Polarization:       (-0.7836,0.33459,0.52347)
- New Momentum Direction: (-0.21872,0.26451,-0.93925)
- New Polarization:       (-0.78634,-0.61773,0.0091529)
+ Old Momentum Direction: (-0.48727,-0.65853,-0.5735)
+ Old Polarization:       (-0.67809,0.69915,-0.22669)
+ New Momentum Direction: (-0.48727,0.65853,-0.5735)
+ New Polarization:       (0.67809,0.69915,0.22669)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.48727,0.65853,-0.5735)
+Old Polarization: (0.67809,0.69915,0.22669)
+New Polarization: (0.099118,0.84075,0.53228)
+Polarization Change: (0.099118,0.84075,0.53228)
+New Momentum Direction: (0.95259,0.074471,-0.29502)
+Momentum Change: (0.95259,0.074471,-0.29502)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95259,0.074471,-0.29502)
+ Old Polarization:       (0.099118,0.84075,0.53228)
+ New Momentum Direction: (0.91122,0.10082,-0.39939)
+ New Polarization:       (-0.17508,0.97244,-0.15399)
  *** FresnelRefraction *** 
-Track (trackID 1263, parentID 1) is processed with stopping code 2
+Track (trackID 1266, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92242,-0.35124,-0.16056)
- Old Polarization:       (0.37272,0.70077,0.60827)
- New Momentum Direction: (0.85468,-0.47216,-0.21584)
- New Polarization:       (-0.50911,-0.84366,-0.17044)
+ Old Momentum Direction: (0.27021,-0.29099,0.91777)
+ Old Polarization:       (-0.92025,-0.35832,0.15733)
+ New Momentum Direction: (0.36557,-0.39369,0.84343)
+ New Polarization:       (-0.33871,-0.90029,-0.27342)
  *** FresnelRefraction *** 
-Track (trackID 1262, parentID 1) is processed with stopping code 2
+Track (trackID 1265, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.26561,-0.74998,-0.60579)
- Old Polarization:       (-0.96136,0.25319,0.10805)
- New Momentum Direction: (-0.36105,-0.43765,-0.82347)
- New Polarization:       (-0.87332,0.46836,0.13399)
- *** FresnelRefraction *** 
-Track (trackID 1261, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1264, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.037289,-0.9993,-0.0037047)
- Old Polarization:       (-0.62741,-0.026297,0.77825)
- New Momentum Direction: (0.050554,-0.99871,-0.0050227)
- New Polarization:       (0.8548,0.040668,0.51736)
- *** FresnelRefraction *** 
-Track (trackID 1260, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1263, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 124
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 123
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 125 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.70996,-0.6731,0.20709)
- Old Polarization:       (0.078407,0.36779,0.9266)
- New Momentum Direction: (0.28732,-0.91549,0.28167)
- New Polarization:       (-0.16369,0.24281,0.95616)
- *** FresnelRefraction *** 
-Track (trackID 1417, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.91811,-0.39497,-0.032681)
-Old Polarization: (0.31536,0.67813,0.66385)
-New Polarization: (0.48625,0.71642,-0.31624)
-Polarization Change: (0.5275,0.7772,-0.34307)
-New Momentum Direction: (0.68879,-0.18511,0.63973)
-Momentum Change: (0.71891,-0.1932,0.66771)
  Photon at Boundary! 
- Old Momentum Direction: (0.71891,-0.1932,0.66771)
- Old Polarization:       (0.5275,0.7772,-0.34307)
- New Momentum Direction: (0.33725,-0.26166,0.90432)
- New Polarization:       (-0.8185,0.39308,0.41898)
+ Old Momentum Direction: (0.22666,0.66208,0.71434)
+ Old Polarization:       (-0.97352,0.1315,0.18702)
+ New Momentum Direction: (0.30668,0.89581,0.32168)
+ New Polarization:       (-0.83174,0.41654,-0.36701)
  *** FresnelRefraction *** 
-Track (trackID 1416, parentID 1) is processed with stopping code 2
+Track (trackID 1544, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50437,-0.82792,0.24526)
- Old Polarization:       (-0.1497,0.1959,0.96913)
- New Momentum Direction: (0.68592,-0.64674,0.33354)
- New Polarization:       (-0.1161,0.35522,0.92754)
+ Old Momentum Direction: (0.92128,-0.28324,0.26649)
+ Old Polarization:       (-0.19431,-0.92883,-0.31546)
+ New Momentum Direction: (0.85029,-0.38332,0.36066)
+ New Polarization:       (-0.32628,-0.92159,-0.21027)
  *** FresnelRefraction *** 
-Track (trackID 1415, parentID 1) is processed with stopping code 2
+Track (trackID 1543, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.58551,-0.13308,-0.79967)
- Old Polarization:       (-0.053811,0.97788,-0.20214)
- New Momentum Direction: (0.78838,-0.17919,-0.58851)
- New Polarization:       (0.45604,0.8123,0.36359)
+Scattering Photon!
+Old Momentum Direction: (0.68355,0.69306,-0.22898)
+Old Polarization: (-0.46082,0.16649,-0.87174)
+New Polarization: (-0.48826,-0.16836,-0.8563)
+Polarization Change: (-0.48826,-0.16836,-0.8563)
+New Momentum Direction: (-0.00052803,0.98127,-0.19263)
+Momentum Change: (-0.00052803,0.98127,-0.19263)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.00052803,0.98127,-0.19263)
+ Old Polarization:       (-0.48826,-0.16836,-0.8563)
+ New Momentum Direction: (-0.00071427,0.96545,-0.26057)
+ New Polarization:       (-0.3818,-0.24109,-0.89225)
  *** FresnelRefraction *** 
-Track (trackID 1414, parentID 1) is processed with stopping code 2
+Track (trackID 1542, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.027098,-0.40953,-0.9119)
- Old Polarization:       (-0.68041,0.66074,-0.31695)
- New Momentum Direction: (0.036809,-0.55629,-0.83018)
- New Polarization:       (-0.46445,-0.74509,0.47868)
- *** FresnelRefraction *** 
-Track (trackID 1413, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1541, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.20294,-0.96643,0.15753)
- Old Polarization:       (-0.48485,0.040596,0.87365)
- New Momentum Direction: (0.27557,-0.93718,0.21391)
- New Polarization:       (-0.44118,0.074407,0.89433)
+ Old Momentum Direction: (0.24872,0.80352,0.54082)
+ Old Polarization:       (-0.95452,0.29812,-0.0039515)
+ New Momentum Direction: (0.33446,0.59937,0.72725)
+ New Polarization:       (-0.54739,-0.50461,0.66763)
  *** FresnelRefraction *** 
-Track (trackID 1412, parentID 1) is processed with stopping code 2
+Track (trackID 1540, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.23217,-0.83499,-0.49888)
- Old Polarization:       (-0.97233,0.18563,0.14181)
- New Momentum Direction: (-0.31465,-0.66624,-0.67611)
- New Polarization:       (-0.93633,0.33479,0.10585)
- *** FresnelRefraction *** 
-Track (trackID 1411, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1539, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90449,-0.17929,-0.38698)
- Old Polarization:       (0.2961,0.91702,0.26722)
- New Momentum Direction: (0.81511,-0.24353,-0.52563)
- New Polarization:       (-0.46316,0.27103,-0.84382)
+ Old Momentum Direction: (0.62517,0.7603,-0.17635)
+ Old Polarization:       (-0.5263,0.24382,-0.81459)
+ New Momentum Direction: (0.84434,0.47995,-0.23818)
+ New Polarization:       (-0.0010499,-0.44304,-0.8965)
  *** FresnelRefraction *** 
-Track (trackID 1410, parentID 1) is processed with stopping code 2
+Track (trackID 1538, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1409, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.36653,0.18722,0.91137)
+ Old Polarization:       (-0.81796,-0.40198,0.41154)
+ New Momentum Direction: (0.49483,0.25275,0.83142)
+ New Polarization:       (0.73571,0.38734,-0.55561)
+ *** FresnelRefraction *** 
+Track (trackID 1537, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.23278,-0.7927,-0.56342)
- Old Polarization:       (-0.96957,0.23434,0.070881)
- New Momentum Direction: (-0.31621,-0.56055,-0.76537)
- New Polarization:       (-0.90351,0.42393,0.062803)
+ Old Momentum Direction: (0.51294,0.85683,-0.052276)
+ Old Polarization:       (-0.65218,0.34939,-0.67274)
+ New Momentum Direction: (0.69434,0.71616,-0.070763)
+ New Polarization:       (0.49927,-0.5502,-0.66933)
  *** FresnelRefraction *** 
-Track (trackID 1408, parentID 1) is processed with stopping code 2
+Track (trackID 1536, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.22723,-0.78916,-0.57061)
- Old Polarization:       (-0.96996,0.23564,0.060369)
- New Momentum Direction: (-0.30729,-0.55689,-0.77165)
- New Polarization:       (-0.90449,0.42294,0.054966)
+ Old Momentum Direction: (0.99232,-0.025639,-0.12105)
+ Old Polarization:       (-0.10894,-0.6449,-0.75647)
+ New Momentum Direction: (0.98604,-0.034497,-0.16287)
+ New Polarization:       (-0.15458,-0.55295,-0.81875)
  *** FresnelRefraction *** 
-Track (trackID 1407, parentID 1) is processed with stopping code 2
+Track (trackID 1535, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.049455,-0.99736,0.053202)
-Old Polarization: (-0.65463,0.0078612,0.75591)
-New Polarization: (-0.5792,-0.48461,0.42417)
-Polarization Change: (-0.6687,-0.55948,0.48971)
-New Momentum Direction: (-0.25463,-0.35288,-0.75084)
-Momentum Change: (-0.29341,-0.40662,-0.8652)
  Photon at Boundary! 
- Old Momentum Direction: (-0.29341,-0.40662,-0.8652)
- Old Polarization:       (-0.6687,-0.55948,0.48971)
- New Momentum Direction: (-0.39903,-0.553,-0.73141)
- New Polarization:       (-0.54908,-0.49473,0.67361)
+ Old Momentum Direction: (0.73719,-0.27335,0.61793)
+ Old Polarization:       (-0.40192,-0.91253,0.075818)
+ New Momentum Direction: (0.39717,-0.37128,0.83929)
+ New Polarization:       (-0.67935,-0.73381,-0.0031351)
  *** FresnelRefraction *** 
-Track (trackID 1406, parentID 1) is processed with stopping code 2
+Track (trackID 1534, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1405, parentID 1) is processed with stopping code 2
+Track (trackID 1533, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68096,-0.70267,0.20628)
- Old Polarization:       (0.05585,0.33069,0.94208)
- New Momentum Direction: (0.9155,-0.29146,0.27733)
- New Polarization:       (-0.052861,0.59621,0.80109)
+ Old Momentum Direction: (0.46437,0.0021545,0.88564)
+ Old Polarization:       (-0.70476,-0.60471,0.371)
+ New Momentum Direction: (0.63187,0.0029316,0.77507)
+ New Polarization:       (0.68359,-0.47341,-0.5555)
  *** FresnelRefraction *** 
-Track (trackID 1404, parentID 1) is processed with stopping code 2
+Track (trackID 1532, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74908,-0.116,-0.65224)
- Old Polarization:       (0.12672,0.99146,-0.030795)
- New Momentum Direction: (0.44286,-0.15699,-0.88274)
- New Polarization:       (-0.24567,0.92562,-0.28787)
+ Old Momentum Direction: (0.50597,-0.046767,0.86128)
+ Old Polarization:       (-0.66009,-0.66375,0.35173)
+ New Momentum Direction: (0.68467,-0.063285,0.7261)
+ New Polarization:       (0.52287,-0.6514,-0.5498)
  *** FresnelRefraction *** 
-Track (trackID 1403, parentID 1) is processed with stopping code 2
+Track (trackID 1531, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93577,-0.33187,-0.11919)
- Old Polarization:       (0.33839,0.75008,0.56822)
- New Momentum Direction: (0.87916,-0.44848,-0.16107)
- New Polarization:       (-0.46589,-0.87996,-0.092832)
+ Old Momentum Direction: (0.68548,0.69146,-0.22804)
+ Old Polarization:       (-0.45833,0.16643,-0.87306)
+ New Momentum Direction: (0.68548,-0.69146,-0.22804)
+ New Polarization:       (0.21301,-0.10904,0.97095)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.68548,-0.69146,-0.22804)
+ Old Polarization:       (0.21301,-0.10904,0.97095)
+ New Momentum Direction: (0.18265,-0.93371,-0.30793)
+ New Polarization:       (-0.43348,-0.35759,0.82718)
  *** FresnelRefraction *** 
-Track (trackID 1402, parentID 1) is processed with stopping code 2
+Track (trackID 1530, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (-0.23307,-0.82833,-0.50946)
-Old Polarization: (-0.97241,0.19352,0.13024)
-New Polarization: (-0.90029,0.04191,0.21871)
-Polarization Change: (-0.97074,0.045189,0.23582)
-New Momentum Direction: (0.13415,-0.66397,0.67945)
-Momentum Change: (0.13982,-0.69205,0.70818)
- Photon at Boundary! 
- Old Momentum Direction: (0.13982,-0.69205,0.70818)
- Old Polarization:       (-0.97074,0.045189,0.23582)
- New Momentum Direction: (0.13982,0.69205,0.70818)
- New Polarization:       (0.9746,0.030152,-0.22189)
- *** FresnelReflection *** 
-Scattering Photon!
-Old Momentum Direction: (0.13982,0.69205,0.70818)
-Old Polarization: (0.9746,0.030152,-0.22189)
-New Polarization: (0.2832,0.38143,-0.77926)
-Polarization Change: (0.31031,0.41793,-0.85384)
-New Momentum Direction: (0.13152,-0.86034,-0.37332)
-Momentum Change: (0.13888,-0.90847,-0.3942)
  Photon at Boundary! 
- Old Momentum Direction: (0.13888,-0.90847,-0.3942)
- Old Polarization:       (0.31031,0.41793,-0.85384)
- New Momentum Direction: (0.18833,-0.82387,-0.53457)
- New Polarization:       (0.27989,0.56677,-0.77488)
+ Old Momentum Direction: (0.62772,0.75518,-0.18884)
+ Old Polarization:       (-0.52375,0.23027,-0.82016)
+ New Momentum Direction: (0.85361,0.45322,-0.25679)
+ New Polarization:       (-0.043009,-0.42996,-0.90182)
  *** FresnelRefraction *** 
-Track (trackID 1401, parentID 1) is processed with stopping code 2
+Track (trackID 1529, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57842,-0.12566,-0.806)
- Old Polarization:       (-0.066393,0.97753,-0.20005)
- New Momentum Direction: (0.78505,-0.17056,-0.59548)
- New Polarization:       (0.45354,0.81304,0.36505)
+ Old Momentum Direction: (0.91543,-0.28414,0.28506)
+ Old Polarization:       (-0.19833,-0.93475,-0.29481)
+ New Momentum Direction: (0.83979,-0.38328,0.38452)
+ New Polarization:       (-0.33224,-0.92295,-0.19437)
  *** FresnelRefraction *** 
-Track (trackID 1400, parentID 1) is processed with stopping code 2
+Track (trackID 1528, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.20632,-0.96691,0.15008)
- Old Polarization:       (-0.48384,0.032506,0.87455)
- New Momentum Direction: (0.27812,-0.939,0.20231)
- New Polarization:       (-0.44944,0.05893,0.89136)
- *** FresnelRefraction *** 
-Track (trackID 1399, parentID 1) is processed with stopping code 2
-### pop requested out of 106 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1398, parentID 1) is processed with stopping code 2
+Track (trackID 1527, parentID 1) is processed with stopping code 2
+### pop requested out of 106 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73043,0.63344,-0.25539)
+ Old Polarization:       (-0.40687,0.10323,-0.90764)
+ New Momentum Direction: (0.3922,0.85315,-0.34397)
+ New Polarization:       (-0.67842,0.015734,-0.73451)
+ *** FresnelRefraction *** 
+Track (trackID 1526, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.17576,-0.9473,-0.26782)
- Old Polarization:       (-0.91432,0.056251,0.40107)
- New Momentum Direction: (-0.2373,-0.90163,-0.36159)
- New Polarization:       (-0.92911,0.10197,0.35548)
+ Old Momentum Direction: (0.85681,0.41717,-0.30305)
+ Old Polarization:       (-0.26712,-0.1436,-0.9529)
+ New Momentum Direction: (0.71571,0.56504,-0.41047)
+ New Polarization:       (-0.45008,-0.076238,-0.88973)
  *** FresnelRefraction *** 
-Track (trackID 1397, parentID 1) is processed with stopping code 2
+Track (trackID 1525, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.080253,-0.99389,0.075781)
- Old Polarization:       (-0.62183,0.0094984,0.7831)
- New Momentum Direction: (0.10892,-0.98871,0.10285)
- New Polarization:       (-0.59812,0.017456,0.80122)
+ Old Momentum Direction: (0.75461,-0.27891,0.59395)
+ Old Polarization:       (-0.38148,-0.92295,0.051266)
+ New Momentum Direction: (0.45859,-0.37772,0.80438)
+ New Polarization:       (-0.64099,-0.76753,0.0050239)
  *** FresnelRefraction *** 
-Track (trackID 1396, parentID 1) is processed with stopping code 2
+Track (trackID 1524, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90584,-0.18063,-0.38318)
- Old Polarization:       (0.29736,0.91536,0.27146)
- New Momentum Direction: (0.8178,-0.24539,-0.52056)
- New Polarization:       (-0.46364,0.25493,-0.84856)
+ Old Momentum Direction: (0.22268,0.73322,0.64249)
+ Old Polarization:       (-0.9732,0.20599,0.10221)
+ New Momentum Direction: (0.30278,0.38092,0.87363)
+ New Polarization:       (-0.79953,-0.39739,0.45037)
  *** FresnelRefraction *** 
-Track (trackID 1395, parentID 1) is processed with stopping code 2
+Track (trackID 1523, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77838,-0.11831,-0.61655)
- Old Polarization:       (0.15813,0.98737,0.010174)
- New Momentum Direction: (0.52547,-0.16034,-0.83557)
- New Polarization:       (-0.29804,0.88517,-0.35729)
+ Old Momentum Direction: (0.38392,0.91219,0.14321)
+ Old Polarization:       (-0.79457,0.40538,-0.45202)
+ New Momentum Direction: (0.52176,0.8306,0.19462)
+ New Polarization:       (0.81097,-0.55372,0.18903)
  *** FresnelRefraction *** 
-Track (trackID 1394, parentID 1) is processed with stopping code 2
+Track (trackID 1522, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1393, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9862,0.023569,-0.16385)
+ Old Polarization:       (-0.11908,-0.58657,-0.80109)
+ New Momentum Direction: (0.97471,0.031817,-0.22119)
+ New Polarization:       (-0.18185,-0.46229,-0.86788)
+ *** FresnelRefraction *** 
+Track (trackID 1521, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1392, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.58962,-0.15351,0.79296)
+ Old Polarization:       (-0.56606,-0.77885,0.27013)
+ New Momentum Direction: (0.8011,-0.20857,0.56102)
+ New Polarization:       (0.10809,-0.8715,-0.47834)
+ *** FresnelRefraction *** 
+Track (trackID 1520, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.31023,-0.92964,0.19881)
- Old Polarization:       (-0.36599,0.076214,0.92749)
- New Momentum Direction: (0.41887,-0.86746,0.26843)
- New Polarization:       (-0.31604,0.13786,0.93868)
+ Old Momentum Direction: (0.96667,-0.22924,0.11399)
+ Old Polarization:       (-0.14739,-0.86236,-0.48437)
+ New Momentum Direction: (0.93749,-0.31163,0.15495)
+ New Polarization:       (-0.24123,-0.90277,-0.35612)
  *** FresnelRefraction *** 
-Track (trackID 1391, parentID 1) is processed with stopping code 2
+Track (trackID 1519, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94086,-0.29333,-0.16955)
- Old Polarization:       (0.33845,0.79093,0.50979)
- New Momentum Direction: (0.88812,-0.39791,-0.23)
- New Polarization:       (-0.45935,-0.78515,-0.41537)
+ Old Momentum Direction: (0.23926,0.80008,0.55012)
+ Old Polarization:       (-0.95848,0.28514,0.0021622)
+ New Momentum Direction: (0.32403,0.58303,0.74504)
+ New Polarization:       (-0.58609,-0.49448,0.64186)
  *** FresnelRefraction *** 
-Track (trackID 1390, parentID 1) is processed with stopping code 2
+Track (trackID 1518, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62273,-0.74653,0.23429)
- Old Polarization:       (-0.017779,0.28586,0.95811)
- New Momentum Direction: (0.84621,-0.42729,0.31837)
- New Polarization:       (-0.058307,0.51964,0.85239)
- *** FresnelRefraction *** 
-Track (trackID 1389, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.75055,-0.26922,0.60349)
+ Old Polarization:       (-0.38387,-0.92099,0.066557)
+ New Momentum Direction: (-0.75055,-0.26922,0.60349)
+ New Polarization:       (-0.12197,0.954,0.27388)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.75055,-0.26922,0.60349)
+ Old Polarization:       (-0.12197,0.954,0.27388)
+ New Momentum Direction: (-0.75055,-0.26922,-0.60349)
+ New Polarization:       (0.12197,-0.954,0.27388)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1517, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.044397,-0.9978,-0.049157)
- Old Polarization:       (-0.76349,0.0021549,0.64581)
- New Momentum Direction: (-0.060095,-0.99597,-0.06654)
- New Polarization:       (-0.7708,0.0039476,0.63706)
+ Old Momentum Direction: (0.4651,0.88516,0.013211)
+ Old Polarization:       (-0.70543,0.3796,-0.59856)
+ New Momentum Direction: (0.63024,0.77619,0.017901)
+ New Polarization:       (0.70334,-0.56102,-0.43655)
  *** FresnelRefraction *** 
-Track (trackID 1388, parentID 1) is processed with stopping code 2
+Track (trackID 1516, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94079,-0.29164,-0.17279)
- Old Polarization:       (0.33881,0.79301,0.5063)
- New Momentum Direction: (0.88807,-0.39551,-0.23433)
- New Polarization:       (-0.45959,-0.77552,-0.43283)
+ Old Momentum Direction: (0.7377,0.62052,-0.26599)
+ Old Polarization:       (-0.40021,0.084629,-0.91251)
+ New Momentum Direction: (0.40628,0.83984,-0.36)
+ New Polarization:       (-0.67242,0.0080318,-0.74013)
  *** FresnelRefraction *** 
-Track (trackID 1387, parentID 1) is processed with stopping code 2
+Track (trackID 1515, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.042326,-0.39682,-0.91692)
- Old Polarization:       (-0.66357,0.67493,-0.32272)
- New Momentum Direction: (0.057486,-0.53896,-0.84037)
- New Polarization:       (-0.38584,-0.78835,0.4792)
+ Old Momentum Direction: (0.94778,0.18893,-0.25694)
+ Old Polarization:       (-0.16492,-0.39921,-0.90191)
+ New Momentum Direction: (0.90198,0.25579,-0.34786)
+ New Polarization:       (-0.27459,-0.28191,-0.91931)
  *** FresnelRefraction *** 
-Track (trackID 1386, parentID 1) is processed with stopping code 2
+Track (trackID 1514, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1385, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.30948,0.30211,0.90164)
+ Old Polarization:       (-0.87837,-0.27239,0.39277)
+ New Momentum Direction: (0.41997,0.40997,0.80966)
+ New Polarization:       (0.32806,0.76325,-0.55663)
+ *** FresnelRefraction *** 
+Track (trackID 1513, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54827,-0.79959,0.24508)
- Old Polarization:       (-0.10111,0.22752,0.96851)
- New Momentum Direction: (0.74583,-0.57671,0.33339)
- New Polarization:       (-0.086332,0.41258,0.90682)
+ Old Momentum Direction: (0.74351,0.60951,-0.27511)
+ Old Polarization:       (-0.39526,0.06872,-0.91599)
+ New Momentum Direction: (0.41617,0.82878,-0.37407)
+ New Polarization:       (-0.6689,0.0003705,-0.74335)
  *** FresnelRefraction *** 
-Track (trackID 1384, parentID 1) is processed with stopping code 2
+Track (trackID 1512, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70824,-0.67554,0.20507)
- Old Polarization:       (0.078796,0.3643,0.92794)
- New Momentum Direction: (0.28777,-0.9164,0.27819)
- New Polarization:       (-0.1634,0.23924,0.95711)
- *** FresnelRefraction *** 
-Track (trackID 1383, parentID 1) is processed with stopping code 2
-### pop requested out of 90 stacked tracks.
+ Old Momentum Direction: (0.62835,-0.19415,0.75331)
+ Old Polarization:       (-0.52309,-0.82221,0.22441)
+ New Momentum Direction: (0.62835,-0.19415,-0.75331)
+ New Polarization:       (0.22284,0.9727,-0.064822)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.038244,-0.48094,-0.87592)
- Old Polarization:       (-0.76044,0.58268,-0.28673)
- New Momentum Direction: (-0.051569,-0.64852,-0.75945)
- New Polarization:       (-0.7416,-0.48445,0.46405)
- *** FresnelRefraction *** 
-Track (trackID 1382, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.62835,-0.19415,-0.75331)
+ Old Polarization:       (0.22284,0.9727,-0.064822)
+ New Momentum Direction: (-0.62835,-0.19415,-0.75331)
+ New Polarization:       (0.22284,-0.9727,0.064822)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.62835,-0.19415,-0.75331)
+Old Polarization: (0.22284,-0.9727,0.064822)
+New Polarization: (-0.40951,-0.87626,0.25391)
+Polarization Change: (-0.40951,-0.87626,0.25391)
+New Momentum Direction: (-0.86072,0.46335,0.21087)
+Momentum Change: (-0.86072,0.46335,0.21087)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.86072,0.46335,0.21087)
+ Old Polarization:       (-0.40951,-0.87626,0.25391)
+ New Momentum Direction: (0.86072,0.46335,0.21087)
+ New Polarization:       (-0.17792,0.66188,-0.72819)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1511, parentID 1) is processed with stopping code 2
+### pop requested out of 90 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1510, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.22806,-0.85863,-0.45908)
- Old Polarization:       (-0.96975,0.15815,0.18596)
- New Momentum Direction: (-0.30865,-0.72022,-0.62131)
- New Polarization:       (-0.94815,0.28504,0.1406)
+ Old Momentum Direction: (0.76613,-0.28816,0.57447)
+ Old Polarization:       (-0.36981,-0.9287,0.027338)
+ New Momentum Direction: (0.48755,-0.39147,0.78042)
+ New Polarization:       (-0.62424,-0.78123,-0.001904)
  *** FresnelRefraction *** 
-Track (trackID 1381, parentID 1) is processed with stopping code 2
+Track (trackID 1509, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.074335,-0.99486,0.068831)
- Old Polarization:       (-0.62951,0.0067195,0.77696)
- New Momentum Direction: (0.10073,-0.99053,0.093276)
- New Polarization:       (-0.61143,0.012325,0.7912)
- *** FresnelRefraction *** 
-Track (trackID 1380, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1508, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.0066252,-0.43939,-0.89827)
- Old Polarization:       (-0.71055,0.63,-0.3134)
- New Momentum Direction: (0.0089249,-0.59191,-0.80595)
- New Polarization:       (-0.5733,-0.66339,0.48087)
- *** FresnelRefraction *** 
-Track (trackID 1379, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1507, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.23294,-0.8596,-0.45479)
- Old Polarization:       (-0.96813,0.16074,0.19207)
- New Momentum Direction: (-0.31679,-0.71911,-0.61848)
- New Polarization:       (-0.9454,0.292,0.14473)
- *** FresnelRefraction *** 
-Track (trackID 1378, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1506, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93473,-0.2541,-0.24843)
- Old Polarization:       (0.34072,0.83948,0.42331)
- New Momentum Direction: (0.87775,-0.34259,-0.33494)
- New Polarization:       (-0.46814,-0.46448,-0.75173)
+ Old Momentum Direction: (0.81923,-0.29393,0.4924)
+ Old Polarization:       (-0.30543,-0.95038,-0.059136)
+ New Momentum Direction: (0.6365,-0.39532,0.66226)
+ New Polarization:       (-0.50895,-0.86045,-0.024468)
  *** FresnelRefraction *** 
-Track (trackID 1377, parentID 1) is processed with stopping code 2
+Track (trackID 1505, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1376, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.24359,0.5015,0.83016)
+ Old Polarization:       (-0.94945,-0.051435,0.30967)
+ New Momentum Direction: (0.33142,0.68232,0.65161)
+ New Polarization:       (-0.45916,0.71999,-0.52037)
+ *** FresnelRefraction *** 
+Track (trackID 1504, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1375, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.25453,0.82882,0.49827)
+ Old Polarization:       (-0.94499,0.32263,-0.053933)
+ New Momentum Direction: (0.34335,0.656,0.67214)
+ New Polarization:       (-0.42479,-0.5298,0.73408)
+ *** FresnelRefraction *** 
+Track (trackID 1503, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56163,-0.79094,0.24288)
- Old Polarization:       (-0.085654,0.23639,0.96788)
- New Momentum Direction: (0.76305,-0.55575,0.32999)
- New Polarization:       (-0.07787,0.42779,0.90052)
+ Old Momentum Direction: (0.49802,0.8668,-0.025162)
+ Old Polarization:       (-0.67005,0.36623,-0.64568)
+ New Momentum Direction: (0.67148,0.74024,-0.033926)
+ New Polarization:       (0.58625,-0.55868,-0.58667)
  *** FresnelRefraction *** 
-Track (trackID 1374, parentID 1) is processed with stopping code 2
+Track (trackID 1502, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79598,-0.58698,0.14788)
- Old Polarization:       (0.18013,0.46291,0.86791)
- New Momentum Direction: (0.57427,-0.79386,0.2)
- New Polarization:       (-0.33127,-0.0019332,0.94353)
+ Old Momentum Direction: (0.98709,0.019387,-0.15899)
+ Old Polarization:       (-0.11678,-0.59228,-0.79723)
+ New Momentum Direction: (0.97641,0.026135,-0.21434)
+ New Polarization:       (-0.17729,-0.46959,-0.8649)
  *** FresnelRefraction *** 
-Track (trackID 1373, parentID 1) is processed with stopping code 2
+Track (trackID 1501, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.1254,-0.97883,-0.16175)
- Old Polarization:       (-0.85418,0.023596,0.51944)
- New Momentum Direction: (-0.16977,-0.96085,-0.21898)
- New Polarization:       (-0.87231,0.043126,0.48706)
+ Old Momentum Direction: (0.7845,0.55186,-0.28285)
+ Old Polarization:       (-0.3457,0.010527,-0.93828)
+ New Momentum Direction: (0.54952,0.74351,-0.38108)
+ New Polarization:       (-0.57643,0.0072221,-0.81712)
  *** FresnelRefraction *** 
-Track (trackID 1372, parentID 1) is processed with stopping code 2
+Track (trackID 1500, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.056835,-0.99655,-0.060424)
- Old Polarization:       (-0.77524,0.0059158,0.63163)
- New Momentum Direction: (-0.077096,-0.99365,-0.081964)
- New Polarization:       (-0.79075,0.010867,0.61205)
+ Old Momentum Direction: (0.30625,0.30323,0.90236)
+ Old Polarization:       (-0.88008,-0.27114,0.38981)
+ New Momentum Direction: (0.41664,0.41253,0.81008)
+ New Polarization:       (0.31776,0.7688,-0.55495)
  *** FresnelRefraction *** 
-Track (trackID 1371, parentID 1) is processed with stopping code 2
+Track (trackID 1499, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.1449,-0.97025,-0.19398)
- Old Polarization:       (-0.87497,0.034113,0.48298)
- New Momentum Direction: (-0.19634,-0.94465,-0.26283)
- New Polarization:       (-0.894,0.062356,0.4437)
- *** FresnelRefraction *** 
-Track (trackID 1370, parentID 1) is processed with stopping code 2
-### pop requested out of 77 stacked tracks.
+ Old Momentum Direction: (0.57534,-0.13685,0.80639)
+ Old Polarization:       (-0.582,-0.76121,0.28607)
+ New Momentum Direction: (0.57534,-0.13685,-0.80639)
+ New Polarization:       (0.2341,0.97221,0.0020354)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57534,-0.13685,-0.80639)
+ Old Polarization:       (0.2341,0.97221,0.0020354)
+ New Momentum Direction: (-0.57534,-0.13685,-0.80639)
+ New Polarization:       (0.2341,-0.97221,-0.0020354)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.57534,-0.13685,-0.80639)
+Old Polarization: (0.2341,-0.97221,-0.0020354)
+New Polarization: (-0.4181,0.8998,-0.12472)
+Polarization Change: (-0.4181,0.8998,-0.12472)
+New Momentum Direction: (-0.73941,-0.41685,-0.52869)
+Momentum Change: (-0.73941,-0.41685,-0.52869)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.73941,-0.41685,-0.52869)
+ Old Polarization:       (-0.4181,0.8998,-0.12472)
+ New Momentum Direction: (-0.73941,0.41685,-0.52869)
+ New Polarization:       (0.4181,0.8998,0.12472)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.0015575,-0.44688,-0.89459)
- Old Polarization:       (-0.7181,0.62208,-0.312)
- New Momentum Direction: (0.0020941,-0.60083,-0.79938)
- New Polarization:       (-0.59787,-0.64153,0.48062)
+ Old Momentum Direction: (-0.73941,0.41685,-0.52869)
+ Old Polarization:       (0.4181,0.8998,0.12472)
+ New Momentum Direction: (-0.4057,0.56591,-0.71774)
+ New Polarization:       (0.69607,0.70023,0.15865)
  *** FresnelRefraction *** 
-Track (trackID 1369, parentID 1) is processed with stopping code 2
+Track (trackID 1498, parentID 1) is processed with stopping code 2
+### pop requested out of 77 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1497, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.53661,-0.13825,-0.83243)
- Old Polarization:       (-0.11186,0.96613,-0.23256)
- New Momentum Direction: (0.72649,-0.18717,-0.66119)
- New Polarization:       (0.55754,0.72299,0.40795)
+ Old Momentum Direction: (0.25144,0.82211,0.5108)
+ Old Polarization:       (-0.94831,0.31482,-0.039875)
+ New Momentum Direction: (0.33924,0.64029,0.68916)
+ New Polarization:       (-0.46479,-0.52284,0.71456)
  *** FresnelRefraction *** 
-Track (trackID 1368, parentID 1) is processed with stopping code 2
+Track (trackID 1496, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.22343,-0.88053,-0.41802)
- Old Polarization:       (-0.96337,0.13423,0.23217)
- New Momentum Direction: (-0.30263,-0.76671,-0.5662)
- New Polarization:       (-0.95311,0.24271,0.18077)
+ Old Momentum Direction: (0.94632,0.19138,-0.26049)
+ Old Polarization:       (-0.16844,-0.39584,-0.90274)
+ New Momentum Direction: (0.89869,0.25968,-0.35344)
+ New Polarization:       (-0.28109,-0.27758,-0.91866)
  *** FresnelRefraction *** 
-Track (trackID 1367, parentID 1) is processed with stopping code 2
+Track (trackID 1495, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.11527,-0.98101,-0.15599)
- Old Polarization:       (-0.84886,0.01572,0.52838)
- New Momentum Direction: (-0.15527,-0.96527,-0.21013)
- New Polarization:       (-0.86206,0.028516,0.506)
+ Old Momentum Direction: (0.47309,0.88101,-0.00057731)
+ Old Polarization:       (-0.69613,0.37341,-0.61317)
+ New Momentum Direction: (0.64176,0.76691,-0.00078312)
+ New Polarization:       (0.66808,-0.55956,-0.49047)
  *** FresnelRefraction *** 
-Track (trackID 1366, parentID 1) is processed with stopping code 2
+Track (trackID 1494, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1365, parentID 1) is processed with stopping code 2
-### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56567,-0.13137,-0.8141)
- Old Polarization:       (-0.079188,0.97401,-0.2122)
- New Momentum Direction: (0.76572,-0.17783,-0.6181)
- New Polarization:       (0.48954,0.78445,0.38077)
+ Old Momentum Direction: (0.61704,0.76649,-0.17821)
+ Old Polarization:       (-0.5356,0.24314,-0.80872)
+ New Momentum Direction: (0.83884,0.48749,-0.24227)
+ New Polarization:       (0.0010448,-0.44649,-0.89479)
  *** FresnelRefraction *** 
-Track (trackID 1364, parentID 1) is processed with stopping code 2
+Track (trackID 1493, parentID 1) is processed with stopping code 2
+### pop requested out of 72 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1492, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.30709,-0.22475,-0.92476)
- Old Polarization:       (-0.36898,0.86759,-0.33339)
- New Momentum Direction: (0.41653,-0.30485,-0.85649)
- New Polarization:       (0.86134,-0.16906,0.47907)
+ Old Momentum Direction: (0.61692,-0.17514,0.76729)
+ Old Polarization:       (-0.53563,-0.80774,0.24629)
+ New Momentum Direction: (0.83481,-0.237,0.4969)
+ New Polarization:       (0.011823,-0.89466,-0.44658)
  *** FresnelRefraction *** 
-Track (trackID 1363, parentID 1) is processed with stopping code 2
+Track (trackID 1491, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64903,-0.72685,0.22459)
- Old Polarization:       (0.01378,0.3064,0.9518)
- New Momentum Direction: (0.87919,-0.3667,0.30423)
- New Polarization:       (-0.05498,0.55618,0.82924)
+ Old Momentum Direction: (0.97524,0.075598,-0.20781)
+ Old Polarization:       (-0.13857,-0.52346,-0.84071)
+ New Momentum Direction: (0.95368,0.10284,-0.28271)
+ New Polarization:       (-0.22238,-0.39191,-0.89272)
  *** FresnelRefraction *** 
-Track (trackID 1362, parentID 1) is processed with stopping code 2
+Track (trackID 1490, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.12279,-0.98792,0.094559)
- Old Polarization:       (-0.57995,0.0058903,0.81463)
- New Momentum Direction: (0.1651,-0.97805,0.12715)
- New Polarization:       (-0.56971,0.010659,0.82178)
+ Old Momentum Direction: (0.30967,0.30641,0.90012)
+ Old Polarization:       (-0.87945,-0.26758,0.39365)
+ New Momentum Direction: (0.41951,0.41508,0.80729)
+ New Polarization:       (0.31366,0.76827,-0.55801)
  *** FresnelRefraction *** 
-Track (trackID 1361, parentID 1) is processed with stopping code 2
+Track (trackID 1489, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75471,-0.11447,-0.64599)
- Old Polarization:       (0.13116,0.99111,-0.022389)
- New Momentum Direction: (0.45683,-0.15521,-0.87591)
- New Polarization:       (-0.25404,0.92089,-0.29568)
+ Old Momentum Direction: (0.31097,0.89223,0.32745)
+ Old Polarization:       (-0.88337,0.39844,-0.24677)
+ New Momentum Direction: (0.41833,0.79433,0.4405)
+ New Polarization:       (0.24631,-0.56601,0.78674)
  *** FresnelRefraction *** 
-Track (trackID 1360, parentID 1) is processed with stopping code 2
+Track (trackID 1488, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1359, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44693,0.89381,0.036768)
+ Old Polarization:       (-0.72483,0.38591,-0.5707)
+ New Momentum Direction: (0.60699,0.79314,0.049937)
+ New Polarization:       (0.75897,-0.55992,-0.33234)
+ *** FresnelRefraction *** 
+Track (trackID 1487, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.20591,-0.71476,-0.66837)
- Old Polarization:       (-0.94639,0.31917,-0.049752)
- New Momentum Direction: (-0.27839,-0.32554,-0.90362)
- New Polarization:       (-0.81388,0.57951,0.041968)
+ Old Momentum Direction: (0.5177,0.85302,-0.065966)
+ Old Polarization:       (-0.64586,0.33908,-0.68402)
+ New Momentum Direction: (0.70385,0.70466,-0.089686)
+ New Polarization:       (0.45524,-0.54439,-0.70456)
+ *** FresnelRefraction *** 
+Track (trackID 1486, parentID 1) is processed with stopping code 2
+### pop requested out of 65 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.91907,-0.28584,0.2713)
+ Old Polarization:       (-0.19773,-0.92996,-0.30997)
+ New Momentum Direction: (0.8455,-0.38731,0.3676)
+ New Polarization:       (-0.33252,-0.92053,-0.20507)
  *** FresnelRefraction *** 
-Track (trackID 1358, parentID 1) is processed with stopping code 2
-### pop requested out of 65 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1357, parentID 1) is processed with stopping code 2
+Track (trackID 1485, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85889,-0.1421,-0.49205)
- Old Polarization:       (0.24467,0.95786,0.15046)
- New Momentum Direction: (0.71801,-0.19312,-0.66871)
- New Polarization:       (-0.42095,0.64464,-0.63815)
+ Old Momentum Direction: (0.23052,0.75018,0.61975)
+ Old Polarization:       (-0.9696,0.23084,0.081229)
+ New Momentum Direction: (0.31176,0.44749,0.83818)
+ New Polarization:       (-0.749,-0.42704,0.50658)
  *** FresnelRefraction *** 
-Track (trackID 1356, parentID 1) is processed with stopping code 2
+Track (trackID 1484, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74516,-0.11429,-0.65702)
- Old Polarization:       (0.12111,0.99201,-0.035209)
- New Momentum Direction: (0.42825,-0.15487,-0.89029)
- New Polarization:       (-0.23676,0.93156,-0.27594)
+ Old Momentum Direction: (0.5014,0.86449,-0.035422)
+ Old Polarization:       (-0.66534,0.35907,-0.65452)
+ New Momentum Direction: (0.67819,0.73333,-0.047911)
+ New Polarization:       (0.55674,-0.55524,-0.61785)
  *** FresnelRefraction *** 
-Track (trackID 1355, parentID 1) is processed with stopping code 2
+Track (trackID 1483, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1354, parentID 1) is processed with stopping code 2
-### pop requested out of 61 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.21895,-0.75734,-0.61522)
- Old Polarization:       (-0.96261,0.27073,0.0093095)
- New Momentum Direction: (-0.21895,0.75734,-0.61522)
- New Polarization:       (0.96377,0.069409,-0.25754)
- *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.21895,0.75734,-0.61522)
- Old Polarization:       (0.96377,0.069409,-0.25754)
- New Momentum Direction: (-0.21895,0.75734,0.61522)
- New Polarization:       (-0.96377,-0.069409,-0.25754)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.85634,-0.30976,0.41319)
+ Old Polarization:       (-0.27035,-0.95063,-0.15235)
+ New Momentum Direction: (0.71167,-0.42139,0.5621)
+ New Polarization:       (-0.458,-0.88501,-0.083598)
+ *** FresnelRefraction *** 
+Track (trackID 1482, parentID 1) is processed with stopping code 2
+### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.21895,0.75734,0.61522)
- Old Polarization:       (-0.96377,-0.069409,-0.25754)
- New Momentum Direction: (-0.29569,0.4714,0.83087)
- New Polarization:       (-0.95521,-0.13487,-0.26342)
+ Old Momentum Direction: (0.9798,0.052214,-0.19303)
+ Old Polarization:       (-0.1332,-0.54959,-0.82475)
+ New Momentum Direction: (0.96231,0.071008,-0.26251)
+ New Polarization:       (-0.21017,-0.41841,-0.88361)
  *** FresnelRefraction *** 
-Track (trackID 1353, parentID 1) is processed with stopping code 2
+Track (trackID 1481, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1352, parentID 1) is processed with stopping code 2
-### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79259,-0.58958,0.15557)
- Old Polarization:       (0.17148,0.46036,0.87101)
- New Momentum Direction: (0.56031,-0.80087,0.21132)
- New Polarization:       (-0.32035,0.025739,0.94695)
+ Old Momentum Direction: (0.87098,0.38773,-0.30174)
+ Old Polarization:       (-0.25114,-0.17651,-0.95172)
+ New Momentum Direction: (0.74654,0.52507,-0.40862)
+ New Polarization:       (-0.42318,-0.099196,-0.9006)
  *** FresnelRefraction *** 
-Track (trackID 1351, parentID 1) is processed with stopping code 2
+Track (trackID 1480, parentID 1) is processed with stopping code 2
+### pop requested out of 59 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1479, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.15278,-0.61764,-0.77148)
- Old Polarization:       (-0.88811,0.42823,-0.16696)
- New Momentum Direction: (-0.20632,-0.83408,-0.51162)
- New Polarization:       (-0.94901,0.043213,0.31226)
+ Old Momentum Direction: (0.29464,0.33777,0.89392)
+ Old Polarization:       (-0.8941,-0.23273,0.38264)
+ New Momentum Direction: (0.40025,0.45883,0.79327)
+ New Polarization:       (0.17305,0.81222,-0.5571)
  *** FresnelRefraction *** 
-Track (trackID 1350, parentID 1) is processed with stopping code 2
+Track (trackID 1478, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1349, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.28025,0.39556,0.87464)
+ Old Polarization:       (-0.9144,-0.16725,0.36864)
+ New Momentum Direction: (0.37873,0.53456,0.75552)
+ New Polarization:       (-0.057635,0.82837,-0.55721)
+ *** FresnelRefraction *** 
+Track (trackID 1477, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1348, parentID 1) is processed with stopping code 2
-### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92767,-0.36484,-0.079571)
- Old Polarization:       (0.33374,0.71448,0.61493)
- New Momentum Direction: (0.86423,-0.49154,-0.1072)
- New Polarization:       (-0.47204,-0.86597,0.16514)
+ Old Momentum Direction: (0.84241,0.44657,-0.30154)
+ Old Polarization:       (-0.28261,-0.11029,-0.95287)
+ New Momentum Direction: (0.68446,0.60421,-0.40797)
+ New Polarization:       (-0.47527,-0.054539,-0.87815)
  *** FresnelRefraction *** 
-Track (trackID 1347, parentID 1) is processed with stopping code 2
+Track (trackID 1476, parentID 1) is processed with stopping code 2
+### pop requested out of 55 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1475, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.066805,-0.38122,-0.92207)
- Old Polarization:       (-0.63863,0.6937,-0.33307)
- New Momentum Direction: (0.090444,-0.51612,-0.85173)
- New Polarization:       (-0.25562,-0.83861,0.48103)
+ Old Momentum Direction: (0.98624,-0.16444,0.017332)
+ Old Polarization:       (-0.12208,-0.79484,-0.59441)
+ New Momentum Direction: (0.97461,-0.22268,0.023471)
+ New Polarization:       (-0.18573,-0.86251,-0.47072)
  *** FresnelRefraction *** 
-Track (trackID 1346, parentID 1) is processed with stopping code 2
+Track (trackID 1474, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1345, parentID 1) is processed with stopping code 2
+Track (trackID 1473, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1344, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29397,0.89049,0.34729)
+ Old Polarization:       (-0.89568,0.38349,-0.22513)
+ New Momentum Direction: (0.39891,0.78663,0.47126)
+ New Polarization:       (0.14138,-0.56054,0.81597)
+ *** FresnelRefraction *** 
+Track (trackID 1472, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.081744,-0.99272,-0.088513)
- Old Polarization:       (-0.80073,0.012536,0.5989)
- New Momentum Direction: (-0.11112,-0.9865,-0.12032)
- New Polarization:       (-0.82163,0.023082,0.56955)
+ Old Momentum Direction: (0.9784,0.075243,-0.19253)
+ Old Polarization:       (-0.12419,-0.53061,-0.83847)
+ New Momentum Direction: (0.96059,0.10118,-0.25889)
+ New Polarization:       (-0.19784,-0.40536,-0.89249)
  *** FresnelRefraction *** 
-Track (trackID 1343, parentID 1) is processed with stopping code 2
+Track (trackID 1471, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89924,-0.18472,-0.39654)
- Old Polarization:       (0.3014,0.9186,0.25559)
- New Momentum Direction: (0.80783,-0.24889,-0.53429)
- New Polarization:       (-0.46737,0.28183,-0.83794)
+ Old Momentum Direction: (0.39049,0.9092,0.14446)
+ Old Polarization:       (-0.79072,0.4116,-0.45316)
+ New Momentum Direction: (0.52738,0.82693,0.1951)
+ New Polarization:       (0.80917,-0.55886,0.18144)
  *** FresnelRefraction *** 
-Track (trackID 1342, parentID 1) is processed with stopping code 2
+Track (trackID 1470, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65403,-0.72278,0.22322)
- Old Polarization:       (0.019352,0.31098,0.95022)
- New Momentum Direction: (0.88599,-0.35153,0.30239)
- New Polarization:       (-0.056577,0.56531,0.82294)
+ Old Momentum Direction: (0.98114,0.050795,-0.18653)
+ Old Polarization:       (-0.12775,-0.55385,-0.82276)
+ New Momentum Direction: (0.96513,0.068784,-0.25259)
+ New Polarization:       (-0.20078,-0.42469,-0.8828)
  *** FresnelRefraction *** 
-Track (trackID 1341, parentID 1) is processed with stopping code 2
+Track (trackID 1469, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1340, parentID 1) is processed with stopping code 2
-### pop requested out of 47 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1339, parentID 1) is processed with stopping code 2
-### pop requested out of 46 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1338, parentID 1) is processed with stopping code 2
-### pop requested out of 45 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.63323,-0.1172,-0.76504)
-Old Polarization: (-0.004709,0.98787,-0.15523)
-New Polarization: (0.68761,0.3557,-0.50208)
-Polarization Change: (0.7452,0.38549,-0.54413)
-New Momentum Direction: (0.63918,-0.42986,0.57085)
-Momentum Change: (0.66668,-0.44835,0.59541)
  Photon at Boundary! 
- Old Momentum Direction: (0.66668,-0.44835,0.59541)
- Old Polarization:       (0.7452,0.38549,-0.54413)
- New Momentum Direction: (-0.66668,-0.44835,0.59541)
- New Polarization:       (0.7452,-0.38549,0.54413)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.3323,0.90706,0.25849)
+ Old Polarization:       (-0.85459,0.40552,-0.32439)
+ New Momentum Direction: (0.44986,0.82168,0.34995)
+ New Polarization:       (0.51344,-0.55855,0.65146)
+ *** FresnelRefraction *** 
+Track (trackID 1468, parentID 1) is processed with stopping code 2
+### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.66668,-0.44835,0.59541)
- Old Polarization:       (0.7452,-0.38549,0.54413)
- New Momentum Direction: (-0.66668,0.44835,0.59541)
- New Polarization:       (-0.7452,-0.38549,-0.54413)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.50967,0.85916,-0.045496)
+ Old Polarization:       (-0.65621,0.35399,-0.6664)
+ New Momentum Direction: (0.68894,0.7222,-0.061499)
+ New Polarization:       (0.52134,-0.55269,-0.65018)
+ *** FresnelRefraction *** 
+Track (trackID 1467, parentID 1) is processed with stopping code 2
+### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.66668,0.44835,0.59541)
- Old Polarization:       (-0.7452,-0.38549,-0.54413)
- New Momentum Direction: (-0.66668,0.44835,-0.59541)
- New Polarization:       (0.7452,0.38549,-0.54413)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.66668,0.44835,-0.59541)
-Old Polarization: (0.7452,0.38549,-0.54413)
-New Polarization: (-0.065508,0.76303,-0.47375)
-Polarization Change: (-0.072744,0.84732,-0.52608)
-New Momentum Direction: (0.84627,-0.19503,-0.43113)
-Momentum Change: (0.87282,-0.20115,-0.44466)
+ Old Momentum Direction: (0.99309,-0.070172,-0.09402)
+ Old Polarization:       (-0.11644,-0.6873,-0.71698)
+ New Momentum Direction: (0.98724,-0.09523,-0.12759)
+ New Polarization:       (-0.15857,-0.6603,-0.73407)
+ *** FresnelRefraction *** 
+Track (trackID 1466, parentID 1) is processed with stopping code 2
+### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87282,-0.20115,-0.44466)
- Old Polarization:       (-0.072744,0.84732,-0.52608)
- New Momentum Direction: (0.74964,-0.27278,-0.60302)
- New Polarization:       (-0.1355,0.82856,-0.54326)
+ Old Momentum Direction: (0.2489,0.83105,0.49739)
+ Old Polarization:       (-0.94638,0.31789,-0.057571)
+ New Momentum Direction: (0.33758,0.65646,0.67461)
+ New Polarization:       (-0.43359,-0.52768,0.73045)
  *** FresnelRefraction *** 
-Track (trackID 1337, parentID 1) is processed with stopping code 2
+Track (trackID 1465, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (-0.14407,-0.59091,-0.79377)
-Old Polarization: (-0.86919,0.459,-0.18394)
-New Polarization: (-0.8558,0.15832,-0.21689)
-Polarization Change: (-0.95413,0.17652,-0.24181)
-New Momentum Direction: (-0.15242,0.31869,0.83406)
-Momentum Change: (-0.16827,0.35183,0.92081)
-
-** Photon absorbed! **
-Track (trackID 1336, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29683,0.35035,0.88834)
+ Old Polarization:       (-0.89656,-0.21801,0.38556)
+ New Momentum Direction: (0.40073,0.47297,0.78467)
+ New Polarization:       (0.13426,0.81689,-0.56096)
+ *** FresnelRefraction *** 
+Track (trackID 1464, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.24581,-0.26704,-0.93181)
- Old Polarization:       (-0.43956,0.82607,-0.3527)
- New Momentum Direction: (0.33086,-0.35944,-0.87255)
- New Polarization:       (0.71116,-0.51281,0.48091)
+ Old Momentum Direction: (0.84647,0.437,-0.30415)
+ Old Polarization:       (-0.27936,-0.12177,-0.95243)
+ New Momentum Direction: (0.69194,0.59256,-0.41242)
+ New Polarization:       (-0.47122,-0.062118,-0.87983)
  *** FresnelRefraction *** 
-Track (trackID 1335, parentID 1) is processed with stopping code 2
+Track (trackID 1463, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92784,-0.36809,-0.06021)
- Old Polarization:       (0.32124,0.7066,0.6305)
- New Momentum Direction: (0.86199,-0.50027,-0.081832)
- New Polarization:       (-0.46581,-0.84538,0.26144)
+ Old Momentum Direction: (0.89884,-0.29439,0.32468)
+ Old Polarization:       (-0.21857,-0.94322,-0.25014)
+ New Momentum Direction: (0.80564,-0.39792,0.43886)
+ New Polarization:       (-0.36738,-0.91676,-0.15682)
  *** FresnelRefraction *** 
-Track (trackID 1334, parentID 1) is processed with stopping code 2
+Track (trackID 1462, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.067423,-0.9952,-0.070925)
- Old Polarization:       (-0.78545,0.009109,0.61885)
- New Momentum Direction: (-0.091598,-0.99112,-0.096356)
- New Polarization:       (-0.80508,0.016762,0.59292)
- *** FresnelRefraction *** 
-Track (trackID 1333, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1461, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.22009,-0.74145,-0.63389)
- Old Polarization:       (-0.9567,0.29096,-0.0081609)
- New Momentum Direction: (-0.29871,-0.41302,-0.86034)
- New Polarization:       (-0.84813,0.52821,0.0409)
+ Old Momentum Direction: (0.80696,-0.29945,0.50906)
+ Old Polarization:       (-0.32305,-0.94536,-0.043998)
+ New Momentum Direction: (0.59979,-0.40571,0.68968)
+ New Polarization:       (-0.54348,-0.83916,-0.020997)
  *** FresnelRefraction *** 
-Track (trackID 1332, parentID 1) is processed with stopping code 2
+Track (trackID 1460, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85893,-0.5051,0.084348)
- Old Polarization:       (0.24818,0.55466,0.7942)
- New Momentum Direction: (0.71993,-0.68456,0.11432)
- New Polarization:       (-0.42382,-0.30319,0.8535)
+ Old Momentum Direction: (0.97381,0.082206,-0.21197)
+ Old Polarization:       (-0.14037,-0.51601,-0.845)
+ New Momentum Direction: (0.95094,0.11186,-0.28843)
+ New Polarization:       (-0.22621,-0.38458,-0.89495)
  *** FresnelRefraction *** 
-Track (trackID 1331, parentID 1) is processed with stopping code 2
+Track (trackID 1459, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.13874,-0.58476,-0.79926)
- Old Polarization:       (-0.86409,0.46578,-0.19078)
- New Momentum Direction: (-0.1886,-0.79489,-0.5767)
- New Polarization:       (-0.93526,-0.033737,0.35235)
+ Old Momentum Direction: (0.95233,-0.24892,0.17639)
+ Old Polarization:       (-0.15659,-0.89504,-0.4176)
+ New Momentum Direction: (0.91141,-0.33575,0.23793)
+ New Polarization:       (-0.2594,-0.9176,-0.30121)
  *** FresnelRefraction *** 
-Track (trackID 1330, parentID 1) is processed with stopping code 2
+Track (trackID 1458, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.92475,-0.21484,-0.31414)
- Old Polarization:       (0.32283,0.87995,0.34853)
- New Momentum Direction: (0.85693,-0.29096,-0.42545)
- New Polarization:       (-0.46902,-0.097888,-0.87775)
+Scattering Photon!
+Old Momentum Direction: (0.98086,0.045411,-0.18934)
+Old Polarization: (-0.13251,-0.55681,-0.82001)
+New Polarization: (0.94421,0.32895,0.016159)
+Polarization Change: (0.94421,0.32895,0.016159)
+New Momentum Direction: (0.18067,-0.47633,-0.8605)
+Momentum Change: (0.18067,-0.47633,-0.8605)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18067,-0.47633,-0.8605)
+ Old Polarization:       (0.94421,0.32895,0.016159)
+ New Momentum Direction: (0.24584,-0.64812,-0.72077)
+ New Polarization:       (0.94541,0.32444,0.03072)
  *** FresnelRefraction *** 
-Track (trackID 1329, parentID 1) is processed with stopping code 2
+Track (trackID 1457, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41049,-0.17521,-0.89488)
- Old Polarization:       (-0.25388,0.9206,-0.2967)
- New Momentum Direction: (0.55813,-0.23822,-0.79482)
- New Polarization:       (0.81498,0.33737,0.47116)
+ Old Momentum Direction: (0.83317,0.46352,-0.30161)
+ Old Polarization:       (-0.29349,-0.091644,-0.95156)
+ New Momentum Direction: (0.66268,0.62772,-0.40845)
+ New Polarization:       (-0.49397,-0.043576,-0.86839)
  *** FresnelRefraction *** 
-Track (trackID 1328, parentID 1) is processed with stopping code 2
+Track (trackID 1456, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4604,-0.1645,-0.87234)
- Old Polarization:       (-0.19659,0.93939,-0.2809)
- New Momentum Direction: (0.4604,-0.1645,0.87234)
- New Polarization:       (-0.13657,-0.98411,-0.1135)
+ Old Momentum Direction: (0.65978,0.72039,-0.21383)
+ Old Polarization:       (-0.48787,0.19421,-0.85104)
+ New Momentum Direction: (0.89501,0.33884,-0.29007)
+ New Polarization:       (-0.15192,-0.37986,-0.91249)
+ *** FresnelRefraction *** 
+Track (trackID 1455, parentID 1) is processed with stopping code 2
+### pop requested out of 34 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.23679,0.544,0.80498)
+ Old Polarization:       (-0.95877,-0.003182,0.28417)
+ New Momentum Direction: (0.32154,0.73871,0.59238)
+ New Polarization:       (-0.57945,0.64829,-0.49391)
+ *** FresnelRefraction *** 
+Track (trackID 1454, parentID 1) is processed with stopping code 2
+### pop requested out of 33 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.36884,0.16466,0.91479)
+ Old Polarization:       (-0.81058,-0.42466,0.40326)
+ New Momentum Direction: (0.5019,0.22405,0.8354)
+ New Polarization:       (0.77914,0.30226,-0.54916)
+ *** FresnelRefraction *** 
+Track (trackID 1453, parentID 1) is processed with stopping code 2
+### pop requested out of 32 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1452, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.88902,-0.29394,0.35107)
+ Old Polarization:       (-0.22681,-0.94876,-0.22002)
+ New Momentum Direction: (0.78738,-0.39575,0.47266)
+ New Polarization:       (-0.37964,-0.91538,-0.13402)
+ *** FresnelRefraction *** 
+Track (trackID 1451, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1450, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.36674,0.19052,0.91061)
+ Old Polarization:       (-0.81873,-0.39872,0.41316)
+ New Momentum Direction: (0.49431,0.25679,0.83049)
+ New Polarization:       (0.7289,0.39814,-0.55695)
+ *** FresnelRefraction *** 
+Track (trackID 1449, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1448, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1447, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.32219,0.9045,0.2794)
+ Old Polarization:       (-0.86519,0.40113,-0.3009)
+ New Momentum Direction: (0.43662,0.81609,0.37863)
+ New Polarization:       (0.43019,-0.55902,0.70882)
+ *** FresnelRefraction *** 
+Track (trackID 1446, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.98304,0.041474,-0.17863)
+ Old Polarization:       (-0.12435,-0.56518,-0.81554)
+ New Momentum Direction: (0.96876,0.056087,-0.24157)
+ New Polarization:       (-0.19367,-0.43728,-0.87822)
+ *** FresnelRefraction *** 
+Track (trackID 1445, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.33482,0.2368,0.91204)
+ Old Polarization:       (-0.84866,-0.34484,0.40108)
+ New Momentum Direction: (0.45534,0.32203,0.83004)
+ New Polarization:       (0.58155,0.59834,-0.55117)
+ *** FresnelRefraction *** 
+Track (trackID 1444, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40875,0.096434,0.90754)
+ Old Polarization:       (-0.76762,-0.50154,0.39903)
+ New Momentum Direction: (0.55479,0.13089,0.82163)
+ New Polarization:       (0.83112,-0.042025,-0.55451)
+ *** FresnelRefraction *** 
+Track (trackID 1443, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.84505,0.43924,-0.30489)
+ Old Polarization:       (-0.2814,-0.11953,-0.95212)
+ New Momentum Direction: (0.68815,0.59605,-0.41373)
+ New Polarization:       (-0.47508,-0.060835,-0.87784)
+ *** FresnelRefraction *** 
+Track (trackID 1442, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.23843,0.59841,0.76489)
+ Old Polarization:       (-0.96593,0.064489,0.25065)
+ New Momentum Direction: (0.32072,0.80494,0.49921)
+ New Polarization:       (-0.69945,0.55666,-0.44822)
+ *** FresnelRefraction *** 
+Track (trackID 1441, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.93433,-0.2767,0.22465)
+Old Polarization: (-0.18383,-0.91412,-0.36137)
+New Polarization: (-0.16354,-0.29686,-0.94081)
+Polarization Change: (-0.16354,-0.29686,-0.94081)
+New Momentum Direction: (0.10288,0.94332,-0.31553)
+Momentum Change: (0.10288,0.94332,-0.31553)
+Scattering Photon!
+Old Momentum Direction: (0.10288,0.94332,-0.31553)
+Old Polarization: (-0.16354,-0.29686,-0.94081)
+New Polarization: (0.74445,0.014196,-0.66752)
+Polarization Change: (0.74445,0.014196,-0.66752)
+New Momentum Direction: (-0.62127,-0.35149,-0.70034)
+Momentum Change: (-0.62127,-0.35149,-0.70034)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.62127,-0.35149,-0.70034)
+ Old Polarization:       (0.74445,0.014196,-0.66752)
+ New Momentum Direction: (-0.84508,-0.47812,-0.23927)
+ New Polarization:       (-0.087747,-0.31743,0.94421)
+ *** FresnelRefraction *** 
+Track (trackID 1440, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.77709,-0.29129,0.55793)
+ Old Polarization:       (-0.3571,-0.93401,0.0097317)
+ New Momentum Direction: (0.52031,-0.39523,0.75701)
+ New Polarization:       (-0.60162,-0.79878,-0.0035337)
+ *** FresnelRefraction *** 
+Track (trackID 1439, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.38603,0.14353,0.91125)
+ Old Polarization:       (-0.79452,-0.4502,0.4075)
+ New Momentum Direction: (0.52247,0.19426,0.83023)
+ New Polarization:       (0.8108,0.18813,-0.55426)
+ *** FresnelRefraction *** 
+Track (trackID 1438, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.86005,0.41351,-0.29888)
+ Old Polarization:       (-0.26107,-0.14663,-0.95412)
+ New Momentum Direction: (-0.86005,0.41351,-0.29888)
+ New Polarization:       (0.083786,0.6923,0.71673)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.4604,-0.1645,0.87234)
- Old Polarization:       (-0.13657,-0.98411,-0.1135)
- New Momentum Direction: (-0.4604,-0.1645,0.87234)
- New Polarization:       (-0.13657,0.98411,0.1135)
+ Old Momentum Direction: (-0.86005,0.41351,-0.29888)
+ Old Polarization:       (0.083786,0.6923,0.71673)
+ New Momentum Direction: (-0.86005,-0.41351,-0.29888)
+ New Polarization:       (-0.083786,0.6923,-0.71673)
  *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1437, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.4604,-0.1645,0.87234)
- Old Polarization:       (-0.13657,0.98411,0.1135)
- New Momentum Direction: (-0.62164,-0.22211,0.75115)
- New Polarization:       (-0.54093,0.8153,-0.20659)
+ Old Momentum Direction: (0.89878,0.3218,-0.29774)
+ Old Polarization:       (-0.22243,-0.25051,-0.94222)
+ New Momentum Direction: (0.80323,0.43723,-0.40454)
+ New Polarization:       (-0.37598,-0.15462,-0.91364)
  *** FresnelRefraction *** 
-Track (trackID 1327, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
+Track (trackID 1436, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1435, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1434, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.18211,-0.97332,0.13959)
- Old Polarization:       (-0.51017,0.027834,0.85963)
- New Momentum Direction: (0.24608,-0.95072,0.18863)
- New Polarization:       (-0.47682,0.050694,0.87754)
+ Old Momentum Direction: (0.91338,0.28492,-0.29079)
+ Old Polarization:       (-0.20644,-0.29148,-0.93404)
+ New Momentum Direction: (0.83297,0.38725,-0.39522)
+ New Polarization:       (-0.34852,-0.1876,-0.91834)
  *** FresnelRefraction *** 
-Track (trackID 1326, parentID 1) is processed with stopping code 2
-### pop requested out of 33 stacked tracks.
+Track (trackID 1433, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1432, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39614,-0.18846,-0.89864)
- Old Polarization:       (-0.26912,0.91189,-0.30988)
- New Momentum Direction: (0.53514,-0.25459,-0.80548)
- New Polarization:       (0.8408,0.25281,0.4787)
+ Old Momentum Direction: (0.51909,-0.072757,0.85161)
+ Old Polarization:       (-0.64423,-0.6881,0.3339)
+ New Momentum Direction: (0.70603,-0.098958,0.70124)
+ New Polarization:       (0.43479,-0.72103,-0.53951)
  *** FresnelRefraction *** 
-Track (trackID 1325, parentID 1) is processed with stopping code 2
-### pop requested out of 32 stacked tracks.
+Track (trackID 1431, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93919,-0.29392,-0.17756)
- Old Polarization:       (0.34332,0.79329,0.50281)
- New Momentum Direction: (0.88598,-0.39691,-0.23977)
- New Polarization:       (-0.46367,-0.76593,-0.44538)
+ Old Momentum Direction: (0.23261,0.56059,0.79475)
+ Old Polarization:       (-0.96236,0.014549,0.2714)
+ New Momentum Direction: (0.31623,0.76211,0.56497)
+ New Polarization:       (-0.62514,0.61535,-0.48016)
  *** FresnelRefraction *** 
-Track (trackID 1324, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
+Track (trackID 1430, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1429, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.26931,-0.24281,-0.93194)
- Old Polarization:       (-0.41086,0.84625,-0.33921)
- New Momentum Direction: (0.36583,-0.32984,-0.87027)
- New Polarization:       (0.80086,-0.3648,0.47492)
+ Old Momentum Direction: (0.84809,0.43276,-0.30572)
+ Old Polarization:       (-0.2784,-0.12697,-0.95204)
+ New Momentum Direction: (0.69452,0.58764,-0.41513)
+ New Polarization:       (-0.47046,-0.065615,-0.87998)
  *** FresnelRefraction *** 
-Track (trackID 1323, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
+Track (trackID 1428, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.92143,-0.28729,0.26161)
+ Old Polarization:       (-0.19786,-0.92638,-0.32043)
+ New Momentum Direction: (0.84903,-0.39065,0.35573)
+ New Polarization:       (-0.33369,-0.91849,-0.2122)
+ *** FresnelRefraction *** 
+Track (trackID 1427, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1426, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1425, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29788,0.88959,0.34627)
+ Old Polarization:       (-0.89386,0.38726,-0.22593)
+ New Momentum Direction: (0.40291,0.78632,0.46836)
+ New Polarization:       (0.15358,-0.56257,0.81236)
+ *** FresnelRefraction *** 
+Track (trackID 1424, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1423, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.082764,-0.52581,-0.84657)
- Old Polarization:       (-0.80878,0.53176,-0.25121)
- New Momentum Direction: (-0.1118,-0.7103,-0.69496)
- New Polarization:       (-0.85683,-0.28532,0.42947)
+ Old Momentum Direction: (0.78803,0.54205,-0.29188)
+ Old Polarization:       (-0.34461,-0.0044832,-0.93874)
+ New Momentum Direction: (0.55059,0.73499,-0.39577)
+ New Polarization:       (-0.58011,-0.0040327,-0.81453)
  *** FresnelRefraction *** 
-Track (trackID 1322, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
+Track (trackID 1422, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 104
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.17611,-0.29757,-0.93832)
- Old Polarization:       (-0.51431,0.78495,-0.34546)
- New Momentum Direction: (0.23937,-0.40445,-0.88268)
- New Polarization:       (0.42247,-0.77515,0.46975)
- *** FresnelRefraction *** 
-Track (trackID 1321, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
+ Old Momentum Direction: (0.63546,0.54394,0.54801)
+ Old Polarization:       (-0.65617,0.0063409,0.75458)
+ New Momentum Direction: (-0.63546,0.54394,0.54801)
+ New Polarization:       (-0.65617,-0.0063409,-0.75458)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.93999,-0.29572,-0.17017)
- Old Polarization:       (0.34079,0.78973,0.51009)
- New Momentum Direction: (0.88698,-0.40027,-0.23034)
- New Polarization:       (-0.46152,-0.78592,-0.41149)
- *** FresnelRefraction *** 
-Track (trackID 1320, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
+ Old Momentum Direction: (-0.63546,0.54394,0.54801)
+ Old Polarization:       (-0.65617,-0.0063409,-0.75458)
+ New Momentum Direction: (-0.63546,0.54394,-0.54801)
+ New Polarization:       (0.65617,0.0063409,-0.75458)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63546,0.54394,-0.54801)
+ Old Polarization:       (0.65617,0.0063409,-0.75458)
+ New Momentum Direction: (-0.63546,-0.54394,-0.54801)
+ New Polarization:       (-0.65617,0.0063409,0.75458)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1319, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
+Track (trackID 1648, parentID 1) is processed with stopping code 2
+### pop requested out of 104 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1318, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
+Track (trackID 1647, parentID 1) is processed with stopping code 2
+### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.062079,-0.996,0.064201)
- Old Polarization:       (-0.64048,0.0095787,0.76792)
- New Momentum Direction: (0.084444,-0.99259,0.08733)
- New Polarization:       (-0.61103,0.017646,0.79141)
+ Old Momentum Direction: (0.94507,-0.30551,-0.11622)
+ Old Polarization:       (-0.30677,-0.95176,0.0073682)
+ New Momentum Direction: (0.8964,-0.41429,-0.15759)
+ New Polarization:       (-0.42802,-0.90144,-0.064841)
  *** FresnelRefraction *** 
-Track (trackID 1317, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
+Track (trackID 1646, parentID 1) is processed with stopping code 2
+### pop requested out of 102 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.63609,0.54438,0.54685)
+Old Polarization: (-0.6556,0.0075434,0.75507)
+New Polarization: (-0.18674,-0.30826,0.93279)
+Polarization Change: (-0.18674,-0.30826,0.93279)
+New Momentum Direction: (-0.88635,0.46236,-0.024639)
+Momentum Change: (-0.88635,0.46236,-0.024639)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.88635,0.46236,-0.024639)
+ Old Polarization:       (-0.18674,-0.30826,0.93279)
+ New Momentum Direction: (-0.88635,-0.46236,-0.024639)
+ New Polarization:       (0.18674,-0.30826,-0.93279)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1645, parentID 1) is processed with stopping code 2
+### pop requested out of 101 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37296,-0.90019,0.22486)
- Old Polarization:       (-0.2955,0.11449,0.94846)
- New Momentum Direction: (0.5065,-0.80635,0.30538)
- New Polarization:       (-0.24006,0.20829,0.94815)
- *** FresnelRefraction *** 
-Track (trackID 1316, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
+ Old Momentum Direction: (0.48728,0.61429,-0.62065)
+ Old Polarization:       (-0.82329,0.086216,-0.56104)
+ New Momentum Direction: (0.48728,0.61429,0.62065)
+ New Polarization:       (0.82329,-0.086216,-0.56104)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.17891,-0.64577,-0.74227)
- Old Polarization:       (-0.9085,0.39803,-0.1273)
- New Momentum Direction: (-0.24324,-0.87798,-0.4123)
- New Polarization:       (-0.95666,0.147,0.25136)
- *** FresnelRefraction *** 
-Track (trackID 1315, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+ Old Momentum Direction: (0.48728,0.61429,0.62065)
+ Old Polarization:       (0.82329,-0.086216,-0.56104)
+ New Momentum Direction: (0.48728,-0.61429,0.62065)
+ New Polarization:       (-0.82329,-0.086216,0.56104)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.92557,-0.21572,-0.3111)
- Old Polarization:       (0.32303,0.87853,0.35189)
- New Momentum Direction: (0.85841,-0.2923,-0.42154)
- New Polarization:       (-0.46851,-0.11208,-0.87632)
- *** FresnelRefraction *** 
-Track (trackID 1314, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
+ Old Momentum Direction: (0.48728,-0.61429,0.62065)
+ Old Polarization:       (-0.82329,-0.086216,0.56104)
+ New Momentum Direction: (-0.48728,-0.61429,0.62065)
+ New Polarization:       (-0.82329,0.086216,-0.56104)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.15412,-0.98091,0.11859)
- Old Polarization:       (-0.54317,0.016143,0.83946)
- New Momentum Direction: (0.20767,-0.96506,0.15979)
- New Polarization:       (-0.52048,0.029296,0.85337)
- *** FresnelRefraction *** 
-Track (trackID 1313, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
+ Old Momentum Direction: (-0.48728,-0.61429,0.62065)
+ Old Polarization:       (-0.82329,0.086216,-0.56104)
+ New Momentum Direction: (-0.48728,-0.61429,-0.62065)
+ New Polarization:       (0.82329,-0.086216,-0.56104)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.48728,-0.61429,-0.62065)
+ Old Polarization:       (0.82329,-0.086216,-0.56104)
+ New Momentum Direction: (-0.48728,0.61429,-0.62065)
+ New Polarization:       (-0.82329,-0.086216,0.56104)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1312, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
+Track (trackID 1644, parentID 1) is processed with stopping code 2
+### pop requested out of 100 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1643, parentID 1) is processed with stopping code 2
+### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88562,-0.462,0.047353)
- Old Polarization:       (0.27404,0.60217,0.74986)
- New Momentum Direction: (0.77552,-0.62803,0.06437)
- New Polarization:       (-0.44946,-0.47764,0.75488)
+ Old Momentum Direction: (0.95292,-0.26823,0.14138)
+ Old Polarization:       (-0.29931,-0.9067,0.29716)
+ New Momentum Direction: (0.91118,-0.36447,0.19212)
+ New Polarization:       (-0.40915,-0.8553,0.31791)
  *** FresnelRefraction *** 
-Track (trackID 1311, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.90511,-0.42509,0.0090493)
-Old Polarization: (0.29492,0.643,0.7068)
-New Polarization: (0.23652,0.21782,0.81223)
-Polarization Change: (0.27075,0.24935,0.9298)
-New Momentum Direction: (0.86104,-0.45066,-0.12988)
-Momentum Change: (0.87818,-0.45963,-0.13246)
+Track (trackID 1642, parentID 1) is processed with stopping code 2
+### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87818,-0.45963,-0.13246)
- Old Polarization:       (0.27075,0.24935,0.9298)
- New Momentum Direction: (0.75942,-0.62516,-0.18016)
- New Polarization:       (-0.44929,-0.70421,0.54976)
+ Old Momentum Direction: (0.69977,0.40869,0.58591)
+ Old Polarization:       (-0.5838,-0.14551,0.79875)
+ New Momentum Direction: (0.24482,0.55469,0.79523)
+ New Polarization:       (-0.88454,-0.20811,0.41747)
  *** FresnelRefraction *** 
-Track (trackID 1310, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
+Track (trackID 1641, parentID 1) is processed with stopping code 2
+### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86796,-0.49173,0.069554)
- Old Polarization:       (0.2604,0.56988,0.77937)
- New Momentum Direction: (0.74057,-0.66536,0.094112)
- New Polarization:       (-0.43617,-0.36941,0.82054)
- *** FresnelRefraction *** 
-Track (trackID 1309, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+ Old Momentum Direction: (0.46968,0.66397,-0.58185)
+ Old Polarization:       (-0.8434,0.14269,-0.51799)
+ New Momentum Direction: (0.46968,-0.66397,-0.58185)
+ New Polarization:       (0.8434,0.14269,0.51799)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5499,-0.80055,0.23818)
- Old Polarization:       (-0.096186,0.22258,0.97016)
- New Momentum Direction: (0.74334,-0.58633,0.32197)
- New Polarization:       (-0.080715,0.39919,0.91331)
- *** FresnelRefraction *** 
-Track (trackID 1308, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
+ Old Momentum Direction: (0.46968,-0.66397,-0.58185)
+ Old Polarization:       (0.8434,0.14269,0.51799)
+ New Momentum Direction: (0.46968,-0.66397,0.58185)
+ New Polarization:       (-0.8434,-0.14269,0.51799)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.46968,-0.66397,0.58185)
+ Old Polarization:       (-0.8434,-0.14269,0.51799)
+ New Momentum Direction: (-0.46968,-0.66397,0.58185)
+ New Polarization:       (-0.8434,0.14269,-0.51799)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1307, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
+Track (trackID 1640, parentID 1) is processed with stopping code 2
+### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43336,-0.87177,0.22851)
- Old Polarization:       (-0.2267,0.13996,0.96386)
- New Momentum Direction: (0.584,-0.75108,0.30794)
- New Polarization:       (-0.17908,0.25079,0.95133)
+ Old Momentum Direction: (0.73051,0.055633,-0.68063)
+ Old Polarization:       (-0.54877,-0.54538,-0.63356)
+ New Momentum Direction: (0.38249,0.075271,-0.92089)
+ New Polarization:       (-0.82696,-0.41667,-0.37753)
  *** FresnelRefraction *** 
-Track (trackID 1306, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
+Track (trackID 1639, parentID 1) is processed with stopping code 2
+### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.53796,-0.14489,-0.83043)
- Old Polarization:       (-0.10743,0.9653,-0.23802)
- New Momentum Direction: (0.7238,-0.19494,-0.6619)
- New Polarization:       (0.56836,0.71237,0.4117)
+ Old Momentum Direction: (0.4233,0.8005,-0.42428)
+ Old Polarization:       (-0.89415,0.29367,-0.33801)
+ New Momentum Direction: (0.5756,0.57951,-0.57693)
+ New Polarization:       (-0.2959,-0.51011,-0.80761)
  *** FresnelRefraction *** 
-Track (trackID 1305, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+Track (trackID 1638, parentID 1) is processed with stopping code 2
+### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92525,-0.20974,-0.31612)
- Old Polarization:       (0.31829,0.88258,0.34604)
- New Momentum Direction: (0.85682,-0.28506,-0.42965)
- New Polarization:       (-0.46636,-0.073004,-0.88158)
+ Old Momentum Direction: (0.84118,0.094133,0.5325)
+ Old Polarization:       (-0.42052,-0.50521,0.7536)
+ New Momentum Direction: (0.68668,0.12655,0.71586)
+ New Polarization:       (-0.62782,-0.39321,0.67174)
  *** FresnelRefraction *** 
-Track (trackID 1304, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (-0.2337,-0.84668,-0.47804)
-Old Polarization: (-0.97063,0.17425,0.16589)
-New Polarization: (-0.88652,-0.083936,-0.024235)
-Polarization Change: (-0.99518,-0.094224,-0.027205)
-New Momentum Direction: (0.025274,-0.0098458,-0.89042)
-Momentum Change: (0.028371,-0.011052,-0.99954)
+Track (trackID 1637, parentID 1) is processed with stopping code 2
+### pop requested out of 93 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1636, parentID 1) is processed with stopping code 2
+### pop requested out of 92 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1635, parentID 1) is processed with stopping code 2
+### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.028371,-0.011052,-0.99954)
- Old Polarization:       (-0.99518,-0.094224,-0.027205)
- New Momentum Direction: (0.038539,-0.015014,-0.99914)
- New Polarization:       (0.74721,-0.66345,0.038791)
+ Old Momentum Direction: (0.83592,-0.15222,-0.52732)
+ Old Polarization:       (-0.43002,-0.77868,-0.45689)
+ New Momentum Direction: (0.66788,-0.20642,-0.71507)
+ New Polarization:       (-0.64786,-0.63416,-0.42205)
  *** FresnelRefraction *** 
-Track (trackID 1303, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
+Track (trackID 1634, parentID 1) is processed with stopping code 2
+### pop requested out of 90 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.2278,-0.78639,-0.57419)
- Old Polarization:       (-0.96929,0.23927,0.056854)
- New Momentum Direction: (-0.30834,-0.54855,-0.77719)
- New Polarization:       (-0.90115,0.43015,0.053909)
+ Old Momentum Direction: (0.41765,0.90103,-0.1171)
+ Old Polarization:       (-0.90699,0.42112,0.0055288)
+ New Momentum Direction: (0.56259,0.81155,-0.15774)
+ New Polarization:       (0.72109,-0.57501,-0.38652)
  *** FresnelRefraction *** 
-Track (trackID 1302, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
+Track (trackID 1633, parentID 1) is processed with stopping code 2
+### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.21565,-0.74973,-0.62562)
- Old Polarization:       (-0.96033,0.27883,-0.0031173)
- New Momentum Direction: (-0.29096,-0.45038,-0.8441)
- New Polarization:       (-0.86568,0.49959,0.031834)
+ Old Momentum Direction: (0.74896,0.02495,-0.66214)
+ Old Polarization:       (-0.5272,-0.58289,-0.6183)
+ New Momentum Direction: (0.44964,0.033633,-0.89257)
+ New Polarization:       (-0.79102,-0.44914,-0.41541)
  *** FresnelRefraction *** 
-Track (trackID 1301, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
+Track (trackID 1632, parentID 1) is processed with stopping code 2
+### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90161,-0.18105,-0.39284)
- Old Polarization:       (0.29784,0.91845,0.26028)
- New Momentum Direction: (0.81072,-0.24504,-0.53168)
- New Polarization:       (-0.46478,0.2828,-0.83905)
+ Old Momentum Direction: (0.94486,-0.30415,-0.12137)
+ Old Polarization:       (-0.30625,-0.95195,0.001398)
+ New Momentum Direction: (0.89624,-0.41198,-0.1644)
+ New Polarization:       (-0.42744,-0.90118,-0.071881)
  *** FresnelRefraction *** 
-Track (trackID 1300, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+Track (trackID 1631, parentID 1) is processed with stopping code 2
+### pop requested out of 87 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.12487,-0.98033,-0.15282)
- Old Polarization:       (-0.84908,0.025899,0.52763)
- New Momentum Direction: (-0.16968,-0.96337,-0.20766)
- New Polarization:       (-0.87027,0.047602,0.49026)
+ Old Momentum Direction: (0.79849,0.17995,0.57448)
+ Old Polarization:       (-0.47297,-0.40287,0.78358)
+ New Momentum Direction: (0.57491,0.24457,0.78081)
+ New Polarization:       (-0.71652,-0.31027,0.62476)
  *** FresnelRefraction *** 
-Track (trackID 1299, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
+Track (trackID 1630, parentID 1) is processed with stopping code 2
+### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46073,-0.16453,-0.87216)
- Old Polarization:       (-0.19618,0.93948,-0.28087)
- New Momentum Direction: (0.62201,-0.22213,-0.75084)
- New Polarization:       (0.73344,0.50106,0.45936)
+ Old Momentum Direction: (0.86444,-0.18881,-0.46593)
+ Old Polarization:       (-0.39428,-0.82961,-0.39533)
+ New Momentum Direction: (0.73631,-0.25413,-0.62711)
+ New Polarization:       (-0.58683,-0.70122,-0.40486)
  *** FresnelRefraction *** 
-Track (trackID 1298, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
+Track (trackID 1629, parentID 1) is processed with stopping code 2
+### pop requested out of 85 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1297, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
+Track (trackID 1628, parentID 1) is processed with stopping code 2
+### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.1543,-0.98042,0.12234)
- Old Polarization:       (-0.54157,0.019643,0.84042)
- New Momentum Direction: (0.20846,-0.96396,0.1653)
- New Polarization:       (-0.51402,0.0358,0.85703)
+ Old Momentum Direction: (0.88712,-0.24154,-0.3933)
+ Old Polarization:       (-0.37333,-0.87656,-0.30375)
+ New Momentum Direction: (0.77884,-0.32824,-0.53448)
+ New Polarization:       (-0.55547,-0.75673,-0.3447)
  *** FresnelRefraction *** 
-Track (trackID 1296, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
+Track (trackID 1627, parentID 1) is processed with stopping code 2
+### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21801,-0.96167,0.16632)
- Old Polarization:       (-0.46784,0.04658,0.88258)
- New Momentum Direction: (0.29623,-0.92799,0.22599)
- New Polarization:       (-0.42127,0.085408,0.90291)
+ Old Momentum Direction: (0.76481,-0.014362,-0.6441)
+ Old Polarization:       (-0.50992,-0.62454,-0.59156)
+ New Momentum Direction: (0.48952,-0.019438,-0.87177)
+ New Polarization:       (-0.76915,-0.48064,-0.42118)
  *** FresnelRefraction *** 
-Track (trackID 1295, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
+Track (trackID 1626, parentID 1) is processed with stopping code 2
+### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.11486,-0.56891,-0.81434)
- Old Polarization:       (-0.848,0.48313,-0.21791)
- New Momentum Direction: (-0.15477,-0.76659,-0.62321)
- New Polarization:       (-0.91331,-0.12951,0.38613)
- *** FresnelRefraction *** 
-Track (trackID 1294, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 86
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 87 stacked tracks.
+ Old Momentum Direction: (0.59999,0.61529,0.51129)
+ Old Polarization:       (-0.696,0.086339,0.71284)
+ New Momentum Direction: (0.59999,-0.61529,0.51129)
+ New Polarization:       (0.696,0.086339,-0.71284)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.83234,0.016915,-0.554)
- Old Polarization:       (0.010686,0.99886,0.046553)
- New Momentum Direction: (0.65855,0.022966,-0.75219)
- New Polarization:       (-0.020406,0.99971,0.012658)
- *** FresnelRefraction *** 
-Track (trackID 1503, parentID 1) is processed with stopping code 2
-### pop requested out of 86 stacked tracks.
+ Old Momentum Direction: (0.59999,-0.61529,0.51129)
+ Old Polarization:       (0.696,0.086339,-0.71284)
+ New Momentum Direction: (-0.59999,-0.61529,0.51129)
+ New Polarization:       (0.696,-0.086339,0.71284)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.019562,-0.56621,-0.82403)
- Old Polarization:       (-0.90437,0.3414,-0.25606)
- New Momentum Direction: (0.026602,-0.76999,-0.6375)
- New Polarization:       (-0.79964,-0.39909,0.44867)
- *** FresnelRefraction *** 
-Track (trackID 1502, parentID 1) is processed with stopping code 2
-### pop requested out of 85 stacked tracks.
+ Old Momentum Direction: (-0.59999,-0.61529,0.51129)
+ Old Polarization:       (0.696,-0.086339,0.71284)
+ New Momentum Direction: (-0.59999,-0.61529,-0.51129)
+ New Polarization:       (-0.696,0.086339,0.71284)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.96353,-0.26514,0.036052)
- Old Polarization:       (0.16087,0.68166,0.71377)
- New Momentum Direction: (0.93191,-0.35939,0.048865)
- New Polarization:       (-0.2596,-0.56684,0.78186)
- *** FresnelRefraction *** 
-Track (trackID 1501, parentID 1) is processed with stopping code 2
-### pop requested out of 84 stacked tracks.
+ Old Momentum Direction: (-0.59999,-0.61529,-0.51129)
+ Old Polarization:       (-0.696,0.086339,0.71284)
+ New Momentum Direction: (-0.59999,0.61529,-0.51129)
+ New Polarization:       (0.696,0.086339,-0.71284)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.016545,-0.96536,-0.2604)
- Old Polarization:       (-0.9178,-0.11799,0.37912)
- New Momentum Direction: (0.022305,-0.93609,-0.35105)
- New Polarization:       (-0.7891,0.19912,-0.58109)
- *** FresnelRefraction *** 
-Track (trackID 1500, parentID 1) is processed with stopping code 2
-### pop requested out of 83 stacked tracks.
+ Old Momentum Direction: (-0.59999,0.61529,-0.51129)
+ Old Polarization:       (0.696,0.086339,-0.71284)
+ New Momentum Direction: (0.59999,0.61529,-0.51129)
+ New Polarization:       (0.696,-0.086339,0.71284)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66754,-0.015929,-0.74441)
- Old Polarization:       (-0.17189,0.96947,-0.17488)
- New Momentum Direction: (0.66754,-0.015929,0.74441)
- New Polarization:       (-0.084429,-0.99494,0.054421)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.59999,0.61529,-0.51129)
+ Old Polarization:       (0.696,-0.086339,0.71284)
+ New Momentum Direction: (0.59999,0.61529,0.51129)
+ New Polarization:       (-0.696,0.086339,0.71284)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.59999,0.61529,0.51129)
+ Old Polarization:       (-0.696,0.086339,0.71284)
+ New Momentum Direction: (0.59999,-0.61529,0.51129)
+ New Polarization:       (0.696,0.086339,-0.71284)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.59999,-0.61529,0.51129)
+ Old Polarization:       (0.696,0.086339,-0.71284)
+ New Momentum Direction: (-0.59999,-0.61529,0.51129)
+ New Polarization:       (0.696,-0.086339,0.71284)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66754,-0.015929,0.74441)
- Old Polarization:       (-0.084429,-0.99494,0.054421)
- New Momentum Direction: (-0.66754,-0.015929,0.74441)
- New Polarization:       (-0.084429,0.99494,-0.054421)
+ Old Momentum Direction: (-0.59999,-0.61529,0.51129)
+ Old Polarization:       (0.696,-0.086339,0.71284)
+ New Momentum Direction: (-0.59999,-0.61529,-0.51129)
+ New Polarization:       (-0.696,0.086339,0.71284)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1499, parentID 1) is processed with stopping code 2
-### pop requested out of 82 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.41948,-0.13975,-0.89694)
- Old Polarization:       (-0.45508,0.82257,-0.341)
- New Momentum Direction: (0.56927,-0.18966,-0.79998)
- New Polarization:       (0.81362,0.26974,0.51503)
- *** FresnelRefraction *** 
-Track (trackID 1498, parentID 1) is processed with stopping code 2
+Track (trackID 1625, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1497, parentID 1) is processed with stopping code 2
+Track (trackID 1624, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.050862,-0.80513,-0.59092)
- Old Polarization:       (-0.99795,0.06396,-0.0012496)
- New Momentum Direction: (-0.068426,-0.60276,-0.79498)
- New Polarization:       (-0.99275,0.12009,-0.0056077)
- *** FresnelRefraction *** 
-Track (trackID 1496, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.64087,0.53725,0.54831)
+ Old Polarization:       (-0.65039,0.00060195,0.7596)
+ New Momentum Direction: (-0.64087,0.53725,0.54831)
+ New Polarization:       (-0.65039,-0.00060195,-0.7596)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64087,0.53725,0.54831)
+ Old Polarization:       (-0.65039,-0.00060195,-0.7596)
+ New Momentum Direction: (-0.64087,0.53725,-0.54831)
+ New Polarization:       (0.65039,0.00060195,-0.7596)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64087,0.53725,-0.54831)
+ Old Polarization:       (0.65039,0.00060195,-0.7596)
+ New Momentum Direction: (-0.64087,-0.53725,-0.54831)
+ New Polarization:       (-0.65039,0.00060195,0.7596)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64087,-0.53725,-0.54831)
+ Old Polarization:       (-0.65039,0.00060195,0.7596)
+ New Momentum Direction: (0.64087,-0.53725,-0.54831)
+ New Polarization:       (-0.65039,-0.00060195,-0.7596)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.64087,-0.53725,-0.54831)
+ Old Polarization:       (-0.65039,-0.00060195,-0.7596)
+ New Momentum Direction: (0.64087,-0.53725,0.54831)
+ New Polarization:       (0.65039,0.00060195,-0.7596)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.64087,-0.53725,0.54831)
+ Old Polarization:       (0.65039,0.00060195,-0.7596)
+ New Momentum Direction: (0.64087,0.53725,0.54831)
+ New Polarization:       (-0.65039,0.00060195,0.7596)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.64087,0.53725,0.54831)
+ Old Polarization:       (-0.65039,0.00060195,0.7596)
+ New Momentum Direction: (-0.64087,0.53725,0.54831)
+ New Polarization:       (-0.65039,-0.00060195,-0.7596)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1623, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.0096063,-0.96683,-0.25523)
- Old Polarization:       (-0.91693,-0.11035,0.38349)
- New Momentum Direction: (0.013048,-0.9379,-0.34667)
- New Polarization:       (-0.81713,0.18982,-0.5443)
+ Old Momentum Direction: (0.43974,0.77591,-0.45232)
+ Old Polarization:       (-0.88217,0.27865,-0.37965)
+ New Momentum Direction: (0.59188,0.52822,-0.60882)
+ New Polarization:       (-0.37583,-0.48733,-0.7882)
  *** FresnelRefraction *** 
-Track (trackID 1495, parentID 1) is processed with stopping code 2
+Track (trackID 1622, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.015138,-0.96565,-0.25939)
- Old Polarization:       (-0.91764,-0.11645,0.37997)
- New Momentum Direction: (0.020439,-0.93645,-0.35022)
- New Polarization:       (-0.79484,0.19727,-0.57386)
+ Old Momentum Direction: (0.93511,-0.3009,-0.18714)
+ Old Polarization:       (-0.31861,-0.94511,-0.072443)
+ New Momentum Direction: (0.87674,-0.40841,-0.25401)
+ New Polarization:       (-0.45323,-0.87831,-0.15219)
  *** FresnelRefraction *** 
-Track (trackID 1494, parentID 1) is processed with stopping code 2
+Track (trackID 1621, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80357,0.015716,-0.59501)
- Old Polarization:       (-0.020214,0.9998,-0.00089206)
- New Momentum Direction: (0.59094,0.021301,-0.80643)
- New Polarization:       (-0.038859,0.99924,-0.0020815)
+ Old Momentum Direction: (0.89106,-0.24954,-0.37914)
+ Old Polarization:       (-0.36957,-0.88382,-0.28686)
+ New Momentum Direction: (0.7865,-0.33954,-0.51588)
+ New Polarization:       (-0.54925,-0.7665,-0.33289)
  *** FresnelRefraction *** 
-Track (trackID 1493, parentID 1) is processed with stopping code 2
+Track (trackID 1620, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1492, parentID 1) is processed with stopping code 2
-### pop requested out of 75 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1491, parentID 1) is processed with stopping code 2
-### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21028,-0.97695,0.036731)
- Old Polarization:       (-0.69084,-0.1219,0.71265)
- New Momentum Direction: (0.28558,-0.95705,0.049885)
- New Polarization:       (0.52364,0.19943,0.82827)
+ Old Momentum Direction: (0.42946,0.90273,0.025264)
+ Old Polarization:       (-0.89197,0.41963,0.16823)
+ New Momentum Direction: (0.57976,0.81407,0.034105)
+ New Polarization:       (0.79231,-0.57304,0.20946)
  *** FresnelRefraction *** 
-Track (trackID 1490, parentID 1) is processed with stopping code 2
-### pop requested out of 73 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1489, parentID 1) is processed with stopping code 2
-### pop requested out of 72 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.6464,-0.016932,-0.76281)
- Old Polarization:       (-0.19873,0.96151,-0.18975)
- New Momentum Direction: (0.6464,-0.016932,0.76281)
- New Polarization:       (-0.076493,-0.99616,0.042708)
- *** FresnelReflection *** 
+Track (trackID 1619, parentID 1) is processed with stopping code 2
+### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6464,-0.016932,0.76281)
- Old Polarization:       (-0.076493,-0.99616,0.042708)
- New Momentum Direction: (-0.6464,-0.016932,0.76281)
- New Polarization:       (-0.076493,0.99616,-0.042708)
+ Old Momentum Direction: (0.65963,0.4937,0.56671)
+ Old Polarization:       (-0.629,-0.050108,0.77579)
+ New Momentum Direction: (-0.65963,0.4937,0.56671)
+ New Polarization:       (-0.629,0.050108,-0.77579)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6464,-0.016932,0.76281)
- Old Polarization:       (-0.076493,0.99616,-0.042708)
- New Momentum Direction: (-0.6464,-0.016932,-0.76281)
- New Polarization:       (0.037066,-0.99927,-0.0092288)
- *** FresnelReflection *** 
+ Old Momentum Direction: (-0.65963,0.4937,0.56671)
+ Old Polarization:       (-0.629,0.050108,-0.77579)
+ New Momentum Direction: (-0.65963,0.4937,-0.56671)
+ New Polarization:       (0.629,-0.050108,-0.77579)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6464,-0.016932,-0.76281)
- Old Polarization:       (0.037066,-0.99927,-0.0092288)
- New Momentum Direction: (0.6464,-0.016932,-0.76281)
- New Polarization:       (0.037066,0.99927,0.0092288)
+ Old Momentum Direction: (-0.65963,0.4937,-0.56671)
+ Old Polarization:       (0.629,-0.050108,-0.77579)
+ New Momentum Direction: (-0.65963,-0.4937,-0.56671)
+ New Polarization:       (-0.629,-0.050108,0.77579)
  *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.65963,-0.4937,-0.56671)
+Old Polarization: (-0.629,-0.050108,0.77579)
+New Polarization: (-0.44834,0.43452,0.78115)
+Polarization Change: (-0.44834,0.43452,0.78115)
+New Momentum Direction: (0.48162,0.85362,-0.19841)
+Momentum Change: (0.48162,0.85362,-0.19841)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.48162,0.85362,-0.19841)
+ Old Polarization:       (-0.44834,0.43452,0.78115)
+ New Momentum Direction: (0.65421,0.70666,-0.26951)
+ New Polarization:       (0.75351,-0.63962,0.152)
+ *** FresnelRefraction *** 
+Track (trackID 1618, parentID 1) is processed with stopping code 2
+### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6464,-0.016932,-0.76281)
- Old Polarization:       (0.037066,0.99927,0.0092288)
- New Momentum Direction: (0.87704,-0.022974,-0.47986)
- New Polarization:       (0.036131,0.99918,0.0182)
+ Old Momentum Direction: (0.92962,-0.29236,-0.22436)
+ Old Polarization:       (-0.32323,-0.93926,-0.11537)
+ New Momentum Direction: (0.86662,-0.39584,-0.30378)
+ New Polarization:       (-0.46325,-0.86449,-0.19508)
  *** FresnelRefraction *** 
-Track (trackID 1488, parentID 1) is processed with stopping code 2
+Track (trackID 1617, parentID 1) is processed with stopping code 2
+### pop requested out of 73 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.41999,0.90681,-0.036199)
+ Old Polarization:       (-0.90154,0.42146,0.097953)
+ New Momentum Direction: (0.56798,0.82158,-0.048955)
+ New Polarization:       (0.81972,-0.57003,-0.055897)
+ *** FresnelRefraction *** 
+Track (trackID 1616, parentID 1) is processed with stopping code 2
+### pop requested out of 72 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.84045,-0.15369,-0.51963)
+ Old Polarization:       (-0.42335,-0.7848,-0.45262)
+ New Momentum Direction: (0.68126,-0.20762,-0.70198)
+ New Polarization:       (-0.63509,-0.64453,-0.42572)
+ *** FresnelRefraction *** 
+Track (trackID 1615, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1487, parentID 1) is processed with stopping code 2
-### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39328,-0.90347,0.17048)
- Old Polarization:       (-0.48582,-0.046785,0.87281)
- New Momentum Direction: (0.53033,-0.81603,0.22989)
- New Polarization:       (-0.28201,0.085919,0.95556)
+ Old Momentum Direction: (0.48724,0.83079,0.26903)
+ Old Polarization:       (-0.82694,0.33995,0.44788)
+ New Momentum Direction: (0.65664,0.66135,0.36256)
+ New Polarization:       (0.094724,-0.54923,0.83029)
  *** FresnelRefraction *** 
-Track (trackID 1486, parentID 1) is processed with stopping code 2
+Track (trackID 1614, parentID 1) is processed with stopping code 2
+### pop requested out of 70 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.71059,0.38288,0.5903)
+Old Polarization: (-0.5717,-0.17486,0.80161)
+New Polarization: (-0.27901,0.37166,-0.88545)
+Polarization Change: (-0.27901,0.37166,-0.88545)
+New Momentum Direction: (-0.94298,0.068265,0.32579)
+Momentum Change: (-0.94298,0.068265,0.32579)
+
+** Photon absorbed! **
+Track (trackID 1613, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97536,-0.09379,-0.19968)
- Old Polarization:       (0.17589,0.87695,0.44725)
- New Momentum Direction: (0.95436,-0.12697,-0.27032)
- New Polarization:       (-0.26087,0.086284,-0.96151)
+ Old Momentum Direction: (0.93331,-0.29485,-0.20494)
+ Old Polarization:       (-0.31856,-0.94327,-0.093628)
+ New Momentum Direction: (0.87406,-0.39892,-0.27727)
+ New Polarization:       (-0.45402,-0.87383,-0.17405)
  *** FresnelRefraction *** 
-Track (trackID 1485, parentID 1) is processed with stopping code 2
+Track (trackID 1612, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51416,-0.085881,-0.85338)
- Old Polarization:       (-0.34747,0.88881,-0.29879)
- New Momentum Direction: (0.69415,-0.11595,-0.71043)
- New Polarization:       (0.60623,0.62631,0.49013)
+ Old Momentum Direction: (0.9388,-0.29601,-0.17617)
+ Old Polarization:       (-0.31065,-0.94852,-0.061677)
+ New Momentum Direction: (0.88538,-0.39948,-0.23775)
+ New Polarization:       (-0.43851,-0.88747,-0.14183)
  *** FresnelRefraction *** 
-Track (trackID 1484, parentID 1) is processed with stopping code 2
+Track (trackID 1611, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1483, parentID 1) is processed with stopping code 2
-### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.03204,-0.55492,-0.83129)
- Old Polarization:       (-0.89562,0.35326,-0.27033)
- New Momentum Direction: (0.043363,-0.75103,-0.65884)
- New Polarization:       (-0.76384,-0.44998,0.46267)
+ Old Momentum Direction: (0.91203,-0.1016,0.39734)
+ Old Polarization:       (-0.34032,-0.72815,0.59496)
+ New Momentum Direction: (0.83341,-0.13691,0.53543)
+ New Polarization:       (-0.4958,-0.61325,0.61491)
  *** FresnelRefraction *** 
-Track (trackID 1482, parentID 1) is processed with stopping code 2
-### pop requested out of 65 stacked tracks.
+Track (trackID 1610, parentID 1) is processed with stopping code 2
+### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89452,-0.41795,0.15859)
- Old Polarization:       (0.086071,0.50917,0.85635)
- New Momentum Direction: (0.7969,-0.56481,0.21432)
- New Polarization:       (-0.15735,0.14847,0.97632)
+ Old Momentum Direction: (0.95472,-0.27326,0.11763)
+ Old Polarization:       (-0.29561,-0.91589,0.2716)
+ New Momentum Direction: (0.91508,-0.37042,0.15945)
+ New Polarization:       (-0.40189,-0.87037,0.28449)
  *** FresnelRefraction *** 
-Track (trackID 1481, parentID 1) is processed with stopping code 2
-### pop requested out of 64 stacked tracks.
+Track (trackID 1609, parentID 1) is processed with stopping code 2
+### pop requested out of 65 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1480, parentID 1) is processed with stopping code 2
+Track (trackID 1608, parentID 1) is processed with stopping code 2
+### pop requested out of 64 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.474,0.85,0.22985)
+ Old Polarization:       (-0.84157,0.36053,0.40222)
+ New Momentum Direction: (0.63941,0.70357,0.31006)
+ New Polarization:       (0.23635,-0.56361,0.7915)
+ *** FresnelRefraction *** 
+Track (trackID 1607, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.60094,-0.75793,0.25381)
- Old Polarization:       (-0.24972,0.12361,0.96039)
- New Momentum Direction: (0.81451,-0.46716,0.34401)
- New Polarization:       (-0.25815,0.23919,0.93603)
+ Old Momentum Direction: (0.94296,-0.30811,-0.12605)
+ Old Polarization:       (-0.31099,-0.95041,-0.0033287)
+ New Momentum Direction: (0.89168,-0.41897,-0.1714)
+ New Polarization:       (-0.43608,-0.89661,-0.076952)
  *** FresnelRefraction *** 
-Track (trackID 1479, parentID 1) is processed with stopping code 2
+Track (trackID 1606, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.35606,-0.92185,0.15303)
- Old Polarization:       (-0.52728,-0.063,0.84735)
- New Momentum Direction: (0.48218,-0.85121,0.20723)
- New Polarization:       (-0.21291,0.1156,0.97021)
- *** FresnelRefraction *** 
-Track (trackID 1478, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.6427,0.5378,0.54563)
+ Old Polarization:       (-0.64863,0.0029717,0.7611)
+ New Momentum Direction: (-0.6427,0.5378,0.54563)
+ New Polarization:       (-0.64863,-0.0029717,-0.7611)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6427,0.5378,0.54563)
+ Old Polarization:       (-0.64863,-0.0029717,-0.7611)
+ New Momentum Direction: (-0.6427,0.5378,-0.54563)
+ New Polarization:       (0.64863,0.0029717,-0.7611)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6427,0.5378,-0.54563)
+ Old Polarization:       (0.64863,0.0029717,-0.7611)
+ New Momentum Direction: (-0.6427,-0.5378,-0.54563)
+ New Polarization:       (-0.64863,0.0029717,0.7611)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1605, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.12821,-0.42134,-0.89779)
- Old Polarization:       (-0.7887,0.50551,-0.34987)
- New Momentum Direction: (0.17306,-0.56872,-0.80412)
- New Polarization:       (-0.2612,-0.81371,0.51929)
+ Old Momentum Direction: (0.57839,0.66222,0.47637)
+ Old Polarization:       (-0.72113,0.14206,0.67808)
+ New Momentum Direction: (0.57839,-0.66222,0.47637)
+ New Polarization:       (0.72113,0.14206,-0.67808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57839,-0.66222,0.47637)
+ Old Polarization:       (0.72113,0.14206,-0.67808)
+ New Momentum Direction: (-0.57839,-0.66222,0.47637)
+ New Polarization:       (0.72113,-0.14206,0.67808)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57839,-0.66222,0.47637)
+ Old Polarization:       (0.72113,-0.14206,0.67808)
+ New Momentum Direction: (-0.57839,-0.66222,-0.47637)
+ New Polarization:       (-0.72113,0.14206,0.67808)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.57839,-0.66222,-0.47637)
+Old Polarization: (-0.72113,0.14206,0.67808)
+New Polarization: (0.55512,-0.69079,-0.4633)
+Polarization Change: (0.55512,-0.69079,-0.4633)
+New Momentum Direction: (-0.46332,-0.7194,0.51749)
+Momentum Change: (-0.46332,-0.7194,0.51749)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.46332,-0.7194,0.51749)
+ Old Polarization:       (0.55512,-0.69079,-0.4633)
+ New Momentum Direction: (-0.6276,-0.33877,0.70097)
+ New Polarization:       (-0.17368,0.9386,0.29811)
  *** FresnelRefraction *** 
-Track (trackID 1477, parentID 1) is processed with stopping code 2
+Track (trackID 1604, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37267,-0.17193,-0.9119)
- Old Polarization:       (-0.50757,0.78489,-0.35541)
- New Momentum Direction: (0.50659,-0.23371,-0.82991)
- New Polarization:       (0.8569,0.030058,0.5146)
+ Old Momentum Direction: (0.45978,0.68423,-0.56607)
+ Old Polarization:       (-0.85283,0.16252,-0.49626)
+ New Momentum Direction: (0.45978,-0.68423,-0.56607)
+ New Polarization:       (0.6871,-0.12972,0.71489)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45978,-0.68423,-0.56607)
+ Old Polarization:       (0.6871,-0.12972,0.71489)
+ New Momentum Direction: (0.45978,-0.68423,0.56607)
+ New Polarization:       (-0.6871,0.12972,0.71489)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45978,-0.68423,0.56607)
+ Old Polarization:       (-0.6871,0.12972,0.71489)
+ New Momentum Direction: (-0.45978,-0.68423,0.56607)
+ New Polarization:       (-0.6871,-0.12972,-0.71489)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45978,-0.68423,0.56607)
+ Old Polarization:       (-0.6871,-0.12972,-0.71489)
+ New Momentum Direction: (-0.62564,-0.12361,0.77026)
+ New Polarization:       (-0.76528,0.2889,-0.57523)
  *** FresnelRefraction *** 
-Track (trackID 1476, parentID 1) is processed with stopping code 2
+Track (trackID 1603, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.36505,-0.91874,0.1505)
- Old Polarization:       (-0.51868,-0.066458,0.85238)
- New Momentum Direction: (0.49131,-0.8471,0.20256)
- New Polarization:       (-0.19384,0.12038,0.97362)
+ Old Momentum Direction: (0.90829,-0.088289,0.40892)
+ Old Polarization:       (-0.34392,-0.71412,0.60972)
+ New Momentum Direction: (0.82641,-0.11883,0.55038)
+ New Polarization:       (-0.50212,-0.59786,0.62486)
  *** FresnelRefraction *** 
-Track (trackID 1475, parentID 1) is processed with stopping code 2
+Track (trackID 1602, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.099488,-0.9887,-0.11212)
- Old Polarization:       (-0.82295,-0.1451,0.54927)
- New Momentum Direction: (0.13409,-0.97938,-0.15111)
- New Polarization:       (0.49724,0.1984,-0.84462)
+ Old Momentum Direction: (0.6797,0.17151,-0.71315)
+ Old Polarization:       (-0.6065,-0.41537,-0.67795)
+ New Momentum Direction: (0.91557,0.23103,-0.32916)
+ New Polarization:       (0.35657,-0.087884,0.93012)
  *** FresnelRefraction *** 
-Track (trackID 1474, parentID 1) is processed with stopping code 2
+Track (trackID 1601, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.076635,-0.47658,-0.87578)
-Old Polarization: (-0.84014,0.44214,-0.31412)
-New Polarization: (-0.31033,0.34692,0.87422)
-Polarization Change: (-0.31333,0.35027,0.88268)
-New Momentum Direction: (0.94267,0.20265,0.2542)
-Momentum Change: (0.94536,0.20323,0.25493)
  Photon at Boundary! 
- Old Momentum Direction: (0.94536,0.20323,0.25493)
- Old Polarization:       (-0.31333,0.35027,0.88268)
- New Momentum Direction: (0.89633,0.27639,0.34671)
- New Polarization:       (-0.43395,0.38635,0.81389)
- *** FresnelRefraction *** 
-Track (trackID 1473, parentID 1) is processed with stopping code 2
-### pop requested out of 56 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.90521,-0.0084625,-0.42488)
-Old Polarization: (0.098777,0.97661,0.19099)
-New Polarization: (0.079621,0.91771,0.26746)
-Polarization Change: (0.083007,0.95675,0.27883)
-New Momentum Direction: (-0.67571,0.25167,-0.66239)
-Momentum Change: (-0.69012,0.25704,-0.67651)
+ Old Momentum Direction: (0.49892,0.60329,-0.62219)
+ Old Polarization:       (-0.81424,0.080439,-0.57493)
+ New Momentum Direction: (0.49892,0.60329,0.62219)
+ New Polarization:       (0.81424,-0.080439,-0.57493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49892,0.60329,0.62219)
+ Old Polarization:       (0.81424,-0.080439,-0.57493)
+ New Momentum Direction: (0.49892,-0.60329,0.62219)
+ New Polarization:       (-0.81424,-0.080439,0.57493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49892,-0.60329,0.62219)
+ Old Polarization:       (-0.81424,-0.080439,0.57493)
+ New Momentum Direction: (-0.49892,-0.60329,0.62219)
+ New Polarization:       (-0.81424,0.080439,-0.57493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49892,-0.60329,0.62219)
+ Old Polarization:       (-0.81424,0.080439,-0.57493)
+ New Momentum Direction: (-0.49892,-0.60329,-0.62219)
+ New Polarization:       (0.81424,-0.080439,-0.57493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49892,-0.60329,-0.62219)
+ Old Polarization:       (0.81424,-0.080439,-0.57493)
+ New Momentum Direction: (-0.49892,0.60329,-0.62219)
+ New Polarization:       (-0.81424,-0.080439,0.57493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49892,0.60329,-0.62219)
+ Old Polarization:       (-0.81424,-0.080439,0.57493)
+ New Momentum Direction: (0.49892,0.60329,-0.62219)
+ New Polarization:       (-0.81424,0.080439,-0.57493)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1472, parentID 1) is processed with stopping code 2
+Track (trackID 1600, parentID 1) is processed with stopping code 2
+### pop requested out of 56 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94639,-0.29591,-0.12957)
+ Old Polarization:       (-0.29954,-0.95404,-0.0090346)
+ New Momentum Direction: (0.90072,-0.39793,-0.17423)
+ New Polarization:       (-0.4163,-0.90529,-0.08456)
+ *** FresnelRefraction *** 
+Track (trackID 1599, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1471, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.89242,-0.25153,-0.37459)
+ Old Polarization:       (-0.36803,-0.88609,-0.28179)
+ New Momentum Direction: (0.78937,-0.34224,-0.50968)
+ New Polarization:       (-0.54654,-0.76989,-0.32949)
+ *** FresnelRefraction *** 
+Track (trackID 1598, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.35438,-0.1855,-0.91652)
- Old Polarization:       (-0.52801,0.76923,-0.35985)
- New Momentum Direction: (0.48197,-0.25229,-0.83908)
- New Polarization:       (0.85522,-0.072809,0.51313)
+ Old Momentum Direction: (0.52864,0.75364,0.3906)
+ Old Polarization:       (-0.7771,0.24452,0.57994)
+ New Momentum Direction: (0.7167,0.45377,0.52955)
+ New Polarization:       (-0.32832,-0.45037,0.83028)
  *** FresnelRefraction *** 
-Track (trackID 1470, parentID 1) is processed with stopping code 2
+Track (trackID 1597, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1469, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95688,-0.28643,0.048417)
+ Old Polarization:       (-0.29031,-0.93693,0.19461)
+ New Momentum Direction: (0.91988,-0.38671,0.065368)
+ New Polarization:       (-0.39206,-0.90231,0.17921)
+ *** FresnelRefraction *** 
+Track (trackID 1596, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91854,-0.37143,0.13533)
- Old Polarization:       (0.10547,0.56018,0.82163)
- New Momentum Direction: (0.84303,-0.50537,0.18413)
- New Polarization:       (-0.19177,0.03744,0.98073)
+ Old Momentum Direction: (0.95451,-0.28369,0.091824)
+ Old Polarization:       (-0.29773,-0.92364,0.24134)
+ New Momentum Direction: (0.91419,-0.38559,0.12481)
+ New Polarization:       (-0.40496,-0.88141,0.24315)
  *** FresnelRefraction *** 
-Track (trackID 1468, parentID 1) is processed with stopping code 2
+Track (trackID 1595, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1467, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.68772,0.43526,0.58102)
+ Old Polarization:       (-0.59738,-0.11549,0.7936)
+ New Momentum Direction: (0.17188,0.59063,0.78842)
+ New Polarization:       (-0.90693,-0.21761,0.36073)
+ *** FresnelRefraction *** 
+Track (trackID 1594, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50128,-0.08592,-0.86101)
- Old Polarization:       (-0.3628,0.8825,-0.29929)
- New Momentum Direction: (0.68084,-0.1167,-0.72307)
- New Polarization:       (0.62625,0.6047,0.49208)
+ Old Momentum Direction: (0.94631,-0.30649,-0.10278)
+ Old Polarization:       (-0.30582,-0.95182,0.022598)
+ New Momentum Direction: (0.89866,-0.41589,-0.13947)
+ New Polarization:       (-0.42551,-0.90374,-0.046812)
  *** FresnelRefraction *** 
-Track (trackID 1466, parentID 1) is processed with stopping code 2
+Track (trackID 1593, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1465, parentID 1) is processed with stopping code 2
-### pop requested out of 48 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23709,-0.29246,-0.92642)
- Old Polarization:       (-0.66111,0.65017,-0.37444)
- New Momentum Direction: (0.32171,-0.39685,-0.85966)
- New Polarization:       (0.48071,-0.71375,0.50939)
+ Old Momentum Direction: (0.41958,0.85082,-0.31632)
+ Old Polarization:       (-0.90464,0.36329,-0.22279)
+ New Momentum Direction: (0.56529,0.70627,-0.42618)
+ New Polarization:       (0.087552,-0.5651,-0.82036)
  *** FresnelRefraction *** 
-Track (trackID 1464, parentID 1) is processed with stopping code 2
+Track (trackID 1592, parentID 1) is processed with stopping code 2
+### pop requested out of 48 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.63287,0.55477,0.54009)
+ Old Polarization:       (-0.65954,0.020897,0.75138)
+ New Momentum Direction: (-0.63287,0.55477,0.54009)
+ New Polarization:       (-0.65954,-0.020897,-0.75138)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63287,0.55477,0.54009)
+ Old Polarization:       (-0.65954,-0.020897,-0.75138)
+ New Momentum Direction: (-0.63287,-0.55477,0.54009)
+ New Polarization:       (0.65954,-0.020897,0.75138)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.63287,-0.55477,0.54009)
+ Old Polarization:       (0.65954,-0.020897,0.75138)
+ New Momentum Direction: (-0.63287,-0.55477,-0.54009)
+ New Polarization:       (-0.65954,0.020897,0.75138)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1591, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34129,-0.20038,-0.91835)
- Old Polarization:       (-0.54372,0.75489,-0.36677)
- New Momentum Direction: (0.46266,-0.27164,-0.84389)
- New Polarization:       (0.84132,-0.16559,0.51455)
+ Old Momentum Direction: (0.41584,0.85922,-0.29803)
+ Old Polarization:       (-0.90732,0.36959,-0.20046)
+ New Momentum Direction: (0.56153,0.723,-0.40245)
+ New Polarization:       (0.15236,-0.56839,-0.80853)
  *** FresnelRefraction *** 
-Track (trackID 1463, parentID 1) is processed with stopping code 2
+Track (trackID 1590, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1462, parentID 1) is processed with stopping code 2
+Track (trackID 1589, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.017783,-0.94198,-0.3352)
- Old Polarization:       (-0.95209,-0.086416,0.29336)
- New Momentum Direction: (-0.02407,-0.89082,-0.45371)
- New Polarization:       (-0.9546,0.15528,-0.25424)
- *** FresnelRefraction *** 
-Track (trackID 1461, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.47844,0.64522,-0.59564)
+ Old Polarization:       (-0.83472,0.12355,-0.53664)
+ New Momentum Direction: (0.47844,-0.64522,-0.59564)
+ New Polarization:       (0.83472,0.12355,0.53664)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.47844,-0.64522,-0.59564)
+ Old Polarization:       (0.83472,0.12355,0.53664)
+ New Momentum Direction: (0.47844,-0.64522,0.59564)
+ New Polarization:       (-0.83472,-0.12355,0.53664)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.47844,-0.64522,0.59564)
+ Old Polarization:       (-0.83472,-0.12355,0.53664)
+ New Momentum Direction: (-0.47844,-0.64522,0.59564)
+ New Polarization:       (-0.83472,0.12355,-0.53664)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.47844,-0.64522,0.59564)
+ Old Polarization:       (-0.83472,0.12355,-0.53664)
+ New Momentum Direction: (-0.47844,0.64522,0.59564)
+ New Polarization:       (0.83472,0.12355,0.53664)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.47844,0.64522,0.59564)
+ Old Polarization:       (0.83472,0.12355,0.53664)
+ New Momentum Direction: (-0.47844,0.64522,-0.59564)
+ New Polarization:       (-0.83472,-0.12355,0.53664)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1588, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97832,-0.1062,-0.17779)
- Old Polarization:       (0.1795,0.86303,0.47218)
- New Momentum Direction: (0.95991,-0.14375,-0.24064)
- New Polarization:       (-0.25807,-0.11816,-0.95887)
+ Old Momentum Direction: (0.77928,-0.051058,-0.6246)
+ Old Polarization:       (-0.49464,-0.66208,-0.56301)
+ New Momentum Direction: (0.52349,-0.069418,-0.8492)
+ New Polarization:       (-0.75005,-0.51038,-0.42064)
  *** FresnelRefraction *** 
-Track (trackID 1460, parentID 1) is processed with stopping code 2
+Track (trackID 1587, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6354,0.54231,0.5497)
+ Old Polarization:       (-0.6561,0.0037929,0.75466)
+ New Momentum Direction: (-0.6354,0.54231,0.5497)
+ New Polarization:       (-0.6561,-0.0037929,-0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6354,0.54231,0.5497)
+ Old Polarization:       (-0.6561,-0.0037929,-0.75466)
+ New Momentum Direction: (-0.6354,0.54231,-0.5497)
+ New Polarization:       (0.6561,0.0037929,-0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6354,0.54231,-0.5497)
+ Old Polarization:       (0.6561,0.0037929,-0.75466)
+ New Momentum Direction: (-0.6354,-0.54231,-0.5497)
+ New Polarization:       (-0.6561,0.0037929,0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6354,-0.54231,-0.5497)
+ Old Polarization:       (-0.6561,0.0037929,0.75466)
+ New Momentum Direction: (0.6354,-0.54231,-0.5497)
+ New Polarization:       (-0.6561,-0.0037929,-0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6354,-0.54231,-0.5497)
+ Old Polarization:       (-0.6561,-0.0037929,-0.75466)
+ New Momentum Direction: (0.6354,-0.54231,0.5497)
+ New Polarization:       (0.6561,0.0037929,-0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6354,-0.54231,0.5497)
+ Old Polarization:       (0.6561,0.0037929,-0.75466)
+ New Momentum Direction: (0.6354,0.54231,0.5497)
+ New Polarization:       (-0.6561,0.0037929,0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6354,0.54231,0.5497)
+ Old Polarization:       (-0.6561,0.0037929,0.75466)
+ New Momentum Direction: (-0.6354,0.54231,0.5497)
+ New Polarization:       (-0.6561,-0.0037929,-0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6354,0.54231,0.5497)
+ Old Polarization:       (-0.6561,-0.0037929,-0.75466)
+ New Momentum Direction: (-0.6354,0.54231,-0.5497)
+ New Polarization:       (0.6561,0.0037929,-0.75466)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6354,0.54231,-0.5497)
+ Old Polarization:       (0.6561,0.0037929,-0.75466)
+ New Momentum Direction: (-0.6354,-0.54231,-0.5497)
+ New Polarization:       (-0.6561,0.0037929,0.75466)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1459, parentID 1) is processed with stopping code 2
+Track (trackID 1586, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1458, parentID 1) is processed with stopping code 2
+Track (trackID 1585, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93962,-0.025191,-0.34129)
- Old Polarization:       (0.12952,0.94927,0.28653)
- New Momentum Direction: (0.88506,-0.034263,-0.46421)
- New Polarization:       (-0.22782,0.83778,-0.49621)
- *** FresnelRefraction *** 
-Track (trackID 1457, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.64271,0.54434,0.53909)
+ Old Polarization:       (-0.64911,0.013167,0.76058)
+ New Momentum Direction: (-0.64271,0.54434,0.53909)
+ New Polarization:       (-0.64911,-0.013167,-0.76058)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64271,0.54434,0.53909)
+ Old Polarization:       (-0.64911,-0.013167,-0.76058)
+ New Momentum Direction: (-0.64271,-0.54434,0.53909)
+ New Polarization:       (0.64911,-0.013167,0.76058)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64271,-0.54434,0.53909)
+ Old Polarization:       (0.64911,-0.013167,0.76058)
+ New Momentum Direction: (-0.64271,-0.54434,-0.53909)
+ New Polarization:       (-0.64911,0.013167,0.76058)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1584, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93775,-0.33273,0.099543)
- Old Polarization:       (0.1313,0.605,0.78532)
- New Momentum Direction: (0.8822,-0.45113,0.13496)
- New Polarization:       (-0.22971,-0.1621,0.95967)
+ Old Momentum Direction: (0.55391,0.44385,-0.70441)
+ Old Polarization:       (-0.74812,-0.10597,-0.65505)
+ New Momentum Direction: (0.75195,0.60254,-0.26743)
+ New Polarization:       (0.039614,0.36364,0.9307)
  *** FresnelRefraction *** 
-Track (trackID 1456, parentID 1) is processed with stopping code 2
+Track (trackID 1583, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.098688,-0.9899,-0.10181)
- Old Polarization:       (-0.8184,-0.13894,0.5576)
- New Momentum Direction: (0.13378,-0.98136,-0.138)
- New Polarization:       (0.56897,0.19007,-0.80009)
+ Old Momentum Direction: (0.88659,-0.23187,-0.40024)
+ Old Polarization:       (-0.37108,-0.87312,-0.31617)
+ New Momentum Direction: (0.78046,-0.3134,-0.54098)
+ New Polarization:       (-0.55007,-0.75547,-0.35592)
  *** FresnelRefraction *** 
-Track (trackID 1455, parentID 1) is processed with stopping code 2
+Track (trackID 1582, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.40035,-0.89773,0.18385)
- Old Polarization:       (-0.47657,-0.032619,0.87853)
- New Momentum Direction: (0.54371,-0.80127,0.24968)
- New Polarization:       (-0.34082,0.061057,0.93814)
- *** FresnelRefraction *** 
-Track (trackID 1454, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1581, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.53386,-0.8115,0.23762)
- Old Polarization:       (-0.32551,0.062133,0.9435)
- New Momentum Direction: (0.72289,-0.61147,0.32176)
- New Polarization:       (-0.31864,0.11818,0.94048)
- *** FresnelRefraction *** 
-Track (trackID 1453, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1580, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97679,-0.094818,-0.19205)
- Old Polarization:       (0.17423,0.87328,0.455)
- New Momentum Direction: (0.95682,-0.12868,-0.26064)
- New Polarization:       (-0.25734,0.041921,-0.96541)
+ Old Momentum Direction: (0.42327,0.80473,-0.41623)
+ Old Polarization:       (-0.89501,0.30002,-0.33008)
+ New Momentum Direction: (0.42327,-0.80473,-0.41623)
+ New Polarization:       (0.70028,-0.00091132,0.71387)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42327,-0.80473,-0.41623)
+ Old Polarization:       (0.70028,-0.00091132,0.71387)
+ New Momentum Direction: (-0.42327,-0.80473,-0.41623)
+ New Polarization:       (0.70028,0.00091132,-0.71387)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.42327,-0.80473,-0.41623)
+ Old Polarization:       (0.70028,0.00091132,-0.71387)
+ New Momentum Direction: (-0.42327,-0.80473,0.41623)
+ New Polarization:       (-0.70028,-0.00091132,-0.71387)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.42327,-0.80473,0.41623)
+ Old Polarization:       (-0.70028,-0.00091132,-0.71387)
+ New Momentum Direction: (-0.57484,-0.59162,0.56529)
+ New Polarization:       (-0.70208,0.0017606,-0.7121)
  *** FresnelRefraction *** 
-Track (trackID 1452, parentID 1) is processed with stopping code 2
+Track (trackID 1579, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1451, parentID 1) is processed with stopping code 2
+Track (trackID 1578, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.14234,-0.39696,-0.90673)
- Old Polarization:       (-0.76902,0.53238,-0.3538)
- New Momentum Direction: (0.19294,-0.53807,-0.82052)
- New Polarization:       (-0.15084,-0.84256,0.51705)
+ Old Momentum Direction: (0.54619,0.7274,0.4154)
+ Old Polarization:       (-0.75877,0.21953,0.61325)
+ New Momentum Direction: (0.73739,0.37648,0.56082)
+ New Polarization:       (-0.40692,-0.41509,0.8137)
  *** FresnelRefraction *** 
-Track (trackID 1450, parentID 1) is processed with stopping code 2
+Track (trackID 1577, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75516,-0.60741,0.24654)
- Old Polarization:       (-0.074696,0.29391,0.95291)
- New Momentum Direction: (-0.75516,-0.60741,0.24654)
- New Polarization:       (-0.019006,-0.35565,-0.93443)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.94007,-0.20937,0.26915)
+ Old Polarization:       (-0.31356,-0.84093,0.44104)
+ New Momentum Direction: (0.88625,-0.2844,0.36562)
+ New Polarization:       (-0.44221,-0.75443,0.48506)
+ *** FresnelRefraction *** 
+Track (trackID 1576, parentID 1) is processed with stopping code 2
+### pop requested out of 32 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1575, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95482,-0.297,-0.010724)
+ Old Polarization:       (-0.29331,-0.94754,0.12702)
+ New Momentum Direction: (0.91581,-0.40135,-0.014491)
+ New Polarization:       (-0.39875,-0.91299,0.086317)
+ *** FresnelRefraction *** 
+Track (trackID 1574, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95026,-0.22898,0.21112)
+ Old Polarization:       (-0.29588,-0.87539,0.3823)
+ New Momentum Direction: (0.90784,-0.30828,0.28423)
+ New Polarization:       (-0.40749,-0.80842,0.42474)
+ *** FresnelRefraction *** 
+Track (trackID 1573, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.94169,-0.3009,-0.15058)
+ Old Polarization:       (-0.30885,-0.95057,-0.031981)
+ New Momentum Direction: (0.89044,-0.40698,-0.20367)
+ New Polarization:       (-0.43383,-0.89429,-0.10968)
+ *** FresnelRefraction *** 
+Track (trackID 1572, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.91676,-0.26843,-0.29579)
+ Old Polarization:       (-0.33418,-0.92108,-0.19986)
+ New Momentum Direction: (0.84319,-0.36129,-0.39811)
+ New Polarization:       (-0.48458,-0.83146,-0.27175)
+ *** FresnelRefraction *** 
+Track (trackID 1571, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1570, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42368,0.81456,-0.39622)
+ Old Polarization:       (-0.89675,0.31547,-0.31036)
+ New Momentum Direction: (0.57349,0.61926,-0.53631)
+ New Polarization:       (-0.19911,-0.52967,-0.8245)
+ *** FresnelRefraction *** 
+Track (trackID 1569, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.90099,-0.26158,-0.34612)
+Old Polarization: (-0.35757,-0.89954,-0.25095)
+New Polarization: (0.85857,0.48758,0.15851)
+Polarization Change: (0.85857,0.48758,0.15851)
+New Momentum Direction: (0.51166,-0.83455,-0.20429)
+Momentum Change: (0.51166,-0.83455,-0.20429)
+
+** Photon absorbed! **
+Track (trackID 1568, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.75516,-0.60741,0.24654)
- Old Polarization:       (-0.019006,-0.35565,-0.93443)
- New Momentum Direction: (-0.75516,0.60741,0.24654)
- New Polarization:       (0.019006,-0.35565,0.93443)
+ Old Momentum Direction: (0.49067,0.60833,-0.62384)
+ Old Polarization:       (-0.82011,0.080536,-0.56651)
+ New Momentum Direction: (0.49067,0.60833,0.62384)
+ New Polarization:       (0.82011,-0.080536,-0.56651)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.75516,0.60741,0.24654)
- Old Polarization:       (0.019006,-0.35565,0.93443)
- New Momentum Direction: (0.75516,0.60741,0.24654)
- New Polarization:       (0.0048085,0.37095,-0.92864)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.49067,0.60833,0.62384)
+ Old Polarization:       (0.82011,-0.080536,-0.56651)
+ New Momentum Direction: (0.49067,-0.60833,0.62384)
+ New Polarization:       (-0.82011,-0.080536,0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49067,-0.60833,0.62384)
+ Old Polarization:       (-0.82011,-0.080536,0.56651)
+ New Momentum Direction: (-0.49067,-0.60833,0.62384)
+ New Polarization:       (-0.82011,0.080536,-0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49067,-0.60833,0.62384)
+ Old Polarization:       (-0.82011,0.080536,-0.56651)
+ New Momentum Direction: (-0.49067,-0.60833,-0.62384)
+ New Polarization:       (0.82011,-0.080536,-0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49067,-0.60833,-0.62384)
+ Old Polarization:       (0.82011,-0.080536,-0.56651)
+ New Momentum Direction: (-0.49067,0.60833,-0.62384)
+ New Polarization:       (-0.82011,-0.080536,0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49067,0.60833,-0.62384)
+ Old Polarization:       (-0.82011,-0.080536,0.56651)
+ New Momentum Direction: (0.49067,0.60833,-0.62384)
+ New Polarization:       (-0.82011,0.080536,-0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49067,0.60833,-0.62384)
+ Old Polarization:       (-0.82011,0.080536,-0.56651)
+ New Momentum Direction: (0.49067,0.60833,0.62384)
+ New Polarization:       (0.82011,-0.080536,-0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49067,0.60833,0.62384)
+ Old Polarization:       (0.82011,-0.080536,-0.56651)
+ New Momentum Direction: (0.49067,-0.60833,0.62384)
+ New Polarization:       (-0.82011,-0.080536,0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.49067,-0.60833,0.62384)
+ Old Polarization:       (-0.82011,-0.080536,0.56651)
+ New Momentum Direction: (-0.49067,-0.60833,0.62384)
+ New Polarization:       (-0.82011,0.080536,-0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49067,-0.60833,0.62384)
+ Old Polarization:       (-0.82011,0.080536,-0.56651)
+ New Momentum Direction: (-0.49067,-0.60833,-0.62384)
+ New Polarization:       (0.82011,-0.080536,-0.56651)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.49067,-0.60833,-0.62384)
+ Old Polarization:       (0.82011,-0.080536,-0.56651)
+ New Momentum Direction: (-0.49067,0.60833,-0.62384)
+ New Polarization:       (-0.82011,-0.080536,0.56651)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.49067,0.60833,-0.62384)
+Old Polarization: (-0.82011,-0.080536,0.56651)
+New Polarization: (0.79692,0.32433,-0.50963)
+Polarization Change: (0.79692,0.32433,-0.50963)
+New Momentum Direction: (0.19396,-0.93635,-0.29261)
+Momentum Change: (0.19396,-0.93635,-0.29261)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.19396,-0.93635,-0.29261)
+ Old Polarization:       (0.79692,0.32433,-0.50963)
+ New Momentum Direction: (0.2629,-0.87954,-0.39661)
+ New Polarization:       (0.70659,0.45542,-0.54159)
+ *** FresnelRefraction *** 
+Track (trackID 1567, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52606,0.76653,0.36835)
+ Old Polarization:       (-0.7827,0.26698,0.56224)
+ New Momentum Direction: (0.70859,0.50173,0.49616)
+ New Polarization:       (-0.25466,-0.47392,0.84294)
+ *** FresnelRefraction *** 
+Track (trackID 1566, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93698,-0.30379,-0.17254)
+ Old Polarization:       (-0.31721,-0.94672,-0.055697)
+ New Momentum Direction: (0.88014,-0.41279,-0.23444)
+ New Polarization:       (-0.44993,-0.88286,-0.13463)
+ *** FresnelRefraction *** 
+Track (trackID 1565, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75516,0.60741,0.24654)
- Old Polarization:       (0.0048085,0.37095,-0.92864)
- New Momentum Direction: (0.75516,0.60741,-0.24654)
- New Polarization:       (-0.0048085,-0.37095,-0.92864)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.85993,-0.19675,-0.47096)
+ Old Polarization:       (-0.40364,-0.82689,-0.39157)
+ New Momentum Direction: (0.72069,-0.26723,-0.63968)
+ New Polarization:       (-0.60622,-0.69055,-0.39451)
+ *** FresnelRefraction *** 
+Track (trackID 1564, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1449, parentID 1) is processed with stopping code 2
-### pop requested out of 32 stacked tracks.
+Track (trackID 1563, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1562, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.072888,-0.98686,-0.14423)
- Old Polarization:       (-0.849,-0.13728,0.51024)
- New Momentum Direction: (0.098667,-0.97578,-0.19525)
- New Polarization:       (0.028448,0.19889,-0.97961)
+ Old Momentum Direction: (0.76774,0.25306,0.58867)
+ Old Polarization:       (-0.50748,-0.32074,0.79974)
+ New Momentum Direction: (0.4917,0.3439,0.79998)
+ New Polarization:       (-0.76919,-0.25908,0.58415)
  *** FresnelRefraction *** 
-Track (trackID 1448, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
+Track (trackID 1561, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1560, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1559, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.44462,-0.87357,0.19797)
-Old Polarization: (-0.42698,-0.012419,0.90417)
-New Polarization: (-0.47265,-0.14853,0.78524)
-Polarization Change: (-0.50906,-0.15997,0.84573)
-New Momentum Direction: (-0.00034381,0.97323,0.18388)
-Momentum Change: (-0.00034712,0.98261,0.18566)
- Photon at Boundary! 
- Old Momentum Direction: (-0.00034712,0.98261,0.18566)
- Old Polarization:       (-0.50906,-0.15997,0.84573)
- New Momentum Direction: (-0.00046813,0.96815,0.25037)
- New Polarization:       (-0.40114,-0.22953,0.8868)
+Old Momentum Direction: (0.4654,0.85497,0.22898)
+Old Polarization: (-0.84708,0.35523,0.39531)
+New Polarization: (0.78643,-0.50942,-0.34932)
+Polarization Change: (0.78643,-0.50942,-0.34932)
+New Momentum Direction: (0.42189,0.85606,-0.29861)
+Momentum Change: (0.42189,0.85606,-0.29861)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.42189,0.85606,-0.29861)
+ Old Polarization:       (0.78643,-0.50942,-0.34932)
+ New Momentum Direction: (0.5735,0.71156,-0.40592)
+ New Polarization:       (0.64689,-0.69738,-0.30853)
  *** FresnelRefraction *** 
-Track (trackID 1447, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
+Track (trackID 1558, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.10872,-0.43502,-0.89383)
- Old Polarization:       (-0.80503,0.48898,-0.3359)
- New Momentum Direction: (0.1477,-0.59101,-0.79303)
- New Polarization:       (-0.36049,-0.77883,0.51329)
+ Old Momentum Direction: (0.93258,-0.17976,0.31301)
+ Old Polarization:       (-0.32106,-0.80938,0.49175)
+ New Momentum Direction: (0.87193,-0.24384,0.42458)
+ New Polarization:       (-0.45846,-0.71102,0.53317)
  *** FresnelRefraction *** 
-Track (trackID 1446, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
+Track (trackID 1557, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87341,-0.45254,0.17991)
- Old Polarization:       (0.061983,0.46973,0.88063)
- New Momentum Direction: (0.75291,-0.61157,0.24313)
- New Polarization:       (-0.11489,0.24161,0.96355)
+ Old Momentum Direction: (0.41749,0.86415,-0.28096)
+ Old Polarization:       (-0.90724,0.379,-0.18242)
+ New Momentum Direction: (0.56232,0.73525,-0.37842)
+ New Polarization:       (0.21665,-0.57264,-0.79067)
  *** FresnelRefraction *** 
-Track (trackID 1445, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
+Track (trackID 1556, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56803,-0.78708,0.24052)
- Old Polarization:       (-0.28531,0.085801,0.95459)
- New Momentum Direction: (0.7652,-0.55632,0.324)
- New Polarization:       (-0.28238,0.16225,0.94548)
+ Old Momentum Direction: (0.72901,0.3445,0.5915)
+ Old Polarization:       (-0.5508,-0.21781,0.80571)
+ New Momentum Direction: (0.3709,0.46738,0.80249)
+ New Polarization:       (-0.83303,-0.21451,0.50995)
  *** FresnelRefraction *** 
-Track (trackID 1444, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
+Track (trackID 1555, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.039658,-0.53895,-0.8414)
- Old Polarization:       (-0.88524,0.37161,-0.27976)
- New Momentum Direction: (0.053759,-0.73057,-0.68072)
- New Polarization:       (-0.72882,-0.4947,0.47338)
+ Old Momentum Direction: (0.85019,0.050005,0.52409)
+ Old Polarization:       (-0.4152,-0.54838,0.72587)
+ New Momentum Direction: (0.69803,0.068014,0.71283)
+ New Polarization:       (-0.62577,-0.42597,0.65342)
  *** FresnelRefraction *** 
-Track (trackID 1443, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
+Track (trackID 1554, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.026572,-0.93229,-0.36073)
- Old Polarization:       (-0.96151,-0.074893,0.26438)
- New Momentum Direction: (-0.035983,-0.87182,-0.4885)
- New Polarization:       (-0.97577,0.13621,-0.17122)
- *** FresnelRefraction *** 
-Track (trackID 1442, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
+ Old Momentum Direction: (0.51707,0.55322,-0.65314)
+ Old Polarization:       (-0.79293,0.022225,-0.60891)
+ New Momentum Direction: (0.51707,0.55322,0.65314)
+ New Polarization:       (0.79293,-0.022225,-0.60891)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.88903,0.0021227,-0.45785)
- Old Polarization:       (0.077108,0.98501,0.15429)
- New Momentum Direction: (0.7844,0.0028755,-0.62025)
- New Polarization:       (-0.14238,0.97412,-0.17554)
- *** FresnelRefraction *** 
-Track (trackID 1441, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
+ Old Momentum Direction: (0.51707,0.55322,0.65314)
+ Old Polarization:       (0.79293,-0.022225,-0.60891)
+ New Momentum Direction: (0.51707,-0.55322,0.65314)
+ New Polarization:       (-0.79293,-0.022225,0.60891)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.079842,-0.47607,-0.87577)
- Old Polarization:       (-0.83867,0.44277,-0.31715)
- New Momentum Direction: (0.10835,-0.64604,-0.75557)
- New Polarization:       (-0.53217,-0.67966,0.50483)
- *** FresnelRefraction *** 
-Track (trackID 1440, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
+ Old Momentum Direction: (0.51707,-0.55322,0.65314)
+ Old Polarization:       (-0.79293,-0.022225,0.60891)
+ New Momentum Direction: (-0.51707,-0.55322,0.65314)
+ New Polarization:       (-0.79293,0.022225,-0.60891)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1439, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+Track (trackID 1553, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92273,-0.016753,-0.38507)
- Old Polarization:       (0.11629,0.9646,0.2367)
- New Momentum Direction: (0.85311,-0.022676,-0.52123)
- New Polarization:       (-0.20748,0.90191,-0.37883)
+ Old Momentum Direction: (0.46834,0.67808,-0.56644)
+ Old Polarization:       (-0.84717,0.16257,-0.50584)
+ New Momentum Direction: (0.63274,0.11829,-0.76528)
+ New Polarization:       (-0.69417,-0.35132,-0.62825)
  *** FresnelRefraction *** 
-Track (trackID 1438, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
+Track (trackID 1552, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96611,-0.065992,-0.24956)
- Old Polarization:       (0.16269,0.90626,0.39016)
- New Momentum Direction: (0.93668,-0.089523,-0.33854)
- New Polarization:       (-0.25979,0.47062,-0.84323)
+ Old Momentum Direction: (0.8857,-0.23744,-0.39895)
+ Old Polarization:       (-0.37432,-0.87356,-0.31109)
+ New Momentum Direction: (0.77645,-0.32229,-0.54153)
+ New Polarization:       (-0.55683,-0.75323,-0.35011)
  *** FresnelRefraction *** 
-Track (trackID 1437, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
+Track (trackID 1551, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.17992,-0.98368,-0.0015711)
- Old Polarization:       (-0.72773,-0.13418,0.67262)
- New Momentum Direction: (0.24346,-0.96991,-0.0021259)
- New Polarization:       (0.8147,0.20331,0.54307)
+ Old Momentum Direction: (0.54613,0.73075,0.40957)
+ Old Polarization:       (-0.75974,0.22609,0.60966)
+ New Momentum Direction: (0.73552,0.39338,0.5516)
+ New Polarization:       (-0.3886,-0.42198,0.8191)
  *** FresnelRefraction *** 
-Track (trackID 1436, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.032315,-0.68823,-0.72477)
- Old Polarization:       (-0.96801,0.20207,-0.14872)
- New Momentum Direction: (-0.032315,-0.68823,0.72477)
- New Polarization:       (0.99773,0.020676,0.064119)
- *** FresnelReflection *** 
+Track (trackID 1550, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.032315,-0.68823,0.72477)
- Old Polarization:       (0.99773,0.020676,0.064119)
- New Momentum Direction: (-0.04376,-0.18657,0.98147)
- New Polarization:       (0.99758,0.045047,0.053041)
+ Old Momentum Direction: (0.88632,-0.22782,-0.40315)
+ Old Polarization:       (-0.37023,-0.87157,-0.3214)
+ New Momentum Direction: (0.781,-0.30726,-0.54372)
+ New Polarization:       (-0.54798,-0.75478,-0.36059)
  *** FresnelRefraction *** 
-Track (trackID 1435, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
+Track (trackID 1549, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75194,-0.60956,0.25104)
- Old Polarization:       (-0.080933,0.29257,0.95281)
- New Momentum Direction: (0.44371,-0.82865,0.34127)
- New Polarization:       (-0.16039,0.30123,0.93997)
+ Old Momentum Direction: (0.74958,0.013971,-0.66177)
+ Old Polarization:       (-0.52738,-0.59156,-0.60985)
+ New Momentum Direction: (0.44222,0.018931,-0.8967)
+ New Polarization:       (-0.79645,-0.45145,-0.40231)
  *** FresnelRefraction *** 
-Track (trackID 1434, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
+Track (trackID 1548, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.038476,-0.53873,-0.8416)
- Old Polarization:       (-0.88543,0.372,-0.27861)
- New Momentum Direction: (0.052211,-0.73103,-0.68034)
- New Polarization:       (-0.7311,-0.49206,0.47262)
- *** FresnelRefraction *** 
-Track (trackID 1433, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+ Old Momentum Direction: (0.56024,0.69212,0.45508)
+ Old Polarization:       (-0.74062,0.1725,0.64941)
+ New Momentum Direction: (0.56024,-0.69212,0.45508)
+ New Polarization:       (0.53297,-0.11937,-0.83767)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.42726,-0.13213,-0.89442)
- Old Polarization:       (-0.44615,0.82962,-0.33568)
- New Momentum Direction: (0.58083,-0.17962,-0.79396)
- New Polarization:       (0.79859,0.31475,0.51301)
- *** FresnelRefraction *** 
-Track (trackID 1432, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
+ Old Momentum Direction: (0.56024,-0.69212,0.45508)
+ Old Polarization:       (0.53297,-0.11937,-0.83767)
+ New Momentum Direction: (-0.56024,-0.69212,0.45508)
+ New Polarization:       (0.53297,0.11937,0.83767)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.38558,-0.16737,-0.90736)
- Old Polarization:       (-0.49382,0.79328,-0.35617)
- New Momentum Direction: (0.52207,-0.22662,-0.82225)
- New Polarization:       (0.85148,0.082766,0.51782)
+ Old Momentum Direction: (-0.56024,-0.69212,0.45508)
+ Old Polarization:       (0.53297,0.11937,0.83767)
+ New Momentum Direction: (-0.56024,-0.69212,-0.45508)
+ New Polarization:       (-0.53297,-0.11937,0.83767)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.56024,-0.69212,-0.45508)
+Old Polarization: (-0.53297,-0.11937,0.83767)
+New Polarization: (0.2534,0.65675,0.71026)
+Polarization Change: (0.2534,0.65675,0.71026)
+New Momentum Direction: (-0.68116,-0.4002,0.61307)
+Momentum Change: (-0.68116,-0.4002,0.61307)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.68116,-0.4002,0.61307)
+ Old Polarization:       (0.2534,0.65675,0.71026)
+ New Momentum Direction: (-0.68116,-0.4002,-0.61307)
+ New Polarization:       (-0.2534,-0.65675,0.71026)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.68116,-0.4002,-0.61307)
+Old Polarization: (-0.2534,-0.65675,0.71026)
+New Polarization: (0.087557,-0.57025,0.8168)
+Polarization Change: (0.087557,-0.57025,0.8168)
+New Momentum Direction: (0.92737,0.34606,0.14219)
+Momentum Change: (0.92737,0.34606,0.14219)
+Scattering Photon!
+Old Momentum Direction: (0.92737,0.34606,0.14219)
+Old Polarization: (0.087557,-0.57025,0.8168)
+New Polarization: (-0.27157,-0.3713,0.88791)
+Polarization Change: (-0.27157,-0.3713,0.88791)
+New Momentum Direction: (0.8234,-0.56727,0.014626)
+Momentum Change: (0.8234,-0.56727,0.014626)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.8234,-0.56727,0.014626)
+ Old Polarization:       (-0.27157,-0.3713,0.88791)
+ New Momentum Direction: (0.6365,-0.77102,0.019879)
+ New Polarization:       (-0.47066,-0.36786,0.80197)
  *** FresnelRefraction *** 
-Track (trackID 1431, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
+Track (trackID 1547, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.88151,-0.032819,0.47102)
+Old Polarization: (-0.38002,-0.64137,0.66651)
+New Polarization: (0.71359,0.4063,-0.57071)
+Polarization Change: (0.71359,0.4063,-0.57071)
+New Momentum Direction: (-0.66091,0.66062,-0.35607)
+Momentum Change: (-0.66091,0.66062,-0.35607)
 Scattering Photon!
-Old Momentum Direction: (0.072924,-0.48577,-0.87104)
-Old Polarization: (-0.84639,0.43182,-0.31168)
-New Polarization: (-0.69837,0.51771,-0.33803)
-Polarization Change: (-0.74873,0.55504,-0.36241)
-New Momentum Direction: (0.12128,-0.38756,-0.84412)
-Momentum Change: (0.12947,-0.41374,-0.90114)
+Old Momentum Direction: (-0.66091,0.66062,-0.35607)
+Old Polarization: (0.71359,0.4063,-0.57071)
+New Polarization: (-0.84093,-0.53911,-0.046884)
+Polarization Change: (-0.84093,-0.53911,-0.046884)
+New Momentum Direction: (-0.077479,0.034204,0.99641)
+Momentum Change: (-0.077479,0.034204,0.99641)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.077479,0.034204,0.99641)
+ Old Polarization:       (-0.84093,-0.53911,-0.046884)
+ New Momentum Direction: (-0.10537,0.046517,0.99334)
+ New Polarization:       (-0.90908,-0.4094,-0.077261)
+ *** FresnelRefraction *** 
+Track (trackID 1546, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.12947,-0.41374,-0.90114)
- Old Polarization:       (-0.74873,0.55504,-0.36241)
- New Momentum Direction: (0.17571,-0.5615,-0.8086)
- New Polarization:       (-0.19202,-0.82515,0.53127)
+ Old Momentum Direction: (0.84578,-0.17064,-0.50551)
+ Old Polarization:       (-0.41912,-0.79878,-0.43161)
+ New Momentum Direction: (0.6899,-0.23153,-0.68589)
+ New Polarization:       (-0.63081,-0.65708,-0.4127)
  *** FresnelRefraction *** 
-Track (trackID 1430, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
+Track (trackID 1545, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 91
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 92 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1429, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.19601,-0.98045,0.017267)
- Old Polarization:       (-0.7089,-0.12951,0.69331)
- New Momentum Direction: (0.26543,-0.96385,0.023383)
- New Polarization:       (0.67774,0.20378,0.7065)
- *** FresnelRefraction *** 
-Track (trackID 1428, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+Track (trackID 1739, parentID 1) is processed with stopping code 2
+### pop requested out of 91 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1427, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
+Track (trackID 1738, parentID 1) is processed with stopping code 2
+### pop requested out of 90 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1737, parentID 1) is processed with stopping code 2
+### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92818,-0.35451,0.11315)
- Old Polarization:       (0.12402,0.58137,0.80413)
- New Momentum Direction: (0.86424,-0.47925,0.15296)
- New Polarization:       (-0.2188,-0.084293,0.97212)
+ Old Momentum Direction: (0.43251,0.88375,0.17867)
+ Old Polarization:       (-0.69886,0.20339,0.68573)
+ New Momentum Direction: (0.58698,0.77243,0.24248)
+ New Polarization:       (0.079314,-0.35293,0.93228)
  *** FresnelRefraction *** 
-Track (trackID 1426, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
+Track (trackID 1736, parentID 1) is processed with stopping code 2
+### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75702,-0.60341,0.25064)
- Old Polarization:       (-0.075925,0.29976,0.95099)
- New Momentum Direction: (0.45778,-0.82105,0.34104)
- New Polarization:       (-0.1504,0.30655,0.9399)
+ Old Momentum Direction: (0.18704,0.89098,-0.41373)
+ Old Polarization:       (-0.97795,0.2087,0.0073163)
+ New Momentum Direction: (0.25443,0.78646,-0.5628)
+ New Polarization:       (-0.55147,-0.36007,-0.75248)
  *** FresnelRefraction *** 
-Track (trackID 1425, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
+Track (trackID 1735, parentID 1) is processed with stopping code 2
+### pop requested out of 87 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95033,-0.30188,0.075769)
- Old Polarization:       (0.14265,0.63883,0.75601)
- New Momentum Direction: (0.90615,-0.41024,0.10297)
- New Polarization:       (-0.24392,-0.30796,0.9196)
+ Old Momentum Direction: (0.5011,0.83073,0.24247)
+ Old Polarization:       (-0.622,0.15094,0.76833)
+ New Momentum Direction: (0.67517,0.66137,0.3267)
+ New Polarization:       (-0.18793,-0.27405,0.94317)
  *** FresnelRefraction *** 
-Track (trackID 1424, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+Track (trackID 1734, parentID 1) is processed with stopping code 2
+### pop requested out of 86 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95913,0.14631,0.24219)
+ Old Polarization:       (-0.09378,-0.64318,0.75995)
+ New Momentum Direction: (0.9235,0.19836,0.32834)
+ New Polarization:       (-0.16571,-0.56567,0.80781)
+ *** FresnelRefraction *** 
+Track (trackID 1733, parentID 1) is processed with stopping code 2
+### pop requested out of 85 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1423, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.27837,-0.95546,0.097987)
-Old Polarization: (-0.6145,-0.098765,0.78271)
-New Polarization: (-0.74071,-0.069561,0.49649)
-Polarization Change: (-0.82814,-0.077772,0.5551)
-New Momentum Direction: (-0.39596,0.71853,-0.49006)
-Momentum Change: (-0.41434,0.75189,-0.51281)
- Photon at Boundary! 
- Old Momentum Direction: (-0.41434,0.75189,-0.51281)
- Old Polarization:       (-0.82814,-0.077772,0.5551)
- New Momentum Direction: (-0.41434,0.75189,0.51281)
- New Polarization:       (0.82814,0.077772,0.5551)
- *** TotalInternalReflection *** 
+Track (trackID 1732, parentID 1) is processed with stopping code 2
+### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.41434,0.75189,0.51281)
- Old Polarization:       (0.82814,0.077772,0.5551)
- New Momentum Direction: (-0.56222,0.44692,0.69583)
- New Polarization:       (0.71812,-0.15344,0.67879)
+ Old Momentum Direction: (0.58727,0.74266,0.32181)
+ Old Polarization:       (-0.52136,0.04298,0.85225)
+ New Momentum Direction: (0.79578,0.42021,0.43607)
+ New Polarization:       (-0.44365,-0.085597,0.8921)
  *** FresnelRefraction *** 
-Track (trackID 1422, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
+Track (trackID 1731, parentID 1) is processed with stopping code 2
+### pop requested out of 83 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.21831,0.67,-0.70954)
+ Old Polarization:       (-0.94273,-0.0431,-0.33075)
+ New Momentum Direction: (0.21831,0.67,0.70954)
+ New Polarization:       (0.85388,-0.48316,0.19352)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.95452,-0.29221,0.05915)
- Old Polarization:       (0.15366,0.6522,0.74231)
- New Momentum Direction: (0.91513,-0.39515,0.079987)
- New Polarization:       (-0.25534,-0.41455,0.87347)
+ Old Momentum Direction: (0.21831,0.67,0.70954)
+ Old Polarization:       (0.85388,-0.48316,0.19352)
+ New Momentum Direction: (0.21831,-0.67,0.70954)
+ New Polarization:       (-0.85388,-0.48316,-0.19352)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.21831,-0.67,0.70954)
+Old Polarization: (-0.85388,-0.48316,-0.19352)
+New Polarization: (0.20132,-0.87116,-0.44783)
+Polarization Change: (0.20132,-0.87116,-0.44783)
+New Momentum Direction: (-0.97821,-0.20248,-0.04585)
+Momentum Change: (-0.97821,-0.20248,-0.04585)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.97821,-0.20248,-0.04585)
+ Old Polarization:       (0.20132,-0.87116,-0.44783)
+ New Momentum Direction: (-0.95933,-0.27531,-0.062341)
+ New Polarization:       (0.27758,-0.87993,-0.38558)
  *** FresnelRefraction *** 
-Track (trackID 1421, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
+Track (trackID 1730, parentID 1) is processed with stopping code 2
+### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.15427,-0.38094,-0.91164)
- Old Polarization:       (-0.75459,0.5502,-0.3576)
- New Momentum Direction: (0.20935,-0.51697,-0.83001)
- New Polarization:       (-0.06466,-0.85428,0.51577)
+ Old Momentum Direction: (0.97431,-0.124,-0.18798)
+ Old Polarization:       (-0.07102,-0.96134,0.26604)
+ New Momentum Direction: (0.95276,-0.16724,-0.25353)
+ New Polarization:       (-0.12458,-0.97648,0.17599)
  *** FresnelRefraction *** 
-Track (trackID 1420, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
+Track (trackID 1729, parentID 1) is processed with stopping code 2
+### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.085814,-0.46506,-0.88111)
- Old Polarization:       (-0.83051,0.45513,-0.32111)
- New Momentum Direction: (0.11662,-0.63202,-0.76612)
- New Polarization:       (-0.49458,-0.7059,0.50705)
+ Old Momentum Direction: (0.92949,-0.1516,-0.33626)
+ Old Polarization:       (-0.12685,-0.98741,0.094541)
+ New Momentum Direction: (0.86631,-0.2053,-0.45536)
+ New Polarization:       (-0.22383,-0.97453,0.01355)
  *** FresnelRefraction *** 
-Track (trackID 1419, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
+Track (trackID 1728, parentID 1) is processed with stopping code 2
+### pop requested out of 80 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1727, parentID 1) is processed with stopping code 2
+### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23317,-0.30868,-0.92214)
- Old Polarization:       (-0.67053,0.63576,-0.38236)
- New Momentum Direction: (0.3138,-0.4154,-0.8538)
- New Polarization:       (0.4219,-0.74457,0.51732)
+ Old Momentum Direction: (0.959,0.15472,0.23743)
+ Old Polarization:       (-0.086228,-0.63877,0.76455)
+ New Momentum Direction: (0.92448,0.20814,0.3194)
+ New Polarization:       (-0.15119,-0.56893,0.80837)
  *** FresnelRefraction *** 
-Track (trackID 1418, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
+Track (trackID 1726, parentID 1) is processed with stopping code 2
+### pop requested out of 78 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 75
-Track (trackID 1, parentID 0) is processed with stopping code 4
+** Photon absorbed! **
+Track (trackID 1725, parentID 1) is processed with stopping code 2
+### pop requested out of 77 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1724, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.30247,-0.48084,-0.82299)
- Old Polarization:       (-0.66504,0.51207,-0.5436)
- New Momentum Direction: (0.4065,-0.64622,-0.64588)
- New Polarization:       (0.15584,-0.64752,0.74595)
+ Old Momentum Direction: (0.92227,0.23978,0.30318)
+ Old Polarization:       (-0.13434,-0.53661,0.83307)
+ New Momentum Direction: (0.85236,0.32441,0.41018)
+ New Polarization:       (-0.23664,-0.46018,0.85571)
  *** FresnelRefraction *** 
-Track (trackID 1578, parentID 1) is processed with stopping code 2
+Track (trackID 1723, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.16703,-0.61938,-0.76712)
- Old Polarization:       (-0.81443,0.35185,-0.46142)
- New Momentum Direction: (0.22692,-0.84147,-0.49034)
- New Polarization:       (-0.42828,-0.5384,0.72574)
+ Old Momentum Direction: (0.99705,-0.066698,-0.038056)
+ Old Polarization:       (-0.04312,-0.89635,0.44124)
+ New Momentum Direction: (0.99464,-0.089841,-0.051261)
+ New Polarization:       (-0.069801,-0.94871,0.30835)
  *** FresnelRefraction *** 
-Track (trackID 1577, parentID 1) is processed with stopping code 2
+Track (trackID 1722, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.094503,-0.72947,-0.67745)
- Old Polarization:       (-0.9037,0.22259,-0.36575)
- New Momentum Direction: (0.094503,0.72947,-0.67745)
- New Polarization:       (0.96838,0.090474,0.23251)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.094503,0.72947,-0.67745)
- Old Polarization:       (0.96838,0.090474,0.23251)
- New Momentum Direction: (0.094503,0.72947,0.67745)
- New Polarization:       (-0.98003,-0.051422,0.19208)
- *** FresnelReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1576, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.98333,-0.11258,-0.14276)
+ Old Polarization:       (-0.062096,-0.94596,0.31828)
+ New Momentum Direction: (0.96938,-0.15207,-0.19283)
+ New Polarization:       (-0.1084,-0.96953,0.21967)
+ *** FresnelRefraction *** 
+Track (trackID 1721, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78052,-0.49754,0.37847)
- Old Polarization:       (-0.10528,0.49216,0.86411)
- New Momentum Direction: (0.53839,-0.6707,0.51019)
- New Polarization:       (-0.19914,0.48702,0.85038)
+ Old Momentum Direction: (0.30042,0.95281,-0.043574)
+ Old Polarization:       (-0.85377,0.289,0.43309)
+ New Momentum Direction: (0.40596,0.91199,-0.058882)
+ New Polarization:       (0.91137,-0.39921,0.10023)
  *** FresnelRefraction *** 
-Track (trackID 1575, parentID 1) is processed with stopping code 2
+Track (trackID 1720, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.029841,-0.84237,-0.53807)
- Old Polarization:       (-0.97503,0.093991,-0.20122)
- New Momentum Direction: (0.040433,-0.68325,-0.72907)
- New Polarization:       (-0.96009,0.17554,-0.21775)
+ Old Momentum Direction: (0.99717,-0.012281,0.074215)
+ Old Polarization:       (-0.052202,-0.82334,0.56515)
+ New Momentum Direction: (0.99477,-0.016683,0.10082)
+ New Polarization:       (-0.08122,-0.72779,0.68097)
  *** FresnelRefraction *** 
-Track (trackID 1574, parentID 1) is processed with stopping code 2
+Track (trackID 1719, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1573, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.20169,0.76712,-0.60897)
+ Old Polarization:       (-0.97133,0.076786,-0.22498)
+ New Momentum Direction: (0.27175,0.50296,-0.82048)
+ New Polarization:       (-0.90851,-0.14713,-0.3911)
+ *** FresnelRefraction *** 
+Track (trackID 1718, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.25572,0.57529,-0.77695)
+ Old Polarization:       (-0.90029,-0.15112,-0.40821)
+ New Momentum Direction: (0.25572,0.57529,0.77695)
+ New Polarization:       (0.86811,-0.49031,0.077322)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.25572,0.57529,0.77695)
+ Old Polarization:       (0.86811,-0.49031,0.077322)
+ New Momentum Direction: (0.25572,-0.57529,0.77695)
+ New Polarization:       (-0.86811,-0.49031,-0.077322)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1572, parentID 1) is processed with stopping code 2
+Track (trackID 1717, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.59378,-0.68988,0.41413)
- Old Polarization:       (-0.32295,0.26707,0.90795)
- New Momentum Direction: (0.79941,-0.22381,0.55754)
- New Polarization:       (-0.389,0.5144,0.76424)
- *** FresnelRefraction *** 
-Track (trackID 1571, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1716, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46209,-0.79866,0.3855)
- Old Polarization:       (-0.47667,0.14288,0.86739)
- New Momentum Direction: (0.62481,-0.5813,0.52125)
- New Polarization:       (-0.45918,0.26637,0.84747)
+ Old Momentum Direction: (0.36061,0.9293,0.079717)
+ Old Polarization:       (-0.78057,0.25389,0.57119)
+ New Momentum Direction: (0.49002,0.86496,0.10832)
+ New Polarization:       (0.53794,-0.39783,0.7432)
  *** FresnelRefraction *** 
-Track (trackID 1570, parentID 1) is processed with stopping code 2
+Track (trackID 1715, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1569, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.31907,0.94768,0.0094293)
+ Old Polarization:       (-0.82748,0.27372,0.49026)
+ New Momentum Direction: (0.43393,0.90085,0.012824)
+ New Polarization:       (0.81303,-0.39768,0.42524)
+ *** FresnelRefraction *** 
+Track (trackID 1714, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1568, parentID 1) is processed with stopping code 2
+Track (trackID 1713, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.44783,-0.80635,0.38632)
- Old Polarization:       (-0.49242,0.13821,0.85931)
- New Momentum Direction: (0.60898,-0.59429,0.52532)
- New Polarization:       (-0.47227,0.26044,0.8421)
+ Old Momentum Direction: (0.5362,0.79424,0.28578)
+ Old Polarization:       (-0.5799,0.10061,0.80845)
+ New Momentum Direction: (0.72779,0.56557,0.38789)
+ New Polarization:       (-0.34097,-0.19233,0.92019)
  *** FresnelRefraction *** 
-Track (trackID 1567, parentID 1) is processed with stopping code 2
+Track (trackID 1712, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34372,-0.43693,-0.83123)
- Old Polarization:       (-0.61588,0.56332,-0.55078)
- New Momentum Direction: (0.46261,-0.58807,-0.66345)
- New Polarization:       (0.33118,-0.57954,0.74461)
+ Old Momentum Direction: (0.1882,0.87083,-0.45414)
+ Old Polarization:       (-0.98082,0.19057,-0.041027)
+ New Momentum Direction: (0.25501,0.74586,-0.61535)
+ New Polarization:       (-0.65412,-0.3356,-0.67786)
  *** FresnelRefraction *** 
-Track (trackID 1566, parentID 1) is processed with stopping code 2
+Track (trackID 1711, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.40715,-0.36579,-0.83691)
- Old Polarization:       (-0.53948,0.64307,-0.54353)
- New Momentum Direction: (0.55245,-0.49633,-0.66966)
- New Polarization:       (0.55269,-0.38328,0.74002)
- *** FresnelRefraction *** 
-Track (trackID 1565, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1710, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98941,-0.14496,-0.0073497)
- Old Polarization:       (0.13507,0.90099,0.41228)
- New Momentum Direction: (0.98057,-0.19592,-0.0099337)
- New Polarization:       (-0.18838,-0.95451,0.23112)
+ Old Momentum Direction: (0.72916,0.56539,0.38556)
+ Old Polarization:       (-0.35953,-0.16289,0.91881)
+ New Momentum Direction: (0.36463,0.7693,0.52461)
+ New Polarization:       (-0.63422,-0.20732,0.74484)
  *** FresnelRefraction *** 
-Track (trackID 1564, parentID 1) is processed with stopping code 2
+Track (trackID 1709, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88895,-0.065978,-0.45322)
- Old Polarization:       (0.019832,0.99419,-0.10583)
- New Momentum Direction: (0.78598,-0.089064,-0.6118)
- New Polarization:       (-0.036776,0.98108,-0.19007)
+ Old Momentum Direction: (0.22508,0.93995,-0.25657)
+ Old Polarization:       (-0.94277,0.27659,0.18622)
+ New Momentum Direction: (0.30364,0.8877,-0.34612)
+ New Polarization:       (0.16419,-0.40658,-0.89874)
  *** FresnelRefraction *** 
-Track (trackID 1563, parentID 1) is processed with stopping code 2
+Track (trackID 1708, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4978,-0.77017,0.39878)
- Old Polarization:       (-0.43528,0.17583,0.88296)
- New Momentum Direction: (0.67303,-0.50631,0.53915)
- New Polarization:       (-0.42729,0.32883,0.84219)
- *** FresnelRefraction *** 
-Track (trackID 1562, parentID 1) is processed with stopping code 2
-### pop requested out of 59 stacked tracks.
+ Old Momentum Direction: (0.22888,0.64523,-0.7289)
+ Old Polarization:       (-0.93222,-0.070339,-0.35498)
+ New Momentum Direction: (0.22888,0.64523,0.7289)
+ New Polarization:       (0.85702,-0.48866,0.16346)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.16687,-0.62006,-0.7666)
- Old Polarization:       (-0.81488,0.35099,-0.46128)
- New Momentum Direction: (0.22664,-0.84214,-0.48932)
- New Polarization:       (-0.42989,-0.5373,0.7256)
- *** FresnelRefraction *** 
-Track (trackID 1561, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.22888,0.64523,0.7289)
+ Old Polarization:       (0.85702,-0.48866,0.16346)
+ New Momentum Direction: (0.22888,-0.64523,0.7289)
+ New Polarization:       (-0.85702,-0.48866,-0.16346)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1707, parentID 1) is processed with stopping code 2
+### pop requested out of 59 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1706, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.14544,-0.65754,-0.73925)
- Old Polarization:       (-0.84512,0.30593,-0.43838)
- New Momentum Direction: (0.19636,-0.88777,-0.4163)
- New Polarization:       (-0.53707,-0.45259,0.71184)
- *** FresnelRefraction *** 
-Track (trackID 1560, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.18326,0.85495,-0.48525)
+ Old Polarization:       (-0.9829,0.1683,-0.074672)
+ New Momentum Direction: (0.18326,-0.85495,-0.48525)
+ New Polarization:       (0.9577,0.043854,0.28442)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18326,-0.85495,-0.48525)
+ Old Polarization:       (0.9577,0.043854,0.28442)
+ New Momentum Direction: (0.18326,-0.85495,0.48525)
+ New Polarization:       (-0.9577,-0.043854,0.28442)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1705, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97181,-0.20748,0.11195)
- Old Polarization:       (0.11334,0.82756,0.54981)
- New Momentum Direction: (0.94777,-0.28071,0.15147)
- New Polarization:       (-0.19049,-0.11724,0.97466)
+ Old Momentum Direction: (0.3222,0.44395,-0.83612)
+ Old Polarization:       (-0.82522,-0.3011,-0.47787)
+ New Momentum Direction: (0.43738,0.60265,-0.66747)
+ New Polarization:       (0.062421,0.72009,0.69107)
  *** FresnelRefraction *** 
-Track (trackID 1559, parentID 1) is processed with stopping code 2
+Track (trackID 1704, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98576,-0.16659,0.022943)
- Old Polarization:       (0.1385,0.88166,0.4511)
- New Momentum Direction: (0.97413,-0.22387,0.030831)
- New Polarization:       (-0.20118,-0.797,0.56949)
+ Old Momentum Direction: (0.21435,0.71417,-0.66634)
+ Old Polarization:       (-0.95639,0.014871,-0.29172)
+ New Momentum Direction: (0.28885,0.33212,-0.89792)
+ New Polarization:       (-0.94823,-0.030082,-0.31616)
  *** FresnelRefraction *** 
-Track (trackID 1558, parentID 1) is processed with stopping code 2
+Track (trackID 1703, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5398,-0.25674,-0.80169)
- Old Polarization:       (-0.38672,0.77028,-0.50706)
- New Momentum Direction: (0.73058,-0.34748,-0.5878)
- New Polarization:       (0.6589,0.13289,0.7404)
+ Old Momentum Direction: (0.52978,0.13867,-0.83672)
+ Old Polarization:       (-0.58739,-0.65166,-0.47991)
+ New Momentum Direction: (0.71856,0.18808,-0.66955)
+ New Polarization:       (0.69547,-0.19512,0.69156)
  *** FresnelRefraction *** 
-Track (trackID 1557, parentID 1) is processed with stopping code 2
+Track (trackID 1702, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1556, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.19898,0.91645,-0.34718)
+ Old Polarization:       (-0.96696,0.24121,0.08252)
+ New Momentum Direction: (0.26999,0.83977,-0.47106)
+ New Polarization:       (-0.3009,-0.39114,-0.86975)
+ *** FresnelRefraction *** 
+Track (trackID 1701, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.43001,-0.82004,0.37765)
-Old Polarization: (-0.51285,0.12239,0.84971)
-New Polarization: (-0.27417,-0.2284,0.79923)
-Polarization Change: (-0.31324,-0.26094,0.91312)
-New Momentum Direction: (-0.35032,0.9069,0.13899)
-Momentum Change: (-0.35671,0.92343,0.14153)
  Photon at Boundary! 
- Old Momentum Direction: (-0.35671,0.92343,0.14153)
- Old Polarization:       (-0.31324,-0.26094,0.91312)
- New Momentum Direction: (-0.48496,0.85311,0.19241)
- New Polarization:       (-0.39668,-0.41067,0.82097)
+ Old Momentum Direction: (0.92045,-0.14377,-0.36346)
+ Old Polarization:       (-0.13062,-0.98958,0.060639)
+ New Momentum Direction: (0.85088,-0.19324,-0.48853)
+ New Polarization:       (-0.22815,-0.97355,-0.012282)
  *** FresnelRefraction *** 
-Track (trackID 1555, parentID 1) is processed with stopping code 2
+Track (trackID 1700, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1554, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.70935,0.59987,0.37009)
+ Old Polarization:       (-0.37894,-0.11817,0.91784)
+ New Momentum Direction: (0.31421,0.80796,0.49847)
+ New Polarization:       (-0.65842,-0.1928,0.72754)
+ *** FresnelRefraction *** 
+Track (trackID 1699, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1553, parentID 1) is processed with stopping code 2
+Track (trackID 1698, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99082,-0.12811,-0.043209)
- Old Polarization:       (0.13498,0.91913,0.3701)
- New Momentum Direction: (0.98312,-0.17337,-0.058476)
- New Polarization:       (-0.18281,-0.94418,-0.27406)
+ Old Momentum Direction: (0.67719,0.6387,0.36535)
+ Old Polarization:       (-0.41741,-0.075448,0.90558)
+ New Momentum Direction: (0.099009,0.86376,0.49409)
+ New Polarization:       (-0.75522,-0.25808,0.60252)
  *** FresnelRefraction *** 
-Track (trackID 1552, parentID 1) is processed with stopping code 2
+Track (trackID 1697, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1551, parentID 1) is processed with stopping code 2
+Track (trackID 1696, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95551,-0.06544,-0.28761)
- Old Polarization:       (0.094225,0.99171,0.087396)
- New Momentum Direction: (0.91689,-0.088555,-0.3892)
- New Polarization:       (-0.16651,0.80132,-0.5746)
+ Old Momentum Direction: (0.93217,-0.15428,-0.3275)
+ Old Polarization:       (-0.12626,-0.98639,0.1053)
+ New Momentum Direction: (0.87082,-0.2095,-0.44472)
+ New Polarization:       (-0.22355,-0.97446,0.021316)
  *** FresnelRefraction *** 
-Track (trackID 1550, parentID 1) is processed with stopping code 2
+Track (trackID 1695, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.24257,-0.94162,0.23348)
- Old Polarization:       (-0.72782,-0.017504,0.68554)
- New Momentum Direction: (0.32955,-0.88925,0.31721)
- New Polarization:       (-0.64614,0.032553,0.76253)
+ Old Momentum Direction: (0.99165,0.032547,0.1248)
+ Old Polarization:       (-0.053495,-0.77668,0.62762)
+ New Momentum Direction: (0.98468,0.044006,0.16874)
+ New Polarization:       (-0.091562,-0.69304,0.71506)
  *** FresnelRefraction *** 
-Track (trackID 1549, parentID 1) is processed with stopping code 2
+Track (trackID 1694, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42134,-0.3593,-0.8327)
- Old Polarization:       (-0.52421,0.65276,-0.5469)
- New Momentum Direction: (0.56892,-0.48515,-0.66405)
- New Polarization:       (0.57524,-0.34231,0.74292)
+ Old Momentum Direction: (0.45059,0.24075,-0.85966)
+ Old Polarization:       (-0.67806,-0.53408,-0.50498)
+ New Momentum Direction: (0.61162,0.32679,-0.72051)
+ New Polarization:       (0.68319,0.2411,0.68929)
  *** FresnelRefraction *** 
-Track (trackID 1548, parentID 1) is processed with stopping code 2
+Track (trackID 1693, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47842,-0.7859,0.39177)
- Old Polarization:       (-0.45776,0.15753,0.87501)
- New Momentum Direction: (0.64675,-0.54884,0.52961)
- New Polarization:       (-0.44382,0.29391,0.84655)
+ Old Momentum Direction: (0.74601,0.54257,0.38612)
+ Old Polarization:       (-0.33983,-0.18846,0.92141)
+ New Momentum Direction: (-0.74601,0.54257,0.38612)
+ New Polarization:       (-0.12055,0.4602,-0.87959)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.74601,0.54257,0.38612)
+ Old Polarization:       (-0.12055,0.4602,-0.87959)
+ New Momentum Direction: (-0.74601,-0.54257,0.38612)
+ New Polarization:       (0.12055,0.4602,0.87959)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.74601,-0.54257,0.38612)
+ Old Polarization:       (0.12055,0.4602,0.87959)
+ New Momentum Direction: (-0.74601,-0.54257,-0.38612)
+ New Polarization:       (-0.12055,-0.4602,0.87959)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.74601,-0.54257,-0.38612)
+ Old Polarization:       (-0.12055,-0.4602,0.87959)
+ New Momentum Direction: (-0.42536,-0.73737,-0.52474)
+ New Polarization:       (0.23745,-0.65042,0.72151)
  *** FresnelRefraction *** 
-Track (trackID 1547, parentID 1) is processed with stopping code 2
+Track (trackID 1692, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29351,-0.91596,0.27362)
- Old Polarization:       (-0.67293,0.0053317,0.73969)
- New Momentum Direction: (0.39626,-0.84054,0.36941)
- New Polarization:       (-0.6706,0.0098428,0.74175)
+ Old Momentum Direction: (0.2168,0.69263,-0.68794)
+ Old Polarization:       (-0.94982,-0.013095,-0.31252)
+ New Momentum Direction: (0.2932,0.22009,-0.93037)
+ New Polarization:       (-0.95147,-0.027971,-0.30647)
  *** FresnelRefraction *** 
-Track (trackID 1546, parentID 1) is processed with stopping code 2
+Track (trackID 1691, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96019,-0.069806,-0.2705)
- Old Polarization:       (0.10201,0.98903,0.10687)
- New Momentum Direction: (0.92608,-0.094285,-0.36535)
- New Polarization:       (-0.17739,0.74581,-0.64211)
+ Old Momentum Direction: (0.95561,0.15744,0.24904)
+ Old Polarization:       (-0.096552,-0.63124,0.76955)
+ New Momentum Direction: (0.91699,0.21317,0.33719)
+ New Polarization:       (-0.17043,-0.55488,0.81429)
  *** FresnelRefraction *** 
-Track (trackID 1545, parentID 1) is processed with stopping code 2
+Track (trackID 1690, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.16444,-0.97752,0.13197)
- Old Polarization:       (-0.81889,-0.060709,0.57073)
- New Momentum Direction: (0.22303,-0.95824,0.17899)
- New Polarization:       (-0.29639,0.10826,0.94891)
- *** FresnelRefraction *** 
-Track (trackID 1544, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (0.83152,-0.12107,-0.54214)
+Old Polarization: (-0.23606,-0.96047,-0.14758)
+New Polarization: (-0.79795,-0.52996,0.28708)
+Polarization Change: (-0.79795,-0.52996,0.28708)
+New Momentum Direction: (0.37929,-0.8117,-0.44416)
+Momentum Change: (0.37929,-0.8117,-0.44416)
+
+** Photon absorbed! **
+Track (trackID 1689, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94789,-0.25635,0.18919)
- Old Polarization:       (0.080995,0.76819,0.63508)
- New Momentum Direction: (0.90153,-0.34817,0.25696)
- New Polarization:       (-0.14648,0.31321,0.93832)
+ Old Momentum Direction: (0.96946,0.12207,0.2127)
+ Old Polarization:       (-0.07583,-0.6756,0.73336)
+ New Momentum Direction: (0.94381,0.16451,0.28665)
+ New Polarization:       (-0.13308,-0.60472,0.78524)
  *** FresnelRefraction *** 
-Track (trackID 1543, parentID 1) is processed with stopping code 2
+Track (trackID 1688, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.83406,-0.43471,0.33966)
- Old Polarization:       (-0.040104,0.56628,0.82324)
- New Momentum Direction: (0.67094,-0.5843,0.45654)
- New Polarization:       (-0.074616,0.55936,0.82556)
+ Old Momentum Direction: (0.7237,-0.053157,-0.68807)
+ Old Polarization:       (-0.36318,-0.87713,-0.31422)
+ New Momentum Direction: (0.36216,-0.071797,-0.92935)
+ New Polarization:       (-0.63231,-0.75147,-0.18835)
  *** FresnelRefraction *** 
-Track (trackID 1542, parentID 1) is processed with stopping code 2
+Track (trackID 1687, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1541, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.18494,0.81591,-0.5478)
+ Old Polarization:       (-0.9814,0.12412,-0.14645)
+ New Momentum Direction: (0.25132,0.61858,-0.74444)
+ New Polarization:       (-0.84576,-0.23366,-0.47968)
+ *** FresnelRefraction *** 
+Track (trackID 1686, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.02562,-0.85432,-0.51911)
- Old Polarization:       (-0.98047,0.079802,-0.17972)
- New Momentum Direction: (0.034698,-0.71029,-0.70305)
- New Polarization:       (-0.96879,0.14885,-0.1982)
+ Old Momentum Direction: (0.93493,-0.14659,-0.32315)
+ Old Polarization:       (-0.11717,-0.98713,0.10881)
+ New Momentum Direction: (0.87795,-0.19778,-0.43599)
+ New Polarization:       (-0.2059,-0.97814,0.029087)
  *** FresnelRefraction *** 
-Track (trackID 1540, parentID 1) is processed with stopping code 2
+Track (trackID 1685, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69551,-0.59142,0.40804)
- Old Polarization:       (-0.20368,0.3823,0.90131)
- New Momentum Direction: (-0.69551,-0.59142,0.40804)
- New Polarization:       (-0.12425,-0.46033,-0.87901)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69551,-0.59142,0.40804)
- Old Polarization:       (-0.12425,-0.46033,-0.87901)
- New Momentum Direction: (-0.69551,0.59142,0.40804)
- New Polarization:       (0.12425,-0.46033,0.87901)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69551,0.59142,0.40804)
- Old Polarization:       (0.12425,-0.46033,0.87901)
- New Momentum Direction: (-0.69551,0.59142,-0.40804)
- New Polarization:       (-0.12425,0.46033,0.87901)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69551,0.59142,-0.40804)
- Old Polarization:       (-0.12425,0.46033,0.87901)
- New Momentum Direction: (-0.25451,0.796,-0.54918)
- New Polarization:       (0.25298,0.60291,0.75664)
+ Old Momentum Direction: (0.98809,0.042864,0.14777)
+ Old Polarization:       (-0.063984,-0.75896,0.64798)
+ New Momentum Direction: (0.97785,0.058306,0.20101)
+ New Polarization:       (-0.11067,-0.67113,0.73304)
  *** FresnelRefraction *** 
-Track (trackID 1539, parentID 1) is processed with stopping code 2
+Track (trackID 1684, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.11788,-0.99105,0.062652)
- Old Polarization:       (-0.86939,-0.07251,0.48877)
- New Momentum Direction: (0.16037,-0.98337,0.085234)
- New Polarization:       (0.22194,0.12006,0.96764)
+ Old Momentum Direction: (0.49968,0.82839,0.25314)
+ Old Polarization:       (-0.62172,0.13951,0.77071)
+ New Momentum Direction: (0.67838,0.64937,0.34367)
+ New Polarization:       (-0.22764,-0.25897,0.93868)
  *** FresnelRefraction *** 
-Track (trackID 1538, parentID 1) is processed with stopping code 2
+Track (trackID 1683, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.037908,-0.98573,-0.16403)
- Old Polarization:       (-0.97009,-0.075684,0.23062)
- New Momentum Direction: (0.051184,-0.97382,-0.22148)
- New Polarization:       (-0.68201,0.12792,-0.72007)
+ Old Momentum Direction: (0.91528,-0.1488,-0.37432)
+ Old Polarization:       (-0.14051,-0.98884,0.049512)
+ New Momentum Direction: (0.83922,-0.20088,-0.50532)
+ New Polarization:       (-0.24667,-0.96879,-0.024543)
  *** FresnelRefraction *** 
-Track (trackID 1537, parentID 1) is processed with stopping code 2
+Track (trackID 1682, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.078265,-0.9964,-0.032566)
- Old Polarization:       (-0.92016,-0.084769,0.38226)
- New Momentum Direction: (0.10595,-0.99339,-0.044086)
- New Polarization:       (0.917,0.11476,-0.38202)
+ Old Momentum Direction: (0.9328,0.21377,0.29014)
+ Old Polarization:       (-0.12395,-0.56568,0.81526)
+ New Momentum Direction: (0.87255,0.28978,0.39331)
+ New Polarization:       (-0.21901,-0.48762,0.84514)
  *** FresnelRefraction *** 
-Track (trackID 1536, parentID 1) is processed with stopping code 2
+Track (trackID 1681, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1535, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.2395,0.62431,-0.74356)
+ Old Polarization:       (-0.92233,-0.092879,-0.37506)
+ New Momentum Direction: (0.32432,0.84541,-0.42439)
+ New Polarization:       (-0.55419,0.53339,0.63904)
+ *** FresnelRefraction *** 
+Track (trackID 1680, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8455,-0.41504,0.33596)
- Old Polarization:       (-0.033072,0.58726,0.80872)
- New Momentum Direction: (0.69126,-0.56166,0.45465)
- New Polarization:       (-0.062307,0.5805,0.81187)
+ Old Momentum Direction: (0.3712,0.36784,-0.85259)
+ Old Polarization:       (-0.77153,-0.38873,-0.50362)
+ New Momentum Direction: (0.5018,0.49725,-0.70777)
+ New Polarization:       (0.35547,0.62741,0.69282)
  *** FresnelRefraction *** 
-Track (trackID 1534, parentID 1) is processed with stopping code 2
+Track (trackID 1679, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51789,-0.27022,-0.81165)
- Old Polarization:       (-0.4122,0.75256,-0.51357)
- New Momentum Direction: (0.70311,-0.36687,-0.60914)
- New Polarization:       (0.66964,0.05341,0.74077)
+ Old Momentum Direction: (0.81791,-0.126,-0.56137)
+ Old Polarization:       (-0.25775,-0.95258,-0.16173)
+ New Momentum Direction: (0.62318,-0.17128,-0.7631)
+ New Polarization:       (-0.45267,-0.87466,-0.17335)
  *** FresnelRefraction *** 
-Track (trackID 1533, parentID 1) is processed with stopping code 2
+Track (trackID 1678, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.0045811,-0.93295,-0.35999)
- Old Polarization:       (-0.99996,-0.0070269,0.0054857)
- New Momentum Direction: (0.0062269,-0.87208,-0.48933)
- New Polarization:       (-0.99926,0.013115,-0.03609)
+ Old Momentum Direction: (0.55484,0.77426,0.30443)
+ Old Polarization:       (-0.55829,0.07521,0.82623)
+ New Momentum Direction: (0.55484,-0.77426,0.30443)
+ New Polarization:       (0.46784,-0.012219,-0.88373)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.55484,-0.77426,0.30443)
+ Old Polarization:       (0.46784,-0.012219,-0.88373)
+ New Momentum Direction: (-0.55484,-0.77426,0.30443)
+ New Polarization:       (0.46784,0.012219,0.88373)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.55484,-0.77426,0.30443)
+ Old Polarization:       (0.46784,0.012219,0.88373)
+ New Momentum Direction: (-0.55484,-0.77426,-0.30443)
+ New Polarization:       (-0.46784,-0.012219,0.88373)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.55484,-0.77426,-0.30443)
+Old Polarization: (-0.46784,-0.012219,0.88373)
+New Polarization: (0.058982,0.13503,-0.98908)
+Polarization Change: (0.058982,0.13503,-0.98908)
+New Momentum Direction: (0.96644,-0.25588,0.022698)
+Momentum Change: (0.96644,-0.25588,0.022698)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.96644,-0.25588,0.022698)
+ Old Polarization:       (0.058982,0.13503,-0.98908)
+ New Momentum Direction: (0.96644,0.25588,0.022698)
+ New Polarization:       (-0.058982,0.13503,0.98908)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.96644,0.25588,0.022698)
+ Old Polarization:       (-0.058982,0.13503,0.98908)
+ New Momentum Direction: (0.93692,0.34818,0.030886)
+ New Polarization:       (-0.1073,0.20238,0.97341)
  *** FresnelRefraction *** 
-Track (trackID 1532, parentID 1) is processed with stopping code 2
+Track (trackID 1677, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98784,-0.11006,-0.10979)
- Old Polarization:       (0.13808,0.94565,0.29441)
- New Momentum Direction: (0.97784,-0.14822,-0.14786)
- New Polarization:       (-0.19548,-0.39349,-0.8983)
+ Old Momentum Direction: (0.21856,0.68042,-0.69947)
+ Old Polarization:       (-0.94582,-0.028675,-0.32342)
+ New Momentum Direction: (0.29615,0.922,-0.24943)
+ New Polarization:       (-0.69836,0.38717,0.60199)
  *** FresnelRefraction *** 
-Track (trackID 1531, parentID 1) is processed with stopping code 2
+Track (trackID 1676, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.026419,-0.97597,-0.2163)
- Old Polarization:       (-0.98337,-0.064262,0.16985)
- New Momentum Direction: (0.035675,-0.95573,-0.29207)
- New Polarization:       (-0.87112,0.11349,-0.47777)
- *** FresnelRefraction *** 
-Track (trackID 1530, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1675, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.32438,-0.8944,0.30792)
-Old Polarization: (-0.63447,0.035718,0.77213)
-New Polarization: (0.24055,0.014513,0.86426)
-Polarization Change: (0.26811,0.016176,0.96325)
-New Momentum Direction: (-0.84411,0.23439,0.23101)
-Momentum Change: (-0.9317,0.2587,0.25498)
  Photon at Boundary! 
- Old Momentum Direction: (-0.9317,0.2587,0.25498)
- Old Polarization:       (0.26811,0.016176,0.96325)
- New Momentum Direction: (-0.87,0.35115,0.3461)
- New Polarization:       (0.41027,0.12631,0.90317)
+ Old Momentum Direction: (0.89535,-0.15419,-0.41781)
+ Old Polarization:       (-0.16878,-0.98565,0.0020515)
+ New Momentum Direction: (-0.89535,-0.15419,-0.41781)
+ New Polarization:       (0.08096,0.86617,-0.49315)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.89535,-0.15419,-0.41781)
+ Old Polarization:       (0.08096,0.86617,-0.49315)
+ New Momentum Direction: (-0.89535,-0.15419,0.41781)
+ New Polarization:       (-0.08096,-0.86617,-0.49315)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.89535,-0.15419,0.41781)
+ Old Polarization:       (-0.08096,-0.86617,-0.49315)
+ New Momentum Direction: (-0.7962,-0.20948,0.56761)
+ New Polarization:       (0.14987,-0.9772,-0.15041)
  *** FresnelRefraction *** 
-Track (trackID 1529, parentID 1) is processed with stopping code 2
+Track (trackID 1674, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1528, parentID 1) is processed with stopping code 2
+Track (trackID 1673, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95141,-0.25498,0.17263)
- Old Polarization:       (0.094599,0.77555,0.62416)
- New Momentum Direction: (0.90984,-0.34362,0.23264)
- New Polarization:       (-0.16646,0.21132,0.96314)
+ Old Momentum Direction: (0.84206,-0.13698,-0.52169)
+ Old Polarization:       (-0.22964,-0.96622,-0.11696)
+ New Momentum Direction: (0.68063,-0.18606,-0.70861)
+ New Polarization:       (-0.40358,-0.90245,-0.15069)
  *** FresnelRefraction *** 
-Track (trackID 1527, parentID 1) is processed with stopping code 2
+Track (trackID 1672, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93645,-0.062487,-0.34519)
- Old Polarization:       (0.073982,0.99705,0.020214)
- New Momentum Direction: (0.88053,-0.08443,-0.46641)
- New Polarization:       (-0.13378,0.89973,-0.41543)
+ Old Momentum Direction: (0.903,-0.15537,-0.40057)
+ Old Polarization:       (-0.16012,-0.98686,0.021817)
+ New Momentum Direction: (0.81193,-0.2111,-0.54425)
+ New Polarization:       (-0.2831,-0.95774,-0.050861)
  *** FresnelRefraction *** 
-Track (trackID 1526, parentID 1) is processed with stopping code 2
+Track (trackID 1671, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.030893,-0.84192,-0.53872)
- Old Polarization:       (-0.97475,0.093881,-0.20262)
- New Momentum Direction: (0.041828,-0.68281,-0.72939)
- New Polarization:       (-0.9599,0.17508,-0.21895)
- *** FresnelRefraction *** 
-Track (trackID 1525, parentID 1) is processed with stopping code 2
+Scattering Photon!
+Old Momentum Direction: (0.97359,-0.13316,-0.18547)
+Old Polarization: (-0.080301,-0.96013,0.26778)
+New Polarization: (0.6451,-0.40239,0.64956)
+Polarization Change: (0.6451,-0.40239,0.64956)
+New Momentum Direction: (0.4742,0.87742,0.072596)
+Momentum Change: (0.4742,0.87742,0.072596)
+
+** Photon absorbed! **
+Track (trackID 1670, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.3657,-0.87029,0.32994)
- Old Polarization:       (-0.58914,0.057986,0.80595)
- New Momentum Direction: (0.49348,-0.74716,0.44522)
- New Polarization:       (-0.57149,0.10733,0.81356)
+ Old Momentum Direction: (0.23336,0.95085,-0.20355)
+ Old Polarization:       (-0.92742,0.28056,0.24734)
+ New Momentum Direction: (0.31666,0.90743,-0.27621)
+ New Polarization:       (0.43447,-0.39761,-0.80817)
  *** FresnelRefraction *** 
-Track (trackID 1524, parentID 1) is processed with stopping code 2
+Track (trackID 1669, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.033883,-0.98742,-0.15446)
- Old Polarization:       (-0.96794,-0.070909,0.24097)
- New Momentum Direction: (0.045999,-0.97668,-0.20969)
- New Polarization:       (-0.68895,0.12099,-0.71464)
+ Old Momentum Direction: (0.9989,-0.037226,0.028428)
+ Old Polarization:       (-0.046554,-0.85584,0.51514)
+ New Momentum Direction: (0.99799,-0.050398,0.038487)
+ New Polarization:       (-0.063202,-0.83997,0.53894)
  *** FresnelRefraction *** 
-Track (trackID 1523, parentID 1) is processed with stopping code 2
+Track (trackID 1668, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1522, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.9851,0.056552,0.16241)
+ Old Polarization:       (-0.06696,-0.74373,0.66512)
+ New Momentum Direction: (0.97228,0.076893,0.22082)
+ New Polarization:       (-0.1167,-0.6588,0.74321)
+ *** FresnelRefraction *** 
+Track (trackID 1667, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1521, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.32321,-0.8981,0.29823)
- Old Polarization:       (-0.63864,0.025552,0.76908)
- New Momentum Direction: (0.32321,0.8981,0.29823)
- New Polarization:       (0.69591,-0.012012,-0.71803)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.55897,0.10697,-0.82226)
+ Old Polarization:       (-0.55404,-0.68961,-0.46635)
+ New Momentum Direction: (0.75667,0.1448,-0.63756)
+ New Polarization:       (0.64438,-0.33015,0.68977)
+ *** FresnelRefraction *** 
+Track (trackID 1666, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1520, parentID 1) is processed with stopping code 2
+Track (trackID 1665, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78957,-0.098179,-0.60575)
- Old Polarization:       (-0.097187,0.95465,-0.28141)
- New Momentum Direction: (0.55802,-0.13277,-0.81914)
- New Polarization:       (-0.18474,0.94247,-0.27861)
+ Old Momentum Direction: (0.9066,-0.15083,-0.39412)
+ Old Polarization:       (-0.15244,-0.98793,0.02743)
+ New Momentum Direction: (0.821,-0.20407,-0.53322)
+ New Polarization:       (-0.26813,-0.96235,-0.04455)
  *** FresnelRefraction *** 
-Track (trackID 1519, parentID 1) is processed with stopping code 2
+Track (trackID 1664, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23516,-0.94697,0.21897)
- Old Polarization:       (-0.73896,-0.027839,0.67318)
- New Momentum Direction: (0.31829,-0.90047,0.29639)
- New Polarization:       (-0.59911,0.051225,0.79902)
+ Old Momentum Direction: (0.62383,0.70019,0.34724)
+ Old Polarization:       (-0.4795,-0.007971,0.8775)
+ New Momentum Direction: (0.8475,0.2433,0.47175)
+ New Polarization:       (-0.48255,-0.017048,0.8757)
  *** FresnelRefraction *** 
-Track (trackID 1518, parentID 1) is processed with stopping code 2
+Track (trackID 1663, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,-0.62007,0.41977)
- Old Polarization:       (-0.24482,0.35033,0.90406)
- New Momentum Direction: (-0.66281,-0.62007,0.41977)
- New Polarization:       (-0.24482,-0.35033,-0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66281,-0.62007,0.41977)
- Old Polarization:       (-0.24482,-0.35033,-0.90406)
- New Momentum Direction: (-0.66281,0.62007,0.41977)
- New Polarization:       (0.24482,-0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66281,0.62007,0.41977)
- Old Polarization:       (0.24482,-0.35033,0.90406)
- New Momentum Direction: (-0.66281,0.62007,-0.41977)
- New Polarization:       (-0.24482,0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66281,0.62007,-0.41977)
- Old Polarization:       (-0.24482,0.35033,0.90406)
- New Momentum Direction: (0.66281,0.62007,-0.41977)
- New Polarization:       (-0.24482,-0.35033,-0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,0.62007,-0.41977)
- Old Polarization:       (-0.24482,-0.35033,-0.90406)
- New Momentum Direction: (0.66281,-0.62007,-0.41977)
- New Polarization:       (0.24482,-0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,-0.62007,-0.41977)
- Old Polarization:       (0.24482,-0.35033,0.90406)
- New Momentum Direction: (0.66281,-0.62007,0.41977)
- New Polarization:       (-0.24482,0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,-0.62007,0.41977)
- Old Polarization:       (-0.24482,0.35033,0.90406)
- New Momentum Direction: (-0.66281,-0.62007,0.41977)
- New Polarization:       (-0.24482,-0.35033,-0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66281,-0.62007,0.41977)
- Old Polarization:       (-0.24482,-0.35033,-0.90406)
- New Momentum Direction: (-0.66281,0.62007,0.41977)
- New Polarization:       (0.24482,-0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66281,0.62007,0.41977)
- Old Polarization:       (0.24482,-0.35033,0.90406)
- New Momentum Direction: (0.66281,0.62007,0.41977)
- New Polarization:       (0.24482,0.35033,-0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,0.62007,0.41977)
- Old Polarization:       (0.24482,0.35033,-0.90406)
- New Momentum Direction: (0.66281,-0.62007,0.41977)
- New Polarization:       (-0.24482,0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,-0.62007,0.41977)
- Old Polarization:       (-0.24482,0.35033,0.90406)
- New Momentum Direction: (0.66281,-0.62007,-0.41977)
- New Polarization:       (0.24482,-0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,-0.62007,-0.41977)
- Old Polarization:       (0.24482,-0.35033,0.90406)
- New Momentum Direction: (-0.66281,-0.62007,-0.41977)
- New Polarization:       (0.24482,0.35033,-0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66281,-0.62007,-0.41977)
- Old Polarization:       (0.24482,0.35033,-0.90406)
- New Momentum Direction: (-0.66281,0.62007,-0.41977)
- New Polarization:       (-0.24482,0.35033,0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66281,0.62007,-0.41977)
- Old Polarization:       (-0.24482,0.35033,0.90406)
- New Momentum Direction: (0.66281,0.62007,-0.41977)
- New Polarization:       (-0.24482,-0.35033,-0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,0.62007,-0.41977)
- Old Polarization:       (-0.24482,-0.35033,-0.90406)
- New Momentum Direction: (0.66281,0.62007,0.41977)
- New Polarization:       (0.24482,0.35033,-0.90406)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66281,0.62007,0.41977)
- Old Polarization:       (0.24482,0.35033,-0.90406)
- New Momentum Direction: (0.66281,-0.62007,0.41977)
- New Polarization:       (-0.24482,0.35033,0.90406)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1517, parentID 1) is processed with stopping code 2
+Track (trackID 1662, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.26486,-0.51033,-0.81817)
- Old Polarization:       (-0.70444,0.477,-0.52558)
- New Momentum Direction: (0.3586,-0.69094,-0.62771)
- New Polarization:       (0.0091803,-0.66978,0.7425)
+ Old Momentum Direction: (0.93037,-0.15357,-0.33291)
+ Old Polarization:       (-0.12752,-0.9869,0.098874)
+ New Momentum Direction: (0.86752,-0.20836,-0.45167)
+ New Polarization:       (-0.22553,-0.9741,0.016185)
  *** FresnelRefraction *** 
-Track (trackID 1516, parentID 1) is processed with stopping code 2
+Track (trackID 1661, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.1157,-0.69103,-0.7135)
- Old Polarization:       (-0.87509,0.26893,-0.40236)
- New Momentum Direction: (0.15691,-0.93714,-0.31168)
- New Polarization:       (-0.63543,-0.33738,0.69455)
+ Old Momentum Direction: (0.23039,0.94367,-0.2375)
+ Old Polarization:       (-0.93676,0.28116,0.20841)
+ New Momentum Direction: (0.31075,0.89489,-0.32034)
+ New Polarization:       (0.26879,-0.406,-0.87345)
  *** FresnelRefraction *** 
-Track (trackID 1515, parentID 1) is processed with stopping code 2
+Track (trackID 1660, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5039,-0.7674,0.39647)
- Old Polarization:       (-0.4282,0.1767,0.88624)
- New Momentum Direction: (0.67882,-0.50394,0.53409)
- New Polarization:       (-0.42156,0.32809,0.84536)
+ Old Momentum Direction: (0.63107,0.69614,0.34226)
+ Old Polarization:       (-0.47053,-0.0072718,0.88236)
+ New Momentum Direction: (0.85157,0.24804,0.46185)
+ New Polarization:       (-0.47326,-0.015251,0.88079)
  *** FresnelRefraction *** 
-Track (trackID 1514, parentID 1) is processed with stopping code 2
+Track (trackID 1659, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1513, parentID 1) is processed with stopping code 2
+Track (trackID 1658, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.959,-0.065235,-0.27581)
- Old Polarization:       (0.096493,0.99016,0.10131)
- New Momentum Direction: (0.9233,-0.088404,-0.37377)
- New Polarization:       (-0.16997,0.77862,-0.60404)
+ Old Momentum Direction: (0.98252,0.072661,0.1714)
+ Old Polarization:       (-0.064794,-0.72964,0.68075)
+ New Momentum Direction: (0.96776,0.098311,0.2319)
+ New Polarization:       (-0.11327,-0.65248,0.7493)
  *** FresnelRefraction *** 
-Track (trackID 1512, parentID 1) is processed with stopping code 2
+Track (trackID 1657, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67463,-0.60669,0.42047)
- Old Polarization:       (-0.23224,0.36625,0.90107)
- New Momentum Direction: (-0.67463,-0.60669,0.42047)
- New Polarization:       (-0.23224,-0.36625,-0.90107)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.67463,-0.60669,0.42047)
- Old Polarization:       (-0.23224,-0.36625,-0.90107)
- New Momentum Direction: (-0.67463,0.60669,0.42047)
- New Polarization:       (0.23224,-0.36625,0.90107)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1511, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.99123,0.034889,0.12743)
+ Old Polarization:       (-0.053843,-0.77409,0.63078)
+ New Momentum Direction: (0.98392,0.047166,0.17227)
+ New Polarization:       (-0.092343,-0.69126,0.71668)
+ *** FresnelRefraction *** 
+Track (trackID 1656, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65858,-0.17004,-0.73305)
- Old Polarization:       (-0.24982,0.86948,-0.42613)
- New Momentum Direction: (0.89233,-0.2304,-0.38817)
- New Polarization:       (0.44867,0.54696,0.70677)
+ Old Momentum Direction: (0.44999,0.87153,0.19482)
+ Old Polarization:       (-0.67988,0.19288,0.7075)
+ New Momentum Direction: (0.609,0.74807,0.26366)
+ New Polarization:       (0.0080894,-0.33825,0.94102)
  *** FresnelRefraction *** 
-Track (trackID 1510, parentID 1) is processed with stopping code 2
+Track (trackID 1655, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91379,-0.06063,-0.40164)
- Old Polarization:       (0.046526,0.99791,-0.044787)
- New Momentum Direction: (0.83556,-0.082004,-0.54324)
- New Polarization:       (-0.085768,0.9572,-0.27642)
+ Old Momentum Direction: (0.43698,0.88166,0.17813)
+ Old Polarization:       (-0.69515,0.20536,0.68891)
+ New Momentum Direction: (0.59104,0.76982,0.24093)
+ New Polarization:       (0.081626,-0.35422,0.93159)
  *** FresnelRefraction *** 
-Track (trackID 1509, parentID 1) is processed with stopping code 2
+Track (trackID 1654, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68541,-0.15553,-0.71135)
- Old Polarization:       (-0.21778,0.88842,-0.40408)
- New Momentum Direction: (0.92666,-0.21027,-0.31159)
- New Polarization:       (0.37306,0.61621,0.69362)
+ Old Momentum Direction: (0.22564,0.65165,-0.72418)
+ Old Polarization:       (-0.93514,-0.06351,-0.34853)
+ New Momentum Direction: (0.30655,0.8853,-0.34968)
+ New Polarization:       (-0.63188,0.46401,0.62082)
  *** FresnelRefraction *** 
-Track (trackID 1508, parentID 1) is processed with stopping code 2
+Track (trackID 1653, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1507, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29895,-0.46793,-0.83166)
- Old Polarization:       (-0.66268,0.5253,-0.53377)
- New Momentum Direction: (0.40655,-0.63635,-0.65557)
- New Polarization:       (0.17793,-0.64866,0.73999)
+ Old Momentum Direction: (0.93399,0.20859,0.29008)
+ Old Polarization:       (-0.12475,-0.57041,0.81183)
+ New Momentum Direction: (0.87424,0.28344,0.39416)
+ New Polarization:       (-0.22105,-0.49045,0.84297)
  *** FresnelRefraction *** 
-Track (trackID 1506, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
+Track (trackID 1652, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5122,-0.75963,0.40077)
- Old Polarization:       (-0.41853,0.18672,0.8888)
- New Momentum Direction: (0.69102,-0.47974,0.54069)
- New Polarization:       (-0.41565,0.34826,0.84021)
+ Old Momentum Direction: (0.27985,0.95575,-0.090704)
+ Old Polarization:       (-0.87794,0.293,0.37864)
+ New Momentum Direction: (0.37801,0.91766,-0.12252)
+ New Polarization:       (0.89139,-0.3965,-0.21956)
  *** FresnelRefraction *** 
-Track (trackID 1505, parentID 1) is processed with stopping code 2
+Track (trackID 1651, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1650, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74144,-0.11631,-0.66086)
- Old Polarization:       (-0.15643,0.92777,-0.33878)
- New Momentum Direction: (-0.74144,-0.11631,-0.66086)
- New Polarization:       (-0.053999,-0.97133,0.23153)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74144,-0.11631,-0.66086)
- Old Polarization:       (-0.053999,-0.97133,0.23153)
- New Momentum Direction: (-0.74144,-0.11631,0.66086)
- New Polarization:       (0.053999,0.97133,0.23153)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74144,-0.11631,0.66086)
- Old Polarization:       (0.053999,0.97133,0.23153)
- New Momentum Direction: (-0.40961,-0.15812,0.89845)
- New Polarization:       (0.10855,0.96942,0.2201)
+ Old Momentum Direction: (0.2463,0.95401,-0.17087)
+ Old Polarization:       (-0.91444,0.28717,0.2852)
+ New Momentum Direction: (0.33355,0.91389,-0.23139)
+ New Polarization:       (0.61108,-0.3965,-0.6851)
  *** FresnelRefraction *** 
-Track (trackID 1504, parentID 1) is processed with stopping code 2
+Track (trackID 1649, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 69
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 67
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 70 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1647, parentID 1) is processed with stopping code 2
-### pop requested out of 69 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1646, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41322,-0.90454,-0.10516)
- Old Polarization:       (-0.83617,-0.33116,-0.4372)
- New Momentum Direction: (0.55945,-0.81655,-0.14237)
- New Polarization:       (0.55624,0.49721,-0.66587)
+ Old Momentum Direction: (0.37297,0.89263,0.25318)
+ Old Polarization:       (-0.91816,0.31575,0.23934)
+ New Momentum Direction: (0.50555,0.79161,0.34317)
+ New Polarization:       (0.19337,-0.49159,0.84909)
  *** FresnelRefraction *** 
-Track (trackID 1645, parentID 1) is processed with stopping code 2
+Track (trackID 1806, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.59683,-0.19725,0.77774)
- Old Polarization:       (-0.61904,0.50348,0.60274)
- New Momentum Direction: (0.80937,-0.26749,0.52285)
- New Polarization:       (0.54949,0.030594,-0.83494)
- *** FresnelRefraction *** 
-Track (trackID 1644, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.65645,0.43074,-0.6193)
+ Old Polarization:       (-0.58571,-0.22635,-0.77827)
+ New Momentum Direction: (-0.65645,0.43074,-0.6193)
+ New Polarization:       (-0.58571,0.22635,0.77827)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1805, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7856,-0.40017,-0.47191)
- Old Polarization:       (-0.39428,0.26401,-0.88025)
- New Momentum Direction: (0.55313,-0.53881,-0.6354)
- New Polarization:       (-0.63374,0.22294,-0.74072)
- *** FresnelRefraction *** 
-Track (trackID 1643, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1804, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81276,0.10222,0.57356)
- Old Polarization:       (-0.36452,0.8572,0.36378)
- New Momentum Direction: (0.61411,0.13847,0.77698)
- New Polarization:       (-0.59173,0.73222,0.3372)
+ Old Momentum Direction: (0.39472,0.8871,-0.23928)
+ Old Polarization:       (-0.89081,0.30568,-0.33619)
+ New Momentum Direction: (0.53634,0.77886,-0.32513)
+ New Polarization:       (0.18813,-0.48586,-0.85355)
  *** FresnelRefraction *** 
-Track (trackID 1642, parentID 1) is processed with stopping code 2
+Track (trackID 1803, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63255,-0.65176,-0.41844)
- Old Polarization:       (-0.57743,-0.036788,-0.81561)
- New Momentum Direction: (0.63255,0.65176,-0.41844)
- New Polarization:       (0.57743,-0.036788,0.81561)
+ Old Momentum Direction: (0.50245,0.63775,0.58379)
+ Old Polarization:       (-0.76972,0.022412,0.63799)
+ New Momentum Direction: (0.50245,-0.63775,0.58379)
+ New Polarization:       (0.76972,0.022412,-0.63799)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50245,-0.63775,0.58379)
+ Old Polarization:       (0.76972,0.022412,-0.63799)
+ New Momentum Direction: (0.50245,-0.63775,-0.58379)
+ New Polarization:       (-0.76972,-0.022412,-0.63799)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63255,0.65176,-0.41844)
- Old Polarization:       (0.57743,-0.036788,0.81561)
- New Momentum Direction: (-0.63255,0.65176,-0.41844)
- New Polarization:       (0.57743,0.036788,-0.81561)
+ Old Momentum Direction: (0.50245,-0.63775,-0.58379)
+ Old Polarization:       (-0.76972,-0.022412,-0.63799)
+ New Momentum Direction: (-0.50245,-0.63775,-0.58379)
+ New Polarization:       (-0.76972,0.022412,0.63799)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63255,0.65176,-0.41844)
- Old Polarization:       (0.57743,0.036788,-0.81561)
- New Momentum Direction: (-0.63255,0.65176,0.41844)
- New Polarization:       (-0.57743,-0.036788,-0.81561)
+ Old Momentum Direction: (-0.50245,-0.63775,-0.58379)
+ Old Polarization:       (-0.76972,0.022412,0.63799)
+ New Momentum Direction: (-0.50245,0.63775,-0.58379)
+ New Polarization:       (0.76972,0.022412,-0.63799)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63255,0.65176,0.41844)
- Old Polarization:       (-0.57743,-0.036788,-0.81561)
- New Momentum Direction: (-0.63255,-0.65176,0.41844)
- New Polarization:       (0.57743,-0.036788,0.81561)
+ Old Momentum Direction: (-0.50245,0.63775,-0.58379)
+ Old Polarization:       (0.76972,0.022412,-0.63799)
+ New Momentum Direction: (-0.50245,0.63775,0.58379)
+ New Polarization:       (-0.76972,-0.022412,-0.63799)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63255,-0.65176,0.41844)
- Old Polarization:       (0.57743,-0.036788,0.81561)
- New Momentum Direction: (0.63255,-0.65176,0.41844)
- New Polarization:       (0.57743,0.036788,-0.81561)
+ Old Momentum Direction: (-0.50245,0.63775,0.58379)
+ Old Polarization:       (-0.76972,-0.022412,-0.63799)
+ New Momentum Direction: (0.50245,0.63775,0.58379)
+ New Polarization:       (-0.76972,0.022412,0.63799)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1641, parentID 1) is processed with stopping code 2
+Track (trackID 1802, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41696,-0.90136,-0.11707)
- Old Polarization:       (-0.83113,-0.32595,-0.45054)
- New Momentum Direction: (0.56504,-0.80967,-0.15865)
- New Polarization:       (0.51306,0.4954,-0.70096)
- *** FresnelRefraction *** 
-Track (trackID 1640, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.65402,0.44678,-0.61045)
+ Old Polarization:       (-0.58888,-0.20585,-0.78157)
+ New Momentum Direction: (-0.65402,0.44678,-0.61045)
+ New Polarization:       (-0.58888,0.20585,0.78157)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65402,0.44678,-0.61045)
+ Old Polarization:       (-0.58888,0.20585,0.78157)
+ New Momentum Direction: (-0.65402,0.44678,0.61045)
+ New Polarization:       (0.58888,-0.20585,0.78157)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65402,0.44678,0.61045)
+ Old Polarization:       (0.58888,-0.20585,0.78157)
+ New Momentum Direction: (-0.65402,-0.44678,0.61045)
+ New Polarization:       (-0.58888,-0.20585,-0.78157)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65402,-0.44678,0.61045)
+ Old Polarization:       (-0.58888,-0.20585,-0.78157)
+ New Momentum Direction: (-0.65402,0.44678,0.61045)
+ New Polarization:       (0.58888,-0.20585,0.78157)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65402,0.44678,0.61045)
+ Old Polarization:       (0.58888,-0.20585,0.78157)
+ New Momentum Direction: (-0.65402,-0.44678,0.61045)
+ New Polarization:       (-0.58888,-0.20585,-0.78157)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65402,-0.44678,0.61045)
+ Old Polarization:       (-0.58888,-0.20585,-0.78157)
+ New Momentum Direction: (0.65402,-0.44678,0.61045)
+ New Polarization:       (-0.58888,0.20585,0.78157)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65402,-0.44678,0.61045)
+ Old Polarization:       (-0.58888,0.20585,0.78157)
+ New Momentum Direction: (0.65402,-0.44678,-0.61045)
+ New Polarization:       (0.58888,-0.20585,0.78157)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65402,-0.44678,-0.61045)
+ Old Polarization:       (0.58888,-0.20585,0.78157)
+ New Momentum Direction: (-0.65402,-0.44678,-0.61045)
+ New Polarization:       (0.58888,0.20585,-0.78157)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1801, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5972,-0.20995,0.77413)
- Old Polarization:       (-0.61981,0.49179,0.61153)
- New Momentum Direction: (0.80392,-0.28262,0.52329)
- New Polarization:       (0.54638,0.0034465,-0.83753)
- *** FresnelRefraction *** 
-Track (trackID 1639, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.58091,0.57419,-0.57694)
+ Old Polarization:       (-0.67468,-0.056872,-0.73592)
+ New Momentum Direction: (-0.58091,0.57419,-0.57694)
+ New Polarization:       (-0.67468,0.056872,0.73592)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58091,0.57419,-0.57694)
+ Old Polarization:       (-0.67468,0.056872,0.73592)
+ New Momentum Direction: (-0.58091,0.57419,0.57694)
+ New Polarization:       (0.67468,-0.056872,0.73592)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58091,0.57419,0.57694)
+ Old Polarization:       (0.67468,-0.056872,0.73592)
+ New Momentum Direction: (-0.58091,-0.57419,0.57694)
+ New Polarization:       (-0.67468,-0.056872,-0.73592)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.58091,-0.57419,0.57694)
+ Old Polarization:       (-0.67468,-0.056872,-0.73592)
+ New Momentum Direction: (0.58091,-0.57419,0.57694)
+ New Polarization:       (-0.67468,0.056872,0.73592)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.58091,-0.57419,0.57694)
+ Old Polarization:       (-0.67468,0.056872,0.73592)
+ New Momentum Direction: (0.58091,-0.57419,-0.57694)
+ New Polarization:       (0.67468,-0.056872,0.73592)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.58091,-0.57419,-0.57694)
+ Old Polarization:       (0.67468,-0.056872,0.73592)
+ New Momentum Direction: (0.58091,0.57419,-0.57694)
+ New Polarization:       (-0.67468,-0.056872,-0.73592)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1800, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.58747,-0.7077,-0.39248)
- Old Polarization:       (-0.6297,-0.095148,-0.77099)
- New Momentum Direction: (0.79826,-0.27996,-0.5333)
- New Polarization:       (-0.49558,0.19795,-0.84571)
+ Old Momentum Direction: (0.97874,-0.19548,-0.062165)
+ Old Polarization:       (-0.2022,-0.9704,-0.13206)
+ New Momentum Direction: (0.9611,-0.26322,-0.083706)
+ New Polarization:       (-0.27403,-0.94668,-0.16946)
  *** FresnelRefraction *** 
-Track (trackID 1638, parentID 1) is processed with stopping code 2
+Track (trackID 1799, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97282,0.056305,-0.22461)
- Old Polarization:       (-0.17879,0.79905,-0.57406)
- New Momentum Direction: (0.94917,0.076534,-0.30531)
- New Polarization:       (-0.26952,0.69865,-0.66276)
+ Old Momentum Direction: (0.39252,0.84225,0.36952)
+ Old Polarization:       (-0.89288,0.25255,0.37282)
+ New Momentum Direction: (0.53371,0.68024,0.50243)
+ New Polarization:       (-0.25389,-0.43782,0.86247)
  *** FresnelRefraction *** 
-Track (trackID 1637, parentID 1) is processed with stopping code 2
+Track (trackID 1798, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57863,-0.22332,0.78442)
- Old Polarization:       (-0.63998,0.47189,0.60642)
- New Momentum Direction: (0.78654,-0.30356,0.53777)
- New Polarization:       (0.54933,-0.053894,-0.83387)
+ Old Momentum Direction: (0.36428,0.93128,-0.0042148)
+ Old Polarization:       (-0.92956,0.36332,-0.06255)
+ New Momentum Direction: (0.49307,0.86997,-0.005705)
+ New Polarization:       (0.86804,-0.49239,-0.063718)
  *** FresnelRefraction *** 
-Track (trackID 1636, parentID 1) is processed with stopping code 2
+Track (trackID 1797, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48115,-0.83931,-0.25311)
- Old Polarization:       (-0.75414,-0.24907,-0.60765)
- New Momentum Direction: (0.65387,-0.6739,-0.34397)
- New Polarization:       (-0.027279,0.43333,-0.90082)
+ Old Momentum Direction: (0.96481,-0.1991,0.17177)
+ Old Polarization:       (-0.22449,-0.96381,0.1438)
+ New Momentum Direction: (0.93429,-0.26994,0.23288)
+ New Polarization:       (-0.32539,-0.91257,0.24766)
  *** FresnelRefraction *** 
-Track (trackID 1635, parentID 1) is processed with stopping code 2
+Track (trackID 1796, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41542,-0.90292,-0.11024)
- Old Polarization:       (-0.83365,-0.32943,-0.44328)
- New Momentum Direction: (0.56236,-0.81332,-0.14923)
- New Polarization:       (0.53783,0.49684,-0.68109)
+ Old Momentum Direction: (0.92795,-0.14151,0.34479)
+ Old Polarization:       (-0.26641,-0.89881,0.34809)
+ New Momentum Direction: (0.86346,-0.19153,0.46664)
+ New Polarization:       (-0.4103,-0.8048,0.42889)
  *** FresnelRefraction *** 
-Track (trackID 1634, parentID 1) is processed with stopping code 2
+Track (trackID 1795, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1633, parentID 1) is processed with stopping code 2
+Track (trackID 1794, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.97709,0.076491,-0.1986)
-Old Polarization: (-0.17463,0.82155,-0.54273)
-New Polarization: (-0.28457,0.29532,-0.76276)
-Polarization Change: (-0.3286,0.341,-0.88076)
-New Momentum Direction: (0.091492,-0.82509,-0.35358)
-Momentum Change: (0.1014,-0.91442,-0.39186)
 
 ** Photon absorbed! **
-Track (trackID 1632, parentID 1) is processed with stopping code 2
+Track (trackID 1793, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1631, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.97749,-0.20098,-0.064194)
+ Old Polarization:       (-0.20799,-0.96902,-0.13317)
+ New Momentum Direction: (0.95838,-0.27197,-0.086867)
+ New Polarization:       (-0.28328,-0.94373,-0.17066)
+ *** FresnelRefraction *** 
+Track (trackID 1792, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62384,-0.15908,0.76519)
- Old Polarization:       (-0.58753,0.55019,0.59338)
- New Momentum Direction: (0.84334,-0.21506,0.49247)
- New Polarization:       (0.52731,0.15461,-0.83549)
+ Old Momentum Direction: (0.41416,0.86046,-0.29679)
+ Old Polarization:       (-0.8703,0.27887,-0.40598)
+ New Momentum Direction: (0.56104,0.72359,-0.40204)
+ New Polarization:       (-0.035286,-0.46434,-0.88495)
  *** FresnelRefraction *** 
-Track (trackID 1630, parentID 1) is processed with stopping code 2
+Track (trackID 1791, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1629, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71845,0.33384,-0.61023)
+ Old Polarization:       (-0.51197,-0.34008,-0.78882)
+ New Momentum Direction: (0.35565,0.44857,-0.81994)
+ New Polarization:       (-0.79438,-0.31714,-0.51806)
+ *** FresnelRefraction *** 
+Track (trackID 1790, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96363,0.2036,0.17312)
- Old Polarization:       (-0.18679,0.97638,-0.10855)
- New Momentum Direction: (0.93213,0.27588,0.23458)
- New Polarization:       (-0.2895,0.95685,0.025091)
+ Old Momentum Direction: (0.96898,-0.2079,0.13362)
+ Old Polarization:       (-0.22171,-0.97014,0.098363)
+ New Momentum Direction: (0.94189,-0.28259,0.18162)
+ New Polarization:       (-0.31599,-0.9288,0.19358)
  *** FresnelRefraction *** 
-Track (trackID 1628, parentID 1) is processed with stopping code 2
+Track (trackID 1789, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63608,-0.13179,0.76028)
- Old Polarization:       (-0.5728,0.57954,0.57969)
- New Momentum Direction: (0.86387,-0.17898,0.47084)
- New Polarization:       (0.50206,0.23049,-0.83355)
+ Old Momentum Direction: (0.36055,0.92389,0.12818)
+ Old Polarization:       (-0.93186,0.35083,0.092523)
+ New Momentum Direction: (0.48921,0.85465,0.17392)
+ New Polarization:       (0.66627,-0.4949,0.55781)
  *** FresnelRefraction *** 
-Track (trackID 1627, parentID 1) is processed with stopping code 2
+Track (trackID 1788, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72883,0.0045545,0.68468)
- Old Polarization:       (-0.46432,0.73821,0.48935)
- New Momentum Direction: (-0.72883,0.0045545,0.68468)
- New Polarization:       (-0.24277,-0.93673,-0.2522)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.62513,0.39608,0.67256)
+ Old Polarization:       (-0.62285,-0.26615,0.73567)
+ New Momentum Direction: (0.62513,0.39608,-0.67256)
+ New Polarization:       (0.62285,0.26615,0.73567)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.72883,0.0045545,0.68468)
- Old Polarization:       (-0.24277,-0.93673,-0.2522)
- New Momentum Direction: (-0.72883,0.0045545,-0.68468)
- New Polarization:       (0.19411,0.96032,-0.20024)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.62513,0.39608,-0.67256)
+ Old Polarization:       (0.62285,0.26615,0.73567)
+ New Momentum Direction: (-0.62513,0.39608,-0.67256)
+ New Polarization:       (0.62285,-0.26615,-0.73567)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.72883,0.0045545,-0.68468)
- Old Polarization:       (0.19411,0.96032,-0.20024)
- New Momentum Direction: (-0.36511,0.0061927,-0.93094)
- New Polarization:       (0.37841,0.91463,-0.14233)
- *** FresnelRefraction *** 
-Track (trackID 1626, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.62513,0.39608,-0.67256)
+ Old Polarization:       (0.62285,-0.26615,-0.73567)
+ New Momentum Direction: (-0.62513,-0.39608,-0.67256)
+ New Polarization:       (-0.62285,-0.26615,0.73567)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1787, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70443,-0.53238,-0.46943)
- Old Polarization:       (-0.49256,0.10953,-0.86336)
- New Momentum Direction: (-0.70443,-0.53238,-0.46943)
- New Polarization:       (-0.34,-0.32746,0.88157)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.51645,0.60531,0.6057)
+ Old Polarization:       (-0.7517,-0.018311,0.65925)
+ New Momentum Direction: (0.51645,0.60531,-0.6057)
+ New Polarization:       (0.7517,0.018311,0.65925)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70443,-0.53238,-0.46943)
- Old Polarization:       (-0.34,-0.32746,0.88157)
- New Momentum Direction: (-0.70443,0.53238,-0.46943)
- New Polarization:       (0.34,-0.32746,-0.88157)
+ Old Momentum Direction: (0.51645,0.60531,-0.6057)
+ Old Polarization:       (0.7517,0.018311,0.65925)
+ New Momentum Direction: (0.51645,-0.60531,-0.6057)
+ New Polarization:       (-0.7517,0.018311,-0.65925)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70443,0.53238,-0.46943)
- Old Polarization:       (0.34,-0.32746,-0.88157)
- New Momentum Direction: (-0.70443,0.53238,0.46943)
- New Polarization:       (-0.34,0.32746,-0.88157)
+ Old Momentum Direction: (0.51645,-0.60531,-0.6057)
+ Old Polarization:       (-0.7517,0.018311,-0.65925)
+ New Momentum Direction: (-0.51645,-0.60531,-0.6057)
+ New Polarization:       (-0.7517,-0.018311,0.65925)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70443,0.53238,0.46943)
- Old Polarization:       (-0.34,0.32746,-0.88157)
- New Momentum Direction: (-0.26882,0.72245,0.63703)
- New Polarization:       (0.62307,0.63479,-0.45698)
- *** FresnelRefraction *** 
-Track (trackID 1625, parentID 1) is processed with stopping code 2
-### pop requested out of 47 stacked tracks.
+ Old Momentum Direction: (-0.51645,-0.60531,-0.6057)
+ Old Polarization:       (-0.7517,-0.018311,0.65925)
+ New Momentum Direction: (-0.51645,-0.60531,0.6057)
+ New Polarization:       (0.7517,0.018311,0.65925)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50623,-0.81092,-0.29349)
- Old Polarization:       (-0.72465,-0.21548,-0.65456)
- New Momentum Direction: (0.50623,0.81092,-0.29349)
- New Polarization:       (0.50907,-0.0062872,0.8607)
- *** FresnelReflection *** 
+ Old Momentum Direction: (-0.51645,-0.60531,0.6057)
+ Old Polarization:       (0.7517,0.018311,0.65925)
+ New Momentum Direction: (-0.51645,0.60531,0.6057)
+ New Polarization:       (-0.7517,0.018311,-0.65925)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.51645,0.60531,0.6057)
+ Old Polarization:       (-0.7517,0.018311,-0.65925)
+ New Momentum Direction: (0.51645,0.60531,0.6057)
+ New Polarization:       (-0.7517,-0.018311,0.65925)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50623,0.81092,-0.29349)
- Old Polarization:       (0.50907,-0.0062872,0.8607)
- New Momentum Direction: (-0.50623,0.81092,-0.29349)
- New Polarization:       (0.50907,0.0062872,-0.8607)
+ Old Momentum Direction: (0.51645,0.60531,0.6057)
+ Old Polarization:       (-0.7517,-0.018311,0.65925)
+ New Momentum Direction: (0.51645,0.60531,-0.6057)
+ New Polarization:       (0.7517,0.018311,0.65925)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.50623,0.81092,-0.29349)
- Old Polarization:       (0.50907,0.0062872,-0.8607)
- New Momentum Direction: (-0.50623,0.81092,0.29349)
- New Polarization:       (-0.50907,-0.0062872,-0.8607)
+ Old Momentum Direction: (0.51645,0.60531,-0.6057)
+ Old Polarization:       (0.7517,0.018311,0.65925)
+ New Momentum Direction: (0.51645,-0.60531,-0.6057)
+ New Polarization:       (-0.7517,0.018311,-0.65925)
  *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1786, parentID 1) is processed with stopping code 2
+### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.50623,0.81092,0.29349)
- Old Polarization:       (-0.50907,-0.0062872,-0.8607)
- New Momentum Direction: (-0.68817,0.60601,0.39897)
- New Polarization:       (-0.5095,-0.012141,-0.86038)
+ Old Momentum Direction: (0.3715,0.8886,0.26904)
+ Old Polarization:       (-0.91706,0.306,0.25566)
+ New Momentum Direction: (0.5053,0.78151,0.36594)
+ New Polarization:       (0.1252,-0.48596,0.86497)
  *** FresnelRefraction *** 
-Track (trackID 1624, parentID 1) is processed with stopping code 2
+Track (trackID 1785, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80649,-0.34988,-0.47662)
- Old Polarization:       (-0.37328,0.32384,-0.86936)
- New Momentum Direction: (0.59535,-0.47546,-0.64768)
- New Polarization:       (-0.60815,0.26015,-0.74998)
- *** FresnelRefraction *** 
-Track (trackID 1623, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.4569,0.71447,0.52988)
+ Old Polarization:       (-0.81949,0.10643,0.56312)
+ New Momentum Direction: (0.4569,-0.71447,0.52988)
+ New Polarization:       (0.7199,-0.052893,-0.69206)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4569,-0.71447,0.52988)
+ Old Polarization:       (0.7199,-0.052893,-0.69206)
+ New Momentum Direction: (0.4569,-0.71447,-0.52988)
+ New Polarization:       (-0.7199,0.052893,-0.69206)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4569,-0.71447,-0.52988)
+ Old Polarization:       (-0.7199,0.052893,-0.69206)
+ New Momentum Direction: (-0.4569,-0.71447,-0.52988)
+ New Polarization:       (-0.7199,-0.052893,0.69206)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1784, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.44613,-0.87922,-0.16716)
- Old Polarization:       (-0.80008,-0.30812,-0.51472)
- New Momentum Direction: (0.6012,-0.76669,-0.22526)
- New Polarization:       (0.31657,0.48734,-0.81381)
- *** FresnelRefraction *** 
-Track (trackID 1622, parentID 1) is processed with stopping code 2
-### pop requested out of 44 stacked tracks.
+ Old Momentum Direction: (0.55256,0.61814,-0.55909)
+ Old Polarization:       (-0.70656,-0.0084151,-0.7076)
+ New Momentum Direction: (0.55256,-0.61814,-0.55909)
+ New Polarization:       (0.70656,-0.0084151,0.7076)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.55256,-0.61814,-0.55909)
+ Old Polarization:       (0.70656,-0.0084151,0.7076)
+ New Momentum Direction: (-0.55256,-0.61814,-0.55909)
+ New Polarization:       (0.70656,0.0084151,-0.7076)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.55256,-0.61814,-0.55909)
+ Old Polarization:       (0.70656,0.0084151,-0.7076)
+ New Momentum Direction: (-0.55256,-0.61814,0.55909)
+ New Polarization:       (-0.70656,-0.0084151,-0.7076)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1621, parentID 1) is processed with stopping code 2
-### pop requested out of 43 stacked tracks.
+Track (trackID 1783, parentID 1) is processed with stopping code 2
+### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96228,0.0076138,-0.27194)
- Old Polarization:       (-0.18585,0.74839,-0.63668)
- New Momentum Direction: (0.93,0.010287,-0.36741)
- New Polarization:       (-0.28881,0.63875,-0.71315)
+ Old Momentum Direction: (0.38884,0.86176,0.32586)
+ Old Polarization:       (-0.90165,0.28328,0.32677)
+ New Momentum Direction: (0.52566,0.72775,0.44052)
+ New Polarization:       (-0.089061,-0.46791,0.87928)
  *** FresnelRefraction *** 
-Track (trackID 1620, parentID 1) is processed with stopping code 2
+Track (trackID 1782, parentID 1) is processed with stopping code 2
+### pop requested out of 43 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.96044,-0.16319,-0.22567)
+Old Polarization: (-0.23135,-0.91861,-0.32037)
+New Polarization: (-0.25253,0.88721,0.38611)
+Polarization Change: (-0.25253,0.88721,0.38611)
+New Momentum Direction: (0.95613,0.29004,-0.041136)
+Momentum Change: (0.95613,0.29004,-0.041136)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95613,0.29004,-0.041136)
+ Old Polarization:       (-0.25253,0.88721,0.38611)
+ New Momentum Direction: (0.91737,0.39409,-0.055892)
+ New Polarization:       (-0.36565,0.88987,0.27281)
+ *** FresnelRefraction *** 
+Track (trackID 1781, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1619, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95678,-0.18513,0.22429)
+ Old Polarization:       (-0.23231,-0.95048,0.20644)
+ New Momentum Direction: (0.91932,-0.2505,0.30349)
+ New Polarization:       (-0.34433,-0.88543,0.31218)
+ *** FresnelRefraction *** 
+Track (trackID 1780, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1618, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.40083,0.82508,0.39822)
+ Old Polarization:       (-0.88344,0.23297,0.40653)
+ New Momentum Direction: (0.54483,0.64045,0.54128)
+ New Polarization:       (-0.34912,-0.41365,0.84084)
+ *** FresnelRefraction *** 
+Track (trackID 1779, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87074,0.15047,0.46816)
- Old Polarization:       (-0.29184,0.92437,0.2457)
- New Momentum Direction: (0.74991,0.20242,0.62981)
- New Polarization:       (-0.47102,0.83187,0.29347)
+ Old Momentum Direction: (0.41449,0.85578,-0.30958)
+ Old Polarization:       (-0.86768,0.26903,-0.41803)
+ New Momentum Direction: (0.56327,0.71115,-0.4207)
+ New Polarization:       (-0.086495,-0.45561,-0.88597)
  *** FresnelRefraction *** 
-Track (trackID 1617, parentID 1) is processed with stopping code 2
+Track (trackID 1778, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.58681,-0.71309,-0.38362)
- Old Polarization:       (-0.63139,-0.10635,-0.76814)
- New Momentum Direction: (0.7934,-0.31857,-0.51867)
- New Polarization:       (-0.47251,0.21484,-0.85474)
+ Old Momentum Direction: (0.38465,0.9011,-0.20017)
+ Old Polarization:       (-0.90176,0.32052,-0.28998)
+ New Momentum Direction: (0.52319,0.80756,-0.27226)
+ New Polarization:       (0.34425,-0.49252,-0.79932)
  *** FresnelRefraction *** 
-Track (trackID 1616, parentID 1) is processed with stopping code 2
+Track (trackID 1777, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5815,-0.7154,-0.38738)
- Old Polarization:       (-0.63659,-0.10363,-0.76421)
- New Momentum Direction: (0.5815,0.7154,-0.38738)
- New Polarization:       (0.50871,0.051848,0.85938)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.5815,0.7154,-0.38738)
- Old Polarization:       (0.50871,0.051848,0.85938)
- New Momentum Direction: (-0.5815,0.7154,-0.38738)
- New Polarization:       (0.50871,-0.051848,-0.85938)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.5815,0.7154,-0.38738)
-Old Polarization: (0.50871,-0.051848,-0.85938)
-New Polarization: (0.40028,-0.40592,-0.66572)
-Polarization Change: (0.4567,-0.46313,-0.75956)
-New Momentum Direction: (0.13691,-0.7189,0.52066)
-Momentum Change: (0.15243,-0.80044,0.57971)
- Photon at Boundary! 
- Old Momentum Direction: (0.15243,-0.80044,0.57971)
- Old Polarization:       (0.4567,-0.46313,-0.75956)
- New Momentum Direction: (0.20724,-0.57955,0.78814)
- New Polarization:       (0.61019,0.70629,0.35892)
+ Old Momentum Direction: (0.44829,0.73899,0.50292)
+ Old Polarization:       (-0.83207,0.13939,0.53687)
+ New Momentum Direction: (0.60549,0.41468,0.67928)
+ New Polarization:       (-0.63103,-0.26994,0.72728)
  *** FresnelRefraction *** 
-Track (trackID 1615, parentID 1) is processed with stopping code 2
+Track (trackID 1776, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9783,0.18967,0.083375)
- Old Polarization:       (-0.16824,0.9621,-0.21462)
- New Momentum Direction: (0.9599,0.25665,0.11282)
- New Polarization:       (-0.24775,0.9649,-0.08714)
+ Old Momentum Direction: (0.79302,0.080802,0.60381)
+ Old Polarization:       (-0.4268,-0.63356,0.64533)
+ New Momentum Direction: (0.56013,0.10988,0.82109)
+ New Polarization:       (-0.67525,-0.51361,0.52938)
  *** FresnelRefraction *** 
-Track (trackID 1614, parentID 1) is processed with stopping code 2
+Track (trackID 1775, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98464,0.1091,-0.13631)
- Old Polarization:       (-0.1615,0.86572,-0.47376)
- New Momentum Direction: (0.97165,0.14774,-0.18459)
- New Polarization:       (-0.2263,0.80726,-0.54509)
- *** FresnelRefraction *** 
-Track (trackID 1613, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
+ Old Momentum Direction: (0.5865,0.45838,0.66776)
+ Old Polarization:       (-0.66703,-0.19431,0.71924)
+ New Momentum Direction: (0.5865,0.45838,-0.66776)
+ New Polarization:       (0.66703,0.19431,0.71924)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5865,0.45838,-0.66776)
+ Old Polarization:       (0.66703,0.19431,0.71924)
+ New Momentum Direction: (-0.5865,0.45838,-0.66776)
+ New Polarization:       (0.66703,-0.19431,-0.71924)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5865,0.45838,-0.66776)
+ Old Polarization:       (0.66703,-0.19431,-0.71924)
+ New Momentum Direction: (-0.5865,-0.45838,-0.66776)
+ New Polarization:       (-0.66703,-0.19431,0.71924)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.5865,-0.45838,-0.66776)
+ Old Polarization:       (-0.66703,-0.19431,0.71924)
+ New Momentum Direction: (-0.5865,-0.45838,0.66776)
+ New Polarization:       (0.66703,0.19431,0.71924)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.5865,-0.45838,0.66776)
+Old Polarization: (0.66703,0.19431,0.71924)
+New Polarization: (-0.67791,-0.45796,-0.57507)
+Polarization Change: (-0.67791,-0.45796,-0.57507)
+New Momentum Direction: (0.066504,-0.81725,0.57243)
+Momentum Change: (0.066504,-0.81725,0.57243)
 
 ** Photon absorbed! **
-Track (trackID 1612, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
+Track (trackID 1774, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54562,-0.27878,0.7903)
- Old Polarization:       (-0.67835,0.40681,0.61183)
- New Momentum Direction: (0.74229,-0.37927,0.55241)
- New Polarization:       (0.50857,-0.2179,-0.83299)
+ Old Momentum Direction: (0.97796,-0.19421,-0.076662)
+ Old Polarization:       (-0.20384,-0.96759,-0.14908)
+ New Momentum Direction: (0.9596,-0.26173,-0.10331)
+ New Polarization:       (-0.27766,-0.94027,-0.19699)
  *** FresnelRefraction *** 
-Track (trackID 1611, parentID 1) is processed with stopping code 2
-### pop requested out of 33 stacked tracks.
+Track (trackID 1773, parentID 1) is processed with stopping code 2
+### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9741,0.062191,-0.2174)
- Old Polarization:       (-0.17759,0.80555,-0.56528)
- New Momentum Direction: (0.95156,0.084562,-0.2956)
- New Polarization:       (-0.26624,0.7075,-0.65465)
+ Old Momentum Direction: (0.95921,-0.19425,0.20538)
+ Old Polarization:       (-0.2325,-0.95536,0.1823)
+ New Momentum Direction: (0.92335,-0.26384,0.27895)
+ New Polarization:       (-0.34257,-0.89422,0.28814)
  *** FresnelRefraction *** 
-Track (trackID 1610, parentID 1) is processed with stopping code 2
+Track (trackID 1772, parentID 1) is processed with stopping code 2
+### pop requested out of 33 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1771, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.49046,-0.38897,0.77984)
- Old Polarization:       (-0.74463,0.27785,0.6069)
- New Momentum Direction: (0.66447,-0.52697,0.52988)
- New Polarization:       (0.30112,-0.46015,-0.83522)
- *** FresnelRefraction *** 
-Track (trackID 1609, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1770, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34305,-0.75858,0.55396)
- Old Polarization:       (-0.92341,-0.16427,0.3469)
- New Momentum Direction: (0.46219,-0.47891,0.74634)
- New Polarization:       (-0.70738,0.30844,0.63598)
+ Old Momentum Direction: (0.81926,0.0398,0.57204)
+ Old Polarization:       (-0.39492,-0.68412,0.6132)
+ New Momentum Direction: (0.6292,0.053947,0.77537)
+ New Polarization:       (-0.62284,-0.56177,0.54451)
  *** FresnelRefraction *** 
-Track (trackID 1608, parentID 1) is processed with stopping code 2
+Track (trackID 1769, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1607, parentID 1) is processed with stopping code 2
+Track (trackID 1768, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95076,-0.03436,-0.30802)
- Old Polarization:       (-0.19637,0.70211,-0.68446)
- New Momentum Direction: (0.90882,-0.046252,-0.41462)
- New Polarization:       (-0.30993,0.59044,-0.7452)
- *** FresnelRefraction *** 
-Track (trackID 1606, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1767, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.34082,-0.74224,0.57699)
- Old Polarization:       (-0.92019,-0.13764,0.36648)
- New Momentum Direction: (0.46221,-0.41718,0.78251)
- New Polarization:       (-0.75966,0.26895,0.5921)
+Scattering Photon!
+Old Momentum Direction: (0.39435,0.88759,-0.23804)
+Old Polarization: (-0.89119,0.30618,-0.33471)
+New Polarization: (-0.98178,0.1368,-0.13186)
+Polarization Change: (-0.98178,0.1368,-0.13186)
+New Momentum Direction: (-0.18899,-0.63161,0.75189)
+Momentum Change: (-0.18899,-0.63161,0.75189)
+Scattering Photon!
+Old Momentum Direction: (-0.18899,-0.63161,0.75189)
+Old Polarization: (-0.98178,0.1368,-0.13186)
+New Polarization: (0.95722,0.28034,-0.071754)
+Polarization Change: (0.95722,0.28034,-0.071754)
+New Momentum Direction: (0.28308,-0.85567,0.43323)
+Momentum Change: (0.28308,-0.85567,0.43323)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.28308,-0.85567,0.43323)
+ Old Polarization:       (0.95722,0.28034,-0.071754)
+ New Momentum Direction: (0.38467,-0.71095,0.58871)
+ New Polarization:       (0.88229,0.47064,-0.0081225)
  *** FresnelRefraction *** 
-Track (trackID 1605, parentID 1) is processed with stopping code 2
+Track (trackID 1766, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.83833,0.12838,0.52983)
- Old Polarization:       (-0.33396,0.8891,0.31299)
- New Momentum Direction: (0.67486,0.17378,0.71719)
- New Polarization:       (-0.54234,0.77586,0.32234)
+ Old Momentum Direction: (0.94135,-0.11414,-0.31753)
+ Old Polarization:       (-0.25057,-0.86671,-0.4313)
+ New Momentum Direction: (0.88965,-0.15447,-0.42971)
+ New Polarization:       (-0.38098,-0.76988,-0.512)
  *** FresnelRefraction *** 
-Track (trackID 1604, parentID 1) is processed with stopping code 2
+Track (trackID 1765, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1603, parentID 1) is processed with stopping code 2
+Track (trackID 1764, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96611,0.025543,-0.25685)
- Old Polarization:       (-0.18387,0.76648,-0.61539)
- New Momentum Direction: (0.93684,0.03461,-0.34803)
- New Polarization:       (-0.28333,0.65851,-0.6972)
+ Old Momentum Direction: (0.84134,0.012986,0.54035)
+ Old Polarization:       (-0.36556,-0.72272,0.58655)
+ New Momentum Direction: (0.68626,0.017475,0.72715)
+ New Polarization:       (-0.572,-0.60457,0.55436)
  *** FresnelRefraction *** 
-Track (trackID 1602, parentID 1) is processed with stopping code 2
+Track (trackID 1763, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.89477,0.17408,0.4112)
- Old Polarization:       (-0.265,0.94819,0.17524)
- New Momentum Direction: (0.79817,0.23486,0.55477)
- New Polarization:       (-0.42849,0.86863,0.24875)
- *** FresnelRefraction *** 
-Track (trackID 1601, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1762, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98611,0.11999,-0.11481)
- Old Polarization:       (-0.15925,0.87933,-0.44881)
- New Momentum Direction: (0.97441,0.1624,-0.1554)
- New Polarization:       (-0.21961,0.83521,-0.50418)
- *** FresnelRefraction *** 
-Track (trackID 1600, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+ Old Momentum Direction: (0.56626,0.59983,-0.56528)
+ Old Polarization:       (-0.69178,-0.026967,-0.7216)
+ New Momentum Direction: (0.56626,-0.59983,-0.56528)
+ New Polarization:       (0.69178,-0.026967,0.7216)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56626,-0.59983,-0.56528)
+ Old Polarization:       (0.69178,-0.026967,0.7216)
+ New Momentum Direction: (-0.56626,-0.59983,-0.56528)
+ New Polarization:       (0.69178,0.026967,-0.7216)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56626,-0.59983,-0.56528)
+ Old Polarization:       (0.69178,0.026967,-0.7216)
+ New Momentum Direction: (-0.56626,-0.59983,0.56528)
+ New Polarization:       (-0.69178,-0.026967,-0.7216)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56626,-0.59983,0.56528)
+ Old Polarization:       (-0.69178,-0.026967,-0.7216)
+ New Momentum Direction: (-0.56626,0.59983,0.56528)
+ New Polarization:       (0.69178,-0.026967,0.7216)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.56626,0.59983,0.56528)
+ Old Polarization:       (0.69178,-0.026967,0.7216)
+ New Momentum Direction: (0.56626,0.59983,0.56528)
+ New Polarization:       (0.69178,0.026967,-0.7216)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.56626,0.59983,0.56528)
+ Old Polarization:       (0.69178,0.026967,-0.7216)
+ New Momentum Direction: (0.56626,0.59983,-0.56528)
+ New Polarization:       (-0.69178,-0.026967,-0.7216)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1599, parentID 1) is processed with stopping code 2
+Track (trackID 1761, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71093,0.23425,0.6631)
+ Old Polarization:       (-0.52188,-0.45629,0.72072)
+ New Momentum Direction: (0.30353,0.31738,0.89841)
+ New Polarization:       (-0.82042,-0.39243,0.41582)
+ *** FresnelRefraction *** 
+Track (trackID 1760, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1598, parentID 1) is processed with stopping code 2
+Track (trackID 1759, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97841,0.19331,0.073104)
- Old Polarization:       (-0.17258,0.9588,-0.22566)
- New Momentum Direction: (0.9597,0.26286,0.099404)
- New Polarization:       (-0.25304,0.96214,-0.10126)
+ Old Momentum Direction: (0.41039,0.87066,-0.27115)
+ Old Polarization:       (-0.87711,0.29552,-0.37862)
+ New Momentum Direction: (0.55414,0.74759,-0.36612)
+ New Polarization:       (0.066768,-0.47832,-0.87564)
  *** FresnelRefraction *** 
-Track (trackID 1597, parentID 1) is processed with stopping code 2
+Track (trackID 1758, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.35576,-0.93307,0.053081)
- Old Polarization:       (-0.90016,-0.35738,-0.24897)
- New Momentum Direction: (0.48392,-0.87213,0.072203)
- New Polarization:       (0.87184,0.4876,0.046396)
+ Old Momentum Direction: (0.35855,0.93061,0.073566)
+ Old Polarization:       (-0.93351,0.35742,0.028543)
+ New Momentum Direction: (0.48689,0.86773,0.099897)
+ New Polarization:       (0.80731,-0.49072,0.32777)
  *** FresnelRefraction *** 
-Track (trackID 1596, parentID 1) is processed with stopping code 2
+Track (trackID 1757, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.38406,-0.92253,-0.038013)
- Old Polarization:       (-0.86786,-0.34663,-0.35591)
- New Momentum Direction: (0.52188,-0.85145,-0.051654)
- New Polarization:       (0.76525,0.49408,-0.41265)
+ Old Momentum Direction: (0.97565,-0.20648,0.074042)
+ Old Polarization:       (-0.20911,-0.97744,0.029696)
+ New Momentum Direction: (0.95504,-0.27907,0.10007)
+ New Polarization:       (-0.28869,-0.95221,0.099773)
  *** FresnelRefraction *** 
-Track (trackID 1595, parentID 1) is processed with stopping code 2
+Track (trackID 1756, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54881,-0.27743,0.78857)
- Old Polarization:       (-0.67527,0.40892,0.61383)
- New Momentum Direction: (0.74493,-0.37658,0.5507)
- New Polarization:       (0.51004,-0.21063,-0.83396)
- *** FresnelRefraction *** 
-Track (trackID 1594, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+ Old Momentum Direction: (0.81253,0.14265,-0.5652)
+ Old Polarization:       (-0.40259,-0.56388,-0.72108)
+ New Momentum Direction: (0.61353,0.19324,-0.76566)
+ New Polarization:       (-0.63443,-0.45671,-0.62363)
+ *** FresnelRefraction *** 
+Track (trackID 1755, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.97425,-0.20247,0.099227)
+ Old Polarization:       (-0.20895,-0.97609,0.059851)
+ New Momentum Direction: (0.95264,-0.27308,0.13383)
+ New Polarization:       (-0.29131,-0.94576,0.14381)
+ *** FresnelRefraction *** 
+Track (trackID 1754, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1753, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6232,0.40241,0.67059)
+ Old Polarization:       (-0.62536,-0.2585,0.73628)
+ New Momentum Direction: (0.6232,0.40241,-0.67059)
+ New Polarization:       (0.62536,0.2585,0.73628)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6232,0.40241,-0.67059)
+ Old Polarization:       (0.62536,0.2585,0.73628)
+ New Momentum Direction: (-0.6232,0.40241,-0.67059)
+ New Polarization:       (0.62536,-0.2585,-0.73628)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6232,0.40241,-0.67059)
+ Old Polarization:       (0.62536,-0.2585,-0.73628)
+ New Momentum Direction: (-0.6232,-0.40241,-0.67059)
+ New Polarization:       (-0.62536,-0.2585,0.73628)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6232,-0.40241,-0.67059)
+ Old Polarization:       (-0.62536,-0.2585,0.73628)
+ New Momentum Direction: (-0.6232,-0.40241,0.67059)
+ New Polarization:       (0.62536,0.2585,0.73628)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.6232,-0.40241,0.67059)
+ Old Polarization:       (0.62536,0.2585,0.73628)
+ New Momentum Direction: (0.6232,-0.40241,0.67059)
+ New Polarization:       (0.62536,-0.2585,-0.73628)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6232,-0.40241,0.67059)
+ Old Polarization:       (0.62536,-0.2585,-0.73628)
+ New Momentum Direction: (0.6232,-0.40241,-0.67059)
+ New Polarization:       (-0.62536,0.2585,-0.73628)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6232,-0.40241,-0.67059)
+ Old Polarization:       (-0.62536,0.2585,-0.73628)
+ New Momentum Direction: (0.6232,0.40241,-0.67059)
+ New Polarization:       (0.62536,0.2585,0.73628)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.6232,0.40241,-0.67059)
+ Old Polarization:       (0.62536,0.2585,0.73628)
+ New Momentum Direction: (-0.6232,0.40241,-0.67059)
+ New Polarization:       (0.62536,-0.2585,-0.73628)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1593, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.32309,-0.84065,0.43464)
- Old Polarization:       (-0.94462,-0.25858,0.20207)
- New Momentum Direction: (0.4365,-0.68166,0.5872)
- New Polarization:       (-0.39425,0.44175,0.80587)
- *** FresnelRefraction *** 
-Track (trackID 1592, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74618,-0.46151,-0.47981)
- Old Polarization:       (-0.44356,0.19282,-0.87526)
- New Momentum Direction: (0.42841,-0.62639,-0.65123)
- New Polarization:       (-0.71951,0.1995,-0.66521)
- *** FresnelRefraction *** 
-Track (trackID 1591, parentID 1) is processed with stopping code 2
+Track (trackID 1752, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1590, parentID 1) is processed with stopping code 2
+Track (trackID 1751, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93184,0.20387,0.30018)
- Old Polarization:       (-0.22594,0.97331,0.040342)
- New Momentum Direction: (0.87018,0.27684,0.40761)
- New Polarization:       (-0.36335,0.91927,0.15136)
+ Old Momentum Direction: (0.7915,0.19051,-0.58072)
+ Old Polarization:       (-0.42567,-0.50998,-0.74748)
+ New Momentum Direction: (0.56655,0.25686,-0.78297)
+ New Polarization:       (-0.66634,-0.41618,-0.6187)
  *** FresnelRefraction *** 
-Track (trackID 1589, parentID 1) is processed with stopping code 2
+Track (trackID 1750, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1749, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1748, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1747, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.49716,-0.82469,-0.26967)
-Old Polarization: (-0.73733,-0.23773,-0.63232)
-New Polarization: (-0.82489,0.3706,0.2799)
-Polarization Change: (-0.87139,0.39149,0.29568)
-New Momentum Direction: (-0.0016005,0.57733,-0.76912)
-Momentum Change: (-0.0016643,0.60032,-0.79975)
+Old Momentum Direction: (0.65302,0.43838,-0.61757)
+Old Polarization: (-0.58974,-0.21726,-0.77782)
+New Polarization: (-0.49584,0.66814,-0.55474)
+Polarization Change: (-0.49584,0.66814,-0.55474)
+New Momentum Direction: (-0.37128,-0.74057,-0.5601)
+Momentum Change: (-0.37128,-0.74057,-0.5601)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.37128,-0.74057,-0.5601)
+ Old Polarization:       (-0.49584,0.66814,-0.55474)
+ New Momentum Direction: (-0.37128,-0.74057,0.5601)
+ New Polarization:       (0.49584,-0.66814,-0.55474)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.0016643,0.60032,-0.79975)
- Old Polarization:       (-0.87139,0.39149,0.29568)
- New Momentum Direction: (-0.0022517,0.81221,-0.58336)
- New Polarization:       (-0.78094,0.36294,0.50834)
+ Old Momentum Direction: (-0.37128,-0.74057,0.5601)
+ Old Polarization:       (0.49584,-0.66814,-0.55474)
+ New Momentum Direction: (-0.5043,-0.40855,0.76077)
+ New Polarization:       (-0.16493,0.91035,0.37955)
  *** FresnelRefraction *** 
-Track (trackID 1588, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
+Track (trackID 1746, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86122,0.14399,0.48741)
- Old Polarization:       (-0.30416,0.91435,0.26731)
- New Momentum Direction: (0.72877,0.19401,0.6567)
- New Polarization:       (-0.49167,0.81576,0.30463)
+ Old Momentum Direction: (0.90217,-0.028739,-0.43043)
+ Old Polarization:       (-0.29514,-0.76884,-0.56726)
+ New Momentum Direction: (0.8129,-0.038799,-0.58111)
+ New Polarization:       (-0.45979,-0.65518,-0.59944)
  *** FresnelRefraction *** 
-Track (trackID 1587, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.31447,-0.85479,0.41284)
-Old Polarization: (-0.94856,-0.2662,0.17137)
-New Polarization: (-0.8686,0.10287,0.11027)
-Polarization Change: (-0.98526,0.11669,0.12508)
-New Momentum Direction: (-0.10822,0.023778,-0.87461)
-Momentum Change: (-0.12275,0.026971,-0.99207)
-Scattering Photon!
-Old Momentum Direction: (-0.12275,0.026971,-0.99207)
-Old Polarization: (-0.98526,0.11669,0.12508)
-New Polarization: (-0.9679,0.13951,0.097642)
-Polarization Change: (-0.98487,0.14196,0.099355)
-New Momentum Direction: (0.15107,0.43905,0.87025)
-Momentum Change: (0.15316,0.44511,0.88228)
+Track (trackID 1745, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1586, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
+Track (trackID 1744, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34589,-0.75284,0.55999)
- Old Polarization:       (-0.92109,-0.15876,0.3555)
- New Momentum Direction: (0.34589,0.75284,0.55999)
- New Polarization:       (0.82457,0.040885,-0.56428)
+ Old Momentum Direction: (0.7329,0.18834,0.65374)
+ Old Polarization:       (-0.49675,-0.50842,0.70338)
+ New Momentum Direction: (0.37957,0.25612,0.889)
+ New Polarization:       (-0.78469,-0.4199,0.45601)
+ *** FresnelRefraction *** 
+Track (trackID 1743, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.73484,0.18606,0.65222)
+ Old Polarization:       (-0.49436,-0.51143,0.70288)
+ New Momentum Direction: (-0.73484,0.18606,0.65222)
+ New Polarization:       (-0.25058,0.81912,-0.51599)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.34589,0.75284,0.55999)
- Old Polarization:       (0.82457,0.040885,-0.56428)
- New Momentum Direction: (0.34589,0.75284,-0.55999)
- New Polarization:       (-0.82457,-0.040885,-0.56428)
+ Old Momentum Direction: (-0.73484,0.18606,0.65222)
+ Old Polarization:       (-0.25058,0.81912,-0.51599)
+ New Momentum Direction: (-0.73484,0.18606,-0.65222)
+ New Polarization:       (0.25058,-0.81912,-0.51599)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1585, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+Track (trackID 1742, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92302,0.19361,0.3325)
- Old Polarization:       (-0.23242,0.96925,0.080807)
- New Momentum Direction: (0.85427,0.26157,0.44922)
- New Polarization:       (-0.374,0.90946,0.18167)
- *** FresnelRefraction *** 
-Track (trackID 1584, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
+ Old Momentum Direction: (0.53246,0.65958,-0.53051)
+ Old Polarization:       (-0.73145,0.043112,-0.68054)
+ New Momentum Direction: (0.53246,-0.65958,-0.53051)
+ New Polarization:       (0.73145,0.043112,0.68054)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50193,-0.81629,-0.28589)
- Old Polarization:       (-0.72991,-0.22245,-0.64633)
- New Momentum Direction: (0.68194,-0.61974,-0.38843)
- New Polarization:       (-0.15207,0.39932,-0.90411)
- *** FresnelRefraction *** 
-Track (trackID 1583, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
+ Old Momentum Direction: (0.53246,-0.65958,-0.53051)
+ Old Polarization:       (0.73145,0.043112,0.68054)
+ New Momentum Direction: (-0.53246,-0.65958,-0.53051)
+ New Polarization:       (0.73145,-0.043112,-0.68054)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.79801,-0.36892,-0.47653)
- Old Polarization:       (-0.38223,0.30151,-0.8735)
- New Momentum Direction: (0.57666,-0.50012,-0.64602)
- New Polarization:       (-0.6205,0.24627,-0.74454)
- *** FresnelRefraction *** 
-Track (trackID 1582, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
+ Old Momentum Direction: (-0.53246,-0.65958,-0.53051)
+ Old Polarization:       (0.73145,-0.043112,-0.68054)
+ New Momentum Direction: (-0.53246,-0.65958,0.53051)
+ New Polarization:       (-0.73145,0.043112,-0.68054)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.42029,-0.89742,-0.1341)
- Old Polarization:       (-0.82511,-0.31649,-0.46801)
- New Momentum Direction: (0.57141,-0.80016,-0.18232)
- New Polarization:       (0.44929,0.49092,-0.74641)
- *** FresnelRefraction *** 
-Track (trackID 1581, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
+ Old Momentum Direction: (-0.53246,-0.65958,0.53051)
+ Old Polarization:       (-0.73145,0.043112,-0.68054)
+ New Momentum Direction: (-0.53246,0.65958,0.53051)
+ New Polarization:       (0.73145,0.043112,0.68054)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53246,0.65958,0.53051)
+ Old Polarization:       (0.73145,0.043112,0.68054)
+ New Momentum Direction: (0.53246,0.65958,0.53051)
+ New Polarization:       (0.73145,-0.043112,-0.68054)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53246,0.65958,0.53051)
+ Old Polarization:       (0.73145,-0.043112,-0.68054)
+ New Momentum Direction: (0.53246,0.65958,-0.53051)
+ New Polarization:       (-0.73145,0.043112,-0.68054)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53246,0.65958,-0.53051)
+ Old Polarization:       (-0.73145,0.043112,-0.68054)
+ New Momentum Direction: (0.53246,-0.65958,-0.53051)
+ New Polarization:       (0.73145,0.043112,0.68054)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53246,-0.65958,-0.53051)
+ Old Polarization:       (0.73145,0.043112,0.68054)
+ New Momentum Direction: (-0.53246,-0.65958,-0.53051)
+ New Polarization:       (0.73145,-0.043112,-0.68054)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53246,-0.65958,-0.53051)
+ Old Polarization:       (0.73145,-0.043112,-0.68054)
+ New Momentum Direction: (-0.53246,-0.65958,0.53051)
+ New Polarization:       (-0.73145,0.043112,-0.68054)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.53246,-0.65958,0.53051)
+ Old Polarization:       (-0.73145,0.043112,-0.68054)
+ New Momentum Direction: (-0.53246,0.65958,0.53051)
+ New Polarization:       (0.73145,0.043112,0.68054)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1580, parentID 1) is processed with stopping code 2
+Track (trackID 1741, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1579, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.95424,-0.14967,-0.2589)
+ Old Polarization:       (-0.23888,-0.90233,-0.35881)
+ New Momentum Direction: (0.91366,-0.20344,-0.3519)
+ New Polarization:       (-0.3561,-0.81807,-0.45161)
+ *** FresnelRefraction *** 
+Track (trackID 1740, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 42
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 41
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 43 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.19368,-0.71729,-0.66931)
- Old Polarization:       (-0.96364,-0.011067,-0.26699)
- New Momentum Direction: (0.26071,-0.34686,-0.90095)
- New Polarization:       (-0.95804,0.022221,-0.28579)
- *** FresnelRefraction *** 
-Track (trackID 1689, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.16868,-0.79502,-0.58266)
- Old Polarization:       (-0.9836,-0.097492,-0.15172)
- New Momentum Direction: (0.22901,-0.56723,-0.79108)
- New Polarization:       (-0.89985,0.18658,-0.39429)
+ Old Momentum Direction: (0.28077,0.70099,-0.65558)
+ Old Polarization:       (-0.95976,0.20169,-0.19538)
+ New Momentum Direction: (0.38063,0.25537,-0.88877)
+ New Polarization:       (-0.79303,-0.40421,-0.45577)
  *** FresnelRefraction *** 
-Track (trackID 1688, parentID 1) is processed with stopping code 2
+Track (trackID 1847, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1687, parentID 1) is processed with stopping code 2
+Track (trackID 1846, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1686, parentID 1) is processed with stopping code 2
+Track (trackID 1845, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.50397,-0.83977,0.20201)
-Old Polarization: (-0.57839,-0.15443,0.80101)
-New Polarization: (-0.75869,-0.057965,0.43453)
-Polarization Change: (-0.86585,-0.066152,0.49591)
-New Momentum Direction: (0.020213,0.98028,0.16606)
-Momentum Change: (0.020326,0.98575,0.16699)
  Photon at Boundary! 
- Old Momentum Direction: (0.020326,0.98575,0.16699)
- Old Polarization:       (-0.86585,-0.066152,0.49591)
- New Momentum Direction: (0.027535,0.97369,0.22621)
- New Polarization:       (-0.79944,-0.1144,0.58975)
+ Old Momentum Direction: (0.54455,-0.00078938,-0.83873)
+ Old Polarization:       (-0.64224,-0.64356,-0.41637)
+ New Momentum Direction: (0.73802,-0.0010698,-0.67477)
+ New Polarization:       (0.57737,-0.51655,0.63231)
  *** FresnelRefraction *** 
-Track (trackID 1685, parentID 1) is processed with stopping code 2
+Track (trackID 1844, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95432,-0.22626,0.19515)
- Old Polarization:       (-0.022714,0.59631,0.80244)
- New Momentum Direction: (0.91563,-0.30444,0.26258)
- New Polarization:       (-0.041275,0.5785,0.81464)
- *** FresnelRefraction *** 
-Track (trackID 1684, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1683, parentID 1) is processed with stopping code 2
+Track (trackID 1843, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.795,0.5352,0.28555)
+ Old Polarization:       (-0.33988,0.0030921,0.94046)
+ New Momentum Direction: (0.5708,0.72443,0.38651)
+ New Polarization:       (-0.56921,0.0098691,0.82213)
+ *** FresnelRefraction *** 
+Track (trackID 1842, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98751,-0.11355,0.10924)
- Old Polarization:       (0.007772,0.72755,0.68601)
- New Momentum Direction: (0.97687,-0.1541,0.14825)
- New Polarization:       (-0.014324,0.64458,0.76441)
+ Old Momentum Direction: (0.33615,0.87119,-0.3578)
+ Old Polarization:       (-0.89632,0.41257,0.16246)
+ New Momentum Direction: (0.45408,0.74847,-0.48333)
+ New Polarization:       (0.15612,-0.60093,-0.78391)
  *** FresnelRefraction *** 
-Track (trackID 1682, parentID 1) is processed with stopping code 2
+Track (trackID 1841, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1681, parentID 1) is processed with stopping code 2
+Track (trackID 1840, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1680, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.69685,0.68086,0.22545)
+ Old Polarization:       (-0.45824,0.18085,0.87024)
+ New Momentum Direction: (-0.69685,0.68086,0.22545)
+ New Polarization:       (-0.32179,-0.015881,-0.94668)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.69685,0.68086,0.22545)
+ Old Polarization:       (-0.32179,-0.015881,-0.94668)
+ New Momentum Direction: (-0.69685,-0.68086,0.22545)
+ New Polarization:       (0.31851,-0.012139,0.94784)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.69685,-0.68086,0.22545)
+ Old Polarization:       (0.31851,-0.012139,0.94784)
+ New Momentum Direction: (-0.24593,-0.92015,0.30469)
+ New Polarization:       (0.5928,0.10592,0.79836)
+ *** FresnelRefraction *** 
+Track (trackID 1839, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.59779,-0.071529,-0.79846)
- Old Polarization:       (-0.4642,0.78115,-0.41752)
- New Momentum Direction: (0.80925,-0.096831,-0.57943)
- New Polarization:       (0.53448,0.53072,0.65777)
+ Old Momentum Direction: (0.93157,-0.24825,-0.2656)
+ Old Polarization:       (-0.17381,-0.94578,0.27439)
+ New Momentum Direction: (0.87086,-0.33564,-0.3591)
+ New Polarization:       (-0.29324,-0.94108,0.16846)
  *** FresnelRefraction *** 
-Track (trackID 1679, parentID 1) is processed with stopping code 2
+Track (trackID 1838, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.33484,-0.94215,-0.015212)
- Old Polarization:       (-0.78918,-0.28922,0.54179)
- New Momentum Direction: (0.45069,-0.89245,-0.020475)
- New Polarization:       (0.8365,0.4142,0.35876)
+ Old Momentum Direction: (0.72361,0.64769,0.2385)
+ Old Polarization:       (-0.4246,0.14531,0.89364)
+ New Momentum Direction: (0.37151,0.87124,0.32081)
+ New Polarization:       (-0.70161,0.037153,0.71159)
  *** FresnelRefraction *** 
-Track (trackID 1678, parentID 1) is processed with stopping code 2
+Track (trackID 1837, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.71304,0.031241,-0.70043)
-Old Polarization: (-0.3257,0.89943,-0.29145)
-New Polarization: (-0.27175,0.73737,-0.46294)
-Polarization Change: (-0.29795,0.80845,-0.50757)
-New Momentum Direction: (-0.80048,-0.48839,-0.30801)
-Momentum Change: (-0.81102,-0.49483,-0.31207)
 
 ** Photon absorbed! **
-Track (trackID 1677, parentID 1) is processed with stopping code 2
+Track (trackID 1836, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.37115,-0.33412,-0.86638)
- Old Polarization:       (-0.73806,0.46004,-0.49359)
- New Momentum Direction: (0.50434,-0.45401,-0.73452)
- New Polarization:       (0.46926,-0.56995,0.6745)
- *** FresnelRefraction *** 
-Track (trackID 1676, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1835, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91909,-0.30336,0.25148)
- Old Polarization:       (-0.07166,0.49889,0.8637)
- New Momentum Direction: (0.84614,-0.41031,0.34014)
- New Polarization:       (-0.13085,0.45874,0.87888)
+ Old Momentum Direction: (0.86896,0.40102,0.28999)
+ Old Polarization:       (-0.2464,-0.15758,0.95627)
+ New Momentum Direction: (0.74604,0.5396,0.3902)
+ New Polarization:       (-0.4128,-0.085028,0.90684)
  *** FresnelRefraction *** 
-Track (trackID 1675, parentID 1) is processed with stopping code 2
+Track (trackID 1834, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86046,0.098242,-0.49995)
- Old Polarization:       (-0.144,0.98812,-0.053668)
- New Momentum Direction: (0.72406,0.13299,-0.67679)
- New Polarization:       (-0.26127,0.961,-0.090683)
+ Old Momentum Direction: (0.33712,0.42762,-0.83874)
+ Old Polarization:       (-0.89666,-0.12571,-0.42449)
+ New Momentum Direction: (0.45464,0.57668,-0.67878)
+ New Polarization:       (-0.028748,0.7712,0.63594)
  *** FresnelRefraction *** 
-Track (trackID 1674, parentID 1) is processed with stopping code 2
+Track (trackID 1833, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.60506,-0.06299,-0.79368)
- Old Polarization:       (-0.4554,0.79031,-0.4099)
- New Momentum Direction: (0.82003,-0.08537,-0.56592)
- New Polarization:       (0.50928,0.56,0.65348)
- *** FresnelRefraction *** 
-Track (trackID 1673, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.4643,-0.86963,0.16786)
- Old Polarization:       (-0.62595,-0.18811,0.75684)
- New Momentum Direction: (0.63023,-0.74223,0.22785)
- New Polarization:       (0.051985,0.33315,0.94144)
- *** FresnelRefraction *** 
-Track (trackID 1672, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.87655,-0.38199,0.29282)
- Old Polarization:       (-0.12757,0.40225,0.9066)
- New Momentum Direction: (0.75657,-0.51898,0.39784)
- New Polarization:       (-0.23329,0.35414,0.90563)
- *** FresnelRefraction *** 
-Track (trackID 1671, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.20471,-0.67873,-0.70528)
- Old Polarization:       (-0.94966,0.036834,-0.31109)
- New Momentum Direction: (0.27564,-0.91388,-0.29806)
- New Polarization:       (-0.71783,-0.40192,0.56849)
- *** FresnelRefraction *** 
-Track (trackID 1670, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
+ Old Momentum Direction: (0.71257,-0.19458,-0.67408)
+ Old Polarization:       (-0.44057,-0.87183,-0.21405)
+ New Momentum Direction: (-0.71257,-0.19458,-0.67408)
+ New Polarization:       (-0.27012,0.9628,0.0076133)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.96979,0.073524,-0.2326)
- Old Polarization:       (-0.0075656,0.9621,0.27258)
- New Momentum Direction: (0.94421,0.099262,-0.31402)
- New Polarization:       (-0.013839,0.96461,0.2633)
- *** FresnelRefraction *** 
-Track (trackID 1669, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+ Old Momentum Direction: (-0.71257,-0.19458,-0.67408)
+ Old Polarization:       (-0.27012,0.9628,0.0076133)
+ New Momentum Direction: (-0.71257,-0.19458,0.67408)
+ New Polarization:       (0.27012,-0.9628,0.0076133)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1668, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.88935,0.097901,-0.44663)
- Old Polarization:       (-0.10489,0.99444,0.0091132)
- New Momentum Direction: (0.78746,0.13198,-0.60207)
- New Polarization:       (-0.18972,0.98128,-0.033036)
- *** FresnelRefraction *** 
-Track (trackID 1667, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.3811,-0.33509,-0.86167)
- Old Polarization:       (-0.73118,0.46115,-0.50271)
- New Momentum Direction: (0.51358,-0.45158,-0.72959)
- New Polarization:       (0.47966,-0.55393,0.6805)
- *** FresnelRefraction *** 
-Track (trackID 1666, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.6496,-0.70279,0.29003)
- Old Polarization:       (-0.40025,0.008205,0.91637)
- New Momentum Direction: (0.87578,-0.28304,0.39101)
- New Polarization:       (-0.40306,0.016922,0.91502)
- *** FresnelRefraction *** 
-Track (trackID 1665, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
+Track (trackID 1832, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1664, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
+Track (trackID 1831, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.53144,-0.13848,-0.8357)
- Old Polarization:       (-0.54503,0.69932,-0.46248)
- New Momentum Direction: (0.53144,-0.13848,0.8357)
- New Polarization:       (-0.054291,-0.99009,-0.12954)
+ Old Momentum Direction: (0.6493,0.73633,0.19034)
+ Old Polarization:       (-0.51607,0.24274,0.82143)
+ New Momentum Direction: (0.6493,-0.73633,0.19034)
+ New Polarization:       (0.18135,-0.093157,-0.979)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53144,-0.13848,0.8357)
- Old Polarization:       (-0.054291,-0.99009,-0.12954)
- New Momentum Direction: (-0.53144,-0.13848,0.8357)
- New Polarization:       (-0.054291,0.99009,0.12954)
+ Old Momentum Direction: (0.6493,-0.73633,0.19034)
+ Old Polarization:       (0.18135,-0.093157,-0.979)
+ New Momentum Direction: (-0.6493,-0.73633,0.19034)
+ New Polarization:       (0.18135,0.093157,0.979)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53144,-0.13848,0.8357)
- Old Polarization:       (-0.054291,0.99009,0.12954)
- New Momentum Direction: (-0.71962,-0.18751,0.66858)
- New Polarization:       (-0.44691,0.86199,-0.23927)
- *** FresnelRefraction *** 
-Track (trackID 1663, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.54769,-0.11396,-0.82888)
- Old Polarization:       (-0.52474,0.72484,-0.44638)
- New Momentum Direction: (0.7451,-0.15504,-0.64868)
- New Polarization:       (0.65608,0.34529,0.67107)
- *** FresnelRefraction *** 
-Track (trackID 1662, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.5945,-0.080629,-0.80005)
- Old Polarization:       (-0.46811,0.77427,-0.42588)
- New Momentum Direction: (0.8016,-0.10872,-0.5879)
- New Polarization:       (0.55384,0.50539,0.6617)
- *** FresnelRefraction *** 
-Track (trackID 1661, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23485,-0.94765,-0.21636)
- Old Polarization:       (-0.9104,-0.29244,0.29265)
- New Momentum Direction: (0.31681,-0.90247,-0.29186)
- New Polarization:       (0.42355,0.40993,-0.80781)
- *** FresnelRefraction *** 
-Track (trackID 1660, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.94764,-0.23411,0.21717)
- Old Polarization:       (-0.043063,0.58018,0.81335)
- New Momentum Direction: (0.90072,-0.31848,0.29543)
- New Polarization:       (-0.079678,0.54743,0.83305)
+ Old Momentum Direction: (-0.6493,-0.73633,0.19034)
+ Old Polarization:       (0.18135,0.093157,0.979)
+ New Momentum Direction: (-0.88132,-0.39563,0.25836)
+ New Polarization:       (0.19863,0.18592,0.96228)
  *** FresnelRefraction *** 
-Track (trackID 1659, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+Track (trackID 1830, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.2073,-0.6413,-0.73875)
- Old Polarization:       (-0.93626,0.088873,-0.33988)
- New Momentum Direction: (0.28161,-0.87118,-0.40218)
- New Polarization:       (-0.63759,-0.48312,0.60006)
- *** FresnelRefraction *** 
-Track (trackID 1658, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+ Old Momentum Direction: (0.99096,-0.0092776,0.13386)
+ Old Polarization:       (-0.10762,-0.65079,0.75159)
+ New Momentum Direction: (-0.99096,-0.0092776,0.13386)
+ New Polarization:       (0.10564,0.5611,0.82098)
+ *** FresnelReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1657, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.92486,-0.2863,0.25033)
-Old Polarization: (-0.070739,0.51723,0.85292)
-New Polarization: (0.41687,0.39595,0.64836)
-Polarization Change: (0.48106,0.45693,0.7482)
-New Momentum Direction: (0.089125,-0.81021,0.43749)
-Momentum Change: (0.096343,-0.87582,0.47292)
- Photon at Boundary! 
- Old Momentum Direction: (0.096343,-0.87582,0.47292)
- Old Polarization:       (0.48106,0.45693,0.7482)
- New Momentum Direction: (0.13109,-0.75414,0.6435)
- New Polarization:       (0.37882,0.63795,0.67046)
- *** FresnelRefraction *** 
-Track (trackID 1656, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.19985,-0.65914,-0.72498)
- Old Polarization:       (-0.94428,0.067928,-0.32207)
- New Momentum Direction: (0.27173,-0.89618,-0.35076)
- New Polarization:       (-0.68379,-0.43626,0.5849)
- *** FresnelRefraction *** 
-Track (trackID 1655, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.24855,-0.95346,-0.17072)
- Old Polarization:       (-0.89019,-0.29432,0.34776)
- New Momentum Direction: (0.33638,-0.91295,-0.23104)
- New Polarization:       (0.65135,0.40273,-0.64308)
- *** FresnelRefraction *** 
-Track (trackID 1654, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.21902,-0.94426,-0.24578)
- Old Polarization:       (-0.92485,-0.28118,0.2561)
- New Momentum Direction: (0.29678,-0.89499,-0.33303)
- New Polarization:       (0.2399,0.40744,-0.88116)
- *** FresnelRefraction *** 
-Track (trackID 1653, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74465,0.045206,-0.66592)
- Old Polarization:       (-0.28511,0.92364,-0.25612)
- New Momentum Direction: (0.42874,0.061189,-0.90136)
- New Polarization:       (-0.51478,0.83644,-0.18808)
- *** FresnelRefraction *** 
-Track (trackID 1652, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.60474,-0.74855,0.27196)
- Old Polarization:       (-0.45566,-0.045132,0.88901)
- New Momentum Direction: (0.8178,-0.44265,0.36778)
- New Polarization:       (-0.3681,0.088906,0.92553)
- *** FresnelRefraction *** 
-Track (trackID 1651, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.83819,-0.44604,0.31382)
-Old Polarization: (-0.17503,0.32496,0.92939)
-New Polarization: (-0.87405,0.27505,0.16631)
-Polarization Change: (-0.93855,0.29535,0.17858)
-New Momentum Direction: (0.22725,0.18492,0.88847)
-Momentum Change: (0.24291,0.19766,0.9497)
- Photon at Boundary! 
- Old Momentum Direction: (0.24291,0.19766,0.9497)
- Old Polarization:       (-0.93855,0.29535,0.17858)
- New Momentum Direction: (-0.24291,0.19766,0.9497)
- New Polarization:       (-0.93855,-0.29535,-0.17858)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.24291,0.19766,0.9497)
- Old Polarization:       (-0.93855,-0.29535,-0.17858)
- New Momentum Direction: (-0.33051,0.26895,0.90467)
- New Polarization:       (-0.94096,-0.16828,-0.29374)
- *** FresnelRefraction *** 
-Track (trackID 1650, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.34891,-0.93683,0.024774)
- Old Polarization:       (-0.76581,-0.26978,0.58374)
- New Momentum Direction: (0.47351,-0.88015,0.033621)
- New Polarization:       (0.71548,0.40662,0.56811)
- *** FresnelRefraction *** 
-Track (trackID 1649, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.51468,-0.15968,-0.84238)
- Old Polarization:       (-0.56582,0.67491,-0.47365)
- New Momentum Direction: (0.6957,-0.21585,-0.68513)
- New Polarization:       (0.71728,0.15726,0.6788)
- *** FresnelRefraction *** 
-Track (trackID 1648, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
+Track (trackID 1829, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 40
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 41 stacked tracks.
+** Photon absorbed! **
+Track (trackID 1828, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.33569,-0.84785,-0.41045)
- Old Polarization:       (-0.80052,0.48643,-0.35008)
- New Momentum Direction: (-0.45673,-0.69248,-0.55845)
- New Polarization:       (-0.64751,0.68924,-0.32508)
+ Old Momentum Direction: (0.38395,0.89598,-0.22318)
+ Old Polarization:       (-0.83698,0.43979,0.32565)
+ New Momentum Direction: (0.51951,0.79932,-0.30198)
+ New Polarization:       (0.63648,-0.5978,-0.48737)
  *** FresnelRefraction *** 
-Track (trackID 1729, parentID 1) is processed with stopping code 2
-### pop requested out of 40 stacked tracks.
+Track (trackID 1827, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.41193,-0.90768,-0.080191)
- Old Polarization:       (-0.91087,0.40776,0.06364)
- New Momentum Direction: (-0.55625,-0.82393,-0.10829)
- New Polarization:       (-0.8297,0.55796,0.016713)
+ Old Momentum Direction: (0.61572,-0.095456,-0.78216)
+ Old Polarization:       (-0.55638,-0.75557,-0.34577)
+ New Momentum Direction: (0.83589,-0.12959,-0.53338)
+ New Polarization:       (0.25428,-0.76975,0.58552)
  *** FresnelRefraction *** 
-Track (trackID 1728, parentID 1) is processed with stopping code 2
-### pop requested out of 39 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,-0.53295)
- Old Polarization:       (0.35585,0.77923,-0.51592)
- New Momentum Direction: (0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (-0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (-0.57882,0.61719,0.53295)
- New Polarization:       (0.35585,0.77923,-0.51592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,0.53295)
- Old Polarization:       (0.35585,0.77923,-0.51592)
- New Momentum Direction: (-0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+Track (trackID 1826, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (0.57882,-0.61719,-0.53295)
- New Polarization:       (0.35585,0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.47266,0.11026,-0.87432)
+ Old Polarization:       (-0.72853,-0.50934,-0.45807)
+ New Momentum Direction: (0.64103,0.14953,-0.75281)
+ New Polarization:       (0.76643,-0.072562,0.63822)
+ *** FresnelRefraction *** 
+Track (trackID 1825, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,-0.53295)
- Old Polarization:       (0.35585,0.77923,-0.51592)
- New Momentum Direction: (0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.61421,-0.088806,-0.78413)
+ Old Polarization:       (-0.55839,-0.75104,-0.35233)
+ New Momentum Direction: (0.83143,-0.12021,-0.54246)
+ New Polarization:       (0.27508,-0.75921,0.58985)
+ *** FresnelRefraction *** 
+Track (trackID 1824, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1823, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (-0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.5059,0.8625,0.012189)
+ Old Polarization:       (-0.68846,0.39522,0.60813)
+ New Momentum Direction: (0.68625,0.72718,0.016534)
+ New Polarization:       (0.61835,-0.59521,0.5132)
+ *** FresnelRefraction *** 
+Track (trackID 1822, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (-0.57882,0.61719,0.53295)
- New Polarization:       (0.35585,0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.36691,0.89423,-0.25637)
+ Old Polarization:       (-0.85525,0.43268,0.28519)
+ New Momentum Direction: (0.49791,0.79439,-0.3479)
+ New Polarization:       (0.53168,-0.59655,-0.60121)
+ *** FresnelRefraction *** 
+Track (trackID 1821, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,0.53295)
- Old Polarization:       (0.35585,0.77923,-0.51592)
- New Momentum Direction: (-0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.34244,0.39367,-0.85309)
+ Old Polarization:       (-0.88548,-0.16834,-0.43312)
+ New Momentum Direction: (0.46426,0.53372,-0.70683)
+ New Polarization:       (0.090549,0.76527,0.63731)
+ *** FresnelRefraction *** 
+Track (trackID 1820, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.34761,0.37208,-0.86065)
+ Old Polarization:       (-0.87737,-0.1947,-0.43854)
+ New Momentum Direction: (0.47232,0.50556,-0.72203)
+ New Polarization:       (0.16939,0.75183,0.63723)
+ *** FresnelRefraction *** 
+Track (trackID 1819, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (0.57882,-0.61719,-0.53295)
- New Polarization:       (0.35585,0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.65196,-0.12398,-0.74805)
+ Old Polarization:       (-0.51263,-0.799,-0.31435)
+ New Momentum Direction: (0.87892,-0.16714,-0.44673)
+ New Polarization:       (0.123,-0.82549,0.55086)
+ *** FresnelRefraction *** 
+Track (trackID 1818, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,-0.53295)
- Old Polarization:       (0.35585,0.77923,-0.51592)
- New Momentum Direction: (0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.41251,0.89734,-0.15689)
+ Old Polarization:       (-0.80163,0.43939,0.40536)
+ New Momentum Direction: (0.55882,0.80159,-0.21254)
+ New Polarization:       (0.77176,-0.59648,-0.22046)
+ *** FresnelRefraction *** 
+Track (trackID 1817, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (-0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.80507,-0.25384,-0.53612)
+ Old Polarization:       (-0.33004,-0.94268,-0.049267)
+ New Momentum Direction: (0.59094,-0.34522,-0.72912)
+ New Polarization:       (-0.55694,-0.82844,-0.059142)
+ *** FresnelRefraction *** 
+Track (trackID 1816, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (-0.57882,0.61719,0.53295)
- New Polarization:       (0.35585,0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.63534,-0.10816,-0.76462)
+ Old Polarization:       (-0.53289,-0.77802,-0.33273)
+ New Momentum Direction: (0.85762,-0.146,-0.49312)
+ New Polarization:       (0.19186,-0.7988,0.57018)
+ *** FresnelRefraction *** 
+Track (trackID 1815, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1814, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,0.53295)
- Old Polarization:       (0.35585,0.77923,-0.51592)
- New Momentum Direction: (-0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.89985,-0.25701,-0.35245)
+ Old Polarization:       (-0.20915,-0.96327,0.16842)
+ New Momentum Direction: (0.80928,-0.3461,-0.47463)
+ New Polarization:       (-0.35168,-0.93266,0.080458)
+ *** FresnelRefraction *** 
+Track (trackID 1813, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.69003,0.68784,0.22524)
+ Old Polarization:       (-0.46705,0.18542,0.86457)
+ New Momentum Direction: (0.19091,0.93286,0.30548)
+ New Polarization:       (-0.79088,-0.038151,0.61078)
+ *** FresnelRefraction *** 
+Track (trackID 1812, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (0.57882,-0.61719,-0.53295)
- New Polarization:       (0.35585,0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.98037,0.071223,0.18383)
+ Old Polarization:       (-0.11331,-0.55952,0.82104)
+ New Momentum Direction: (0.96392,0.096168,0.24822)
+ New Polarization:       (-0.18341,-0.43587,0.88112)
+ *** FresnelRefraction *** 
+Track (trackID 1811, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,-0.53295)
- Old Polarization:       (0.35585,0.77923,-0.51592)
- New Momentum Direction: (0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.7173,0.6539,0.24061)
+ Old Polarization:       (-0.43339,0.14832,0.88892)
+ New Momentum Direction: (0.33707,0.88356,0.32512)
+ New Polarization:       (-0.72217,0.021095,0.6914)
+ *** FresnelRefraction *** 
+Track (trackID 1810, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1809, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (-0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.77957,0.55742,0.28557)
+ Old Polarization:       (-0.36052,0.02654,0.93237)
+ New Momentum Direction: (0.52383,0.75812,0.3884)
+ New Polarization:       (-0.60725,0.012584,0.79441)
+ *** FresnelRefraction *** 
+Track (trackID 1808, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (-0.57882,-0.61719,-0.53295)
- New Polarization:       (0.35585,-0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.98701,-0.15474,-0.043257)
+ Old Polarization:       (-0.10666,-0.83237,0.54386)
+ New Momentum Direction: (0.97612,-0.20922,-0.058487)
+ New Polarization:       (-0.16701,-0.89489,0.41387)
+ *** FresnelRefraction *** 
+Track (trackID 1807, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 43
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,-0.61719,-0.53295)
- Old Polarization:       (0.35585,-0.77923,0.51592)
- New Momentum Direction: (-0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.42049,0.83061,-0.36507)
+ Old Polarization:       (-0.081218,0.43522,0.89665)
+ New Momentum Direction: (0.57063,0.65493,-0.49543)
+ New Polarization:       (0.75368,-0.65724,-0.000766)
+ *** FresnelRefraction *** 
+Track (trackID 1890, parentID 1) is processed with stopping code 2
+### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (0.57882,-0.61719,0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (-0.27104,0.45041,-0.85069)
+ Old Polarization:       (-0.95848,-0.044987,0.28157)
+ New Momentum Direction: (-0.36732,0.6104,-0.70178)
+ New Polarization:       (-0.88147,0.012317,0.47208)
+ *** FresnelRefraction *** 
+Track (trackID 1889, parentID 1) is processed with stopping code 2
+### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,-0.61719,0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (0.57882,0.61719,0.53295)
- New Polarization:       (0.35585,-0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (-0.069553,0.79318,-0.605)
+ Old Polarization:       (-0.7034,0.39105,0.59355)
+ New Momentum Direction: (-0.094205,0.56538,-0.81943)
+ New Polarization:       (-0.68759,-0.6322,-0.35715)
+ *** FresnelRefraction *** 
+Track (trackID 1888, parentID 1) is processed with stopping code 2
+### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,0.61719,0.53295)
- Old Polarization:       (0.35585,-0.77923,0.51592)
- New Momentum Direction: (0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,0.77923,0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.3348,-0.2688,-0.90314)
+ Old Polarization:       (-0.18942,-0.95808,0.21493)
+ New Momentum Direction: (0.45369,-0.36425,-0.81332)
+ New Polarization:       (-0.094805,-0.9272,0.36236)
+ *** FresnelRefraction *** 
+Track (trackID 1887, parentID 1) is processed with stopping code 2
+### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,0.77923,0.51592)
- New Momentum Direction: (-0.57882,0.61719,-0.53295)
- New Polarization:       (-0.35585,-0.77923,-0.51592)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.63882,0.69416,-0.33174)
+ Old Polarization:       (0.19905,0.26739,0.9428)
+ New Momentum Direction: (0.86378,0.22951,-0.44857)
+ New Polarization:       (0.49855,-0.51828,0.69486)
+ *** FresnelRefraction *** 
+Track (trackID 1886, parentID 1) is processed with stopping code 2
+### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.57882,0.61719,-0.53295)
- Old Polarization:       (-0.35585,-0.77923,-0.51592)
- New Momentum Direction: (-0.57882,-0.61719,-0.53295)
- New Polarization:       (0.35585,-0.77923,0.51592)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1727, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.82255,-0.022158,-0.56826)
+ Old Polarization:       (0.42425,-0.64151,0.63912)
+ New Momentum Direction: (0.63424,-0.030124,-0.77255)
+ New Polarization:       (-0.65378,-0.55427,-0.51512)
+ *** FresnelRefraction *** 
+Track (trackID 1885, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1726, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.61174,-0.60632,-0.50808)
-Old Polarization: (0.38857,0.78977,-0.47463)
-New Polarization: (0.15029,0.42735,-0.74041)
-Polarization Change: (0.17315,0.49234,-0.85301)
-New Momentum Direction: (0.951,0.025362,0.20768)
-Momentum Change: (0.97664,0.026046,0.21328)
  Photon at Boundary! 
- Old Momentum Direction: (0.97664,0.026046,0.21328)
- Old Polarization:       (0.17315,0.49234,-0.85301)
- New Momentum Direction: (0.95646,0.03538,0.28971)
- New Polarization:       (-0.25689,0.57316,0.77814)
+ Old Momentum Direction: (0.48287,-0.26636,-0.8342)
+ Old Polarization:       (-0.0020842,-0.95296,0.30308)
+ New Momentum Direction: (0.65505,-0.36134,-0.66358)
+ New Polarization:       (0.039454,-0.86068,0.50762)
  *** FresnelRefraction *** 
-Track (trackID 1725, parentID 1) is processed with stopping code 2
-### pop requested out of 36 stacked tracks.
+Track (trackID 1884, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77464,-0.63145,0.034694)
- Old Polarization:       (0.61179,0.76216,0.21174)
- New Momentum Direction: (0.52506,-0.84979,0.04669)
- New Polarization:       (-0.83705,-0.50571,0.20883)
+ Old Momentum Direction: (0.71587,-0.16196,-0.67918)
+ Old Polarization:       (0.28914,-0.81663,0.4995)
+ New Momentum Direction: (0.31283,-0.22032,-0.9239)
+ New Polarization:       (-0.54344,-0.8393,0.016141)
  *** FresnelRefraction *** 
-Track (trackID 1724, parentID 1) is processed with stopping code 2
+Track (trackID 1883, parentID 1) is processed with stopping code 2
+### pop requested out of 36 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.75859,-0.11681,-0.64101)
+Old Polarization: (0.34536,-0.76214,0.5476)
+New Polarization: (-0.47951,0.80342,-0.35296)
+Polarization Change: (-0.47951,0.80342,-0.35296)
+New Momentum Direction: (-0.50514,0.076194,0.85967)
+Momentum Change: (-0.50514,0.076194,0.85967)
+
+** Photon absorbed! **
+Track (trackID 1882, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.21449,-0.90388,0.37012)
- Old Polarization:       (-0.65361,0.41442,0.63329)
- New Momentum Direction: (-0.29073,-0.81473,0.50168)
- New Polarization:       (-0.55977,0.57007,0.6014)
+ Old Momentum Direction: (0.35849,-0.27335,-0.89262)
+ Old Polarization:       (-0.15975,-0.96003,0.22983)
+ New Momentum Direction: (0.48677,-0.37116,-0.79075)
+ New Polarization:       (-0.070357,-0.91896,0.38803)
  *** FresnelRefraction *** 
-Track (trackID 1723, parentID 1) is processed with stopping code 2
+Track (trackID 1881, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.41318,-0.89215,-0.18264)
- Old Polarization:       (-0.90033,0.43031,-0.065171)
- New Momentum Direction: (-0.56137,-0.78949,-0.24815)
- New Polarization:       (-0.79453,0.59804,-0.10526)
+ Old Momentum Direction: (0.20467,0.87221,-0.44425)
+ Old Polarization:       (-0.35439,0.48909,0.79699)
+ New Momentum Direction: (0.27757,0.74832,-0.60247)
+ New Polarization:       (0.32072,-0.66331,-0.67613)
  *** FresnelRefraction *** 
-Track (trackID 1722, parentID 1) is processed with stopping code 2
+Track (trackID 1880, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47568,-0.74607,0.46596)
- Old Polarization:       (0.22109,0.61413,0.75761)
- New Momentum Direction: (0.64365,-0.43379,0.6305)
- New Polarization:       (0.1055,0.86627,0.48831)
+ Old Momentum Direction: (0.51691,-0.25797,-0.81624)
+ Old Polarization:       (0.041954,-0.94473,0.32514)
+ New Momentum Direction: (0.70032,-0.34949,-0.62242)
+ New Polarization:       (0.063825,-0.8378,0.54224)
  *** FresnelRefraction *** 
-Track (trackID 1721, parentID 1) is processed with stopping code 2
+Track (trackID 1879, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.72659,-0.65591,0.20457)
- Old Polarization:       (0.53796,0.72832,0.42444)
- New Momentum Direction: (0.36577,-0.8885,0.27711)
- New Polarization:       (-0.82204,-0.16879,0.54383)
- *** FresnelRefraction *** 
-Track (trackID 1720, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1719, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
+Track (trackID 1878, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.28282,-0.91205,0.29694)
- Old Polarization:       (-0.73845,0.40461,0.53943)
- New Momentum Direction: (-0.38374,-0.83091,0.4029)
- New Polarization:       (-0.65514,0.55245,0.51535)
+ Old Momentum Direction: (0.061644,0.84898,-0.52481)
+ Old Polarization:       (-0.54031,0.47049,0.69765)
+ New Momentum Direction: (0.083109,0.70175,-0.70756)
+ New Polarization:       (-0.26676,-0.66844,-0.69428)
  *** FresnelRefraction *** 
-Track (trackID 1718, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
+Track (trackID 1877, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.36392,-0.91949,0.14863)
- Old Polarization:       (-0.84806,0.39309,0.35535)
- New Momentum Direction: (-0.49181,-0.84721,0.20087)
- New Polarization:       (-0.78201,0.53124,0.32596)
+ Old Momentum Direction: (-0.021659,-0.11496,-0.99313)
+ Old Polarization:       (-0.64064,-0.76102,0.10207)
+ New Momentum Direction: (-0.029387,-0.15599,-0.98732)
+ New Polarization:       (-0.54367,-0.82637,0.14674)
  *** FresnelRefraction *** 
-Track (trackID 1717, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
+Track (trackID 1876, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1716, parentID 1) is processed with stopping code 2
+Track (trackID 1875, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.87009,0.14299,-0.4717)
+ Old Polarization:       (0.48351,-0.43344,0.76049)
+ New Momentum Direction: (0.74208,0.19445,-0.64148)
+ New Polarization:       (-0.66364,0.078518,-0.74392)
+ *** FresnelRefraction *** 
+Track (trackID 1874, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1715, parentID 1) is processed with stopping code 2
+Track (trackID 1873, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1714, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.1419,0.014163,-0.98978)
+ Old Polarization:       (-0.79417,-0.59851,0.10529)
+ New Momentum Direction: (-0.19235,0.019198,-0.98114)
+ New Polarization:       (-0.86541,-0.4747,0.16037)
+ *** FresnelRefraction *** 
+Track (trackID 1872, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1713, parentID 1) is processed with stopping code 2
+Track (trackID 1871, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.23965,-0.91104,0.33553)
- Old Polarization:       (-0.69357,0.40249,0.59746)
- New Momentum Direction: (-0.32299,-0.83138,0.4522)
- New Polarization:       (-0.60771,0.54849,0.57432)
- *** FresnelRefraction *** 
-Track (trackID 1712, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1870, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.088294,-0.76526,-0.63764)
- Old Polarization:       (-0.49301,0.5898,-0.63959)
- New Momentum Direction: (-0.11981,-0.4869,-0.8652)
- New Polarization:       (-0.34967,0.83633,-0.42223)
- *** FresnelRefraction *** 
-Track (trackID 1711, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1869, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.10565,-0.88373,0.45592)
- Old Polarization:       (-0.51296,0.44121,0.73635)
- New Momentum Direction: (-0.14365,-0.77142,0.61991)
- New Polarization:       (-0.40932,0.61662,0.67248)
- *** FresnelRefraction *** 
-Track (trackID 1710, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1868, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.21673,-0.90209,0.37317)
- Old Polarization:       (-0.65214,0.41824,0.63229)
- New Momentum Direction: (-0.29473,-0.80969,0.50748)
- New Polarization:       (-0.55633,0.57718,0.5978)
- *** FresnelRefraction *** 
-Track (trackID 1709, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1867, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.39857,-0.91488,0.064336)
- Old Polarization:       (-0.8823,0.40163,0.24543)
- New Momentum Direction: (-0.54142,-0.8362,0.087395)
- New Polarization:       (-0.81145,0.54692,0.20597)
- *** FresnelRefraction *** 
-Track (trackID 1708, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1866, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.30909,-0.83736,-0.45087)
- Old Polarization:       (-0.76784,0.49945,-0.4012)
- New Momentum Direction: (-0.42037,-0.66878,-0.6132)
- New Polarization:       (-0.60917,0.70888,-0.35553)
+ Old Momentum Direction: (0.60287,-0.23125,-0.76359)
+ Old Polarization:       (0.14925,-0.90749,0.39267)
+ New Momentum Direction: (0.81832,-0.31389,-0.48149)
+ New Polarization:       (0.095244,-0.75207,0.65217)
  *** FresnelRefraction *** 
-Track (trackID 1707, parentID 1) is processed with stopping code 2
+Track (trackID 1865, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.53138,-0.72589,0.43671)
- Old Polarization:       (0.28711,0.63932,0.71333)
- New Momentum Direction: (0.53138,0.72589,0.43671)
- New Polarization:       (0.021489,0.5038,-0.86355)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.53138,0.72589,0.43671)
- Old Polarization:       (0.021489,0.5038,-0.86355)
- New Momentum Direction: (-0.53138,0.72589,0.43671)
- New Polarization:       (0.021489,-0.5038,0.86355)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.53138,0.72589,0.43671)
- Old Polarization:       (0.021489,-0.5038,0.86355)
- New Momentum Direction: (-0.53138,0.72589,-0.43671)
- New Polarization:       (-0.021489,0.5038,0.86355)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.54936,-0.24961,-0.79743)
+ Old Polarization:       (0.082836,-0.93337,0.34922)
+ New Momentum Direction: (0.74458,-0.33831,-0.57545)
+ New Polarization:       (0.081249,-0.80972,0.58116)
+ *** FresnelRefraction *** 
+Track (trackID 1864, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1706, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.40683,-0.91349,-0.0051965)
- Old Polarization:       (-0.90219,0.4009,0.15917)
- New Momentum Direction: (-0.54997,-0.83516,-0.0070248)
- New Polarization:       (-0.83009,0.54567,0.11484)
- *** FresnelRefraction *** 
-Track (trackID 1705, parentID 1) is processed with stopping code 2
+Track (trackID 1863, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77846,-0.62557,0.051579)
- Old Polarization:       (0.60034,0.76601,0.22985)
- New Momentum Direction: (0.52396,-0.84886,0.06999)
- New Polarization:       (-0.83321,-0.49378,0.24888)
+ Old Momentum Direction: (0.6335,-0.21355,-0.74369)
+ Old Polarization:       (0.19027,-0.88865,0.41726)
+ New Momentum Direction: (0.8581,-0.28927,-0.42426)
+ New Polarization:       (0.099133,-0.71736,0.68961)
  *** FresnelRefraction *** 
-Track (trackID 1704, parentID 1) is processed with stopping code 2
+Track (trackID 1862, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.061013,-0.85029,0.52276)
- Old Polarization:       (-0.30402,0.48302,0.82114)
- New Momentum Direction: (0.08292,-0.69884,0.71046)
- New Polarization:       (-0.21591,0.68338,0.6974)
+ Old Momentum Direction: (0.39228,-0.27476,-0.87785)
+ Old Polarization:       (-0.11712,-0.9615,0.2486)
+ New Momentum Direction: (0.53275,-0.37315,-0.75957)
+ New Polarization:       (-0.037609,-0.90709,0.41924)
  *** FresnelRefraction *** 
-Track (trackID 1703, parentID 1) is processed with stopping code 2
+Track (trackID 1861, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1702, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67243,-0.60576,-0.42532)
- Old Polarization:       (0.47593,0.79395,-0.37834)
- New Momentum Direction: (-0.67243,-0.60576,-0.42532)
- New Polarization:       (-0.44845,-0.12372,0.8852)
- *** FresnelReflection *** 
+ Old Momentum Direction: (0.66204,0.67511,-0.32546)
+ Old Polarization:       (0.22298,0.23716,0.94553)
+ New Momentum Direction: (0.66204,-0.67511,-0.32546)
+ New Polarization:       (-0.22298,0.23716,-0.94553)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67243,-0.60576,-0.42532)
- Old Polarization:       (-0.44845,-0.12372,0.8852)
- New Momentum Direction: (-0.67243,0.60576,-0.42532)
- New Polarization:       (0.44845,-0.12372,-0.8852)
+ Old Momentum Direction: (0.66204,-0.67511,-0.32546)
+ Old Polarization:       (-0.22298,0.23716,-0.94553)
+ New Momentum Direction: (-0.66204,-0.67511,-0.32546)
+ New Polarization:       (-0.22298,-0.23716,0.94553)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67243,0.60576,-0.42532)
- Old Polarization:       (0.44845,-0.12372,-0.8852)
- New Momentum Direction: (-0.67243,0.60576,0.42532)
- New Polarization:       (-0.44845,0.12372,-0.8852)
+ Old Momentum Direction: (-0.66204,-0.67511,-0.32546)
+ Old Polarization:       (-0.22298,-0.23716,0.94553)
+ New Momentum Direction: (-0.66204,-0.67511,0.32546)
+ New Polarization:       (0.22298,0.23716,0.94553)
  *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1860, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.67243,0.60576,0.42532)
- Old Polarization:       (-0.44845,0.12372,-0.8852)
- New Momentum Direction: (-0.053545,0.81724,0.5738)
- New Polarization:       (0.79717,0.38105,-0.46832)
+ Old Momentum Direction: (0.61985,0.71156,-0.33084)
+ Old Polarization:       (0.17303,0.2873,0.94208)
+ New Momentum Direction: (0.83955,0.30719,-0.4481)
+ New Polarization:       (0.54165,-0.53727,0.64649)
  *** FresnelRefraction *** 
-Track (trackID 1701, parentID 1) is processed with stopping code 2
+Track (trackID 1859, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45478,-0.75091,0.47887)
- Old Polarization:       (0.19273,0.60793,0.77025)
- New Momentum Direction: (0.61663,-0.44518,0.64929)
- New Polarization:       (0.09267,0.86007,0.50169)
+ Old Momentum Direction: (0.73972,0.58502,-0.3325)
+ Old Polarization:       (0.32296,0.12484,0.93814)
+ New Momentum Direction: (0.40809,0.7937,-0.45111)
+ New Polarization:       (-0.57466,0.60728,0.54861)
  *** FresnelRefraction *** 
-Track (trackID 1700, parentID 1) is processed with stopping code 2
+Track (trackID 1858, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.31149,-0.91839,0.24401)
- Old Polarization:       (-0.78461,0.39343,0.47916)
- New Momentum Direction: (-0.4201,-0.8457,0.3291)
- New Polarization:       (-0.712,0.53202,0.45827)
+ Old Momentum Direction: (0.33445,0.85219,-0.40239)
+ Old Polarization:       (-0.189,0.47896,0.85725)
+ New Momentum Direction: (0.44988,0.71038,-0.54127)
+ New Polarization:       (0.66596,-0.67066,-0.32667)
  *** FresnelRefraction *** 
-Track (trackID 1699, parentID 1) is processed with stopping code 2
+Track (trackID 1857, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.22166,-0.68684,-0.69218)
- Old Polarization:       (-0.10151,0.68973,-0.71692)
- New Momentum Direction: (0.29951,-0.92805,-0.22138)
- New Polarization:       (0.13765,-0.18758,0.97256)
- *** FresnelRefraction *** 
-Track (trackID 1698, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1697, parentID 1) is processed with stopping code 2
+Track (trackID 1856, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.13184,-0.0055593,-0.99126)
+ Old Polarization:       (-0.77698,-0.62039,0.10682)
+ New Momentum Direction: (-0.17928,-0.0075596,-0.98377)
+ New Polarization:       (-0.84767,-0.50634,0.15837)
+ *** FresnelRefraction *** 
+Track (trackID 1855, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23375,-0.67769,-0.6972)
- Old Polarization:       (-0.08718,0.69957,-0.70922)
- New Momentum Direction: (0.31805,-0.92209,-0.22045)
- New Polarization:       (0.15848,-0.17754,0.97127)
+ Old Momentum Direction: (-0.15648,0.72361,-0.67224)
+ Old Polarization:       (-0.80827,0.29735,0.50821)
+ New Momentum Direction: (-0.21274,0.34563,-0.91394)
+ New Polarization:       (-0.83522,-0.54976,-0.013489)
  *** FresnelRefraction *** 
-Track (trackID 1696, parentID 1) is processed with stopping code 2
+Track (trackID 1854, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29612,-0.7979,0.52505)
- Old Polarization:       (-0.006388,0.54804,0.83643)
- New Momentum Direction: (0.39995,-0.58065,0.70914)
- New Polarization:       (0.0032359,0.77461,0.63243)
+ Old Momentum Direction: (-0.24627,0.57375,-0.78113)
+ Old Polarization:       (-0.92222,0.10915,0.37093)
+ New Momentum Direction: (-0.33464,0.77964,-0.52932)
+ New Polarization:       (-0.78146,0.084311,0.61823)
  *** FresnelRefraction *** 
-Track (trackID 1695, parentID 1) is processed with stopping code 2
+Track (trackID 1853, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.27923,-0.91231,0.29954)
- Old Polarization:       (-0.73554,0.40375,0.54403)
- New Momentum Direction: (-0.37847,-0.83182,0.406)
- New Polarization:       (-0.65244,0.55088,0.52044)
- *** FresnelRefraction *** 
-Track (trackID 1694, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1852, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78792,-0.61514,-0.028095)
- Old Polarization:       (0.61307,0.77936,0.12942)
- New Momentum Direction: (0.54989,-0.83436,-0.038107)
- New Polarization:       (-0.83343,-0.55113,0.040525)
+ Old Momentum Direction: (-0.22156,0.15335,-0.96301)
+ Old Polarization:       (-0.89584,-0.42213,0.13889)
+ New Momentum Direction: (-0.30023,0.20779,-0.93096)
+ New Polarization:       (-0.92535,-0.3003,0.23139)
  *** FresnelRefraction *** 
-Track (trackID 1693, parentID 1) is processed with stopping code 2
+Track (trackID 1851, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1850, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1849, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.18087,-0.80311,-0.56772)
- Old Polarization:       (-0.6215,0.54071,-0.56689)
- New Momentum Direction: (-0.24311,-0.59886,-0.76307)
- New Polarization:       (-0.47121,0.76052,-0.44673)
+ Old Momentum Direction: (-0.26725,0.32471,-0.90727)
+ Old Polarization:       (-0.9564,-0.20443,0.20856)
+ New Momentum Direction: (-0.36166,0.43941,-0.82227)
+ New Polarization:       (-0.93002,-0.10822,0.35122)
  *** FresnelRefraction *** 
-Track (trackID 1692, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
+Track (trackID 1848, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 31
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 32 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.094796,-0.71033,-0.69746)
+Old Polarization: (-0.14433,-0.70302,0.69638)
+New Polarization: (-0.43888,-0.52689,0.72786)
+Polarization Change: (-0.43888,-0.52689,0.72786)
+New Momentum Direction: (-0.79088,0.61099,-0.034591)
+Momentum Change: (-0.79088,0.61099,-0.034591)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.79088,0.61099,-0.034591)
+ Old Polarization:       (-0.43888,-0.52689,0.72786)
+ New Momentum Direction: (-0.55581,0.82998,-0.046988)
+ New Polarization:       (0.68794,0.49096,0.53451)
+ *** FresnelRefraction *** 
+Track (trackID 1921, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1920, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.68375,0.071328,-0.72622)
+ Old Polarization:       (0.66259,0.35625,0.65883)
+ New Momentum Direction: (0.92366,0.096355,-0.37089)
+ New Polarization:       (0.34133,0.23302,0.9106)
+ *** FresnelRefraction *** 
+Track (trackID 1919, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.16134,-0.70319,-0.69245)
+ Old Polarization:       (-0.053802,-0.70687,0.70529)
+ New Momentum Direction: (0.21785,-0.27975,-0.93503)
+ New Polarization:       (0.13182,0.95769,-0.25582)
+ *** FresnelRefraction *** 
+Track (trackID 1918, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29213,-0.67294,-0.67957)
+ Old Polarization:       (0.12901,-0.67634,0.7252)
+ New Momentum Direction: (0.39251,-0.90416,-0.16859)
+ New Polarization:       (-0.020125,-0.1917,0.98125)
+ *** FresnelRefraction *** 
+Track (trackID 1917, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5973,0.24883,-0.76244)
+ Old Polarization:       (0.53122,0.58948,0.60854)
+ New Momentum Direction: (0.5973,0.24883,0.76244)
+ New Polarization:       (-0.042844,-0.9394,0.34015)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.5973,0.24883,0.76244)
+ Old Polarization:       (-0.042844,-0.9394,0.34015)
+ New Momentum Direction: (-0.5973,0.24883,0.76244)
+ New Polarization:       (-0.042844,0.9394,-0.34015)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.5973,0.24883,0.76244)
+Old Polarization: (-0.042844,0.9394,-0.34015)
+New Polarization: (0.097391,0.8686,-0.48584)
+Polarization Change: (0.097391,0.8686,-0.48584)
+New Momentum Direction: (-0.64782,0.42592,0.63161)
+Momentum Change: (-0.64782,0.42592,0.63161)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64782,0.42592,0.63161)
+ Old Polarization:       (0.097391,0.8686,-0.48584)
+ New Momentum Direction: (-0.64782,-0.42592,0.63161)
+ New Polarization:       (-0.097391,0.8686,0.48584)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.64782,-0.42592,0.63161)
+ Old Polarization:       (-0.097391,0.8686,0.48584)
+ New Momentum Direction: (-0.64782,-0.42592,-0.63161)
+ New Polarization:       (0.097391,-0.8686,0.48584)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1916, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.79131,-0.6093,-0.050876)
-Old Polarization: (0.61105,0.78521,0.10035)
-New Polarization: (0.3627,0.80746,-0.10959)
-Polarization Change: (0.40664,0.90529,-0.12287)
-New Momentum Direction: (0.62924,-0.19161,0.67078)
-Momentum Change: (0.66979,-0.20395,0.714)
+Old Momentum Direction: (0.70587,0.013915,-0.7082)
+Old Polarization: (0.67845,0.27408,0.6816)
+New Polarization: (-0.89162,0.29402,-0.34433)
+Polarization Change: (-0.89162,0.29402,-0.34433)
+New Momentum Direction: (0.002587,0.76377,0.64548)
+Momentum Change: (0.002587,0.76377,0.64548)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.002587,0.76377,0.64548)
+ Old Polarization:       (-0.89162,0.29402,-0.34433)
+ New Momentum Direction: (0.0035175,0.47929,0.87765)
+ New Polarization:       (-0.80038,-0.5248,0.2898)
+ *** FresnelRefraction *** 
+Track (trackID 1915, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.30835,-0.67296,-0.67235)
+ Old Polarization:       (0.14772,-0.66434,0.73269)
+ New Momentum Direction: (0.30835,0.67296,-0.67235)
+ New Polarization:       (-0.67087,0.65493,0.34785)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.30835,0.67296,-0.67235)
+ Old Polarization:       (-0.67087,0.65493,0.34785)
+ New Momentum Direction: (0.30835,0.67296,0.67235)
+ New Polarization:       (0.67087,-0.65493,0.34785)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66979,-0.20395,0.714)
- Old Polarization:       (0.40664,0.90529,-0.12287)
- New Momentum Direction: (-0.66979,-0.20395,0.714)
- New Polarization:       (0.40664,-0.90529,0.12287)
+ Old Momentum Direction: (0.30835,0.67296,0.67235)
+ Old Polarization:       (0.67087,-0.65493,0.34785)
+ New Momentum Direction: (-0.30835,0.67296,0.67235)
+ New Polarization:       (0.67087,0.65493,-0.34785)
  *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1914, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1913, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.47741,0.35357,-0.8044)
+ Old Polarization:       (0.37928,0.74287,0.55163)
+ New Momentum Direction: (0.64508,0.47775,-0.59635)
+ New Polarization:       (0.29902,0.56037,0.77238)
+ *** FresnelRefraction *** 
+Track (trackID 1912, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.32477,0.42635,-0.84425)
+ Old Polarization:       (0.17298,0.8508,0.4962)
+ New Momentum Direction: (0.43719,0.57393,-0.69244)
+ New Polarization:       (0.17774,0.69959,0.69208)
+ *** FresnelRefraction *** 
+Track (trackID 1911, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.42497,-0.31234,-0.84962)
+ Old Polarization:       (-0.85524,-0.169,0.48991)
+ New Momentum Direction: (-0.57477,-0.42245,-0.70084)
+ New Polarization:       (-0.70595,-0.17716,0.68575)
+ *** FresnelRefraction *** 
+Track (trackID 1910, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1909, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.18923,0.36566,-0.91131)
+ Old Polarization:       (-0.52563,0.74619,0.40856)
+ New Momentum Direction: (-0.25749,0.49758,-0.82832)
+ New Polarization:       (-0.45912,0.69128,0.55798)
+ *** FresnelRefraction *** 
+Track (trackID 1908, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.71013,-0.11269,-0.69499)
+ Old Polarization:       (0.70404,0.10399,0.70251)
+ New Momentum Direction: (0.31548,-0.15188,-0.9367)
+ New Polarization:       (-0.94891,-0.056887,-0.31037)
+ *** FresnelRefraction *** 
+Track (trackID 1907, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.43424,0.38896,-0.81249)
+ Old Polarization:       (0.31355,0.7803,0.54113)
+ New Momentum Direction: (0.59003,0.52851,-0.61036)
+ New Polarization:       (0.25614,0.59439,0.76229)
+ *** FresnelRefraction *** 
+Track (trackID 1906, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.66979,-0.20395,0.714)
- Old Polarization:       (0.40664,-0.90529,0.12287)
- New Momentum Direction: (-0.91141,-0.27752,0.30384)
- New Polarization:       (0.204,-0.94595,-0.2521)
+ Old Momentum Direction: (0.25831,0.44215,-0.85894)
+ Old Polarization:       (0.081638,0.87594,0.47546)
+ New Momentum Direction: (0.34723,0.59437,-0.72536)
+ New Polarization:       (0.1107,0.7421,0.66108)
  *** FresnelRefraction *** 
-Track (trackID 1691, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
+Track (trackID 1905, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1904, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1903, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77655,-0.62636,0.068151)
- Old Polarization:       (0.59452,0.76426,0.2499)
- New Momentum Direction: (0.51621,-0.85144,0.092641)
- New Polarization:       (-0.83229,-0.47317,0.28879)
+ Old Momentum Direction: (-0.14825,0.38726,-0.90997)
+ Old Polarization:       (-0.47329,0.78014,0.40911)
+ New Momentum Direction: (-0.20122,0.52561,-0.82658)
+ New Polarization:       (-0.40472,0.72384,0.5588)
  *** FresnelRefraction *** 
-Track (trackID 1690, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 30
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 31 stacked tracks.
+Track (trackID 1902, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.47881,-0.62899,-0.61246)
- Old Polarization:       (-0.42081,0.7767,-0.46868)
- New Momentum Direction: (-0.47881,0.62899,-0.61246)
- New Polarization:       (0.42081,0.7767,0.46868)
+ Old Momentum Direction: (0.39127,-0.63558,-0.66554)
+ Old Polarization:       (0.26285,-0.61589,0.74269)
+ New Momentum Direction: (0.39127,-0.63558,0.66554)
+ New Polarization:       (-0.26285,0.61589,0.74269)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.47881,0.62899,-0.61246)
- Old Polarization:       (0.42081,0.7767,0.46868)
- New Momentum Direction: (-0.47881,0.62899,0.61246)
- New Polarization:       (-0.42081,-0.7767,0.46868)
+ Old Momentum Direction: (0.39127,-0.63558,0.66554)
+ Old Polarization:       (-0.26285,0.61589,0.74269)
+ New Momentum Direction: (0.39127,0.63558,0.66554)
+ New Polarization:       (0.26285,0.61589,-0.74269)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.47881,0.62899,0.61246)
- Old Polarization:       (-0.42081,-0.7767,0.46868)
- New Momentum Direction: (0.47881,0.62899,0.61246)
- New Polarization:       (-0.42081,0.7767,-0.46868)
+ Old Momentum Direction: (0.39127,0.63558,0.66554)
+ Old Polarization:       (0.26285,0.61589,-0.74269)
+ New Momentum Direction: (-0.39127,0.63558,0.66554)
+ New Polarization:       (0.26285,-0.61589,0.74269)
  *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (0.47881,0.62899,0.61246)
-Old Polarization: (-0.42081,0.7767,-0.46868)
-New Polarization: (-0.64597,0.52648,0.32187)
-Polarization Change: (-0.7231,0.58933,0.3603)
-New Momentum Direction: (0.58416,0.31399,0.65877)
-Momentum Change: (0.62492,0.3359,0.70473)
  Photon at Boundary! 
- Old Momentum Direction: (0.62492,0.3359,0.70473)
- Old Polarization:       (-0.7231,0.58933,0.3603)
- New Momentum Direction: (0.62492,0.3359,-0.70473)
- New Polarization:       (0.25214,-0.94117,-0.22501)
- *** FresnelReflection *** 
+ Old Momentum Direction: (-0.39127,0.63558,0.66554)
+ Old Polarization:       (0.26285,-0.61589,0.74269)
+ New Momentum Direction: (-0.39127,0.63558,-0.66554)
+ New Polarization:       (-0.26285,0.61589,0.74269)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.62492,0.3359,-0.70473)
- Old Polarization:       (0.25214,-0.94117,-0.22501)
- New Momentum Direction: (0.62492,-0.3359,-0.70473)
- New Polarization:       (-0.25214,-0.94117,0.22501)
+ Old Momentum Direction: (-0.39127,0.63558,-0.66554)
+ Old Polarization:       (-0.26285,0.61589,0.74269)
+ New Momentum Direction: (-0.39127,-0.63558,-0.66554)
+ New Polarization:       (0.26285,0.61589,-0.74269)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.62492,-0.3359,-0.70473)
- Old Polarization:       (-0.25214,-0.94117,0.22501)
- New Momentum Direction: (-0.62492,-0.3359,-0.70473)
- New Polarization:       (-0.25214,0.94117,-0.22501)
+ Old Momentum Direction: (-0.39127,-0.63558,-0.66554)
+ Old Polarization:       (0.26285,0.61589,-0.74269)
+ New Momentum Direction: (-0.39127,-0.63558,0.66554)
+ New Polarization:       (-0.26285,-0.61589,-0.74269)
  *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.62492,-0.3359,-0.70473)
-Old Polarization: (-0.25214,0.94117,-0.22501)
-New Polarization: (0.40654,0.73838,-0.21765)
-Polarization Change: (0.46699,0.84818,-0.25001)
-New Momentum Direction: (0.012193,-0.25297,-0.83545)
-Momentum Change: (0.013967,-0.28978,-0.95699)
  Photon at Boundary! 
- Old Momentum Direction: (0.013967,-0.28978,-0.95699)
- Old Polarization:       (0.46699,0.84818,-0.25001)
- New Momentum Direction: (0.018967,-0.39352,-0.91912)
- New Polarization:       (0.43584,-0.82409,0.36183)
- *** FresnelRefraction *** 
-Track (trackID 1759, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
+ Old Momentum Direction: (-0.39127,-0.63558,0.66554)
+ Old Polarization:       (-0.26285,-0.61589,-0.74269)
+ New Momentum Direction: (0.39127,-0.63558,0.66554)
+ New Polarization:       (-0.26285,0.61589,0.74269)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.43048,-0.89954,0.074274)
- Old Polarization:       (0.79183,0.41587,0.44729)
- New Momentum Direction: (0.58475,-0.80492,0.10089)
- New Polarization:       (0.73399,0.57794,0.35671)
- *** FresnelRefraction *** 
-Track (trackID 1758, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
+ Old Momentum Direction: (0.39127,-0.63558,0.66554)
+ Old Polarization:       (-0.26285,0.61589,0.74269)
+ New Momentum Direction: (0.39127,0.63558,0.66554)
+ New Polarization:       (0.26285,0.61589,-0.74269)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.08917,-0.68282,-0.72513)
- Old Polarization:       (0.33827,0.70551,-0.62275)
- New Momentum Direction: (0.12088,-0.9256,-0.35867)
- New Polarization:       (0.34164,-0.30046,0.89051)
- *** FresnelRefraction *** 
-Track (trackID 1757, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
+ Old Momentum Direction: (0.39127,0.63558,0.66554)
+ Old Polarization:       (0.26285,0.61589,-0.74269)
+ New Momentum Direction: (0.39127,0.63558,-0.66554)
+ New Polarization:       (-0.26285,-0.61589,-0.74269)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.36959,-0.75829,-0.53703)
- Old Polarization:       (0.70805,0.60409,-0.36569)
- New Momentum Direction: (0.50278,-0.46205,-0.73056)
- New Polarization:       (0.4723,0.85468,-0.21552)
- *** FresnelRefraction *** 
-Track (trackID 1756, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1755, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
+ Old Momentum Direction: (0.39127,0.63558,-0.66554)
+ Old Polarization:       (-0.26285,-0.61589,-0.74269)
+ New Momentum Direction: (0.39127,-0.63558,-0.66554)
+ New Polarization:       (0.26285,-0.61589,0.74269)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1754, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.48458,-0.86651,-0.11977)
- Old Polarization:       (0.86797,0.45928,0.18891)
- New Momentum Direction: (0.65702,-0.73618,-0.16239)
- New Polarization:       (0.75361,0.64711,0.11544)
- *** FresnelRefraction *** 
-Track (trackID 1753, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
+Track (trackID 1901, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1752, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.27404,-0.92215,0.27303)
- Old Polarization:       (0.58472,0.38516,0.71397)
- New Momentum Direction: (0.37186,-0.85115,0.37049)
- New Polarization:       (0.55364,0.52371,0.64747)
- *** FresnelRefraction *** 
-Track (trackID 1751, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+Track (trackID 1900, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1750, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
+Track (trackID 1899, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1749, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
+Track (trackID 1898, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1748, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
+Track (trackID 1897, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.41006,-0.35853,-0.83863)
+ Old Polarization:       (-0.83158,-0.23069,0.50523)
+ New Momentum Direction: (-0.41006,-0.35853,0.83863)
+ New Polarization:       (0.36176,-0.90801,-0.2113)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66381,-0.65998,-0.35182)
- Old Polarization:       (-0.66698,0.73522,-0.12075)
- New Momentum Direction: (-0.66381,0.65998,-0.35182)
- New Polarization:       (0.66698,0.73522,0.12075)
+ Old Momentum Direction: (-0.41006,-0.35853,0.83863)
+ Old Polarization:       (0.36176,-0.90801,-0.2113)
+ New Momentum Direction: (0.41006,-0.35853,0.83863)
+ New Polarization:       (0.36176,0.90801,0.2113)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66381,0.65998,-0.35182)
- Old Polarization:       (0.66698,0.73522,0.12075)
- New Momentum Direction: (0.66381,0.65998,-0.35182)
- New Polarization:       (0.66698,-0.73522,-0.12075)
+ Old Momentum Direction: (0.41006,-0.35853,0.83863)
+ Old Polarization:       (0.36176,0.90801,0.2113)
+ New Momentum Direction: (0.41006,0.35853,0.83863)
+ New Polarization:       (-0.36176,0.90801,-0.2113)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1747, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.11024,-0.68514,-0.72002)
- Old Polarization:       (0.36495,0.70174,-0.61186)
- New Momentum Direction: (0.14974,-0.93057,-0.33408)
- New Polarization:       (0.37824,-0.25828,0.88895)
+ Old Momentum Direction: (0.41006,0.35853,0.83863)
+ Old Polarization:       (-0.36176,0.90801,-0.2113)
+ New Momentum Direction: (0.55548,0.48567,0.67495)
+ New Polarization:       (-0.30927,0.87414,-0.37448)
  *** FresnelRefraction *** 
-Track (trackID 1746, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1745, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+Track (trackID 1896, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39982,-0.77629,-0.48737)
- Old Polarization:       (0.75547,0.58019,-0.30437)
- New Momentum Direction: (0.54179,-0.51991,-0.66042)
- New Polarization:       (0.53525,0.81923,-0.20583)
+ Old Momentum Direction: (-0.32323,-0.49928,-0.80389)
+ Old Polarization:       (-0.71703,-0.42516,0.55236)
+ New Momentum Direction: (-0.43697,-0.67497,-0.59453)
+ New Polarization:       (-0.5391,-0.33257,0.7738)
  *** FresnelRefraction *** 
-Track (trackID 1744, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
+Track (trackID 1895, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1743, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
+Track (trackID 1894, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1742, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
+Track (trackID 1893, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48999,-0.85865,-0.15043)
- Old Polarization:       (0.86993,0.47055,0.14768)
- New Momentum Direction: (0.66595,-0.71743,-0.20445)
- New Polarization:       (0.74193,0.66554,0.081249)
+ Old Momentum Direction: (0.30545,-0.67228,-0.67435)
+ Old Polarization:       (0.14493,-0.66712,0.73072)
+ New Momentum Direction: (0.41194,-0.90666,-0.090927)
+ New Polarization:       (-0.040504,-0.11791,0.9922)
  *** FresnelRefraction *** 
-Track (trackID 1741, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+Track (trackID 1892, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1740, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+Track (trackID 1891, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 25
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41405,-0.90415,0.10529)
- Old Polarization:       (0.77023,0.40965,0.48881)
- New Momentum Direction: (0.56233,-0.81445,0.143)
- New Polarization:       (0.72005,0.56731,0.3996)
+ Old Momentum Direction: (-0.2275,-0.096386,-0.969)
+ Old Polarization:       (-0.91301,0.36714,0.17783)
+ New Momentum Direction: (-0.30654,-0.12988,-0.94296)
+ New Polarization:       (-0.93343,0.23498,0.27108)
  *** FresnelRefraction *** 
-Track (trackID 1739, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
+Track (trackID 1946, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43938,-0.79872,-0.41107)
- Old Polarization:       (0.81019,0.55001,-0.20269)
- New Momentum Direction: (0.59494,-0.57987,-0.5566)
- New Polarization:       (0.60787,0.77766,-0.16043)
+ Old Momentum Direction: (0.6179,0.18069,-0.76521)
+ Old Polarization:       (0.38168,0.78194,0.49284)
+ New Momentum Direction: (0.83785,0.24501,-0.48782)
+ New Polarization:       (0.26432,0.5998,0.75524)
  *** FresnelRefraction *** 
-Track (trackID 1738, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
+Track (trackID 1945, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1944, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.24441,-0.92454,0.29239)
- Old Polarization:       (0.54861,0.38048,0.74449)
- New Momentum Direction: (0.33076,-0.85675,0.3957)
- New Polarization:       (0.51728,0.51529,0.6833)
+ Old Momentum Direction: (-0.18382,-0.56072,-0.80734)
+ Old Polarization:       (-0.83578,-0.34316,0.42862)
+ New Momentum Direction: (-0.24875,-0.75881,-0.60194)
+ New Polarization:       (-0.68434,-0.3021,0.66363)
  *** FresnelRefraction *** 
-Track (trackID 1737, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
+Track (trackID 1943, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.26667,-0.72281,-0.63752)
- Old Polarization:       (0.57153,0.65121,-0.49927)
- New Momentum Direction: (0.36273,-0.34122,-0.86717)
- New Polarization:       (0.33836,0.91527,-0.21862)
- *** FresnelRefraction *** 
-Track (trackID 1736, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+ Old Momentum Direction: (0.52106,-0.65837,-0.54318)
+ Old Polarization:       (0.24103,-0.49699,0.83361)
+ New Momentum Direction: (0.52106,0.65837,-0.54318)
+ New Polarization:       (-0.24103,-0.49699,-0.83361)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52106,0.65837,-0.54318)
+ Old Polarization:       (-0.24103,-0.49699,-0.83361)
+ New Momentum Direction: (0.52106,0.65837,0.54318)
+ New Polarization:       (0.24103,0.49699,-0.83361)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.52106,0.65837,0.54318)
+ Old Polarization:       (0.24103,0.49699,-0.83361)
+ New Momentum Direction: (-0.52106,0.65837,0.54318)
+ New Polarization:       (0.24103,-0.49699,0.83361)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.52106,0.65837,0.54318)
+ Old Polarization:       (0.24103,-0.49699,0.83361)
+ New Momentum Direction: (-0.52106,-0.65837,0.54318)
+ New Polarization:       (-0.24103,-0.49699,-0.83361)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1735, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.65312,-0.75393,0.070901)
- Old Polarization:       (-0.65608,0.61012,0.4442)
- New Momentum Direction: (-0.88576,-0.45408,0.096156)
- New Polarization:       (-0.40704,0.85949,0.30919)
- *** FresnelRefraction *** 
-Track (trackID 1734, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.4903,-0.84289,-0.2217)
-Old Polarization: (0.86917,0.49167,0.052915)
-New Polarization: (0.37787,0.4175,0.68094)
-Polarization Change: (0.42764,0.47249,0.77063)
-New Momentum Direction: (0.71977,-0.69341,0.025728)
-Momentum Change: (0.71994,-0.69356,0.025734)
- Photon at Boundary! 
- Old Momentum Direction: (0.71994,-0.69356,0.025734)
- Old Polarization:       (0.42764,0.47249,0.77063)
- New Momentum Direction: (0.71994,0.69356,0.025734)
- New Polarization:       (-0.31795,0.36255,-0.87605)
- *** FresnelReflection *** 
+Track (trackID 1942, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1733, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.69554,-0.7029,-0.14886)
- Old Polarization:       (-0.71847,0.67917,0.1501)
- New Momentum Direction: (-0.94093,-0.2722,-0.20137)
- New Polarization:       (-0.30226,0.94329,0.13727)
- *** FresnelRefraction *** 
-Track (trackID 1732, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
+Track (trackID 1941, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.45078,-0.63783,-0.62447)
- Old Polarization:       (-0.39558,0.76988,-0.5008)
- New Momentum Direction: (-0.45078,0.63783,-0.62447)
- New Polarization:       (0.39558,0.76988,0.5008)
+ Old Momentum Direction: (0.57607,-0.62021,-0.53243)
+ Old Polarization:       (0.31828,-0.42977,0.84498)
+ New Momentum Direction: (0.57607,0.62021,-0.53243)
+ New Polarization:       (-0.31828,-0.42977,-0.84498)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.45078,0.63783,-0.62447)
- Old Polarization:       (0.39558,0.76988,0.5008)
- New Momentum Direction: (-0.45078,0.63783,0.62447)
- New Polarization:       (-0.39558,-0.76988,0.5008)
+ Old Momentum Direction: (0.57607,0.62021,-0.53243)
+ Old Polarization:       (-0.31828,-0.42977,-0.84498)
+ New Momentum Direction: (-0.57607,0.62021,-0.53243)
+ New Polarization:       (-0.31828,0.42977,0.84498)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.45078,0.63783,0.62447)
- Old Polarization:       (-0.39558,-0.76988,0.5008)
- New Momentum Direction: (0.45078,0.63783,0.62447)
- New Polarization:       (-0.39558,0.76988,-0.5008)
+ Old Momentum Direction: (-0.57607,0.62021,-0.53243)
+ Old Polarization:       (-0.31828,0.42977,0.84498)
+ New Momentum Direction: (-0.57607,0.62021,0.53243)
+ New Polarization:       (0.31828,-0.42977,0.84498)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.45078,0.63783,0.62447)
- Old Polarization:       (-0.39558,0.76988,-0.5008)
- New Momentum Direction: (0.45078,-0.63783,0.62447)
- New Polarization:       (0.39558,0.76988,0.5008)
+ Old Momentum Direction: (-0.57607,0.62021,0.53243)
+ Old Polarization:       (0.31828,-0.42977,0.84498)
+ New Momentum Direction: (-0.57607,-0.62021,0.53243)
+ New Polarization:       (-0.31828,-0.42977,-0.84498)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.45078,-0.63783,0.62447)
- Old Polarization:       (0.39558,0.76988,0.5008)
- New Momentum Direction: (0.45078,-0.63783,-0.62447)
- New Polarization:       (-0.39558,-0.76988,0.5008)
+ Old Momentum Direction: (-0.57607,-0.62021,0.53243)
+ Old Polarization:       (-0.31828,-0.42977,-0.84498)
+ New Momentum Direction: (0.57607,-0.62021,0.53243)
+ New Polarization:       (-0.31828,0.42977,0.84498)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.45078,-0.63783,-0.62447)
- Old Polarization:       (-0.39558,-0.76988,0.5008)
- New Momentum Direction: (-0.45078,-0.63783,-0.62447)
- New Polarization:       (-0.39558,0.76988,-0.5008)
+ Old Momentum Direction: (0.57607,-0.62021,0.53243)
+ Old Polarization:       (-0.31828,0.42977,0.84498)
+ New Momentum Direction: (0.57607,-0.62021,-0.53243)
+ New Polarization:       (0.31828,-0.42977,0.84498)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1731, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
+Track (trackID 1940, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21748,-0.92493,0.31177)
- Old Polarization:       (0.51211,0.38005,0.77026)
- New Momentum Direction: (0.29437,-0.85747,0.42201)
- New Polarization:       (0.47814,0.51447,0.71183)
+ Old Momentum Direction: (0.1681,0.26676,-0.94899)
+ Old Polarization:       (-0.30206,0.93032,0.208)
+ New Momentum Direction: (0.22633,0.35917,-0.90541)
+ New Polarization:       (-0.1747,0.92943,0.32503)
  *** FresnelRefraction *** 
-Track (trackID 1730, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 17
-Track (trackID 1, parentID 0) is processed with stopping code 4
+Track (trackID 1939, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.76768,-0.35618,-0.53273)
- Old Polarization:       (-0.47261,0.87611,0.095275)
- New Momentum Direction: (-0.49692,-0.48233,-0.72141)
- New Polarization:       (0.73289,0.2119,-0.64651)
+ Old Momentum Direction: (0.46814,-0.6958,-0.54471)
+ Old Polarization:       (0.15431,-0.54258,0.82571)
+ New Momentum Direction: (0.63526,-0.22382,-0.73916)
+ New Polarization:       (0.49193,0.85508,0.16385)
  *** FresnelRefraction *** 
-Track (trackID 1776, parentID 1) is processed with stopping code 2
+Track (trackID 1938, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.80116,-0.40501,-0.44058)
- Old Polarization:       (-0.53678,0.81182,0.22982)
- New Momentum Direction: (-0.5929,-0.54498,-0.59285)
- New Polarization:       (0.75994,-0.13512,-0.6358)
+ Old Momentum Direction: (0.36888,-0.73603,-0.56761)
+ Old Polarization:       (0.0057425,-0.60886,0.79326)
+ New Momentum Direction: (0.49946,-0.39988,-0.76853)
+ New Polarization:       (0.46859,0.87083,-0.14858)
  *** FresnelRefraction *** 
-Track (trackID 1775, parentID 1) is processed with stopping code 2
+Track (trackID 1937, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (-0.59636,-0.80119,0.0496)
-Old Polarization: (-0.21976,0.22238,0.94987)
-New Polarization: (0.22793,0.5408,0.63827)
-Polarization Change: (0.26288,0.62371,0.73612)
-New Momentum Direction: (0.92088,-0.039144,-0.29569)
-Momentum Change: (0.95134,-0.040439,-0.30547)
  Photon at Boundary! 
- Old Momentum Direction: (0.95134,-0.040439,-0.30547)
- Old Polarization:       (0.26288,0.62371,0.73612)
- New Momentum Direction: (0.90865,-0.0548,-0.41396)
- New Polarization:       (-0.38105,0.29661,-0.87568)
+ Old Momentum Direction: (-0.17458,0.027237,-0.98427)
+ Old Polarization:       (-0.81908,0.55077,0.16052)
+ New Momentum Direction: (-0.23654,0.036903,-0.97092)
+ New Polarization:       (-0.85911,0.45882,0.22674)
  *** FresnelRefraction *** 
-Track (trackID 1774, parentID 1) is processed with stopping code 2
+Track (trackID 1936, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.66782,-0.74416,0.015874)
- Old Polarization:       (-0.32081,0.30701,0.896)
- New Momentum Direction: (-0.90703,-0.42051,0.02156)
- New Polarization:       (-0.23651,0.55118,0.80016)
+ Old Momentum Direction: (-0.19431,0.0042786,-0.98093)
+ Old Polarization:       (-0.84204,0.51224,0.16903)
+ New Momentum Direction: (-0.2641,0.0058154,-0.96448)
+ New Polarization:       (-0.88167,0.40397,0.24386)
  *** FresnelRefraction *** 
-Track (trackID 1773, parentID 1) is processed with stopping code 2
+Track (trackID 1935, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.70105,-0.46572,-0.54003)
+Old Polarization: (0.51197,-0.19845,0.83577)
+New Polarization: (-0.06997,0.56583,0.82155)
+Polarization Change: (-0.06997,0.56583,0.82155)
+New Momentum Direction: (0.65231,-0.59714,0.46682)
+Momentum Change: (0.65231,-0.59714,0.46682)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65231,-0.59714,0.46682)
+ Old Polarization:       (-0.06997,0.56583,0.82155)
+ New Momentum Direction: (-0.65231,-0.59714,0.46682)
+ New Polarization:       (-0.06997,-0.56583,-0.82155)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.19875,-0.72539,-0.65902)
- Old Polarization:       (0.93841,0.33478,-0.085495)
- New Momentum Direction: (0.27028,-0.35176,-0.89622)
- New Polarization:       (0.79792,0.60274,0.0040698)
- *** FresnelRefraction *** 
-Track (trackID 1772, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.65231,-0.59714,0.46682)
+ Old Polarization:       (-0.06997,-0.56583,-0.82155)
+ New Momentum Direction: (-0.65231,0.59714,0.46682)
+ New Polarization:       (0.06997,-0.56583,0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65231,0.59714,0.46682)
+ Old Polarization:       (0.06997,-0.56583,0.82155)
+ New Momentum Direction: (-0.65231,0.59714,-0.46682)
+ New Polarization:       (-0.06997,0.56583,0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65231,0.59714,-0.46682)
+ Old Polarization:       (-0.06997,0.56583,0.82155)
+ New Momentum Direction: (0.65231,0.59714,-0.46682)
+ New Polarization:       (-0.06997,-0.56583,-0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65231,0.59714,-0.46682)
+ Old Polarization:       (-0.06997,-0.56583,-0.82155)
+ New Momentum Direction: (0.65231,-0.59714,-0.46682)
+ New Polarization:       (0.06997,-0.56583,0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65231,-0.59714,-0.46682)
+ Old Polarization:       (0.06997,-0.56583,0.82155)
+ New Momentum Direction: (-0.65231,-0.59714,-0.46682)
+ New Polarization:       (0.06997,0.56583,-0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.65231,-0.59714,-0.46682)
+ Old Polarization:       (0.06997,0.56583,-0.82155)
+ New Momentum Direction: (0.65231,-0.59714,-0.46682)
+ New Polarization:       (0.06997,-0.56583,0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65231,-0.59714,-0.46682)
+ Old Polarization:       (0.06997,-0.56583,0.82155)
+ New Momentum Direction: (0.65231,-0.59714,0.46682)
+ New Polarization:       (-0.06997,0.56583,0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65231,-0.59714,0.46682)
+ Old Polarization:       (-0.06997,0.56583,0.82155)
+ New Momentum Direction: (0.65231,0.59714,0.46682)
+ New Polarization:       (0.06997,0.56583,-0.82155)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.65231,0.59714,0.46682)
+ Old Polarization:       (0.06997,0.56583,-0.82155)
+ New Momentum Direction: (-0.65231,0.59714,0.46682)
+ New Polarization:       (0.06997,-0.56583,0.82155)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1934, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.82992,-0.48145,-0.28186)
- Old Polarization:       (-0.55717,0.68972,0.46244)
- New Momentum Direction: (-0.65267,-0.65383,-0.38278)
- New Polarization:       (0.75715,-0.58106,-0.2985)
+ Old Momentum Direction: (0.70459,-0.46353,-0.53731)
+ Old Polarization:       (0.51191,-0.19235,0.83723)
+ New Momentum Direction: (0.27082,-0.6288,-0.72888)
+ New Polarization:       (-0.81871,-0.54872,0.16917)
  *** FresnelRefraction *** 
-Track (trackID 1771, parentID 1) is processed with stopping code 2
+Track (trackID 1933, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.37411,-0.32985,-0.86674)
- Old Polarization:       (0.10636,0.91318,-0.39343)
- New Momentum Direction: (-0.50717,-0.44716,-0.73677)
- New Polarization:       (-0.80551,-0.058056,0.58973)
- *** FresnelRefraction *** 
-Track (trackID 1770, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1932, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1769, parentID 1) is processed with stopping code 2
+Track (trackID 1931, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.17833,-0.93176,-0.31626)
- Old Polarization:       (0.9105,0.034391,0.41208)
- New Momentum Direction: (0.24232,-0.86983,-0.42975)
- New Polarization:       (0.91907,0.063917,0.38886)
+ Old Momentum Direction: (0.025325,0.20598,-0.97823)
+ Old Polarization:       (-0.52341,0.83643,0.16257)
+ New Momentum Direction: (0.034094,0.2773,-0.96018)
+ New Polarization:       (-0.40192,0.88343,0.24086)
  *** FresnelRefraction *** 
-Track (trackID 1768, parentID 1) is processed with stopping code 2
+Track (trackID 1930, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.022167,-0.99795,-0.060114)
- Old Polarization:       (0.61819,-0.060938,0.78366)
- New Momentum Direction: (-0.030139,-0.9962,-0.081734)
- New Polarization:       (-0.11731,0.084732,-0.98947)
+ Old Momentum Direction: (0.081929,-0.74476,-0.66228)
+ Old Polarization:       (-0.43169,-0.62546,0.64996)
+ New Momentum Direction: (0.11079,-0.43093,-0.89556)
+ New Polarization:       (-0.19298,0.87463,-0.44473)
  *** FresnelRefraction *** 
-Track (trackID 1767, parentID 1) is processed with stopping code 2
+Track (trackID 1929, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.14966,-0.41131,-0.89912)
- Old Polarization:       (0.4329,0.79031,-0.4336)
- New Momentum Direction: (-0.20355,-0.55942,-0.80351)
- New Polarization:       (-0.18022,-0.78525,0.59236)
+ Old Momentum Direction: (0.2182,-0.76386,-0.60738)
+ Old Polarization:       (-0.22293,-0.64493,0.731)
+ New Momentum Direction: (0.29614,-0.4825,-0.82432)
+ New Polarization:       (0.18727,0.87561,-0.44524)
  *** FresnelRefraction *** 
-Track (trackID 1766, parentID 1) is processed with stopping code 2
+Track (trackID 1928, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.82216,-0.50576,-0.26126)
- Old Polarization:       (-0.5637,0.65932,0.49754)
- New Momentum Direction: (-0.64116,-0.68181,-0.3522)
- New Polarization:       (0.76354,-0.61277,-0.20376)
+ Old Momentum Direction: (0.0028938,0.20718,-0.9783)
+ Old Polarization:       (-0.54724,0.81914,0.17185)
+ New Momentum Direction: (0.0039291,0.28129,-0.95961)
+ New Polarization:       (-0.43128,0.86626,0.25216)
  *** FresnelRefraction *** 
-Track (trackID 1765, parentID 1) is processed with stopping code 2
+Track (trackID 1927, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1764, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.25173,-0.39784,-0.88224)
+ Old Polarization:       (-0.94473,-0.096854,0.31323)
+ New Momentum Direction: (-0.33993,-0.53724,-0.77189)
+ New Polarization:       (-0.85369,-0.16805,0.49292)
+ *** FresnelRefraction *** 
+Track (trackID 1926, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1763, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.21669,-0.7611,-0.61136)
+ Old Polarization:       (-0.22576,-0.64833,0.72712)
+ New Momentum Direction: (0.29325,-0.47906,-0.82735)
+ New Polarization:       (0.17961,0.87759,-0.44449)
+ *** FresnelRefraction *** 
+Track (trackID 1925, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.072158,-0.99712,-0.023217)
- Old Polarization:       (0.54507,-0.058918,0.83632)
- New Momentum Direction: (-0.098162,-0.99467,-0.031584)
- New Polarization:       (-0.97036,0.088625,0.22481)
+ Old Momentum Direction: (0.65553,0.13658,-0.74272)
+ Old Polarization:       (0.44679,0.72276,0.52725)
+ New Momentum Direction: (0.8853,0.18446,-0.42687)
+ New Polarization:       (0.27232,0.53846,0.79744)
  *** FresnelRefraction *** 
-Track (trackID 1762, parentID 1) is processed with stopping code 2
+Track (trackID 1924, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1761, parentID 1) is processed with stopping code 2
+Track (trackID 1923, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1760, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 13
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 14 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.86084,0.11815,-0.49496)
- Old Polarization:       (0.25832,0.93949,-0.22501)
- New Momentum Direction: (-0.72152,0.16076,-0.67347)
- New Polarization:       (0.44017,0.85733,-0.26692)
- *** FresnelRefraction *** 
-Track (trackID 1789, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.58513,-0.78495,-0.20365)
- Old Polarization:       (0.73585,-0.61948,0.27343)
- New Momentum Direction: (-0.78991,-0.54814,-0.27492)
- New Polarization:       (-0.52142,0.83633,-0.1693)
+ Old Momentum Direction: (-0.19449,-0.54509,-0.81551)
+ Old Polarization:       (-0.85147,-0.31896,0.41626)
+ New Momentum Direction: (-0.26326,-0.73783,-0.62153)
+ New Polarization:       (-0.70469,-0.29292,0.64623)
  *** FresnelRefraction *** 
-Track (trackID 1788, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+Track (trackID 1922, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
 
-** Photon absorbed! **
-Track (trackID 1787, parentID 1) is processed with stopping code 2
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 10
+Track (trackID 1, parentID 0) is processed with stopping code 4
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.91378,0.13645,-0.38261)
- Old Polarization:       (0.16309,0.98588,-0.037907)
- New Momentum Direction: (-0.83516,0.18475,-0.51804)
- New Polarization:       (0.28354,0.95171,-0.11769)
+ Old Momentum Direction: (0.21455,-0.51975,-0.82694)
+ Old Polarization:       (0.7129,0.66207,-0.23116)
+ New Momentum Direction: (0.29079,-0.70444,-0.64746)
+ New Polarization:       (0.91293,0.0017525,0.40812)
  *** FresnelRefraction *** 
-Track (trackID 1786, parentID 1) is processed with stopping code 2
+Track (trackID 1956, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.56759,-0.7853,-0.24726)
- Old Polarization:       (0.76419,-0.61427,0.19669)
- New Momentum Direction: (-0.76761,-0.54677,-0.3344)
- New Polarization:       (-0.46424,0.83405,-0.29808)
+ Old Momentum Direction: (-0.61378,-0.70822,-0.34885)
+ Old Polarization:       (-0.72629,0.33333,0.60116)
+ New Momentum Direction: (-0.83393,-0.28265,-0.47398)
+ New Polarization:       (-0.53721,0.61237,0.58001)
  *** FresnelRefraction *** 
-Track (trackID 1785, parentID 1) is processed with stopping code 2
+Track (trackID 1955, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (-0.80246,0.048755,-0.59471)
-Old Polarization: (0.35516,0.83991,-0.41037)
-New Polarization: (0.36235,0.83461,-0.40029)
-Polarization Change: (0.36452,0.83962,-0.40269)
-New Momentum Direction: (-0.59903,-0.11713,-0.78648)
-Momentum Change: (-0.60171,-0.11766,-0.79)
- Photon at Boundary! 
- Old Momentum Direction: (-0.60171,-0.11766,-0.79)
- Old Polarization:       (0.36452,0.83962,-0.40269)
- New Momentum Direction: (-0.81286,-0.15895,-0.56035)
- New Polarization:       (-0.54839,0.53304,0.64431)
- *** FresnelRefraction *** 
-Track (trackID 1784, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1954, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.66603,-0.74533,-0.029939)
- Old Polarization:       (0.59522,-0.55522,0.5809)
- New Momentum Direction: (-0.89757,-0.43902,-0.040348)
- New Polarization:       (-0.41757,0.81723,0.39719)
+ Old Momentum Direction: (0.33596,-0.75483,-0.56335)
+ Old Polarization:       (0.94133,0.24876,0.22806)
+ New Momentum Direction: (0.45322,-0.46585,-0.75999)
+ New Polarization:       (0.86041,0.45148,0.23636)
  *** FresnelRefraction *** 
-Track (trackID 1783, parentID 1) is processed with stopping code 2
+Track (trackID 1953, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.87865,-0.42956,0.20845)
- Old Polarization:       (0.22701,0.0082264,0.97386)
- New Momentum Direction: (-0.76093,-0.58374,0.28327)
- New Polarization:       (0.38952,-0.061832,0.91894)
+ Old Momentum Direction: (0.070384,-0.4462,-0.89216)
+ Old Polarization:       (0.47228,0.80269,-0.3642)
+ New Momentum Direction: (0.094722,-0.60049,-0.794)
+ New Polarization:       (0.57565,-0.61768,0.53582)
  *** FresnelRefraction *** 
-Track (trackID 1782, parentID 1) is processed with stopping code 2
+Track (trackID 1952, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.91951,0.1364,-0.36865)
- Old Polarization:       (0.1523,0.98823,-0.014246)
- New Momentum Direction: (-0.84687,0.18453,-0.49876)
- New Polarization:       (0.26533,0.95941,-0.095542)
+ Old Momentum Direction: (-0.28065,-0.36064,-0.88948)
+ Old Polarization:       (-0.1488,0.93187,-0.33088)
+ New Momentum Direction: (-0.38181,-0.49063,-0.78327)
+ New Polarization:       (-0.84331,-0.16187,0.51247)
  *** FresnelRefraction *** 
-Track (trackID 1781, parentID 1) is processed with stopping code 2
+Track (trackID 1951, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.92794,0.13312,-0.34815)
- Old Polarization:       (0.13463,0.9907,0.019986)
- New Momentum Direction: (-0.86427,0.17965,-0.46985)
- New Polarization:       (0.23496,0.97007,-0.061285)
+ Old Momentum Direction: (0.33705,-0.78565,-0.51879)
+ Old Polarization:       (0.9311,0.19655,0.30727)
+ New Momentum Direction: (0.45626,-0.54645,-0.7023)
+ New Polarization:       (0.88491,0.36162,0.29353)
  *** FresnelRefraction *** 
-Track (trackID 1780, parentID 1) is processed with stopping code 2
+Track (trackID 1950, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1779, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.98565,0.10061,-0.13554)
- Old Polarization:       (0.040464,0.92038,0.38892)
- New Momentum Direction: (-0.97347,0.13638,-0.18373)
- New Polarization:       (0.072749,0.94577,0.31658)
+ Old Momentum Direction: (-0.26905,-0.95306,-0.1389)
+ Old Polarization:       (-0.13652,-0.10502,0.98505)
+ New Momentum Direction: (-0.36283,-0.91284,-0.18732)
+ New Polarization:       (-0.77385,0.18317,0.6063)
  *** FresnelRefraction *** 
-Track (trackID 1778, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
+Track (trackID 1949, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.4802,-0.41335,-0.77366)
+ Old Polarization:       (-0.50523,0.85135,-0.14127)
+ New Momentum Direction: (-0.4802,-0.41335,0.77366)
+ New Polarization:       (0.67258,-0.73969,0.022262)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.4802,-0.41335,0.77366)
+ Old Polarization:       (0.67258,-0.73969,0.022262)
+ New Momentum Direction: (0.4802,-0.41335,0.77366)
+ New Polarization:       (0.67258,0.73969,-0.022262)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4802,-0.41335,0.77366)
+ Old Polarization:       (0.67258,0.73969,-0.022262)
+ New Momentum Direction: (0.4802,0.41335,0.77366)
+ New Polarization:       (-0.67258,0.73969,0.022262)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4802,0.41335,0.77366)
+ Old Polarization:       (-0.67258,0.73969,0.022262)
+ New Momentum Direction: (0.4802,0.41335,-0.77366)
+ New Polarization:       (0.64921,-0.7606,-0.0034239)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.4802,0.41335,-0.77366)
+ Old Polarization:       (0.64921,-0.7606,-0.0034239)
+ New Momentum Direction: (-0.4802,0.41335,-0.77366)
+ New Polarization:       (0.64921,0.7606,0.0034239)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.91827,-0.33751,0.20706)
- Old Polarization:       (0.15873,0.1653,0.97339)
- New Momentum Direction: (-0.84309,-0.45838,0.28121)
- New Polarization:       (0.27737,0.077345,0.95765)
+ Old Momentum Direction: (-0.4802,0.41335,-0.77366)
+ Old Polarization:       (0.64921,0.7606,0.0034239)
+ New Momentum Direction: (-0.64967,0.55923,-0.51496)
+ New Polarization:       (0.64933,0.76047,0.0066562)
  *** FresnelRefraction *** 
-Track (trackID 1777, parentID 1) is processed with stopping code 2
+Track (trackID 1948, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1947, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 4
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 5
 Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 6 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1961, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.7686,0.6074,-0.20079)
- Old Polarization:       (-0.63763,-0.75277,0.16361)
- New Momentum Direction: (-0.50804,0.81781,-0.27035)
- New Polarization:       (0.85995,0.4638,-0.21303)
- *** FresnelRefraction *** 
-Track (trackID 1793, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1960, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.77343,0.62375,-0.1129)
- Old Polarization:       (-0.60631,-0.67601,0.4188)
- New Momentum Direction: (-0.51314,0.84458,-0.15287)
- New Polarization:       (0.83966,0.53089,0.1146)
- *** FresnelRefraction *** 
-Track (trackID 1792, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1959, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1791, parentID 1) is processed with stopping code 2
+Track (trackID 1958, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.26049,0.87264,-0.41308)
- Old Polarization:       (0.8899,0.051068,-0.4533)
- New Momentum Direction: (-0.35386,0.74826,-0.56114)
- New Polarization:       (0.77922,-0.095973,-0.61936)
+ Old Momentum Direction: (-0.036261,-0.79475,-0.60586)
+ Old Polarization:       (-0.58968,-0.47245,0.65503)
+ New Momentum Direction: (-0.0491,-0.5697,-0.82038)
+ New Polarization:       (-0.5218,0.71501,-0.46529)
  *** FresnelRefraction *** 
-Track (trackID 1790, parentID 1) is processed with stopping code 2
+Track (trackID 1957, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 Track (trackID 1, parentID 0) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
-Track (trackID 1795, parentID 1) is processed with stopping code 2
+Track (trackID 1963, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
-Track (trackID 1794, parentID 1) is processed with stopping code 2
+Track (trackID 1962, parentID 1) is processed with stopping code 2
 ### pop requested out of 0 stacked tracks.
 ### 0 waiting tracks are re-classified to
      0 urgent tracks and 0 waiting tracks.
 NULL returned from G4StackManager.
 Terminate current event processing.
-number of event = 1 User=4.28s Real=4.87s Sys=0.48s
+number of event = 1 User=3.18s Real=3.55s Sys=0.29s
 exit
diff --git a/source/GNUmakefile b/source/GNUmakefile
index c7003a1be1430deea8ae54c01ee08fde89f6e411..98f557023b38c2de856895a478aff8252139a708 100644
--- a/source/GNUmakefile
+++ b/source/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.25 2000/12/13 08:25:34 gcosmo Exp $
+# $Id: GNUmakefile,v 1.26 2001/02/12 08:17:31 gcosmo Exp $
 # -----------------------------------------------------------------
 # "gmake" makes default libraries for each subdomain.
 # "gmake global" makes global libraries for each subdomain.
@@ -138,3 +138,5 @@ clean_all:
 	@rm -rf $(G4LIB)
 	@echo Removing $(G4BIN) ...
 	@rm -rf $(G4BIN)
+	@echo Removing $(G4INCLUDE) ...
+	@rm -rf $(G4INCLUDE)
diff --git a/source/analysis/Lab/include/G4LabSystem.hh b/source/analysis/Lab/include/G4LabSystem.hh
index 2be79fea65cd9553a9e10094bc34fd2020208ebc..ef8f91b400521f89f2a3e5308a1cdeba1a4bdb02 100644
--- a/source/analysis/Lab/include/G4LabSystem.hh
+++ b/source/analysis/Lab/include/G4LabSystem.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LabSystem.hh,v 1.2 2000/11/16 13:44:38 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/Lab/src/G4LabSystem.cc b/source/analysis/Lab/src/G4LabSystem.cc
index b326d7f7520d86fe64ec7ef30cd42faa81c25463..79e6ab8ff7cd74142506592986c11a0bf64df2a6 100644
--- a/source/analysis/Lab/src/G4LabSystem.cc
+++ b/source/analysis/Lab/src/G4LabSystem.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LabSystem.cc,v 1.2 2000/11/16 13:44:41 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/Lizard/include/G4LizardSystem.hh b/source/analysis/Lizard/include/G4LizardSystem.hh
index bb18b8d1b928a7b7d0c46795cdec950b9ee1f9dc..35f49ddf2f8bd7711688ff0cb4105f884f5d4909 100644
--- a/source/analysis/Lizard/include/G4LizardSystem.hh
+++ b/source/analysis/Lizard/include/G4LizardSystem.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LizardSystem.hh,v 1.5 2000/11/16 13:44:41 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/Lizard/src/G4LizardSystem.cc b/source/analysis/Lizard/src/G4LizardSystem.cc
index 7c591b1b8c2e5b5e47152e18e97e43b0582409c4..659cc5604987ed2334ac448f3e3c573d60e1d40f 100644
--- a/source/analysis/Lizard/src/G4LizardSystem.cc
+++ b/source/analysis/Lizard/src/G4LizardSystem.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LizardSystem.cc,v 1.8 2000/11/17 08:16:45 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/jas/include/G4JasSystem.hh b/source/analysis/jas/include/G4JasSystem.hh
index f5edc2c5d6ec1529592e3091285fcc63ab80a5d6..0a5e1faff5b4a6e86df42cb6b3a7e95ef1e3c6fd 100644
--- a/source/analysis/jas/include/G4JasSystem.hh
+++ b/source/analysis/jas/include/G4JasSystem.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4JasSystem.hh,v 1.8 2000/11/16 13:44:43 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/jas/src/G4JasSystem.cc b/source/analysis/jas/src/G4JasSystem.cc
index abc0d4d3e472c0f77086aaa41484afd36890b9f3..7281d558c5e67d152d65c485e902768826ebe4fd 100644
--- a/source/analysis/jas/src/G4JasSystem.cc
+++ b/source/analysis/jas/src/G4JasSystem.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4JasSystem.cc,v 1.8 2000/11/16 13:44:43 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/management/include/G4AnalysisManager.hh b/source/analysis/management/include/G4AnalysisManager.hh
index 2414f79e9d140efd8f26867369bb2b08b735e528..baf0dcfe34ba4252c0e6539702c4af53e80adccc 100644
--- a/source/analysis/management/include/G4AnalysisManager.hh
+++ b/source/analysis/management/include/G4AnalysisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AnalysisManager.hh,v 1.8 2000/11/16 13:44:45 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 20th Mai 2000
diff --git a/source/analysis/management/include/G4VAnalysisManager.hh b/source/analysis/management/include/G4VAnalysisManager.hh
index 362f66d69b23d578a83b63f6cf7cd143bd64e091..ec97acb71eb67ea7378d8085b5f80a000c8c2a36 100644
--- a/source/analysis/management/include/G4VAnalysisManager.hh
+++ b/source/analysis/management/include/G4VAnalysisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VAnalysisManager.hh,v 1.5 2000/11/16 13:44:46 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Guy Barrand 20th Mai 2000
 //
diff --git a/source/analysis/management/include/G4VAnalysisSystem.hh b/source/analysis/management/include/G4VAnalysisSystem.hh
index 9255212738499a00981d80f2a858bf930c9ab783..36ca0f66fc6912917ec539ccc91db4828ad60bb2 100644
--- a/source/analysis/management/include/G4VAnalysisSystem.hh
+++ b/source/analysis/management/include/G4VAnalysisSystem.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VAnalysisSystem.hh,v 1.8 2000/11/16 13:44:46 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/analysis/management/src/G4AnalysisManager.cc b/source/analysis/management/src/G4AnalysisManager.cc
index 8659854490f37246856d639605d8de98a2078321..2e3058b32312791144b302200c8987a667aa50c8 100644
--- a/source/analysis/management/src/G4AnalysisManager.cc
+++ b/source/analysis/management/src/G4AnalysisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AnalysisManager.cc,v 1.10 2000/11/21 15:41:25 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Guy Barrand 20th Mai 2000
 //
diff --git a/source/digits+hits/History b/source/digits+hits/History
index 4dae67b0ba8f3e9511986421829444ab3d6b82bb..79e53b372ffe7e92fda83a7e9189e0a668fbb131 100644
--- a/source/digits+hits/History
+++ b/source/digits+hits/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.3 1999/11/09 00:46:57 asaim Exp $
+$Id: History,v 1.4 2001/02/08 06:11:34 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,27 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Feb 8, 2001, M.Asai (digits+hits-V03-00-01)
+- STL vector classes migration
+  affected files :
+./digits+hits/detector/include/G4HCtable.hh
+./digits+hits/detector/include/G4SDStructure.hh
+./digits+hits/detector/include/G4SensitiveVolumeList.hh
+./digits+hits/detector/include/G4SensitiveVolumeList.icc
+./digits+hits/detector/include/G4VSensitiveDetector.hh
+./digits+hits/detector/include/G4CollectionNameVector.hh
+./digits+hits/detector/src/G4HCtable.cc
+./digits+hits/detector/src/G4SDStructure.cc
+./digits+hits/detector/src/G4SensitiveVolumeList.cc
+./digits+hits/detector/src/G4VSensitiveDetector.cc
+./digits+hits/digits/include/G4DCofThisEvent.hh
+./digits+hits/digits/include/G4TDigiCollection.hh
+./digits+hits/digits/src/G4DCofThisEvent.cc
+./digits+hits/hits/include/G4HCofThisEvent.hh
+./digits+hits/hits/include/G4THitsCollection.hh
+./digits+hits/hits/src/G4HCofThisEvent.cc
+
+
 Nov 4, 99, M.Asai (tag digits+hits-V00-01-00)
 - Comments are enriched for software reference manual.
 
diff --git a/source/digits+hits/detector/GNUmakefile b/source/digits+hits/detector/GNUmakefile
index 9805896407f0b00abbaab30dce1bccfe1d391141..0d0f48d3fd0b068fee315b39284677cc247cf8f3 100644
--- a/source/digits+hits/detector/GNUmakefile
+++ b/source/digits+hits/detector/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/01/07 16:06:24 gunter Exp $
+# $Id: GNUmakefile,v 1.2 2000/01/31 09:36:55 gcosmo Exp $
 # --------------------------------------------------------------
 # GNUmakefile for digits+hits library.  Makoto Asai, 1/11/96.
 # --------------------------------------------------------------
@@ -16,7 +16,6 @@ CPPFLAGS += \
 	    -I$(G4BASE)/global/management/include \
 	    -I$(G4BASE)/global/HEPGeometry/include \
             -I$(G4BASE)/track/include \
-            -I$(G4BASE)/processes/management/include \
             -I$(G4BASE)/particles/management/include \
             -I$(G4BASE)/materials/include \
             -I$(G4BASE)/geometry/management/include \
diff --git a/source/digits+hits/detector/include/G4CollectionNameVector.hh b/source/digits+hits/detector/include/G4CollectionNameVector.hh
new file mode 100644
index 0000000000000000000000000000000000000000..b8672641e7428cec594f7ab072df9e6908ca5645
--- /dev/null
+++ b/source/digits+hits/detector/include/G4CollectionNameVector.hh
@@ -0,0 +1,28 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4CollectionNameVector.hh,v 1.1 2001/02/08 06:08:53 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+
+#ifndef G4CollectionNameVector_H 
+#define G4CollectionNameVector_H 1
+
+#include "globals.hh"
+#include "g4std/vector"
+
+class G4CollectionNameVector : public G4std::vector<G4String>
+{
+  public:
+    G4CollectionNameVector() {;}
+    virtual ~G4CollectionNameVector() {;}
+
+    void insert(G4String s) { push_back(s); }
+};
+
+#endif
+
diff --git a/source/digits+hits/detector/include/G4HCtable.hh b/source/digits+hits/detector/include/G4HCtable.hh
index 32a0aeb5b5816b6fb56c4fbb4175197dc5130ca8..72b3b92491f6804bcd80fb8cf5e980d4c3c050de 100644
--- a/source/digits+hits/detector/include/G4HCtable.hh
+++ b/source/digits+hits/detector/include/G4HCtable.hh
@@ -5,15 +5,16 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4HCtable.hh,v 1.5 2001/02/08 06:07:10 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4HCtable_H
 #define G4HCtable_H 1
 
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
+//#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -38,12 +39,12 @@ class G4HCtable
     G4int GetCollectionID(G4String HCname);
 
   private:
-    G4RWTValOrderedVector<G4String> SDlist;
-    G4RWTValOrderedVector<G4String> HClist;
+    G4std::vector<G4String> SDlist;
+    G4std::vector<G4String> HClist;
 
   public:
     inline G4int entries() const
-    { return HClist.entries(); }
+    { return HClist.size(); }
 
 };
 
diff --git a/source/digits+hits/detector/include/G4SDManager.hh b/source/digits+hits/detector/include/G4SDManager.hh
index 277a5e1e93d8ba103a3db7ca0d0455e74afce109..e855b878cdd4d4a328e3e7e3cddc3cc5af100f56 100644
--- a/source/digits+hits/detector/include/G4SDManager.hh
+++ b/source/digits+hits/detector/include/G4SDManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SDManager.hh,v 1.2.4.1 1999/12/07 20:47:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SDManager.hh,v 1.3 1999/12/15 14:49:33 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4SDManager_h
diff --git a/source/digits+hits/detector/include/G4SDStructure.hh b/source/digits+hits/detector/include/G4SDStructure.hh
index 56acd9a0a748dd09c2800c472643d4f57ea9119c..fea86cf6cf4b6cd665412cae9057a542c5f6f43e 100644
--- a/source/digits+hits/detector/include/G4SDStructure.hh
+++ b/source/digits+hits/detector/include/G4SDStructure.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4SDStructure.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4SDStructure_h
@@ -17,7 +17,8 @@
 // G4VSensitiveDetector
 #include "G4VSensitiveDetector.hh"
 // G4RWTPtrOrderedVector
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 class G4HCofThisEvent;
 
@@ -48,8 +49,8 @@ class G4SDStructure
       G4String ExtractDirName(G4String aPath);
 
   private:
-      G4RWTPtrOrderedVector<G4SDStructure> structure;
-      G4RWTPtrOrderedVector<G4VSensitiveDetector> detector;
+      G4std::vector<G4SDStructure*> structure;
+      G4std::vector<G4VSensitiveDetector*> detector;
       G4String pathName;
       G4String dirName;
       G4int verboseLevel;
@@ -58,10 +59,10 @@ class G4SDStructure
       inline void SetVerboseLevel(G4int vl) 
       {
         verboseLevel = vl;
-        for(int i=0; i<structure.entries(); i++)
-        { structure(i)->SetVerboseLevel(vl); }
-        for(int j=0; j<detector.entries(); j++)
-        { detector(j)->SetVerboseLevel(vl); }
+        for(int i=0; i<structure.size(); i++)
+        { structure[i]->SetVerboseLevel(vl); }
+        for(int j=0; j<detector.size(); j++)
+        { detector[j]->SetVerboseLevel(vl); }
       };
 
 };
diff --git a/source/digits+hits/detector/include/G4SDmessenger.hh b/source/digits+hits/detector/include/G4SDmessenger.hh
index 2a1ffe431c23926a84a587bdea3cf09b62a9a093..92245ec517f7a7162a159d696a9b3f2a0b3ada6e 100644
--- a/source/digits+hits/detector/include/G4SDmessenger.hh
+++ b/source/digits+hits/detector/include/G4SDmessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SDmessenger.hh,v 1.2.4.1 1999/12/07 20:47:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SDmessenger.hh,v 1.3 1999/12/15 14:49:35 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4SDmessenger_h
diff --git a/source/digits+hits/detector/include/G4SensitiveVolumeList.hh b/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
index 83d60463727c23e0cfa18cc17d9fdab81d887de2..3cf8480485d0baa8b4bac07f49e1f5b0a8eb6006 100644
--- a/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
+++ b/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4SensitiveVolumeList.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1996
@@ -22,8 +22,9 @@
 #ifndef G4SensitiveVolumeList_h
 #define G4SensitiveVolumeList_h 1
 
-#include "g4rw/tpordvec.h"
-#include "g4rw/tvordvec.h"
+//#include "g4rw/tpordvec.h"
+//#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 #include "G4LogicalVolume.hh"
 #include "G4VPhysicalVolume.hh"
 
@@ -60,11 +61,11 @@ class G4SensitiveVolumeList
       G4bool CheckLV(const G4LogicalVolume *lvp) const;
 
     //Get and Set Operations for Has Relationships
-      const G4RWTPtrOrderedVector<G4VPhysicalVolume>& GetThePhysicalVolumeList() const;
-      void SetThePhysicalVolumeList(const G4RWTPtrOrderedVector<G4VPhysicalVolume> value);
+      const G4std::vector<G4VPhysicalVolume*>& GetThePhysicalVolumeList() const;
+      void SetThePhysicalVolumeList(const G4std::vector<G4VPhysicalVolume*> value);
 
-      const G4RWTPtrOrderedVector<G4LogicalVolume>& GetTheLogicalVolumeList() const;
-      void SetTheLogicalVolumeList(const G4RWTPtrOrderedVector<G4LogicalVolume> value);
+      const G4std::vector<G4LogicalVolume*>& GetTheLogicalVolumeList() const;
+      void SetTheLogicalVolumeList(const G4std::vector<G4LogicalVolume*> value);
 
 
 
@@ -72,8 +73,8 @@ class G4SensitiveVolumeList
 
     //Data Members for Has Relationships
 
-      G4RWTPtrOrderedVector<G4VPhysicalVolume> thePhysicalVolumeList;
-      G4RWTPtrOrderedVector<G4LogicalVolume> theLogicalVolumeList;
+      G4std::vector<G4VPhysicalVolume*> thePhysicalVolumeList;
+      G4std::vector<G4LogicalVolume*> theLogicalVolumeList;
 
 };
 
diff --git a/source/digits+hits/detector/include/G4SensitiveVolumeList.icc b/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
index 2d9d9775b2bd4b1aac9f55bcc5a15e5a8edaadea..fcfc4b43acc0f41b82518af80dbb782112c211ff 100644
--- a/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
+++ b/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4SensitiveVolumeList.icc,v 1.4 2001/02/08 06:07:11 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -----------------------------------------------------------
 //      Inline functions of GEANT 4 class header file.
@@ -22,14 +22,14 @@
 
 //Get and Set Operations for Has Relationships
 
-      inline const G4RWTPtrOrderedVector<G4VPhysicalVolume>& G4SensitiveVolumeList::get_the_G4VPhysicalVolume_list() const { return the_G4VPhysicalVolume_list; }
+      inline const G4std::vector<G4VPhysicalVolume*>& G4SensitiveVolumeList::get_the_G4VPhysicalVolume_list() const { return the_G4VPhysicalVolume_list; }
 
-      inline void G4SensitiveVolumeList::set_the_G4VPhysicalVolume_list(const G4RWTPtrOrderedVector<G4VPhysicalVolume> value) { the_G4VPhysicalVolume_list = value; }
+      inline void G4SensitiveVolumeList::set_the_G4VPhysicalVolume_list(const G4std::vector<G4VPhysicalVolume*> value) { the_G4VPhysicalVolume_list = value; }
 
 
-      inline const G4RWTPtrOrderedVector<G4LogicalVolume>& G4SensitiveVolumeList::get_the_G4LogicalVolume() const { return the_G4LogicalVolume_list; }
+      inline const G4std::vector<G4LogicalVolume*>& G4SensitiveVolumeList::get_the_G4LogicalVolume() const { return the_G4LogicalVolume_list; }
 
-      inline void G4SensitiveVolumeList::set_the_G4LogicalVolume(const G4RWTPtrOrderedVector<G4LogicalVolume> value) { the_G4LogicalVolume_list = value; }
+      inline void G4SensitiveVolumeList::set_the_G4LogicalVolume(const G4std::vector<G4LogicalVolume*> value) { the_G4LogicalVolume_list = value; }
 
 
 
diff --git a/source/digits+hits/detector/include/G4VReadOutGeometry.hh b/source/digits+hits/detector/include/G4VReadOutGeometry.hh
index d06ee19983484193573447a69d5b185a77037cdc..c8ed91f5d9f404e9a7592933ff66cfd9bc830634 100644
--- a/source/digits+hits/detector/include/G4VReadOutGeometry.hh
+++ b/source/digits+hits/detector/include/G4VReadOutGeometry.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VReadOutGeometry.hh,v 1.1.10.1 1999/12/07 20:47:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VReadOutGeometry.hh,v 1.2 1999/12/15 14:49:35 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 
diff --git a/source/digits+hits/detector/include/G4VSensitiveDetector.hh b/source/digits+hits/detector/include/G4VSensitiveDetector.hh
index 5b71f335afa2312200819be102ba308174e527b9..1ee81e47984803fca25dc6ed9b386bfab71cc709 100644
--- a/source/digits+hits/detector/include/G4VSensitiveDetector.hh
+++ b/source/digits+hits/detector/include/G4VSensitiveDetector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4VSensitiveDetector.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VSensitiveDetector_h
@@ -17,7 +17,8 @@
 #include "G4HCofThisEvent.hh"
 #include "G4VReadOutGeometry.hh"
 #include "G4TouchableHistory.hh"
-#include "g4rw/tvordvec.h"
+//#include "g4rw/tvordvec.h"
+#include "G4CollectionNameVector.hh"
 
 // class description:
 //
@@ -77,7 +78,7 @@ class G4VSensitiveDetector
       //  This is a utility method which returns the hits collection ID of the
       // "i"-th collection. "i" is the order (starting with zero) of the collection
       // whose name is stored to the collectionName protected vector.
-      G4RWTValOrderedVector<G4String> collectionName;
+      G4CollectionNameVector collectionName;
       //  This protected name vector must be filled at the constructor of the user's
       // concrete class for registering the name(s) of hits collection(s) being
       // created by this particular sensitive detector.
@@ -115,7 +116,7 @@ class G4VSensitiveDetector
 
   public:
       inline G4int GetNumberOfCollections()
-      { return collectionName.entries(); }
+      { return collectionName.size(); }
       inline G4String GetCollectionName(G4int id)
       { return collectionName[id]; }
       inline void SetVerboseLevel(G4int vl)
diff --git a/source/digits+hits/detector/src/G4HCtable.cc b/source/digits+hits/detector/src/G4HCtable.cc
index 398060d955801942ad937fb85f4b538fcf8f3c8c..02dd1bdc5d6e5c84f0ae56f94981c6db3c5531c0 100644
--- a/source/digits+hits/detector/src/G4HCtable.cc
+++ b/source/digits+hits/detector/src/G4HCtable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4HCtable.cc,v 1.4 2001/02/08 06:07:12 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4HCtable.hh"
@@ -17,11 +17,11 @@ G4HCtable::~G4HCtable() {;}
 
 G4int G4HCtable::Registor(G4String SDname,G4String HCname)
 {
-  for(int i=0;i<HClist.entries();i++)
+  for(int i=0;i<HClist.size();i++)
   { if(HClist[i]==HCname && SDlist[i]==SDname) return -1; }
-  HClist.insert(HCname);
-  SDlist.insert(SDname);
-  return HClist.entries();
+  HClist.push_back(HCname);
+  SDlist.push_back(SDname);
+  return HClist.size();
 }
 
 G4int G4HCtable::GetCollectionID(G4String HCname)
@@ -29,7 +29,7 @@ G4int G4HCtable::GetCollectionID(G4String HCname)
   G4int i = -1;
   if(HCname.index("/")==G4std::string::npos) // HCname only
   {
-    for(G4int j=0;j<HClist.entries();j++)
+    for(G4int j=0;j<HClist.size();j++)
     {
       if(HClist[j]==HCname)
       { 
@@ -40,7 +40,7 @@ G4int G4HCtable::GetCollectionID(G4String HCname)
   }
   else
   {
-    for(G4int j=0;j<HClist.entries();j++)
+    for(G4int j=0;j<HClist.size();j++)
     {
       G4String tgt = SDlist[j];
       tgt += "/";
diff --git a/source/digits+hits/detector/src/G4SDManager.cc b/source/digits+hits/detector/src/G4SDManager.cc
index 62fe193e0f2cd7d136fef19ad2be6b096d2dce77..f35cea377e117b96cdb41a9bd42fe2c841b47d1a 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.2.1 1999/12/08 17:33:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SDManager.cc,v 1.2 1999/12/15 14:49:36 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4SDManager.hh"
diff --git a/source/digits+hits/detector/src/G4SDStructure.cc b/source/digits+hits/detector/src/G4SDStructure.cc
index 175f5c0a62ba873bf20952b32e23fde2b5486161..16ca55eb8c1a017fe15091285cd5a5df20c3b726 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.2.1 1999/12/08 17:33:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SDStructure.cc,v 1.4 2001/02/08 06:07:12 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4SDStructure
@@ -50,7 +50,7 @@ void G4SDStructure::AddNewDetector(G4VSensitiveDetector*aSD,
     { // Subdirectory not found. Create a new directory.
       subD.prepend(pathName);
       tgtSDS = new G4SDStructure(subD);
-      structure.insert( tgtSDS );
+      structure.push_back( tgtSDS );
     }
     tgtSDS->AddNewDetector(aSD,treeStructure);
   }
@@ -64,25 +64,25 @@ void G4SDStructure::AddNewDetector(G4VSensitiveDetector*aSD,
     }
     else
     {
-      detector.insert( aSD );
+      detector.push_back( aSD );
     }
   }
 }
 
 G4SDStructure* G4SDStructure::FindSubDirectory(G4String subD)
 {
-  for( int i=0; i<structure.entries(); i++ )
+  for( int i=0; i<structure.size(); i++ )
   {
-    if( subD == structure(i)->dirName ) return structure(i);
+    if( subD == structure[i]->dirName ) return structure[i];
   } 
   return NULL;
 }
 
 G4VSensitiveDetector* G4SDStructure::GetSD(G4String aSDName)
 {
-  for( int i=0; i<detector.entries(); i++ )
+  for( int i=0; i<detector.size(); i++ )
   {
-    G4VSensitiveDetector* tgtSD = detector(i);
+    G4VSensitiveDetector* tgtSD = detector[i];
     if( aSDName == tgtSD->GetName() ) return tgtSD;
   }
   return NULL;
@@ -115,13 +115,13 @@ void G4SDStructure::Activate(G4String aName, G4bool sensitiveFlag)
   }
   else if( aPath.isNull() )
   {  // Command is ordered for all detectors in this directory.
-    for( int i=0; i<detector.entries(); i++)
+    for( int i=0; i<detector.size(); i++)
     { 
-      detector(i)->Activate(sensitiveFlag);
+      detector[i]->Activate(sensitiveFlag);
     }
-    for( int j=0;j<structure.entries(); j++)
+    for( int j=0;j<structure.size(); j++)
     {
-      structure(j)->Activate(G4String("/"),sensitiveFlag);
+      structure[j]->Activate(G4String("/"),sensitiveFlag);
     }
   }
   else
@@ -171,14 +171,14 @@ void G4SDStructure::Initialize(G4HCofThisEvent*HCE)
 {
   int i;
   // Broadcast to subdirectories.
-  for( i=0; i<structure.entries(); i++ )
+  for( i=0; i<structure.size(); i++ )
   {
-    structure(i)->Initialize(HCE);
+    structure[i]->Initialize(HCE);
   }
   // Initialize all detectors in this directory.
-  for( i=0; i<detector.entries(); i++ )
+  for( i=0; i<detector.size(); i++ )
   {
-    if(detector(i)->isActive()) detector(i)->Initialize(HCE);
+    if(detector[i]->isActive()) detector[i]->Initialize(HCE);
   }
 }
 
@@ -186,23 +186,23 @@ void G4SDStructure::Terminate(G4HCofThisEvent*HCE)
 {
   int i;
   // Broadcast to subdirectories.
-  for( i=0; i<structure.entries(); i++ )
+  for( i=0; i<structure.size(); i++ )
   {
-    structure(i)->Terminate(HCE);
+    structure[i]->Terminate(HCE);
   }
   // Initialize all detectors in this directory.
-  for( i=0; i<detector.entries(); i++ )
+  for( i=0; i<detector.size(); i++ )
   {
-    if(detector(i)->isActive()) detector(i)->EndOfEvent(HCE);
+    if(detector[i]->isActive()) detector[i]->EndOfEvent(HCE);
   }
 }
 
 void G4SDStructure::ListTree()
 {
   G4cout << pathName << G4endl;
-  for(int i=0; i<detector.entries(); i++)
+  for(int i=0; i<detector.size(); i++)
   {
-    G4VSensitiveDetector* sd = detector(i);
+    G4VSensitiveDetector* sd = detector[i];
     G4cout << pathName << sd->GetName();
     if( sd->isActive() )
     { G4cout << "   *** Active "; }
@@ -210,8 +210,8 @@ void G4SDStructure::ListTree()
     { G4cout << "   XXX Inactive "; }
     G4cout << G4endl;
   }
-  for(int j=0; j<structure.entries(); j++)
-  { structure(j)->ListTree(); }
+  for(int j=0; j<structure.size(); j++)
+  { structure[j]->ListTree(); }
 }
         
 
diff --git a/source/digits+hits/detector/src/G4SDmessenger.cc b/source/digits+hits/detector/src/G4SDmessenger.cc
index 7e36d5d3e8868f5a4d0bc1e9b3b14f971161dac7..09edf22f143f6a01e90bbdef36e8d5e18da485a3 100644
--- a/source/digits+hits/detector/src/G4SDmessenger.cc
+++ b/source/digits+hits/detector/src/G4SDmessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SDmessenger.cc,v 1.1.10.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SDmessenger.cc,v 1.2 1999/12/15 14:49:36 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------------
 
diff --git a/source/digits+hits/detector/src/G4SensitiveVolumeList.cc b/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
index cc871399cf6559fd8526eb1e9c92d34ec1f51459..856af5b3865a0f58c51b495d214918b7b661c519 100644
--- a/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
+++ b/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SensitiveVolumeList.cc,v 1.1.10.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SensitiveVolumeList.cc,v 1.3 2001/02/08 06:07:13 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
@@ -63,18 +63,18 @@
  //Other Operations 
    G4bool G4SensitiveVolumeList::CheckPV(const G4VPhysicalVolume * pvp) const
    {
-     if (thePhysicalVolumeList.entries()==0) return false;
-     for(int i=0;i<thePhysicalVolumeList.entries();i++)
-     { if(thePhysicalVolumeList(i)==pvp) return true; }
+     if (thePhysicalVolumeList.size()==0) return false;
+     for(int i=0;i<thePhysicalVolumeList.size();i++)
+     { if(thePhysicalVolumeList[i]==pvp) return true; }
      return false;  
    }
 
 
    G4bool G4SensitiveVolumeList::CheckLV(const G4LogicalVolume * lvp) const
    {
-    if (theLogicalVolumeList.entries()==0) return false;
-      for(int i=0;i<theLogicalVolumeList.entries();i++)
-      { if(theLogicalVolumeList(i)==lvp) return true; }
+    if (theLogicalVolumeList.size()==0) return false;
+      for(int i=0;i<theLogicalVolumeList.size();i++)
+      { if(theLogicalVolumeList[i]==lvp) return true; }
     return false;  
    }
 
diff --git a/source/digits+hits/detector/src/G4VReadOutGeometry.cc b/source/digits+hits/detector/src/G4VReadOutGeometry.cc
index d46dff68115a114f613b45431add8b97c524648f..ea90910414658ce34a2edac415a572b409e4bd1a 100644
--- a/source/digits+hits/detector/src/G4VReadOutGeometry.cc
+++ b/source/digits+hits/detector/src/G4VReadOutGeometry.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VReadOutGeometry.cc,v 1.2.6.1 1999/12/07 20:47:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VReadOutGeometry.cc,v 1.3 1999/12/15 14:49:36 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4VReadOutGeometry.hh"
diff --git a/source/digits+hits/detector/src/G4VSensitiveDetector.cc b/source/digits+hits/detector/src/G4VSensitiveDetector.cc
index ec0aefe256dca274af394a6d5211fb2a9b5ab590..2e4ff1846366054979cb3f259221d44199192c34 100644
--- a/source/digits+hits/detector/src/G4VSensitiveDetector.cc
+++ b/source/digits+hits/detector/src/G4VSensitiveDetector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4VSensitiveDetector.cc,v 1.3 1999/12/15 14:49:36 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VSensitiveDetector
 #include "G4VSensitiveDetector.hh"
diff --git a/source/digits+hits/digits/include/G4DCofThisEvent.hh b/source/digits+hits/digits/include/G4DCofThisEvent.hh
index 544506bcb8750595039d0383e5e67a3b8b2c1e43..6ad82bbc8e3e7d6796b07da57b32639bff502923 100644
--- a/source/digits+hits/digits/include/G4DCofThisEvent.hh
+++ b/source/digits+hits/digits/include/G4DCofThisEvent.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4DCofThisEvent.hh,v 1.5 2001/02/08 06:07:13 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4DCofThisEvent_h
@@ -15,7 +15,8 @@
 #include "globals.hh"
 #include "G4Allocator.hh"
 #include "G4VDigiCollection.hh"
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -40,7 +41,7 @@ class G4DCofThisEvent
       void AddDigiCollection(G4int DCID,G4VDigiCollection * aDC);
 
   private:
-      G4RWTPtrOrderedVector<G4VDigiCollection> * DC;
+      G4std::vector<G4VDigiCollection*> * DC;
 
   public: // with description
       inline G4VDigiCollection* GetDC(G4int i) const
@@ -53,7 +54,7 @@ class G4DCofThisEvent
       inline G4int GetNumberOfCollections() const
       {
         G4int n = 0;
-        for(int i=0;i<DC->entries();i++)
+        for(int i=0;i<DC->size();i++)
         {
           if((*DC)[i]) n++;
         }
@@ -64,7 +65,7 @@ class G4DCofThisEvent
   public:
       inline G4int GetCapacity() const
       {
-        return DC->entries();
+        return DC->size();
       }
 };
 
diff --git a/source/digits+hits/digits/include/G4TDigiCollection.hh b/source/digits+hits/digits/include/G4TDigiCollection.hh
index 136f5335a34001dd9fb28aad1a9198df52633c96..7921b2b54d21b97b0c86fba6f6893a1cc63c1529 100644
--- a/source/digits+hits/digits/include/G4TDigiCollection.hh
+++ b/source/digits+hits/digits/include/G4TDigiCollection.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4TDigiCollection.hh,v 1.8 2001/02/08 06:07:13 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4TDigiCollection_h
@@ -15,7 +15,8 @@
 #include "G4VDigiCollection.hh"
 #include "G4Allocator.hh"
 #include "globals.hh"
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -62,25 +63,25 @@ template <class T> class G4TDigiCollection : public G4DigiCollection
 
   public: // with description
       inline T* operator[](size_t i) const
-      { return (*((G4RWTPtrOrderedVector<T>*)theCollection))[i]; }
+      { return (*((G4std::vector<T*>*)theCollection))[i]; }
       //  Returns a pointer to a concrete digi object.
-      inline G4RWTPtrOrderedVector<T>* GetVector() const
-      { return (G4RWTPtrOrderedVector<T>*)theCollection; }
+      inline G4std::vector<T*>* GetVector() const
+      { return (G4std::vector<T*>*)theCollection; }
       //  Returns a collection vector.
       inline int insert(T* aHit)
       {
-        G4RWTPtrOrderedVector<T>*theDigiCollection 
-          = (G4RWTPtrOrderedVector<T>*)theCollection;
-        theDigiCollection->insert(aHit);
-        return theDigiCollection->entries();
+        G4std::vector<T*>*theDigiCollection 
+          = (G4std::vector<T*>*)theCollection;
+        theDigiCollection->push_back(aHit);
+        return theDigiCollection->size();
       }
       //  Insert a digi object. Total number of digi objects stored in this
       // collection is returned.
       inline int entries() const
       {
-        G4RWTPtrOrderedVector<T>*theDigiCollection 
-          = (G4RWTPtrOrderedVector<T>*)theCollection;
-        return theDigiCollection->entries();
+        G4std::vector<T*>*theDigiCollection 
+          = (G4std::vector<T*>*)theCollection;
+        return theDigiCollection->size();
       }
       //  Returns the number of digi objcets stored in this collection.
 };
@@ -99,24 +100,27 @@ template <class T> inline void G4TDigiCollection<T>::operator delete(void* aDC)
 
 template <class T> G4TDigiCollection<T>::G4TDigiCollection()
 { 
-  G4RWTPtrOrderedVector<T> * theDigiCollection
-    = new G4RWTPtrOrderedVector<T>;
+  G4std::vector<T*> * theDigiCollection
+    = new G4std::vector<T*>;
   theCollection = (void*)theDigiCollection;
 }
 
 template <class T> G4TDigiCollection<T>::G4TDigiCollection(G4String detName,G4String colNam)
 : G4DigiCollection(detName,colNam)
 { 
-  G4RWTPtrOrderedVector<T> * theDigiCollection
-    = new G4RWTPtrOrderedVector<T>;
+  G4std::vector<T*> * theDigiCollection
+    = new G4std::vector<T*>;
   theCollection = (void*)theDigiCollection;
 }
 
 template <class T> G4TDigiCollection<T>::~G4TDigiCollection()
 {
-  G4RWTPtrOrderedVector<T> * theDigiCollection 
-    = (G4RWTPtrOrderedVector<T>*)theCollection;
-  theDigiCollection->clearAndDestroy();
+  G4std::vector<T*> * theDigiCollection 
+    = (G4std::vector<T*>*)theCollection;
+  //theDigiCollection->clearAndDestroy();
+  for(int i=0;i<theDigiCollection->size();i++)
+  { delete (*theDigiCollection)[i]; }
+  theDigiCollection->clear();
   delete theDigiCollection;
 }
 
@@ -125,18 +129,18 @@ template <class T> int G4TDigiCollection<T>::operator==(const G4TDigiCollection<
 
 template <class T> void G4TDigiCollection<T>::DrawAllDigi() 
 {
-  G4RWTPtrOrderedVector<T> * theDigiCollection 
-    = (G4RWTPtrOrderedVector<T>*)theCollection;
-  int n = theDigiCollection->entries();
+  G4std::vector<T*> * theDigiCollection 
+    = (G4std::vector<T*>*)theCollection;
+  int n = theDigiCollection->size();
   for(int i=0;i<n;i++)
   { (*theDigiCollection)[i]->Draw(); }
 }
 
 template <class T> void G4TDigiCollection<T>::PrintAllDigi() 
 {
-  G4RWTPtrOrderedVector<T> * theDigiCollection 
-    = (G4RWTPtrOrderedVector<T>*)theCollection;
-  int n = theDigiCollection->entries();
+  G4std::vector<T*> * theDigiCollection 
+    = (G4std::vector<T*>*)theCollection;
+  int n = theDigiCollection->size();
   for(int i=0;i<n;i++)
   { (*theDigiCollection)[i]->Print(); }
 }
diff --git a/source/digits+hits/digits/include/G4VDigi.hh b/source/digits+hits/digits/include/G4VDigi.hh
index 72484ee76319287997bf2ce0844381b40173fc1d..c5dc6833b07c3328f9a652c55cf2bb3777b39996 100644
--- a/source/digits+hits/digits/include/G4VDigi.hh
+++ b/source/digits+hits/digits/include/G4VDigi.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDigi.hh,v 1.4.4.1 1999/12/07 20:47:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VDigi.hh,v 1.5 1999/12/15 14:49:36 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VDigi_h
diff --git a/source/digits+hits/digits/include/G4VDigiCollection.hh b/source/digits+hits/digits/include/G4VDigiCollection.hh
index 68b800352a5b7bb6ce09b21a1c6e8f7d744ba436..5fdc8cf03731088590ce4f251ff128c8c661a64d 100644
--- a/source/digits+hits/digits/include/G4VDigiCollection.hh
+++ b/source/digits+hits/digits/include/G4VDigiCollection.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDigiCollection.hh,v 1.4.4.1 1999/12/07 20:47:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VDigiCollection.hh,v 1.5 1999/12/15 14:49:36 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VDigiCollection_h
diff --git a/source/digits+hits/digits/src/G4DCofThisEvent.cc b/source/digits+hits/digits/src/G4DCofThisEvent.cc
index a0fcf736de18d9b38b2e9a2a50d59cbf3cceef3a..ce949f1a5dc5f772a224b5e5197122f1413a2b1f 100644
--- a/source/digits+hits/digits/src/G4DCofThisEvent.cc
+++ b/source/digits+hits/digits/src/G4DCofThisEvent.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4DCofThisEvent.cc,v 1.4 2001/02/08 06:07:14 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4DCofThisEvent.hh"
@@ -15,27 +15,30 @@ G4Allocator<G4DCofThisEvent> anDCoTHAllocator;
 
 G4DCofThisEvent::G4DCofThisEvent()
 {
-  DC = new G4RWTPtrOrderedVector<G4VDigiCollection>;
+  DC = new G4std::vector<G4VDigiCollection*>;
 }
 
 G4DCofThisEvent::G4DCofThisEvent(G4int cap)
 {
-  DC = new G4RWTPtrOrderedVector<G4VDigiCollection>;
+  DC = new G4std::vector<G4VDigiCollection*>;
   for(int i=0;i<cap;i++)
   {
-    DC->insert((G4VDigiCollection*)NULL);
+    DC->push_back((G4VDigiCollection*)NULL);
   }
 }
 
 G4DCofThisEvent::~G4DCofThisEvent()
 {
-  DC->clearAndDestroy();
+  //DC->clearAndDestroy();
+  for(G4int i=0;i<DC->size();i++)
+  { delete (*DC)[i]; }
+  DC->clear();
   delete DC;
 }
 
 void G4DCofThisEvent::AddDigiCollection(G4int DCID,G4VDigiCollection * aDC)
 {
-  if(DCID>=0 && DCID<DC->entries())
+  if(DCID>=0 && DCID<DC->size())
   { (*DC)[DCID] = aDC; }
 }
 
diff --git a/source/digits+hits/digits/src/G4TDigiCollection.cc b/source/digits+hits/digits/src/G4TDigiCollection.cc
index b4450cce1d99ee24ca60a5f6a15e0a2adeae0013..c81a975a2802f657e7bf55d7faf2e4557387631f 100644
--- a/source/digits+hits/digits/src/G4TDigiCollection.cc
+++ b/source/digits+hits/digits/src/G4TDigiCollection.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TDigiCollection.cc,v 1.1.10.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TDigiCollection.cc,v 1.2 1999/12/15 14:49:37 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4TDigiCollection.hh"
diff --git a/source/digits+hits/digits/src/G4VDigi.cc b/source/digits+hits/digits/src/G4VDigi.cc
index c3465a66abc707e203c1187ddeeb4de38ae3492b..ca4668df71a433057c4aad6f136f4a1bc66e77de 100644
--- a/source/digits+hits/digits/src/G4VDigi.cc
+++ b/source/digits+hits/digits/src/G4VDigi.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDigi.cc,v 1.3.4.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VDigi.cc,v 1.4 1999/12/15 14:49:37 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4VDigi
diff --git a/source/digits+hits/digits/src/G4VDigiCollection.cc b/source/digits+hits/digits/src/G4VDigiCollection.cc
index 7b7d47dc6f912a13dd02e36ad982d9399f314c46..46496d67dffc74b39f688c80f658f839136fba6f 100644
--- a/source/digits+hits/digits/src/G4VDigiCollection.cc
+++ b/source/digits+hits/digits/src/G4VDigiCollection.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDigiCollection.cc,v 1.3.4.1 1999/12/07 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VDigiCollection.cc,v 1.4 1999/12/15 14:49:37 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4VDigiCollection
diff --git a/source/digits+hits/hits/include/G4HCofThisEvent.hh b/source/digits+hits/hits/include/G4HCofThisEvent.hh
index 1ab33968471cdcea73c6bed2cc0ecaa5dd92af3b..25a2b9ac5e30ba49930899b9c93421974a4f8fa4 100644
--- a/source/digits+hits/hits/include/G4HCofThisEvent.hh
+++ b/source/digits+hits/hits/include/G4HCofThisEvent.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4HCofThisEvent.hh,v 1.5 2001/02/08 06:07:14 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4HCofThisEvent_h
@@ -15,7 +15,8 @@
 #include "globals.hh"
 #include "G4Allocator.hh"
 #include "G4VHitsCollection.hh"
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -40,7 +41,7 @@ class G4HCofThisEvent
       void AddHitsCollection(G4int HCID,G4VHitsCollection * aHC);
 
   private:
-      G4RWTPtrOrderedVector<G4VHitsCollection> * HC;
+      G4std::vector<G4VHitsCollection*> * HC;
 
   public: // with description
       inline G4VHitsCollection* GetHC(G4int i)
@@ -53,7 +54,7 @@ class G4HCofThisEvent
       inline G4int GetNumberOfCollections()
       {
         G4int n = 0;
-        for(int i=0;i<HC->entries();i++)
+        for(int i=0;i<HC->size();i++)
         {
           if((*HC)[i]) n++;
         }
@@ -64,7 +65,7 @@ class G4HCofThisEvent
   public:
       inline G4int GetCapacity()
       {
-        return HC->entries();
+        return HC->size();
       }
 };
 
diff --git a/source/digits+hits/hits/include/G4THitsCollection.hh b/source/digits+hits/hits/include/G4THitsCollection.hh
index 00903a6df7ac9b986384a8190985e530a0c79891..1bb9468a375c0ee684017340c06b2588aae6649f 100644
--- a/source/digits+hits/hits/include/G4THitsCollection.hh
+++ b/source/digits+hits/hits/include/G4THitsCollection.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4THitsCollection.hh,v 1.7 2001/02/08 06:07:14 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4THitsCollection_h
@@ -15,7 +15,8 @@
 #include "G4VHitsCollection.hh"
 #include "G4Allocator.hh"
 #include "globals.hh"
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -62,25 +63,25 @@ template <class T> class G4THitsCollection : public G4HitsCollection
 
   public: // with description
       inline T* operator[](size_t i) const
-      { return (*((G4RWTPtrOrderedVector<T>*)theCollection))[i]; }
+      { return (*((G4std::vector<T*>*)theCollection))[i]; }
       //  Returns a pointer to a concrete hit object.
-      inline G4RWTPtrOrderedVector<T>* GetVector() const
-      { return (G4RWTPtrOrderedVector<T>*)theCollection; }
+      inline G4std::vector<T*>* GetVector() const
+      { return (G4std::vector<T*>*)theCollection; }
       //  Returns a collection vector.
       inline int insert(T* aHit)
       {
-        G4RWTPtrOrderedVector<T>*theHitsCollection 
-          = (G4RWTPtrOrderedVector<T>*)theCollection;
-        theHitsCollection->insert(aHit);
-        return theHitsCollection->entries();
+        G4std::vector<T*>*theHitsCollection 
+          = (G4std::vector<T*>*)theCollection;
+        theHitsCollection->push_back(aHit);
+        return theHitsCollection->size();
       }
       //  Insert a hit object. Total number of hit objects stored in this
       // collection is returned.
       inline int entries() const
       {
-        G4RWTPtrOrderedVector<T>*theHitsCollection
-          = (G4RWTPtrOrderedVector<T>*)theCollection;
-        return theHitsCollection->entries();
+        G4std::vector<T*>*theHitsCollection
+          = (G4std::vector<T*>*)theCollection;
+        return theHitsCollection->size();
       }
       //  Returns the number of hit objects stored in this collection
 
@@ -100,24 +101,27 @@ template <class T> inline void G4THitsCollection<T>::operator delete(void* anHC)
 
 template <class T> G4THitsCollection<T>::G4THitsCollection()
 { 
-  G4RWTPtrOrderedVector<T> * theHitsCollection
-    = new G4RWTPtrOrderedVector<T>;
+  G4std::vector<T*> * theHitsCollection
+    = new G4std::vector<T*>;
   theCollection = (void*)theHitsCollection;
 }
 
 template <class T> G4THitsCollection<T>::G4THitsCollection(G4String detName,G4String colNam)
 : G4HitsCollection(detName,colNam)
 { 
-  G4RWTPtrOrderedVector<T> * theHitsCollection
-    = new G4RWTPtrOrderedVector<T>;
+  G4std::vector<T*> * theHitsCollection
+    = new G4std::vector<T*>;
   theCollection = (void*)theHitsCollection;
 }
 
 template <class T> G4THitsCollection<T>::~G4THitsCollection()
 {
-  G4RWTPtrOrderedVector<T> * theHitsCollection 
-    = (G4RWTPtrOrderedVector<T>*)theCollection;
-  theHitsCollection->clearAndDestroy();
+  G4std::vector<T*> * theHitsCollection 
+    = (G4std::vector<T*>*)theCollection;
+  //theHitsCollection->clearAndDestroy();
+  for(int i=0;i<theHitsCollection->size();i++)
+  { delete (*theHitsCollection)[i]; }
+  theHitsCollection->clear();
   delete theHitsCollection;
 }
 
@@ -126,18 +130,18 @@ template <class T> int G4THitsCollection<T>::operator==(const G4THitsCollection<
 
 template <class T> void G4THitsCollection<T>::DrawAllHits() 
 {
-  G4RWTPtrOrderedVector<T> * theHitsCollection 
-    = (G4RWTPtrOrderedVector<T>*)theCollection;
-  int n = theHitsCollection->entries();
+  G4std::vector<T*> * theHitsCollection 
+    = (G4std::vector<T*>*)theCollection;
+  int n = theHitsCollection->size();
   for(int i=0;i<n;i++)
   { (*theHitsCollection)[i]->Draw(); }
 }
 
 template <class T> void G4THitsCollection<T>::PrintAllHits() 
 {
-  G4RWTPtrOrderedVector<T> * theHitsCollection 
-    = (G4RWTPtrOrderedVector<T>*)theCollection;
-  int n = theHitsCollection->entries();
+  G4std::vector<T*> * theHitsCollection 
+    = (G4std::vector<T*>*)theCollection;
+  int n = theHitsCollection->size();
   for(int i=0;i<n;i++)
   { (*theHitsCollection)[i]->Print(); }
 }
diff --git a/source/digits+hits/hits/include/G4VHit.hh b/source/digits+hits/hits/include/G4VHit.hh
index 4a74d54aad834e728e89b6428aa4146ac19507e1..83dd29a0a5f2bb6f3035bf3c02c35de65861fc48 100644
--- a/source/digits+hits/hits/include/G4VHit.hh
+++ b/source/digits+hits/hits/include/G4VHit.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VHit.hh,v 1.3.4.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VHit.hh,v 1.4 1999/12/15 14:49:37 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VHit_h
diff --git a/source/digits+hits/hits/include/G4VHitsCollection.hh b/source/digits+hits/hits/include/G4VHitsCollection.hh
index 228ba5e5953c0ee4c237432c86e973c9c7c67b68..b2030e3cf5f0dcbb790308c1f3918671dbe02948 100644
--- a/source/digits+hits/hits/include/G4VHitsCollection.hh
+++ b/source/digits+hits/hits/include/G4VHitsCollection.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VHitsCollection.hh,v 1.3.4.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VHitsCollection.hh,v 1.4 1999/12/15 14:49:37 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VHitsCollection_h
diff --git a/source/digits+hits/hits/src/G4HCofThisEvent.cc b/source/digits+hits/hits/src/G4HCofThisEvent.cc
index b203370904dd931f50486160f231134959fd7638..bd1897e3fdbc6e79c2470dca5773386709b4f577 100644
--- a/source/digits+hits/hits/src/G4HCofThisEvent.cc
+++ b/source/digits+hits/hits/src/G4HCofThisEvent.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4HCofThisEvent.cc,v 1.4 2001/02/08 06:07:15 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4HCofThisEvent.hh"
@@ -15,27 +15,30 @@ G4Allocator<G4HCofThisEvent> anHCoTHAllocator;
 
 G4HCofThisEvent::G4HCofThisEvent()
 {
-  HC = new G4RWTPtrOrderedVector<G4VHitsCollection>;
+  HC = new G4std::vector<G4VHitsCollection*>;
 }
 
 G4HCofThisEvent::G4HCofThisEvent(G4int cap)
 {
-  HC = new G4RWTPtrOrderedVector<G4VHitsCollection>;
+  HC = new G4std::vector<G4VHitsCollection*>;
   for(int i=0;i<cap;i++)
   {
-    HC->insert((G4VHitsCollection*)NULL);
+    HC->push_back((G4VHitsCollection*)NULL);
   }
 }
 
 G4HCofThisEvent::~G4HCofThisEvent()
 {
-  HC->clearAndDestroy();
+  //HC->clearAndDestroy();
+  for(G4int i=0;i<HC->size();i++)
+  { delete (*HC)[i]; }
+  HC->clear();
   delete HC;
 }
 
 void G4HCofThisEvent::AddHitsCollection(G4int HCID,G4VHitsCollection * aHC)
 {
-  if(HCID>=0 && HCID<HC->entries())
+  if(HCID>=0 && HCID<HC->size())
   { (*HC)[HCID] = aHC; }
 }
 
diff --git a/source/digits+hits/hits/src/G4THitsCollection.cc b/source/digits+hits/hits/src/G4THitsCollection.cc
index 2c797e92f204b1a3a8cc65547b600de676b2fefe..6b83566227633b23422c7681713cbcae1647816f 100644
--- a/source/digits+hits/hits/src/G4THitsCollection.cc
+++ b/source/digits+hits/hits/src/G4THitsCollection.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4THitsCollection.cc,v 1.1.10.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4THitsCollection.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4THitsCollection.hh"
diff --git a/source/digits+hits/hits/src/G4VHit.cc b/source/digits+hits/hits/src/G4VHit.cc
index 622b94db6922dd0a6832f6bf7e6433526529decb..1770c0573bb8537ce53b16c037ed6ee7e34f1635 100644
--- a/source/digits+hits/hits/src/G4VHit.cc
+++ b/source/digits+hits/hits/src/G4VHit.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VHit.cc,v 1.1.10.1 1999/12/07 20:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VHit.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4VHit
diff --git a/source/digits+hits/hits/src/G4VHitsCollection.cc b/source/digits+hits/hits/src/G4VHitsCollection.cc
index df6604a56f2b22cfcfc152c63031d3168cbd7320..aee3f6e41c99e1f91cdc2191eef10a00e652b96e 100644
--- a/source/digits+hits/hits/src/G4VHitsCollection.cc
+++ b/source/digits+hits/hits/src/G4VHitsCollection.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VHitsCollection.cc,v 1.1.10.1 1999/12/07 20:47:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VHitsCollection.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4VHitsCollection
diff --git a/source/event/History b/source/event/History
index a35d403b8974fe0bf16055034cb7a4354faccc5a..9dec64c9a74fc5cda022a4007b73d662bdc6ec4b 100644
--- a/source/event/History
+++ b/source/event/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.16 2000/11/20 15:39:53 gcosmo Exp $
+$Id: History,v 1.21 2001/02/08 06:13:53 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,38 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Feb 8 2001, M.Asai (event-V03-00-03)
+- Migration to STL vector classes
+  affected files :
+./event/include/G4HEPEvtInterface.hh
+./event/include/G4PrimaryParticle.hh
+./event/include/G4TrajectoryContainer.hh
+./event/src/G4EventManager.cc
+./event/src/G4GeneralParticleSource.cc
+./event/src/G4HEPEvtInterface.cc
+./event/src/G4PrimaryParticle.cc
+./event/src/G4PrimaryTransformer.cc
+
+Feb 7 2001, M.Asai (event-V03-00-02)
+- Add proper time to G4PrimaryParticle
+
+Feb 7 2001, M.Asai (event-V03-00-01)
+- Fix syntax errors in G4GeneralSourceParticle.cc
+
+Feb 5 2001, M.Asai (event-V03-00-00)
+
+Jan 26 2001, F. Lei
+- bug fixing in G4GeneralSourceParticle.cc
+ replace: 
+          posphi = acos(tx/sin(posthe));
+ 
+ with:
+          if (posthe != 0. && posthe != pi) 
+             posphi = acos(tx/sin(posthe)); 
+          else 
+             posphi = 0.0;
+	  endif
+
 Nov 20 2000, G.Cosmo (event-V02-00-04)
 - Removed data-logs from test directory.
 
diff --git a/source/event/include/G4ClassificationOfNewTrack.hh b/source/event/include/G4ClassificationOfNewTrack.hh
index 1611418bbb2f3fd31df90b92ab849af93304bb35..612ebffd716396f90beafc519df52e0754dc1ed8 100644
--- a/source/event/include/G4ClassificationOfNewTrack.hh
+++ b/source/event/include/G4ClassificationOfNewTrack.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClassificationOfNewTrack.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/event/include/G4EvManMessenger.hh b/source/event/include/G4EvManMessenger.hh
index 1eddf68500fb12032a84c229166b2c825620e59d..55d7f6f706b171970425240bfff4df0acbdb112e 100644
--- a/source/event/include/G4EvManMessenger.hh
+++ b/source/event/include/G4EvManMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EvManMessenger.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4EvManMessenger_h
diff --git a/source/event/include/G4Event.hh b/source/event/include/G4Event.hh
index 94b6ac77fdfa74157ab0e105799d09080ee11f9d..93193e672f2dbc9693c45b3a071b65272efe60d8 100644
--- a/source/event/include/G4Event.hh
+++ b/source/event/include/G4Event.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Event.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4Event_h
diff --git a/source/event/include/G4EventManager.hh b/source/event/include/G4EventManager.hh
index 98927170ff8eccf38338eaf2fba555b22c8e891c..aae5559bd82ea7f74ea91abe266d05a70b64d37c 100644
--- a/source/event/include/G4EventManager.hh
+++ b/source/event/include/G4EventManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EventManager.hh,v 1.5 2000/01/12 01:29:50 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/event/include/G4HEPEvtInterface.hh b/source/event/include/G4HEPEvtInterface.hh
index 735c0df53b68ef18e7b370a0cc498d6fc153071f..0d4022282a075bc560f7b6ab7e8cf0813afc3bda 100644
--- a/source/event/include/G4HEPEvtInterface.hh
+++ b/source/event/include/G4HEPEvtInterface.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPEvtInterface.hh,v 1.4 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4HEPEvtInterface.hh,v 1.5 2001/02/08 06:07:16 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4HEPEvtInterface_h
 #define G4HEPEvtInterface_h 1
 
 #include "g4std/fstream"
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "globals.hh"
 #include "G4VPrimaryGenerator.hh"
 #include "G4HEPEvtParticle.hh"
@@ -70,7 +70,7 @@ class G4HEPEvtInterface:public G4VPrimaryGenerator
   private:
     G4String fileName;
     G4std::ifstream inputFile;
-    G4RWTPtrOrderedVector<G4HEPEvtParticle> HPlist;
+    G4std::vector<G4HEPEvtParticle*> HPlist;
 };
 
 #endif
diff --git a/source/event/include/G4HEPEvtParticle.hh b/source/event/include/G4HEPEvtParticle.hh
index f53508905d7120f98b7905ae6dfa824565ab984b..b12ace34bbca375fb828a0bcb6021b3720446632 100644
--- a/source/event/include/G4HEPEvtParticle.hh
+++ b/source/event/include/G4HEPEvtParticle.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPEvtParticle.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/event/include/G4ParticleGun.hh b/source/event/include/G4ParticleGun.hh
index 28e7ff420b4de46a5c16fad7cab500346e464186..32a3845978a1df8911e1940133165997f2031f07 100644
--- a/source/event/include/G4ParticleGun.hh
+++ b/source/event/include/G4ParticleGun.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleGun.hh,v 1.4 2000/10/18 12:41:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4ParticleGun_h
diff --git a/source/event/include/G4ParticleGunMessenger.hh b/source/event/include/G4ParticleGunMessenger.hh
index fcbd837f80242d538716682da2d55d65b64920f1..0066a309b6776fc6baa9406b571a4262e7b40c9f 100644
--- a/source/event/include/G4ParticleGunMessenger.hh
+++ b/source/event/include/G4ParticleGunMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleGunMessenger.hh,v 1.5 2000/10/19 13:29:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/event/include/G4PrimaryParticle.hh b/source/event/include/G4PrimaryParticle.hh
index 2f788d8194f6002df5cbd10d5ab7ebe48a29c4ef..c073025cc72affdd638c36826e5ce129d9faa867 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.6 2000/10/19 15:19:36 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PrimaryParticle.hh,v 1.8 2001/02/08 06:07:16 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
@@ -88,6 +88,7 @@ class G4PrimaryParticle
       G4double polY;
       G4double polZ;
       G4double Weight0;
+      G4double properTime;
 
   public: // with description
       // followings are get methods available.
@@ -124,6 +125,8 @@ class G4PrimaryParticle
       inline G4double GetPolZ() const { return polZ; }
       inline G4double GetWeight() const { return Weight0; }
       inline void SetWeight(G4double w) { Weight0 = w; }
+      inline void SetProperTime(G4double t) { properTime = t; }
+      inline G4double GetProperTime() const { return properTime; }
 
   public: // with description
       // Followings are available Set methods.
diff --git a/source/event/include/G4PrimaryTransformer.hh b/source/event/include/G4PrimaryTransformer.hh
index 02c8faad384204d482df19d8b02240baaa83bd8f..cc32528a1ae3761fc9a8d2d342820547c45a971e 100644
--- a/source/event/include/G4PrimaryTransformer.hh
+++ b/source/event/include/G4PrimaryTransformer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PrimaryTransformer.hh,v 1.4 2000/10/19 15:19:36 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4PromaryTransformer_h 
diff --git a/source/event/include/G4PrimaryVertex.hh b/source/event/include/G4PrimaryVertex.hh
index d5874b95d542378f95f8bda05c9e50b22a0b26dd..0954ad6b43acbf0b9e91e09041b99da82ba85635 100644
--- a/source/event/include/G4PrimaryVertex.hh
+++ b/source/event/include/G4PrimaryVertex.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PrimaryVertex.hh,v 1.5 2000/10/19 15:19:36 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/event/include/G4StackManager.hh b/source/event/include/G4StackManager.hh
index 34c7a297ab7ca0279968d89b752c365700083796..dfb85c8e5ac0682ed244ee43469f201722837084 100644
--- a/source/event/include/G4StackManager.hh
+++ b/source/event/include/G4StackManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StackManager.hh,v 1.5 2000/01/26 06:42:14 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/event/include/G4StackedTrack.hh b/source/event/include/G4StackedTrack.hh
index 0d3cb3f2860f4a874fab7074d1203b9b6719a8d5..ec5f3b58b4dc03197026e2abecc4323bf07bc5ea 100644
--- a/source/event/include/G4StackedTrack.hh
+++ b/source/event/include/G4StackedTrack.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StackedTrack.hh,v 1.4 2000/01/26 06:42:15 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  Last Modification : 02/Feb/96 M.Asai
diff --git a/source/event/include/G4StackingMessenger.hh b/source/event/include/G4StackingMessenger.hh
index 84d4f17992f278e7d2ec41ccbc5261c634591809..d9f6039e050149f2aa3435db576f1f41207f80a6 100644
--- a/source/event/include/G4StackingMessenger.hh
+++ b/source/event/include/G4StackingMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StackingMessenger.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4StackingMessenger_h
diff --git a/source/event/include/G4TrackStack.hh b/source/event/include/G4TrackStack.hh
index 3863c2c992a39d5dacb981ec84acffbea9f99a78..41e6b9d4d06eaf0dcdf76b95c6aaa9c7368690e6 100644
--- a/source/event/include/G4TrackStack.hh
+++ b/source/event/include/G4TrackStack.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TrackStack.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/include/G4TrajectoryContainer.hh b/source/event/include/G4TrajectoryContainer.hh
index 6c63923541a6cd25211aa68b0ee699aeff4308da..f2a217e04711970a7ed10388e1c150070995a9d2 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.5 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrajectoryContainer.hh,v 1.6 2001/02/08 06:07:16 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //	G4TrajectoryContainer
@@ -17,15 +17,31 @@
 
 #include "G4VTrajectory.hh"
 // G4RWTPtrOrderedVector
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
 
 // class description:
 //
 //  This is a container of G4VTrajectory objects and the object of this
 // container will be associated to G4Event object.
 
-typedef G4RWTPtrOrderedVector<G4VTrajectory> G4TrajectoryContainer;
+//typedef G4RWTPtrOrderedVector<G4VTrajectory> G4TrajectoryContainer;
 
+class G4TrajectoryContainer : public G4std::vector<G4VTrajectory*>
+{
+  public:
+    G4TrajectoryContainer() {;}
+    ~G4TrajectoryContainer() {;}
+
+  public:
+    inline G4int entries() { return size(); }
+    inline G4bool insert(G4VTrajectory* p) { push_back(p); return true; }
+    inline void clearAndDestroy()
+    {
+      for(int i=0;i<size();i++)
+      { delete (*this)[i]; }
+      clear();
+    }
+};
 #endif
 
 
diff --git a/source/event/include/G4UserEventAction.hh b/source/event/include/G4UserEventAction.hh
index 306e262f2be9ddd8cfad49f920a9243aa5a09b3a..d887248d316fd27f19601c4c11802bd18f35f1c4 100644
--- a/source/event/include/G4UserEventAction.hh
+++ b/source/event/include/G4UserEventAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserEventAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/event/include/G4UserStackingAction.hh b/source/event/include/G4UserStackingAction.hh
index 9500580f24f17b4b53e3cc4f515054ee869c1d77..c9741d6c370c3a8c9c94169bdddfe6d6e40d6464 100644
--- a/source/event/include/G4UserStackingAction.hh
+++ b/source/event/include/G4UserStackingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserStackingAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UserStackingAction_h
diff --git a/source/event/include/G4VPrimaryGenerator.hh b/source/event/include/G4VPrimaryGenerator.hh
index 28fd99e7b54addc20aaf93e36954bcfef73431fc..4d63f737789f1b45d45d0768ddd141b81a7f6adc 100644
--- a/source/event/include/G4VPrimaryGenerator.hh
+++ b/source/event/include/G4VPrimaryGenerator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPrimaryGenerator.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VPrimaryGenerator_h
diff --git a/source/event/include/eventgendefs.hh b/source/event/include/eventgendefs.hh
index b0837d2d0c1dce8f00b89e8f85c91f3e139ec364..0e340b3324238f97eb48335d833040c8a7a44455 100644
--- a/source/event/include/eventgendefs.hh
+++ b/source/event/include/eventgendefs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: eventgendefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef EventGenerator_DEBUG
 #define EventGenerator_DEBUG
diff --git a/source/event/include/evmandefs.hh b/source/event/include/evmandefs.hh
index a6e8c7981063b62a74e6435d388c00efa52de737..9342e9f7381703d548ed29b5ce68dd539f4f4b26 100644
--- a/source/event/include/evmandefs.hh
+++ b/source/event/include/evmandefs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: evmandefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 ///#define G4EVENTMANAGER_DEBUG 1
diff --git a/source/event/include/trajectoryControl.hh b/source/event/include/trajectoryControl.hh
index 70eb98f70e7417d8ca46923ab56ea9971fa86bc0..2b08135db09a27a29445b1b5df677ac61dd4535d 100644
--- a/source/event/include/trajectoryControl.hh
+++ b/source/event/include/trajectoryControl.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: trajectoryControl.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////#define G4_STORE_TRAJECTORY 1
 
diff --git a/source/event/src/G4EvManMessenger.cc b/source/event/src/G4EvManMessenger.cc
index 0fa14fc85931c916ae8e30a5b88bf48ac4bc7eb3..99f8493179c66b685d32e03cbce67a3218d882fb 100644
--- a/source/event/src/G4EvManMessenger.cc
+++ b/source/event/src/G4EvManMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EvManMessenger.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 
diff --git a/source/event/src/G4Event.cc b/source/event/src/G4Event.cc
index 6d4b75c07812d18d4013cc700687a312e9c443c2..fd99eae16f9124d7942273c4b582303e705b5190 100644
--- a/source/event/src/G4Event.cc
+++ b/source/event/src/G4Event.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Event.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4Event
diff --git a/source/event/src/G4EventManager.cc b/source/event/src/G4EventManager.cc
index 560f923697453a397e6a92822290eb8f16363463..446b0c4b944fedc7d5393e4f61a4905c2ea8b8de 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.5 2000/01/26 06:42:15 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4EventManager.cc,v 1.6 2001/02/08 06:07:16 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
@@ -184,7 +184,13 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
         G4cout << "Illeagal TrackStatus returned from G4TrackingManager!"
              << G4endl;
       case fKillTrackAndSecondaries:
-        if( secondaries ) secondaries->clearAndDestroy();
+        //if( secondaries ) secondaries->clearAndDestroy();
+        if( secondaries )
+        {
+          for(G4int i=0;i<secondaries->size();i++)
+          { delete (*secondaries)[i]; }
+          secondaries->clear();
+        }
         delete track;
         break;
     }
@@ -217,7 +223,7 @@ void G4EventManager::StackTracks(G4TrackVector *trackVector)
   if( trackVector )
   {
 
-    size_t n_passedTrack = trackVector->entries();
+    size_t n_passedTrack = trackVector->size();
     if( n_passedTrack == 0 ) return;
     for( size_t i = 0; i < n_passedTrack; i++ )
     {
diff --git a/source/event/src/G4GeneralParticleSource.cc b/source/event/src/G4GeneralParticleSource.cc
index c5f081c25fec8178957ded77a84ff92c4a09ef5d..4b01ba82cbd9ee386f1e45f0fff43c565e8dce04 100644
--- a/source/event/src/G4GeneralParticleSource.cc
+++ b/source/event/src/G4GeneralParticleSource.cc
@@ -21,6 +21,17 @@
 // CHANGE HISTORY
 // --------------
 //
+// 26-01-2001, F. Lei
+// replace: 
+//          posphi = acos(tx/sin(posthe));
+// 
+// with:
+//          if (posthe != 0. && posthe != pi) 
+//           { posphi = acos(tx/sin(posthe)); }
+//          else 
+//           { posphi = 0.0;}
+//          endif
+//
 // 10-Nov-2000, F. Lei
 //    some bug fixing:
 //          i) dclared ' G4int count' in all ****Interpolation functions
@@ -28,7 +39,7 @@
 //              as default.
 //
 // 09-Nov-2000, F Lei
-//    Changed to a fast mplementation for generating iso and cos angular directions 
+//    Changed to a fast implementation for generating iso and cos angular directions 
 //
 // Version 1.1, 18 October 2000, Modified to inherit from G4VPrimaryGenerator.
 // New name at the request of M. Asai.
@@ -261,7 +272,6 @@ void G4GeneralParticleSource::ConfineSourceToVolume(G4String Vname)
     found  = tempPV->GetName() == theRequiredVolumeName;
     if(verbosityLevel == 2)
       G4cout << i << " " << " " << tempPV->GetName() << " " << theRequiredVolumeName << " " << found << G4endl;
-
     if (!found)
       {i++;}
   }
@@ -298,7 +308,6 @@ void G4GeneralParticleSource::GeneratePointsInPlane()
   G4double expression;
   G4ThreeVector RandPos;
   G4double tempx, tempy, tempz;
-
   z = 0.;
 
   if(SourcePosType != "Plane" && verbosityLevel >= 1)
@@ -1112,7 +1121,10 @@ void G4GeneralParticleSource::GenerateIsotropicFlux()
   tz = tz/tt;
   //  G4cout << "unit position " << tx << " " << ty << " " << tz << G4endl;
   posthe = acos(tz);
-  posphi = acos(tx/sin(posthe));
+  if (posthe != 0. && posthe != pi) 
+  { posphi = acos(tx/sin(posthe)); }
+  else 
+  { posphi = 0.0;}
   //  G4cout << "Posthe and posphi " << posthe << " " << posphi << G4endl;
   G4double finx, finy, finz;
   finx = (px*cos(posthe)*cos(posphi)) - (py*sin(posphi)) + (pz*sin(posthe)*cos(posphi));
diff --git a/source/event/src/G4HEPEvtInterface.cc b/source/event/src/G4HEPEvtInterface.cc
index 3c81be4b8595c7b516e294631ed3c742fddde3ba..bbb355254aeeb1c480fe19eac139601e51afd326 100644
--- a/source/event/src/G4HEPEvtInterface.cc
+++ b/source/event/src/G4HEPEvtInterface.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4HEPEvtInterface.cc,v 1.3 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4HEPEvtInterface.cc,v 1.4 2001/02/08 06:07:17 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
@@ -75,28 +75,28 @@ void G4HEPEvtInterface::GeneratePrimaryVertex(G4Event* evt)
       = new G4HEPEvtParticle( particle, ISTHEP, JDAHEP1, JDAHEP2 );
 
     // Store
-    HPlist.insert( hepParticle );
+    HPlist.push_back( hepParticle );
   }
 
   // check if there is at least one particle
-  if( HPlist.entries() == 0 ) return; 
+  if( HPlist.size() == 0 ) return; 
 
   // make connection between daughter particles decayed from 
   // the same mother
-  for( int i=0; i<HPlist.entries(); i++ )
+  for( int i=0; i<HPlist.size(); i++ )
   {
-    if( HPlist(i)->GetJDAHEP1() > 0 ) //  it has daughters
+    if( HPlist[i]->GetJDAHEP1() > 0 ) //  it has daughters
     {
-      int jda1 = HPlist(i)->GetJDAHEP1()-1; // FORTRAN index starts from 1
-      int jda2 = HPlist(i)->GetJDAHEP2()-1; // but C++ starts from 0.
-      G4PrimaryParticle* mother = HPlist(i)->GetTheParticle();
+      int jda1 = HPlist[i]->GetJDAHEP1()-1; // FORTRAN index starts from 1
+      int jda2 = HPlist[i]->GetJDAHEP2()-1; // but C++ starts from 0.
+      G4PrimaryParticle* mother = HPlist[i]->GetTheParticle();
       for( int j=jda1; j<=jda2; j++ )
       {
-        G4PrimaryParticle* daughter = HPlist(j)->GetTheParticle();
-        if(HPlist(j)->GetISTHEP()>0)
+        G4PrimaryParticle* daughter = HPlist[j]->GetTheParticle();
+        if(HPlist[j]->GetISTHEP()>0)
         {
           mother->SetDaughter( daughter );
-          HPlist(j)->Done();
+          HPlist[j]->Done();
         }
       }
     }
@@ -110,18 +110,21 @@ void G4HEPEvtInterface::GeneratePrimaryVertex(G4Event* evt)
   G4PrimaryVertex* vertex = new G4PrimaryVertex(x0,y0,z0,t0);
 
   // put initial particles to the vertex
-  for( int ii=0; ii<HPlist.entries(); ii++ )
+  for( int ii=0; ii<HPlist.size(); ii++ )
   {
-    if( HPlist(ii)->GetISTHEP() > 0 ) // ISTHEP of daughters had been 
+    if( HPlist[ii]->GetISTHEP() > 0 ) // ISTHEP of daughters had been 
                                        // set to negative
     {
-      G4PrimaryParticle* initialParticle = HPlist(ii)->GetTheParticle();
+      G4PrimaryParticle* initialParticle = HPlist[ii]->GetTheParticle();
       vertex->SetPrimary( initialParticle );
     }
   }
 
   // clear G4HEPEvtParticles
-  HPlist.clearAndDestroy();
+  //HPlist.clearAndDestroy();
+  for(G4int iii=0;iii<HPlist.size();iii++)
+  { delete HPlist[iii]; }
+  HPlist.clear();
 
   // Put the vertex to G4Event object
   evt->AddPrimaryVertex( vertex );
diff --git a/source/event/src/G4HEPEvtParticle.cc b/source/event/src/G4HEPEvtParticle.cc
index b241211eed65b23022f05eb8055242f714603ca7..8cde3ff566f9b7c5f54d65d30781a6a14c7bbde6 100644
--- a/source/event/src/G4HEPEvtParticle.cc
+++ b/source/event/src/G4HEPEvtParticle.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPEvtParticle.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/event/src/G4ParticleGun.cc b/source/event/src/G4ParticleGun.cc
index 3aadd5cbeb97f3f6e6922ada4f7dd3183217e342..860aa67e7eac50f14df47e9524c0ebdc0f6256ea 100644
--- a/source/event/src/G4ParticleGun.cc
+++ b/source/event/src/G4ParticleGun.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleGun.cc,v 1.3 2000/10/18 12:41:25 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4ParticleGun
diff --git a/source/event/src/G4ParticleGunMessenger.cc b/source/event/src/G4ParticleGunMessenger.cc
index 24cd80add19b5c0acdb465a62ff8d003bec10f74..ab4e9159bac0f116b7eaeacc9335eb0da2eb92fe 100644
--- a/source/event/src/G4ParticleGunMessenger.cc
+++ b/source/event/src/G4ParticleGunMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleGunMessenger.cc,v 1.4 2000/10/19 13:29:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4ParticleGunMessenger.hh"
diff --git a/source/event/src/G4PrimaryParticle.cc b/source/event/src/G4PrimaryParticle.cc
index a7be54e823beac5e55c4dfb47e9083abba4d9cfe..355c80e07fc8bbe1611d924ab11fa734b1b13451 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.3 2000/10/19 15:19:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PrimaryParticle.cc,v 1.5 2001/02/08 06:07:17 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4PrimaryParticle.hh"
@@ -19,33 +19,33 @@ G4Allocator<G4PrimaryParticle> aPrimaryParticleAllocator;
 G4PrimaryParticle::G4PrimaryParticle()
 :PDGcode(0),G4code(NULL),Px(0.),Py(0.),Pz(0.),
  nextParticle(NULL),daughterParticle(NULL),trackID(-1),
- mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
+ mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
 {;}
 
 G4PrimaryParticle::G4PrimaryParticle(G4int Pcode)
 :PDGcode(Pcode),Px(0.),Py(0.),Pz(0.),
  nextParticle(NULL),daughterParticle(NULL),trackID(-1),
- mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
+ mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
 { G4code = G4ParticleTable::GetParticleTable()->FindParticle(Pcode); }
 
 G4PrimaryParticle::G4PrimaryParticle(G4int Pcode,
                         G4double px,G4double py,G4double pz)
 :PDGcode(Pcode),Px(px),Py(py),Pz(pz),
  nextParticle(NULL),daughterParticle(NULL),trackID(-1),
- mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
+ mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
 { G4code = G4ParticleTable::GetParticleTable()->FindParticle(Pcode); }
 
 G4PrimaryParticle::G4PrimaryParticle(G4ParticleDefinition* Gcode)
 :G4code(Gcode),Px(0.),Py(0.),Pz(0.),
  nextParticle(NULL),daughterParticle(NULL),trackID(-1),
- mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
+ mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
 { PDGcode = Gcode->GetPDGEncoding(); }
 
 G4PrimaryParticle::G4PrimaryParticle(G4ParticleDefinition* Gcode,
                         G4double px,G4double py,G4double pz)
 :G4code(Gcode),Px(px),Py(py),Pz(pz),
  nextParticle(NULL),daughterParticle(NULL),trackID(-1),
- mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
+ mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
 { PDGcode = Gcode->GetPDGEncoding(); }
 
 G4PrimaryParticle::~G4PrimaryParticle()
@@ -87,6 +87,8 @@ void G4PrimaryParticle::Print() const
   G4cout << "     Polarization ( " << polX << ", " << polY << ", "
                                  << polZ << " )" << G4endl;
   G4cout << "     Weight : " << Weight0 << G4endl;
+  if(properTime>0.0)
+  { G4cout << "     PreAssigned proper decay time : " << properTime/ns << " (nsec)" << G4endl; }
   if(daughterParticle != NULL)
   {
     G4cout << ">>>> Daughters" << G4endl;
diff --git a/source/event/src/G4PrimaryTransformer.cc b/source/event/src/G4PrimaryTransformer.cc
index 11e2c710064e1f8e67f3d2d2bf11d5091eec8b08..9818410ac5a8cd003b3a728eaa5146257b24e465 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.5 2000/10/19 15:19:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PrimaryTransformer.cc,v 1.8 2001/02/09 00:11:31 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4PrimaryTransformer.hh"
@@ -30,7 +30,10 @@ G4PrimaryTransformer::~G4PrimaryTransformer()
     
 G4TrackVector* G4PrimaryTransformer::GimmePrimaries(G4Event* anEvent)
 {
-  TV.clearAndDestroy();
+  //TV.clearAndDestroy();
+  for( int ii=0; ii<TV.size();ii++)
+  { delete TV[ii]; }
+  TV.clear();
   G4int n_vertex = anEvent->GetNumberOfPrimaryVertex();
   if(n_vertex==0) return NULL; 
   for( int i=0; i<n_vertex; i++ )
@@ -105,6 +108,8 @@ void G4PrimaryTransformer::GenerateSingleTrack
     DP->SetPolarization(primaryParticle->GetPolX(),
                         primaryParticle->GetPolY(),
                         primaryParticle->GetPolZ());
+    if(primaryParticle->GetProperTime()>0.0)
+    { DP->SetPreAssignedDecayProperTime(primaryParticle->GetProperTime()); }
     // Set Charge
     if (abs(primaryParticle->GetCharge()-DP->GetCharge())>eplus) {
       DP->SetCharge(primaryParticle->GetCharge());
@@ -118,7 +123,7 @@ void G4PrimaryTransformer::GenerateSingleTrack
     // Set weight ( vertex weight * particle weight )
     track->SetWeight(wv*(primaryParticle->GetWeight()));
     // Store it to G4TrackVector
-    TV.insert( track );
+    TV.push_back( track );
   }
 }
 
diff --git a/source/event/src/G4PrimaryVertex.cc b/source/event/src/G4PrimaryVertex.cc
index ccdd95f613778cf34c9a0332d4bda740b65f2a5a..a8cbc226c1367a8ae1be8ba4016cf24c9a8ada68 100644
--- a/source/event/src/G4PrimaryVertex.cc
+++ b/source/event/src/G4PrimaryVertex.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PrimaryVertex.cc,v 1.3 2000/10/19 15:19:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4PrimaryVertex.hh"
diff --git a/source/event/src/G4StackManager.cc b/source/event/src/G4StackManager.cc
index 9182b93227ba965a4cfbc013f7a6803c6888265f..b5e2a144d58a10c70c04f03dcf6aa28b7ea3e418 100644
--- a/source/event/src/G4StackManager.cc
+++ b/source/event/src/G4StackManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StackManager.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/src/G4StackedTrack.cc b/source/event/src/G4StackedTrack.cc
index 9bd9b641872dece4fc51de42c4096cfa117a9a8b..8d78894bddd5c0e342a237dd99fbeb53fae34bb0 100644
--- a/source/event/src/G4StackedTrack.cc
+++ b/source/event/src/G4StackedTrack.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StackedTrack.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  Last Modification : 02/Feb/96 M.Asai
diff --git a/source/event/src/G4StackingMessenger.cc b/source/event/src/G4StackingMessenger.cc
index d566d77e5f87802de485a8f673bd81fb4357879b..ee4f36fc28aab228cc7de0b370bfdc9a2c8cc798 100644
--- a/source/event/src/G4StackingMessenger.cc
+++ b/source/event/src/G4StackingMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StackingMessenger.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 
diff --git a/source/event/src/G4TrackStack.cc b/source/event/src/G4TrackStack.cc
index 15578a85f46332ffdff0f956b5faa6e10e2a03d8..f2bf95b95f0f924e1c422c0f34a04751769a759d 100644
--- a/source/event/src/G4TrackStack.cc
+++ b/source/event/src/G4TrackStack.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TrackStack.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/src/G4UserEventAction.cc b/source/event/src/G4UserEventAction.cc
index 18a6787ea286b1c566daf2fdd53aec81f276bed3..6e38adc048efbb67cc9251c3d2db82d73f7f4d88 100644
--- a/source/event/src/G4UserEventAction.cc
+++ b/source/event/src/G4UserEventAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserEventAction.cc,v 1.3 1999/12/15 14:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UserEventAction.hh"
diff --git a/source/event/src/G4UserStackingAction.cc b/source/event/src/G4UserStackingAction.cc
index befeae2954f790ad0b1d3a38d4177054b3246315..68acf491e16a9bfe64eee77a2e10ca1d1afb1e4d 100644
--- a/source/event/src/G4UserStackingAction.cc
+++ b/source/event/src/G4UserStackingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserStackingAction.cc,v 1.3 1999/12/15 14:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UserStackingAction.hh"
diff --git a/source/event/src/G4VPrimaryGenerator.cc b/source/event/src/G4VPrimaryGenerator.cc
index 5979c807b176c6d0ee2525813c02ed8040ffe32e..ffa773f2bffb74dc363d15375959b8cdd91cf86b 100644
--- a/source/event/src/G4VPrimaryGenerator.cc
+++ b/source/event/src/G4VPrimaryGenerator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPrimaryGenerator.cc,v 1.2 1999/12/15 14:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4VPrimaryGenerator
diff --git a/source/g3tog4/GNUmakefile b/source/g3tog4/GNUmakefile
index babe484ff95b6f9f251e6b7c208f9dc60c36217b..a218ed643e3b97f4bdde5b2d23eab27cfc215a41 100644
--- a/source/g3tog4/GNUmakefile
+++ b/source/g3tog4/GNUmakefile
@@ -78,6 +78,10 @@ Flibsources = $(filter-out $(Fbinsources),$(wildcard src/*.F))
 Flibobjects = $(patsubst src/%.F,$(G4TMPDIR)/%.o,$(Flibsources))
 Fdependencies = $(patsubst %.o,%.d,$(Fbinobjects) $(Flibobjects))
 
+ifdef G3G4DEBUG
+  CPPFLAGS += -DG3G4DEBUG
+endif
+
 ###############################################################################
 ### user beware! .rz files made with cernlib v 95a cannot be read with later
 ### versions. You can use cernlib -v option to specify the cernlib version 
diff --git a/source/g3tog4/History b/source/g3tog4/History
index 3cc83c81c842d315cd32998bf5690668e7d25d6b..1d26f061b4dd7f5a84c527908fac30d50f968240 100644
--- a/source/g3tog4/History
+++ b/source/g3tog4/History
@@ -1,8 +1,25 @@
-$Id: History,v 1.38 2000/11/28 12:07:54 gcosmo Exp $
+$Id: History,v 1.42 2001/03/14 13:27:44 gcosmo Exp $
 
 G3toG4 Modification History (reverse chronological order, please !)
 --------------------------------------------------------------------
 
+g3tog4-V03-00-02 14-Mar-2001 G.Cosmo
+- G3toG4MakeSolid.cc: fixed bug in construction of G4Sphere where theta and
+  phi parameters were reversed according to G4Sphere constructor.
+  Fixes problem report #230.
+- G3Division.cc: correction for "PARA". Slices are placed with G4PVPlacement
+  instead of G4PVReplica for this particular case (I.Hrivnacova).
+
+g3tog4-V03-00-01 14-Feb-2001 G.Cosmo
+- Added support for replicated "PARA" shapes in G3Division::CreateSolid(...)
+  (I.Hrivnacova).
+
+g3tog4-V03-00-00 25-Jan-2001 G.Cosmo
+- Fixes for report #188:
+  o Fixed bug in G3toG4BuildTree(G3VolTableEntry*, G3VolTableEntry*)
+    when positioning volume copies. Index is now decremented.
+  o Added -DG3G4DEBUG to CPPFLAGS in GNUmakefile.
+
 g3tog4-V02-00-05 28-Nov-2000 G.Cosmo
 - Fixed bug in G3toG4BuildTree::ClearG3PosCopy(G4int). Entry in vector was
   not properly destroyed.
diff --git a/source/g3tog4/README b/source/g3tog4/README
index e781a67dba80de00a183f82f38bd0b9a0ed8f37b..40c42fd03dd444ece24d266dae1bae014da7de0c 100644
--- a/source/g3tog4/README
+++ b/source/g3tog4/README
@@ -70,18 +70,19 @@ gmake clean
 - GSPART has to be updated.
 - Usage of magnetic field class has to be turned on.
 
- the implementation (July 2000)
+ the implementation (February 2001)
 ----------------------------------------
 - Supported shapes: all G3 shapes except for
   "HYPE", "GTRA", "CTUB"
 - G3 MANY feature is not supported.
 - GSDV* routines for dividing volumes implemented, using
   G4PVReplicas, for shapes:
-      "BOX", "TUBE", "TUBS" - all axes;
+      "BOX", "TUBE", "TUBS", "PARA" - all axes;
       "CONE", "CONS" - axes 2, 3;
       "TRD1", "TRD2", "TRAP" - axis 3; 
       "PGON", "PCON" - axis 2;
+      "PARA" -axis 1; axis 2,3 for a special case
   Unsupported shapes:    
-      "SPHE", "PARA", "ELTU", "HYPE", "GTRA", "CTUB"
+      "SPHE", "ELTU", "HYPE", "GTRA", "CTUB"
 
 See History file for modification history.
diff --git a/source/g3tog4/include/G3DetTable.hh b/source/g3tog4/include/G3DetTable.hh
index 96f2159f81c9fd0363e6558a28fdd1363f245e94..20759771cd92f6999531390f73b3d693e68f2fbb 100644
--- a/source/g3tog4/include/G3DetTable.hh
+++ b/source/g3tog4/include/G3DetTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3DetTable.hh,v 1.6 1999/12/15 14:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G3DetTable class
 
diff --git a/source/g3tog4/include/G3DetTableEntry.hh b/source/g3tog4/include/G3DetTableEntry.hh
index 9e75ae384aa9631e839b3d5f92e2afa1e57d95be..c4b0c232d40b03560077554eb7f91b0e4b33bd75 100644
--- a/source/g3tog4/include/G3DetTableEntry.hh
+++ b/source/g3tog4/include/G3DetTableEntry.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3DetTableEntry.hh,v 1.3 1999/12/09 01:27:42 lockman Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G3DetTableEntry class
 
diff --git a/source/g3tog4/include/G3Division.hh b/source/g3tog4/include/G3Division.hh
index 059d714be889a2dc6da217d117e2e037e59110b2..9015a72dc2c2e0418df4f27dfd5f05bafc8875a0 100644
--- a/source/g3tog4/include/G3Division.hh
+++ b/source/g3tog4/include/G3Division.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3Division.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3EleTable.hh b/source/g3tog4/include/G3EleTable.hh
index 56e4bc9ac624a84bcf7105fb8653e744c2dc0d82..2bf24cf4dab3ba0649f6f7c31c7d753d13e2d963 100644
--- a/source/g3tog4/include/G3EleTable.hh
+++ b/source/g3tog4/include/G3EleTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3EleTable.hh,v 1.5 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3G4Interface.hh b/source/g3tog4/include/G3G4Interface.hh
index e8243beefaae1568134a540c3294cd5cf24bda82..52d1bc5b9e589eb2c16cc1e3045b0617fac72dcf 100644
--- a/source/g3tog4/include/G3G4Interface.hh
+++ b/source/g3tog4/include/G3G4Interface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3G4Interface.hh,v 1.7 1999/12/09 01:27:42 lockman Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   Interfaces for G3 equivalent routines
 //
diff --git a/source/g3tog4/include/G3MatTable.hh b/source/g3tog4/include/G3MatTable.hh
index 770d0a42447122dc70e163bf6e07d907ce06a294..7e675071d60a2f9e3c1ca5d3b69f0fb8a6b00b46 100644
--- a/source/g3tog4/include/G3MatTable.hh
+++ b/source/g3tog4/include/G3MatTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MatTable.hh,v 1.9 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3MatTableEntry.hh b/source/g3tog4/include/G3MatTableEntry.hh
index 8b74da8ab686e7b80ae8ed5da9192de70946d95b..7b887593a4068f315a5ab3d2b631d4518a6b319d 100644
--- a/source/g3tog4/include/G3MatTableEntry.hh
+++ b/source/g3tog4/include/G3MatTableEntry.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MatTableEntry.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3MedTable.hh b/source/g3tog4/include/G3MedTable.hh
index 3c55b3e97ee969ac14ce540b99f70aad93fe3676..75f2648e189fb887407a99afb4d26f19a44ac8fa 100644
--- a/source/g3tog4/include/G3MedTable.hh
+++ b/source/g3tog4/include/G3MedTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MedTable.hh,v 1.8 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3MedTableEntry.hh b/source/g3tog4/include/G3MedTableEntry.hh
index ab1e1655b343826367be48ee2e642a943c36d3f1..6d2bf57f5a63650e06c44fc962e1e6104c707870 100644
--- a/source/g3tog4/include/G3MedTableEntry.hh
+++ b/source/g3tog4/include/G3MedTableEntry.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3MedTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3PartTable.hh b/source/g3tog4/include/G3PartTable.hh
index d0c05cf4e1b1007fd522d4b2d776f8d265c44fb2..96e93b3301afacd8b1839f50476f1c088b6fd669 100644
--- a/source/g3tog4/include/G3PartTable.hh
+++ b/source/g3tog4/include/G3PartTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3PartTable.hh,v 1.7 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3Pos.hh b/source/g3tog4/include/G3Pos.hh
index bdba539f7d950dd653326fc7460ece2b6040719b..69827c07eab980371f9a0237a00fa76f541d42e6 100644
--- a/source/g3tog4/include/G3Pos.hh
+++ b/source/g3tog4/include/G3Pos.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3Pos.hh,v 1.9 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3RotTable.hh b/source/g3tog4/include/G3RotTable.hh
index f3b52f7feb1324c2f36d236e9daf443aa55da0e3..0bf4e572de2b5eb3af608a22a03004178f8e680c 100644
--- a/source/g3tog4/include/G3RotTable.hh
+++ b/source/g3tog4/include/G3RotTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3RotTable.hh,v 1.11 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3RotTableEntry.hh b/source/g3tog4/include/G3RotTableEntry.hh
index 8ec463a704da3ed338b01791ac5f03b6e5999b04..67cfb5d0bf0767168fb48b7329e810a4f1ad3db2 100644
--- a/source/g3tog4/include/G3RotTableEntry.hh
+++ b/source/g3tog4/include/G3RotTableEntry.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3RotTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3SensVolVector.hh b/source/g3tog4/include/G3SensVolVector.hh
index b15b2f4476abd9d9bce780ed3afc6d0f8182b136..62fdbf31adccb876f802a1d32592f8f14347b55a 100644
--- a/source/g3tog4/include/G3SensVolVector.hh
+++ b/source/g3tog4/include/G3SensVolVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3SensVolVector.hh,v 1.3 1999/12/09 01:27:46 lockman Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // vector of logical volumes that were defined with
 // tracking medium with ISVOL=1
diff --git a/source/g3tog4/include/G3VolTable.hh b/source/g3tog4/include/G3VolTable.hh
index d919895b5dcc6d18f81fce6b703ddbe37e93456e..cd3e0a1cf21bef369eeb260c45e0684dffa6fbc0 100644
--- a/source/g3tog4/include/G3VolTable.hh
+++ b/source/g3tog4/include/G3VolTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3VolTable.hh,v 1.15 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3VolTableEntry.hh b/source/g3tog4/include/G3VolTableEntry.hh
index d159137900e60c3e780d96fa49ecebad47b3c43a..874e5b140f759524fd1fe8d26ad9cfdec563d709 100644
--- a/source/g3tog4/include/G3VolTableEntry.hh
+++ b/source/g3tog4/include/G3VolTableEntry.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3VolTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3toG4.hh b/source/g3tog4/include/G3toG4.hh
index 27a4c14a3a61a92fb6ea284948ea6940a909095e..6f3e85ce4e16206623be7c4c7deb4e3247eaa551 100644
--- a/source/g3tog4/include/G3toG4.hh
+++ b/source/g3tog4/include/G3toG4.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4.hh,v 1.6 2000/03/07 10:51:40 stesting Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/include/G3toG4.inc b/source/g3tog4/include/G3toG4.inc
index 1b7b51ad105624a73883df2788c54be472fdc0f7..6f4ff8bff3001ca2a5ecf71857e3b1d134214b1e 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-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 712bcdfc85cdb612f09481b2e6596b198b6ec833..7a9c2415fc0c8fedc8cf39979f22bddce0a5c127 100644
--- a/source/g3tog4/include/G3toG4BuildTree.hh
+++ b/source/g3tog4/include/G3toG4BuildTree.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4BuildTree.hh,v 1.5 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class Description:
diff --git a/source/g3tog4/include/G3toG4MakeSolid.hh b/source/g3tog4/include/G3toG4MakeSolid.hh
index 84db27284d428394fb7f914757fc18e43216182a..8caf4eb7ff0506ed06fce6f47f37298d626baf17 100644
--- a/source/g3tog4/include/G3toG4MakeSolid.hh
+++ b/source/g3tog4/include/G3toG4MakeSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4MakeSolid.hh,v 1.5 2000/11/24 09:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------
 // Class Description:
diff --git a/source/g3tog4/include/G3toG4RotationMatrix.hh b/source/g3tog4/include/G3toG4RotationMatrix.hh
index 9dc469e8fcd15dd3c7dd0754b5b7a7989f99bde7..dd9ed707d6998dff966593377c5a3b997b7cfcd6 100644
--- a/source/g3tog4/include/G3toG4RotationMatrix.hh
+++ b/source/g3tog4/include/G3toG4RotationMatrix.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3toG4RotationMatrix.hh,v 1.4 2000/11/24 09:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ----------------------
 // Class description:
 //
diff --git a/source/g3tog4/include/gcbank.inc b/source/g3tog4/include/gcbank.inc
index cb69d210c7019ef37ee0d73716f41a771f0e53db..7b9aa4ba4619d5c63fa4703a38e611404bd75345 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
       INTEGER IQ,LQ,NZEBRA,IXSTOR,IXDIV,IXCONS,LMAIN,LR1,JCG
       INTEGER KWBANK,KWWORK,IWS
diff --git a/source/g3tog4/src/G3DetTable.cc b/source/g3tog4/src/G3DetTable.cc
index 8daa945d3e9bcd4a85e467cecac733692afe82c4..51a8259f200630cba19b6029f13770a3beca960c 100644
--- a/source/g3tog4/src/G3DetTable.cc
+++ b/source/g3tog4/src/G3DetTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3DetTable.cc,v 1.9 2000/03/02 17:54:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "globals.hh"
 #include "G3DetTable.hh"
diff --git a/source/g3tog4/src/G3DetTableEntry.cc b/source/g3tog4/src/G3DetTableEntry.cc
index a9a9f0395ae944cc8d30fa6f107afd5e8173cfc8..a92420c3ff2d10647599beeedae5a565452448c3 100644
--- a/source/g3tog4/src/G3DetTableEntry.cc
+++ b/source/g3tog4/src/G3DetTableEntry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3DetTableEntry.cc,v 1.3 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "globals.hh"
 #include "G3DetTableEntry.hh"
diff --git a/source/g3tog4/src/G3Division.cc b/source/g3tog4/src/G3Division.cc
index 863832685e301136c44a0fb203a8249436803204..d26797a39031ca6c9e2a5d13a644522341810ee3 100644
--- a/source/g3tog4/src/G3Division.cc
+++ b/source/g3tog4/src/G3Division.cc
@@ -5,20 +5,22 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G3Division.cc,v 1.7 2000/11/24 09:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G3Division.cc,v 1.9 2001/03/14 13:27:23 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, V.Berejnoi 13.10.99
 
 #include "G3Division.hh"
 #include "G3VolTableEntry.hh"
 #include "G3toG4MakeSolid.hh"
+#include "G4Para.hh"
 #include "G3Pos.hh"
 #include "G4LogicalVolume.hh"
 #include "G4VPhysicalVolume.hh"
 #include "G4PVPlacement.hh"
 #include "G4PVReplica.hh"
 
+
 G3VolTableEntry* G4CreateVTE(G4String vname, G4String shape, G4int nmed,
                                G4double Rpar[], G4int npar);
 
@@ -89,7 +91,7 @@ void G3Division::UpdateVTE()
     
     if (envVTE) {
       // reset mother <-> daughter
-       fMVTE->ReplaceDaughter(fVTE, envVTE);
+      fMVTE->ReplaceDaughter(fVTE, envVTE);
       fVTE->ReplaceMother(fMVTE, envVTE);
       envVTE->AddDaughter(fVTE);
       envVTE->AddMother(fMVTE);
@@ -106,6 +108,26 @@ G4VPhysicalVolume* G3Division::CreatePVReplica()
   G4LogicalVolume* lv =  fVTE->GetLV();
   G4LogicalVolume* mlv = fMVTE->GetLV();
   
+  G4String shape = fMVTE->GetShape();
+  if (shape == "PARA") {
+    // The para volume cannot be replicated using G4PVReplica.
+    // (Replicating a volume along a cartesian axis means "slicing" it
+    // with slices -perpendicular- to that axis.)
+    
+    // position the replicated elements    
+    for (G4int i=0; i<fNofDivisions; i++) {
+       G4ThreeVector position = G4ThreeVector(); 
+       position[fIAxis-1] = fLowRange + fWidth/2. + i*fWidth;
+       if (position.y()!=0.) 
+         position.setX(position.y()*((G4Para*)lv->GetSolid())->GetTanAlpha());
+
+       new G4PVPlacement(0, position, lv, name, mlv, 0, i);
+    }
+    
+    // no G4PVReplica was created - return 0
+    return 0;   
+  }     
+  
   G4PVReplica* pvol 
     = new G4PVReplica(name, lv, mlv, fAxis, fNofDivisions, fWidth, fOffset);
 
@@ -650,7 +672,23 @@ void G3Division::CreateSolid(G4String shape, G4double par[], G4int npar)
          Rpar[0] = fWidth/2./cm; 
       }
     }
-    else if (shape == "SPHE" || shape == "PARA") {
+    else if (shape == "PARA") {
+      if      ( fIAxis == 1 ) {
+         Rpar[0] = fWidth/2./cm;
+      }	 
+      else if ( Rpar[4] == 0. && Rpar[5] == 0. ) {
+         // only special case for axis 2,3 is supported
+        if ( fIAxis == 2 ) {
+          Rpar[1] = fWidth/2./cm;
+	}  
+  	else if ( fIAxis == 3) {
+          Rpar[2] = fWidth/2./cm;
+	}
+      }	  
+      else    
+         Exception("CreateSolid", shape);
+    }	 
+    else if (shape == "SPHE") {
       Exception("CreateSolid", shape);
     }
     else if ( shape == "PGON" ) {
diff --git a/source/g3tog4/src/G3EleTable.cc b/source/g3tog4/src/G3EleTable.cc
index 4868554e0a3094b94adaf167ee130e42336e4ab0..05ecd7d042f14b9e37c73cbf433ce319d7503b8b 100644
--- a/source/g3tog4/src/G3EleTable.cc
+++ b/source/g3tog4/src/G3EleTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3EleTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4strstreambuf.hh"
diff --git a/source/g3tog4/src/G3MatTable.cc b/source/g3tog4/src/G3MatTable.cc
index 2e7652dbf3656cb424aa73fe62efa2cd8841b1c0..90e7a6b8410344edc0f850cacda29c7c781b6dbd 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3MatTableEntry.cc b/source/g3tog4/src/G3MatTableEntry.cc
index 389fd8aafc14047eb39383158600bb97dcb84fab..3a7ba3c44e44d6c6ea140b85a82a5e595d9dc2b1 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3MedTable.cc b/source/g3tog4/src/G3MedTable.cc
index dd6b343e5531c193cfe1777bfd1234fa4438e9b7..5006ca9da8a7b1f75a28e3bcc8ef866b6db8a870 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3MedTableEntry.cc b/source/g3tog4/src/G3MedTableEntry.cc
index afd6fb88237afa228e96039f2065846dd5e2bc72..094cffd506b932105ec9c6f6faf8781a8d3d55a0 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3NegVolPars.cc b/source/g3tog4/src/G3NegVolPars.cc
index cb6763e71bb29fa1bfc5db2325806f206517aa23..c82a3385943128cd65a99cd863332f5c0025e859 100644
--- a/source/g3tog4/src/G3NegVolPars.cc
+++ b/source/g3tog4/src/G3NegVolPars.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3NegVolPars.cc,v 1.7 2000/11/24 09:50:12 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I. Hrivnacova, 13.10.99 
 
diff --git a/source/g3tog4/src/G3PartTable.cc b/source/g3tog4/src/G3PartTable.cc
index ffd5cf28fbe08b2a49265009cfb4473efdf62d06..4110036a3b2952d2eeb2c71ea877850fd436be21 100644
--- a/source/g3tog4/src/G3PartTable.cc
+++ b/source/g3tog4/src/G3PartTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3PartTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/strstream"
diff --git a/source/g3tog4/src/G3Pos.cc b/source/g3tog4/src/G3Pos.cc
index 7de351e1b299fee5a2f8df618d49f4fde960ea46..081de62b8cc718077a483683efb974750abd499a 100644
--- a/source/g3tog4/src/G3Pos.cc
+++ b/source/g3tog4/src/G3Pos.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3Pos.cc,v 1.7 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G3RotTable.cc b/source/g3tog4/src/G3RotTable.cc
index 39f6ff769397fb72f198073ed5e70ff9f4bd44e0..6ebc0e9eb509656763620785a1ab94a2f55a3131 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.12 2000/07/24 11:32:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3RotTableEntry.cc b/source/g3tog4/src/G3RotTableEntry.cc
index 83798b1a8a2aa742e288ce3a29de645bb5e8f4dd..8a503680b64fa3d79a57d1a2a5f8a5d15f6a6198 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3VolTable.cc b/source/g3tog4/src/G3VolTable.cc
index 648f9d4eb5632c83ca67776c833f8e7e2a42b499..38289adba3895e0a4bc8f7db06fa30a0e79bdd36 100644
--- a/source/g3tog4/src/G3VolTable.cc
+++ b/source/g3tog4/src/G3VolTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3VolTable.cc,v 1.19 2000/03/02 17:54:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G3VolTableEntry.cc b/source/g3tog4/src/G3VolTableEntry.cc
index c90defd8bb1d2f16492c461011672b108bb66c5e..e8eab3fa55ffb2a6cb9af800fb68895700957390 100644
--- a/source/g3tog4/src/G3VolTableEntry.cc
+++ b/source/g3tog4/src/G3VolTableEntry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3VolTableEntry.cc,v 1.6 2000/11/28 12:07:54 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G3fillParams.cc.archive b/source/g3tog4/src/G3fillParams.cc.archive
index b42360cc7dae3232cf0ed599544870ba6c89be72..c9b1a8987d0af3dcec16a400a745f079083ef9bb 100644
--- a/source/g3tog4/src/G3fillParams.cc.archive
+++ b/source/g3tog4/src/G3fillParams.cc.archive
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3fillParams.cc.archive,v 1.1 1999/12/06 19:19:57 lockman Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e06b89040767c413e2c5735cbd3bdead730ebf8e..4f0adcd201f6838c8857ce3a056454f92e5845a6 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.12 2000/11/24 09:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G3toG4BuildTree.cc,v 1.13 2001/01/25 17:41:49 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I. Hrivnacova, 2.8.99 
 
@@ -98,7 +98,8 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
 	}
 	
 	// clear this position
-	curVTE->ClearG3PosCopy(i); 
+	curVTE->ClearG3PosCopy(i);
+	i--;
       }
     }
 
diff --git a/source/g3tog4/src/G3toG4MakeSolid.cc b/source/g3tog4/src/G3toG4MakeSolid.cc
index a2fa8c8556e6909de0d3339cb294adbfbfd730ae..f1d36d48cb3802e7acd6585d3dafd96e73d17ee5 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.6 2000/08/01 09:08:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G3toG4MakeSolid.cc,v 1.7 2001/03/12 09:49:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I.Hrivnacova, V.Berejnoi 27 Sep 99 
 
@@ -200,7 +200,7 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
     NegVolPars = pRmin<0 || pRmax<0;
 
     if (!(NegVolPars || Deferred)) {
-      solid = new G4Sphere(vname, pRmin, pRmax, pThe1, pDThe, pPhi1, pDPhi);
+      solid = new G4Sphere(vname, pRmin, pRmax, pPhi1, pDPhi, pThe1, pDThe);
     }
 
   } else if ( shape == "PARA" ) {
diff --git a/source/g3tog4/src/G3toG4RotationMatrix.cc b/source/g3tog4/src/G3toG4RotationMatrix.cc
index 48824056b7a8f028f6b4b081350a9be3d467187f..9209543ef5746f1d7859978579d7283f51c17542 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G3toG4RotationMatrix.hh"
 
diff --git a/source/g3tog4/src/G4BuildGeom.cc b/source/g3tog4/src/G4BuildGeom.cc
index 4e71ada7f2977c31c8bad60e8ce9bc7f34f45fd3..7b82c216aeb7753fe0292719b0975cac3954eee5 100644
--- a/source/g3tog4/src/G4BuildGeom.cc
+++ b/source/g3tog4/src/G4BuildGeom.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BuildGeom.cc,v 1.13 2000/11/24 09:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I. Hrivnacova, 13.10.99 
 
diff --git a/source/g3tog4/src/G4ggclos.cc b/source/g3tog4/src/G4ggclos.cc
index 668ec75f21c5c7fd66c8259c3008d9a71f440624..c5a8af480ef27b09a02a425b2bb571b829d8a5bf 100644
--- a/source/g3tog4/src/G4ggclos.cc
+++ b/source/g3tog4/src/G4ggclos.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ggclos.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G3toG4.hh"
 #include "G3VolTable.hh"
diff --git a/source/g3tog4/src/G4gsatt.cc b/source/g3tog4/src/G4gsatt.cc
index aa22e78ced7ad7a264d71ef6443502c395556db8..b0db6f0d14faa41a3edaa915112bc6a10f21b236 100644
--- a/source/g3tog4/src/G4gsatt.cc
+++ b/source/g3tog4/src/G4gsatt.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsatt.cc,v 1.8 2000/03/02 17:54:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "g4rw/cstring.h"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdet.cc b/source/g3tog4/src/G4gsdet.cc
index d5e978d53b690d1b53f45dfaab67c19fc2019c61..e045661dd9004acddb32b2d57e058ec3499567a4 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "globals.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdeta.cc b/source/g3tog4/src/G4gsdeta.cc
index 9e6584a2e1e8fd18307607f34ee53759db12eb7e..d4d45f553cfecf42aad808bc1daa2c191e3a3451 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // modified by I.Hrivnacova, 6 Oct 99
diff --git a/source/g3tog4/src/G4gsdetd.cc b/source/g3tog4/src/G4gsdetd.cc
index db796c08c10038c9d53942d2ba88631157933e4c..2d93fcd43693209f9323f5b56aa114eb2a63f2d0 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G3toG4.hh"
 #include "G3DetTable.hh"
diff --git a/source/g3tog4/src/G4gsdeth.cc b/source/g3tog4/src/G4gsdeth.cc
index 17f3456072eae5a2a9df74dc00b448e33cce947e..1430732cfb84b66e645bba9b4bdd85d10113d67b 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G3toG4.hh"
 #include "G3DetTable.hh"
diff --git a/source/g3tog4/src/G4gsdetu.cc b/source/g3tog4/src/G4gsdetu.cc
index 17a0db3cae5292f4e7db768d5584ab5e373f3e21..fb2c5194df8e882205369755db0963073dbb1f5e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G3toG4.hh"
 
diff --git a/source/g3tog4/src/G4gsdetv.cc b/source/g3tog4/src/G4gsdetv.cc
index a233d6a4d11bd068b98a2137c81ac74d86ac039f..3aaca357fc5f740ea5a37aef3c213497aebff511 100644
--- a/source/g3tog4/src/G4gsdetv.cc
+++ b/source/g3tog4/src/G4gsdetv.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsdetv.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G4ios.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdk.cc b/source/g3tog4/src/G4gsdk.cc
index d82a7a9ddc4b7e773e74a28367e083cf14c34609..20491fd9697cc1483453bcc9bbe76ff3c29beb17 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G4Decay.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdvn.cc b/source/g3tog4/src/G4gsdvn.cc
index 5fe9fb99905039b57c0d9f32bf375ce3387e8d1a..7b2a0f3a6e1d1ad179cc69dd1b271d0a42a1dfa2 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvn2.cc b/source/g3tog4/src/G4gsdvn2.cc
index 746a1f91382f44091d9a50337369f116b3452347..b35c7fa06cf63255591fa5ab97c7cae52ff89f1a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvt.cc b/source/g3tog4/src/G4gsdvt.cc
index 14f3e763a6d6800c03dbafb8c2b1f9d9e0334f0f..d7600eb3a05fce06d170c9184faa802783947c22 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvt2.cc b/source/g3tog4/src/G4gsdvt2.cc
index c5c18d9a9cab89dc17b4ca87b3edf2d938eacca5..67192df2a053a41dda74589567d4f1f3fef2cef7 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvx.cc b/source/g3tog4/src/G4gsdvx.cc
index 1babd8b4b7515063f5e5666284da0d99732589bb..76a4dc8bd27b8364770c034963ae393edd6a8800 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, V.Berejnoi, 27 Sep 99
 
diff --git a/source/g3tog4/src/G4gsmate.cc b/source/g3tog4/src/G4gsmate.cc
index ed42061aa5d4dce62ffd5afe3a74022c6066c38e..a23dc8dcc98897d7c379f19ff9a3ecd1b6e815be 100644
--- a/source/g3tog4/src/G4gsmate.cc
+++ b/source/g3tog4/src/G4gsmate.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsmate.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G4gsmixt.cc b/source/g3tog4/src/G4gsmixt.cc
index 6679a76a1b8483707cfc3af56b581985514e13eb..95b3dba666aa1faea2246b57829d6bff167c0fea 100644
--- a/source/g3tog4/src/G4gsmixt.cc
+++ b/source/g3tog4/src/G4gsmixt.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsmixt.cc,v 1.7 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G4gspart.cc b/source/g3tog4/src/G4gspart.cc
index db06fca2690482e4c8924e149673ce78c9cacf20..ce93a3f7e3e55760fb45deca2a2a422ccf3fd97a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4ProcessManager.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gspos.cc b/source/g3tog4/src/G4gspos.cc
index fe8785485d1a8d85423dce4e481030596bba25d4..2de63857479fa602e460c1951aa11a220511fa13 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G4gsposp.cc b/source/g3tog4/src/G4gsposp.cc
index 3f66afb2c9632c5b1079422e431ecaf8e4ac2cfc..b2ec8fe7ae5a4a34207351f25c0c1d7f206d1940 100644
--- a/source/g3tog4/src/G4gsposp.cc
+++ b/source/g3tog4/src/G4gsposp.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsposp.cc,v 1.13 2000/03/07 10:51:40 stesting Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G4gsrotm.cc b/source/g3tog4/src/G4gsrotm.cc
index b28f33148f4ccba318d53901cd8e326d537e571c..214f5918977f8496b88488903281fa7b49e3e23f 100644
--- a/source/g3tog4/src/G4gsrotm.cc
+++ b/source/g3tog4/src/G4gsrotm.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsrotm.cc,v 1.8 1999/12/15 14:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G3toG4.hh"
 #include "G3RotTable.hh"
diff --git a/source/g3tog4/src/G4gstmed.cc b/source/g3tog4/src/G4gstmed.cc
index 4fd4ce4ae2e1dff319f6b829e1ec8646ceb23eee..c5964508090b9a805a903c4fea03a416682c5361 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 9d16f0f089a047d3420551e6c969ffb2b8c9fba5..60fa74be10fc34fa13bbc04234aa64687189369a 100644
--- a/source/g3tog4/src/G4gstpar.cc
+++ b/source/g3tog4/src/G4gstpar.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gstpar.cc,v 1.5 1999/12/15 14:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G3toG4.hh"
 #include "G3VolTable.hh"
diff --git a/source/g3tog4/src/G4gsvolu.cc b/source/g3tog4/src/G4gsvolu.cc
index 1c8757eaf765dac6df105186070fc753f34d389a..17db75a795af069790489b3170013b982b970652 100644
--- a/source/g3tog4/src/G4gsvolu.cc
+++ b/source/g3tog4/src/G4gsvolu.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4gsvolu.cc,v 1.7 1999/12/15 14:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/clparse.cc b/source/g3tog4/src/clparse.cc
index 75111e7a0ecabb49a299c5d680f590c7d59bc25d..d6d5ba57db6431c62490c0df7809cedda9a4d26d 100644
--- a/source/g3tog4/src/clparse.cc
+++ b/source/g3tog4/src/clparse.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: clparse.cc,v 1.11 2000/03/07 10:51:41 stesting Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // modified by I.Hrivnacova
 // added G3SensVol
diff --git a/source/g3tog4/src/g3routines.F b/source/g3tog4/src/g3routines.F
index 244738d0ce449aaa752f671ecb2dca44cbcfefc6..4945b0715f01f0a4cd8c717822d7c39d3cb8ab2d 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
 #define CALL_GEANT
 
diff --git a/source/g3tog4/src/g3test.F.main b/source/g3tog4/src/g3test.F.main
index ac696111fa27908c55d50e59337e68c345b412cb..12bf2e028a709ea18f313c7b3c6672248f675201 100644
--- a/source/g3tog4/src/g3test.F.main
+++ b/source/g3tog4/src/g3test.F.main
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: g3test.F.main,v 1.2 1999/12/05 17:50:16 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
 *
 *       g3test
diff --git a/source/g3tog4/src/g3tog4.F b/source/g3tog4/src/g3tog4.F
index 126efac3c5817923b7f6d122bf0b32f49b2205ea..903248671fa4b9a31427d425dbc2c5f3de4baf3a 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
 *
 *       G3toG4
diff --git a/source/g3tog4/src/g4geom.cc.main b/source/g3tog4/src/g4geom.cc.main
index fe4c57fdace5ed54d43365ed8294a901c44ecac8..238fd7331d92bf663c2a5a92ae33fe9084c32935 100644
--- a/source/g3tog4/src/g4geom.cc.main
+++ b/source/g3tog4/src/g4geom.cc.main
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: g4geom.cc.main,v 1.2 1999/12/05 17:50:17 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-03-00 $ 
+// GEANT4 tag $Name: geant4-03-01 $ 
 //
 //   g4geom
 //
diff --git a/source/g3tog4/src/jshape.F b/source/g3tog4/src/jshape.F
index a7e75ae771e4bffa7cca89cbf28f86be68fc21bf..e14cdc1cd21c4e83235d37f284f8d0d9fcf20e3c 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
 *     
 *--   Author : Jouko Vuoskoski, CERN, Jouko.Vuoskoski@cern.ch
diff --git a/source/g3tog4/src/mztog4.F b/source/g3tog4/src/mztog4.F
index 4ae1d96f3bd2966d3d1e8d8c508d14c0c25f39c8..d045c28d8cc266f9bedee2dab92094d35a1deafb 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
       subroutine mztog4
 ************************************************************************
diff --git a/source/g3tog4/src/rztog4.F b/source/g3tog4/src/rztog4.F
index 67dfbc2c2b00c91290843d7f219ab2e4c0af2356..c5d5c4ac29bc72c5c7bfbb59d9c456da6f2577eb 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
       program rztog4
 ************************************************************************
diff --git a/source/g3tog4/src/tog4.F b/source/g3tog4/src/tog4.F
index 5248501f9c7182abc5e445108380532ff38c30b1..f0341ac3abac6795e862b24deacede9247d1636f 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-03-00 $
+*     GEANT4 tag $Name: geant4-03-01 $
 *    
       subroutine tog4
 ************************************************************************
diff --git a/source/geometry/magneticfield/History b/source/geometry/magneticfield/History
index 4dd4ba3b1f6c2a597786be6adea66d378a7da4a6..9763bad74cb5cd884b5cdd44c178b2073e2e60c4 100644
--- a/source/geometry/magneticfield/History
+++ b/source/geometry/magneticfield/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.24 2000/11/20 17:29:03 gcosmo Exp $
+$Id: History,v 1.33 2001/04/04 10:43:11 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,73 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Apr 04th, 2001  G. Cosmo - field-V03-00-05
+------------------------
+- G4FieldTrack.icc: fixed pedantic warnings on Linux-g++.
+
+Mar 23rd, 2001  J. Apostolakis - field-V03-00-04
+------------------------------
+- Electric Field unit test now works: test runs until completion.
+   Test outputs saved (on Linux).
+
+- Fixed src/G4UniformElectricField.cc to set correct field components
+                                      (compatible with Equation of Motion
+                                       G4EqMagElectricField )
+
+- Tidied G4FieldTrack
+   * deleted obsolete methods Set/Get MomentumModulus() and its data member.
+   * in constructor to set the value of the spin to (0.0, 0.0, 0.0) 
+          if pSpin is null.  (It was undefined.)
+
+Mar 23rd, 2001  J. Apostolakis - field-V03-00-03
+------------------------------
+- Fixed (hacked) CashKarp to work using Auxiliary Stepper.   
+
+- Modified G4MagIntegratorStepper 
+     to use pointer to G4EquationOfMotion
+            instead of G4Mag_EqRhs
+
+- Design iteration appears neccessary
+
+Mar 23rd, 2001  J. Apostolakis - field-V03-00-02
+------------------------------
+- Fixed G4MagHelicalStepper::AdvanceHelix for momentum, allowing
+    the possibility of (correct) use of all Helical Steppers. 
+
+- test/testProElectroMagField.cc updated for momentum.
+    (Not yet updated: Spin tests)
+
+
+Mar 19th, 2001  J. Apostolakis - field-V03-00-01
+------------------------------
+- Tagging the modification of several classes to integrate in momentum*c_light
+    instead of velocity.  
+  Reason for change:  Velocity integration can result in superluminar
+    velocities,  due to arithmetic inaccuracies.
+  Classes modified: 
+    G4FieldTrack,   (Changed components 3,4,5 of SixVector to Momentum,
+    G4Mag_EqRhs, G4Mag_UsualEqRhs, G4EqMagElectricField
+
+Feb 20th, 2001  J. Apostolakis 
+
+- Modified several classes to integrate in momentum instead of velocity.
+
+ G4FieldTrack:
+     Changed components 3,4,5 of SixVector to Momentum,
+     Modified constructor
+     Added energy calculation to "LoadFromArray" method
+     GetEnergy method is now implemented. 
+     Deleted obsolete (old) method names for Curve and Position. New have "Get"
+
+ G4ChordFinder
+     Renamed old-method names of Field Track to new ones. 
+
+Jan 29th, 2001  G. Cosmo - field-V03-00-00
+-------------------------
+
+- Minor fix to G4MagneticField.hh: added explicit call to G4Field() in
+  copy constructor. Fixes report #205.
+
 Nov 20th, 2000  G. Cosmo - field-V02-00-02
 
 - Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
diff --git a/source/geometry/magneticfield/include/G4CashKarpRKF45.hh b/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
index 3e92d00bcb779840e04d48f306019d02f5e30e6a..5a1ffd25c6bab8b066498b52d51a115dfa6fc6cd 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.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4CashKarpRKF45.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4CashKarpRKF45
@@ -33,7 +33,7 @@ class G4CashKarpRKF45 : public G4MagIntegratorStepper
 
   public:  // with description
 
-    G4CashKarpRKF45(G4Mag_EqRhs *EqRhs, G4int numberOfVariables = 6) ;
+    G4CashKarpRKF45(G4EquationOfMotion *EqRhs, G4int numberOfVariables = 6, G4bool primary= true) ;
    ~G4CashKarpRKF45() ;
 
     void Stepper( const G4double y[],
@@ -53,8 +53,8 @@ class G4CashKarpRKF45 : public G4MagIntegratorStepper
 
   public:  // without description
 
-   G4double  DistChord() const = 0 ; // This is not IMPLEMENTED yet. 
-                                     //  It must be done before it can work.
+   G4double  DistChord() const; 
+                                 
    G4int IntegratorOrder() const { return 4; }
 
   private:
@@ -67,6 +67,12 @@ class G4CashKarpRKF45 : public G4MagIntegratorStepper
 
    G4int fNumberOfVariables ;
    G4double *ak2, *ak3, *ak4, *ak5, *ak6, *ak7, *yTemp, *yIn;  // scratch space
+
+  // for DistChord calculations
+
+  G4double fLastStepLength;
+  G4double *fLastInitialVector, *fLastFinalVector, *fLastDyDx, *fMidVector, *fMidError;
+  G4CashKarpRKF45* fAuxStepper; 
 };
 
 #endif /* G4CashKARP_RKF45 */
diff --git a/source/geometry/magneticfield/include/G4ChordFinder.hh b/source/geometry/magneticfield/include/G4ChordFinder.hh
index 5039ea29bb90aea5498cbb49007aed97790a1215..8af3156ae6e1cc9db7abb24f2d760569ace6f6e3 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.5 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ChordFinder.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4ChordFinder
@@ -100,7 +100,7 @@ class G4ChordFinder
 
       //  Variables used in construction/destruction
       G4bool fAllocatedStepper;
-      G4Mag_EqRhs* fEquation; 
+      G4EquationOfMotion* fEquation; 
       G4MagIntegratorStepper* fDriversStepper; 
 };
 
diff --git a/source/geometry/magneticfield/include/G4ChordFinder.icc b/source/geometry/magneticfield/include/G4ChordFinder.icc
index 521d7297f8c9cc63a1d7ee7060a81fe70beea2c5..df06dbe25ca12d9492386502acdf3e9532ce9b58 100644
--- a/source/geometry/magneticfield/include/G4ChordFinder.icc
+++ b/source/geometry/magneticfield/include/G4ChordFinder.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ChordFinder.icc,v 1.2 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4ChordFinder inline implementations
 //
diff --git a/source/geometry/magneticfield/include/G4ClassicalRK4.hh b/source/geometry/magneticfield/include/G4ClassicalRK4.hh
index ca6c2211b26abebed3c0b7a427ce3f516d8ebad8..d96583974af4a3d5e7b92d05991e793d9111eda1 100644
--- a/source/geometry/magneticfield/include/G4ClassicalRK4.hh
+++ b/source/geometry/magneticfield/include/G4ClassicalRK4.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClassicalRK4.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4ClassicalRK4
diff --git a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
index 1c272b62c2766daf3d8299977d97ba966e79f813..fc3b7fef2de22d80d2e15d525e50fe87a33e2591 100644
--- a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
+++ b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ElectroMagneticField.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4ElectroMagneticField
diff --git a/source/geometry/magneticfield/include/G4EqMagElectricField.hh b/source/geometry/magneticfield/include/G4EqMagElectricField.hh
index 5aed10ed7aaf323f9a1cac23e6f8d02587035bd2..06e3a45e6c13b50286b6b880e823d60fa68935af 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.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4EqMagElectricField.hh,v 1.5 2001/02/20 08:49:29 grichine Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4EqMagElectricField
@@ -46,7 +46,8 @@ class G4EqMagElectricField : public G4Mag_EqRhs
 
   private:
 
-     G4double        fElectroMagCof;
+    G4double        fElectroMagCof ;
+    G4double        fMassCof;
 };
 
 #endif
diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.hh b/source/geometry/magneticfield/include/G4EquationOfMotion.hh
index f97b8579d359d48a0effac469cd6558d52d41952..308a85e11973d29828e2d0fde5adcc1905d117d7 100644
--- a/source/geometry/magneticfield/include/G4EquationOfMotion.hh
+++ b/source/geometry/magneticfield/include/G4EquationOfMotion.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EquationOfMotion.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4EquationOfMotion
diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.icc b/source/geometry/magneticfield/include/G4EquationOfMotion.icc
index 31ca8a81de77582660de4746a6af2664684d1a54..bba6c09c01ec6cb034ad49e655bf53c83fbf5725 100644
--- a/source/geometry/magneticfield/include/G4EquationOfMotion.icc
+++ b/source/geometry/magneticfield/include/G4EquationOfMotion.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EquationOfMotion.icc,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  Inline implementation 
diff --git a/source/geometry/magneticfield/include/G4ExplicitEuler.hh b/source/geometry/magneticfield/include/G4ExplicitEuler.hh
index b131534cee0851bf0eaf01851977ed2cd886771d..4cb2b72ea41fd1b22d5b8e8e8ccf3b3805f11ca6 100644
--- a/source/geometry/magneticfield/include/G4ExplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4ExplicitEuler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExplicitEuler.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4ExplicitEuler
diff --git a/source/geometry/magneticfield/include/G4Field.hh b/source/geometry/magneticfield/include/G4Field.hh
index 00a32fe53488e59758e9f5581e94f482543873f4..948a3d0cebeea9466247d4b0cfa50e6b94cce5d6 100644
--- a/source/geometry/magneticfield/include/G4Field.hh
+++ b/source/geometry/magneticfield/include/G4Field.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Field.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4Field
diff --git a/source/geometry/magneticfield/include/G4FieldManager.hh b/source/geometry/magneticfield/include/G4FieldManager.hh
index e7b8e00ac9517a71faea010c695cdaf98fc508a5..be23e9c5587d1a1f93fd4137d82e44617004b343 100644
--- a/source/geometry/magneticfield/include/G4FieldManager.hh
+++ b/source/geometry/magneticfield/include/G4FieldManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FieldManager.hh,v 1.5 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 // class G4FieldManager
diff --git a/source/geometry/magneticfield/include/G4FieldManager.icc b/source/geometry/magneticfield/include/G4FieldManager.icc
index b197403123945d83f8eb8e3583424829fe1b56c4..435cff4307dc2e1b2ff1b95fb489fdc8e48c2a87 100644
--- a/source/geometry/magneticfield/include/G4FieldManager.icc
+++ b/source/geometry/magneticfield/include/G4FieldManager.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FieldManager.icc,v 1.3 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4FieldManager inline implementation 
diff --git a/source/geometry/magneticfield/include/G4FieldTrack.hh b/source/geometry/magneticfield/include/G4FieldTrack.hh
index 6580d724ca87e51f1fe4ec2cdd660937db1a0b38..df6608b3ace1cb849fd46c33b60e3ef2202a30f7 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.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4FieldTrack.hh,v 1.6 2001/03/27 15:35:14 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4FieldTrack
@@ -35,10 +35,12 @@ class  G4FieldTrack
    public:  // with description
 
      G4FieldTrack( const G4ThreeVector& pPosition, 
-		   const G4ThreeVector& pVelocity,   // Or UnitVelocity
+		   const G4ThreeVector& pMomentumDirection,
 		         G4double       curve_length,
-		         G4double       Energy,
-		         G4double       LabratTimeOfFlight=0.0,
+		         G4double       kineticEnergy,
+     		   const G4double       restMass_c2,
+		         G4double       velocity,
+		         G4double       LaboratoryTimeOfFlight=0.0,
 		         G4double       ProperTimeOfFlight=0.0, 
 		   const G4ThreeVector* pSpin=0);
 
@@ -50,27 +52,29 @@ class  G4FieldTrack
      inline G4FieldTrack& operator = ( const G4FieldTrack & rStVec );
        // Assignment operator
 
-     inline G4ThreeVector  GetVelocity() const;   
+     inline G4ThreeVector  GetMomentum() const;   
      inline G4ThreeVector  GetPosition() const; 
      inline const G4ThreeVector& GetMomentumDir() const;
      inline G4double       GetCurveLength() const;
        // Distance along curve of point.
-     inline G4double       GetMomentumModulus() const;
+     // inline G4double       GetMomentumModulus() const;  // Obsolete
      inline G4ThreeVector  GetSpin()   const;
      inline G4double       GetLabTimeOfFlight() const;
      inline G4double       GetProperTimeOfFlight() const;
        // Accessors.
 
      inline void SetPosition(G4ThreeVector nPos); 
-     inline void SetVelocity(G4ThreeVector nMomDir);
+     inline void SetMomentum(G4ThreeVector nMomDir);
        // Does change mom-dir too.
+
      inline void SetMomentumDir(G4ThreeVector nMomDir);
-       // Does NOT change velocity.
+       // Does NOT change Momentum or Velocity Vector.
+
      inline void SetCurveLength(G4double nCurve_s);
        // Distance along curve.
-     inline void SetEnergy(G4double nEnergy);
+     inline void SetKineticEnergy(G4double nEnergy);
        // Does not modify momentum.
-     inline void SetMomentumModulus(G4double nMomentumMod);
+     // inline void SetMomentumModulus(G4double nMomentumMod);  // Obsolete
        // Does not modify energy.
      inline void SetSpin(G4ThreeVector nSpin);
      inline void SetLabTimeOfFlight(G4double nTOF); 
@@ -80,26 +84,18 @@ class  G4FieldTrack
    public: // without description
 
      inline G4FieldTrack& SetCurvePnt(const G4ThreeVector& pPosition, 
-				      const G4ThreeVector& pVelocity,
+				      const G4ThreeVector& pMomentum,
 				            G4double       s_curve );
        // Old multi-set method
 
-     inline G4ThreeVector Position() const;
-       // Renamed to GetPosition
-
-     inline G4double CurveS() const;
-       // Distance along curve of point
-     inline void SetCurveS(G4double new_curve_s);
-       // Old methods to be deleted. 
-
-     // G4double       GetEnergy() const;       //  Wrong Energy  --> FIXME
+     G4double       GetKineticEnergy() const;  // Check it --> FIXME
 
-     // G4double*      PosVelVec();       // [6]  Needed for RK integrator
+     // G4double*      PosVelVec();       // [6]  Needed(?) for RK integrator
        // This old method completely broke encapsulation ?  
   
      // static const G4int ncompSVEC=15;
        // Needed and should be used only for RK integration driver
-     enum { ncompSVEC = 16 };
+     enum { ncompSVEC = 12 };
      inline void DumpToArray(G4double valArr[ncompSVEC]) const; 
      inline void LoadFromArray(G4double valArr[ncompSVEC]); 
      
@@ -110,10 +106,11 @@ class  G4FieldTrack
 
      G4double  SixVector[6];
      G4double  fDistanceAlongCurve;  // distance along curve of point
-     G4double  fEnergy;
+     G4double  fKineticEnergy;
+     G4double  fRestMass_c2;
      G4double  fLabTimeOfFlight;
      G4double  fProperTimeOfFlight;
-     G4double  fMomentumModulus;
+     // G4double  fMomentumModulus;  // Unused
      G4ThreeVector fSpin;
      G4ThreeVector fMomentumDir;
 }; 
diff --git a/source/geometry/magneticfield/include/G4FieldTrack.icc b/source/geometry/magneticfield/include/G4FieldTrack.icc
index 9b0655d4c3631c6be5a19085c69df1501d05d4a0..b0b62fd9d1b241c3a089f481f71c644fcb47aa0b 100644
--- a/source/geometry/magneticfield/include/G4FieldTrack.icc
+++ b/source/geometry/magneticfield/include/G4FieldTrack.icc
@@ -5,35 +5,45 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FieldTrack.icc,v 1.4 2000/11/20 17:29:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4FieldTrack.icc,v 1.7 2001/04/04 10:39:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "PhysicalConstants.h"
 
 inline
 G4FieldTrack::G4FieldTrack( const G4ThreeVector& pPosition, 
-			    const G4ThreeVector& pVelocity,    // Can be unit
+			    const G4ThreeVector& pMomentumDirection,    
 			          G4double       curve_length, 
-			          G4double       pEnergy,
-			          G4double       pLabortTimeOfFlight,
+			          G4double       kineticEnergy,
+			    const G4double       restMass_c2,
+			          G4double       velocity,
+			          G4double       pLaboratoryTimeOfFlight,
 			          G4double       pProperTimeOfFlight,
 			    const G4ThreeVector* pSpin)
- : fEnergy(pEnergy),
-   fLabTimeOfFlight(pLabortTimeOfFlight), 
+ : fKineticEnergy(kineticEnergy),
+   fRestMass_c2(restMass_c2),
+   fLabTimeOfFlight(pLaboratoryTimeOfFlight), 
    fProperTimeOfFlight(pProperTimeOfFlight),
-   fMomentumDir(pVelocity.unit())
+   fMomentumDir(pMomentumDirection)
 {
-  SetCurvePnt( pPosition, pVelocity, curve_length );
+  G4double momentum  = sqrt(kineticEnergy*kineticEnergy
+                            +2.0*restMass_c2*kineticEnergy);
+
+  G4ThreeVector pMomentum= momentum * pMomentumDirection; 
+  // fMomentumModulus= pMomentum;
+  SetCurvePnt( pPosition, pMomentum, curve_length );
   if(pSpin) fSpin = *pSpin;
+  else      fSpin = G4ThreeVector(0.0, 0.0, 0.0);
 }
 
 inline
 G4FieldTrack::G4FieldTrack( const G4FieldTrack&  rStVec  )
  : fDistanceAlongCurve( rStVec.fDistanceAlongCurve),
-   fEnergy( rStVec.fEnergy ),
+   fKineticEnergy( rStVec.fKineticEnergy ),
+   fRestMass_c2( rStVec.fRestMass_c2),
    fLabTimeOfFlight( rStVec.fLabTimeOfFlight ), 
    fProperTimeOfFlight( rStVec.fProperTimeOfFlight ), 
-   fMomentumModulus( rStVec.fMomentumModulus ),
+   // fMomentumModulus( rStVec.fMomentumModulus ),
    fSpin( rStVec.fSpin ), 
    fMomentumDir( rStVec.fMomentumDir )
 {
@@ -56,18 +66,18 @@ G4FieldTrack::~G4FieldTrack()
 
 inline G4FieldTrack& 
 G4FieldTrack::SetCurvePnt(const G4ThreeVector& pPosition, 
-			  const G4ThreeVector& pVelocity,  // Can be Unit
+			  const G4ThreeVector& pMomentum,  // Can be Unit
 			        G4double       s_curve )
 {
   SixVector[0] = pPosition.x(); 
   SixVector[1] = pPosition.y(); 
   SixVector[2] = pPosition.z(); 
 
-  SixVector[3] = pVelocity.x(); 
-  SixVector[4] = pVelocity.y(); 
-  SixVector[5] = pVelocity.z(); 
+  SixVector[3] = pMomentum.x(); 
+  SixVector[4] = pMomentum.y(); 
+  SixVector[5] = pMomentum.z(); 
 
-  fMomentumDir = pVelocity.unit();
+  fMomentumDir = pMomentum.unit();
 
   fDistanceAlongCurve= s_curve;
 
@@ -89,17 +99,10 @@ void G4FieldTrack::SetPosition( G4ThreeVector pPosition)
    SixVector[2] = pPosition.z(); 
 } 
 
-// Older ... obsolete 
-inline
-G4ThreeVector  G4FieldTrack::Position() const
-{
-   return this->GetPosition();
-}
-
 inline
 const G4ThreeVector& G4FieldTrack::GetMomentumDir() const 
 {
-   // G4ThreeVector myVelocity( SixVector[3], SixVector[4], SixVector[5] );
+   // G4ThreeVector myMomentum( SixVector[3], SixVector[4], SixVector[5] );
    // return myVelocity;
    return fMomentumDir;
 } 
@@ -110,36 +113,24 @@ G4double  G4FieldTrack::GetCurveLength() const
      return  fDistanceAlongCurve;  
 }
 
-inline
-G4double  G4FieldTrack::CurveS() const 
-{
-     return  this->GetCurveLength();
-}
-
 inline
 void G4FieldTrack::SetCurveLength(G4double nCurve_s)
 {
      fDistanceAlongCurve= nCurve_s;  
 }
 
+// #ifdef ENERGY_OK
 inline
-void G4FieldTrack::SetCurveS(G4double new_curve_s) 
+G4double  G4FieldTrack::GetKineticEnergy() const
 {
-     this->SetCurveLength(new_curve_s);
+   return fKineticEnergy;
 }
+// #endif
 
-#ifdef ENERGY_OK
 inline
-G4double  G4FieldTrack::GetEnergy() const
+void G4FieldTrack::SetKineticEnergy(G4double newKinEnergy)
 {
-   return fEnergy;
-}
-#endif
-
-inline
-void G4FieldTrack::SetEnergy(G4double nEnergy)
-{
-   fEnergy=nEnergy;
+   fKineticEnergy=newKinEnergy;
 }
 
 inline
@@ -178,6 +169,7 @@ void G4FieldTrack::SetProperTimeOfFlight(G4double nTOF)
    fProperTimeOfFlight=nTOF;
 }
 
+#ifdef  MOMENTUM_MODULUS
 inline
 G4double G4FieldTrack::GetMomentumModulus() const
 {
@@ -189,6 +181,7 @@ void G4FieldTrack::SetMomentumModulus(G4double nMomentumMod)
 {
    fMomentumModulus= nMomentumMod;         // does not modify energy
 }
+#endif
 
 inline
 void G4FieldTrack::SetMomentumDir(G4ThreeVector newMomDir)
@@ -197,19 +190,19 @@ void G4FieldTrack::SetMomentumDir(G4ThreeVector newMomDir)
 }
 
 inline
-G4ThreeVector G4FieldTrack::GetVelocity() const 
+G4ThreeVector G4FieldTrack::GetMomentum() const 
 {
    return G4ThreeVector( SixVector[3], SixVector[4], SixVector[5] );
 } 
 
 inline
-void G4FieldTrack::SetVelocity(G4ThreeVector pVelocity)
+void G4FieldTrack::SetMomentum(G4ThreeVector pMomentum)
 {
-  SixVector[3] = pVelocity.x(); 
-  SixVector[4] = pVelocity.y(); 
-  SixVector[5] = pVelocity.z(); 
+  SixVector[3] = pMomentum.x(); 
+  SixVector[4] = pMomentum.y(); 
+  SixVector[5] = pMomentum.z(); 
 
-  fMomentumDir = pVelocity.unit(); 
+  fMomentumDir = pMomentum.unit(); 
 }
 
 // Dump values to array
@@ -226,12 +219,14 @@ void G4FieldTrack::DumpToArray(G4double valArr[ncompSVEC] ) const
   valArr[4]=SixVector[4];
   valArr[5]=SixVector[5];
 
-  G4ThreeVector Velocity(valArr[3],valArr[4],valArr[5]);
-  G4double      velocity_mag_sq = Velocity.mag2();
+  G4ThreeVector Momentum(valArr[3],valArr[4],valArr[5]);
 
-  G4double mass_in_Kg;
-  mass_in_Kg = fEnergy / velocity_mag_sq * (1-velocity_mag_sq/c_squared);
-  valArr[6]= mass_in_Kg;
+  // G4double mass_in_Kg;
+  // mass_in_Kg = fEnergy / velocity_mag_sq * (1-velocity_mag_sq/c_squared);
+  // valArr[6]= mass_in_Kg;
+
+  // The following components may or may not be integrated.
+  valArr[6]= fKineticEnergy; 
 
   // valArr[6]=fEnergy;  // When it is integrated over, do this ...
   valArr[7]=fLabTimeOfFlight;
@@ -259,15 +254,19 @@ void G4FieldTrack::LoadFromArray(G4double valArr[ncompSVEC])
   SixVector[4]=valArr[4];
   SixVector[5]=valArr[5];
 
-  G4ThreeVector Velocity(valArr[3],valArr[4],valArr[5]);
-  G4double      velocity_mag_sq = Velocity.mag2();
+  G4ThreeVector Momentum(valArr[3],valArr[4],valArr[5]);
+
+  G4double momentum_square= Momentum.mag2();
+  fMomentumDir= Momentum.unit();
 
-  // fEnergy=valArr[6]; // When it is integrated over, do this ...
+  fKineticEnergy = momentum_square / 
+                   (sqrt(momentum_square+fRestMass_c2*fRestMass_c2)
+                     + fRestMass_c2 ); 
+  // The above equation is stable for small and large momenta
 
-  G4double mass_in_Kg=valArr[6];
-  fEnergy= mass_in_Kg * velocity_mag_sq / (1-velocity_mag_sq/c_squared);
-                                                            // sqr(c_light)
-  fMomentumDir= Velocity.unit();
+  // The following components may or may not be
+  //    integrated over -- integration is optional
+  // fKineticEnergy= valArr[6];
 
   fLabTimeOfFlight=valArr[7];
   fProperTimeOfFlight=valArr[8];
@@ -292,11 +291,11 @@ G4FieldTrack & G4FieldTrack::operator = ( const G4FieldTrack& rStVec )
   SixVector[5]= rStVec.SixVector[5];
   SetCurveLength( rStVec.GetCurveLength() );
 
-  SetEnergy(  rStVec.fEnergy );
+  SetKineticEnergy(  rStVec.fKineticEnergy );
   SetLabTimeOfFlight( rStVec.GetLabTimeOfFlight()  ); 
   SetProperTimeOfFlight( rStVec.GetProperTimeOfFlight()  ); 
   SetSpin( rStVec.GetSpin() );
-  SetMomentumModulus( rStVec.GetMomentumModulus());
+  //  SetMomentumModulus( rStVec.GetMomentumModulus());
   SetMomentumDir( rStVec.fMomentumDir );
 
   return *this;
diff --git a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
index 8ffacf46314a09f0f4b4e6bdd886db95d25cbc6a..d0650ef007036f959bd329f8e2091cddb1ee1e39 100644
--- a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixExplicitEuler.hh,v 1.5 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4HelixExplicitEuler
diff --git a/source/geometry/magneticfield/include/G4HelixHeum.hh b/source/geometry/magneticfield/include/G4HelixHeum.hh
index 29baf154797a447b44ab0a54fd66280538fe7ecf..bb33700f30a9c04be0a62f0c104eb1f608122c12 100644
--- a/source/geometry/magneticfield/include/G4HelixHeum.hh
+++ b/source/geometry/magneticfield/include/G4HelixHeum.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixHeum.hh,v 1.5 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4HelixHeum
diff --git a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
index dfdf56500d55a2326ca030ab255aaa7174130dfc..ee6ceb5d0e86de08b827b4da4d4ebc8f48692ed5 100644
--- a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixImplicitEuler.hh,v 1.5 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4HelixImplicitEuler
diff --git a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
index ec01624194d7b3344f1904acf66afc6b79b0e726..b0cec40f0c9288eaff85396913165365e7e53820 100644
--- a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
+++ b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixSimpleRunge.hh,v 1.4 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5eea5ffc39199563566d0cec0933ccae41f8bce8..110a0fc8cf28ed2f3716281fbd02c3d7ef615669 100644
--- a/source/geometry/magneticfield/include/G4ImplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4ImplicitEuler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ImplicitEuler.hh,v 1.3 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a6e602c472d142ed8486227a9307fda917be6400..6ca480b412f4eb0e53bd39432051c27abd2a17bf 100644
--- a/source/geometry/magneticfield/include/G4LineSection.hh
+++ b/source/geometry/magneticfield/include/G4LineSection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LineSection.hh,v 1.4 2000/04/27 09:14:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4LineSection
diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.hh b/source/geometry/magneticfield/include/G4MagErrorStepper.hh
index b56785fa79cb0c3c01c11a1060bfa56ff7630b78..6fd9e162bec65e94136d0ac69a86a6984b4586cf 100644
--- a/source/geometry/magneticfield/include/G4MagErrorStepper.hh
+++ b/source/geometry/magneticfield/include/G4MagErrorStepper.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagErrorStepper.hh,v 1.7 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4MagErrorStepper
diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.icc b/source/geometry/magneticfield/include/G4MagErrorStepper.icc
index 83b215d391413c334478c85813e21b87a5a28eab..5bd43d870e0c08b67e5e09b43a224209aac881c6 100644
--- a/source/geometry/magneticfield/include/G4MagErrorStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagErrorStepper.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagErrorStepper.icc,v 1.7 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 inline
diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.hh b/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
index cd88d5c0de658d9da550c7996f73b49a6aebb288..1a97621396a9653dffd17fb1bb93498174d1202d 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.5 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MagHelicalStepper.hh,v 1.6 2001/03/22 18:48:52 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4MagHelicalStepper
@@ -80,6 +80,7 @@ class G4MagHelicalStepper : public G4MagIntegratorStepper
     G4MagHelicalStepper& operator=(const G4MagHelicalStepper&);
       // Private copy constructor and assignment operator.
 
+    static const G4double fUnitConstant;   //  As in G4Mag_EqRhs.hh/cc where it is not used.
   private:
   
     G4ThreeVector yInitial, yMidPoint, yFinal;
diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
index 7fd6550a16b987fd144ddf38d19787a59915addc..618c7bc7c49603c82268f861fe224339280f8bd2 100644
--- a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagHelicalStepper.icc,v 1.4 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c249689cd144622dc6a592dbc1f26ee803ec67c1..137f61e1b737544e2573aa0cbef438f7fe7f2a32 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
+++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagIntegratorDriver.hh,v 1.7 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4MagInt_Driver
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
index d50bc3fe03ececef9739f250779c46b2b9d729a2..8202ff211be86466b25da0a1400039eec36dca60 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
+++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagIntegratorDriver.icc,v 1.5 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 inline
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh b/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
index 8002241a4860064a9c6528a1ec66598f7a5af131..ad7156a449aed6320b6d51bfef759590783d0f16 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.5 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MagIntegratorStepper.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4MagIntegratorStepper
@@ -23,13 +23,13 @@
 #define G4MAGIntegratorSTEPPER
 
 #include "globals.hh"
-#include "G4Mag_EqRhs.hh"
+#include "G4EquationOfMotion.hh"
 
 class G4MagIntegratorStepper
 {
   public:  // with description
 
-     G4MagIntegratorStepper(G4Mag_EqRhs *EqRhs, G4int num_variables);
+     G4MagIntegratorStepper(G4EquationOfMotion *Equation, G4int num_variables);
      virtual ~G4MagIntegratorStepper();
        // Constructor and destructor. No actions.
 
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
index 63062acc362999a507e5f7a6a8477ae77a2e5216..f6fc9c17cadf369bf726315bce82dd66dcda6a77 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagIntegratorStepper.icc,v 1.4 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 inline
diff --git a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
index 32e225a7756d5bddcd9b80eb0106a95f2e988b84..700298bb8bfcc3ea36f8085e5a9db3128f7ba9a9 100644
--- a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Mag_EqRhs.hh,v 1.5 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4Mag_EqRhs
diff --git a/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh b/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
index f0884b3369ffe8eb0aead410c3e4e244c0f8aee9..dd7b07f4259dbb3195e4c98199b2d01041c55c3f 100644
--- a/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Mag_SpinEqRhs.hh,v 1.4 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4Mag_SpinEqRhs
diff --git a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
index c1609d22db40a50ae312abc434fe86948868a1df..bcffa3fb591717daef988675a18d4e6211a1a759 100644
--- a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Mag_UsualEqRhs.hh,v 1.3 2000/04/27 09:14:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4Mag_UsualEqRhs
diff --git a/source/geometry/magneticfield/include/G4MagneticField.hh b/source/geometry/magneticfield/include/G4MagneticField.hh
index dc03d8213719d63762f71670dec41f6089362dd1..5c3c4279a327ff0842c0b41c833aab459cfea1fd 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.5 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MagneticField.hh,v 1.6 2001/01/29 10:13:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4MagneticField
@@ -45,7 +45,7 @@ class G4MagneticField : public G4Field
 
 inline  G4MagneticField::G4MagneticField() {}
 inline  G4MagneticField::~G4MagneticField() {}
-inline  G4MagneticField::G4MagneticField(const G4MagneticField &) {}
+inline  G4MagneticField::G4MagneticField(const G4MagneticField &):G4Field() {}
 inline  G4MagneticField& G4MagneticField::operator = (const G4MagneticField &p)
  { if (&p == this) return *this; *this = p; return *this; }
 
diff --git a/source/geometry/magneticfield/include/G4RKG3_Stepper.hh b/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
index f476fce9d90424f5d6564000c7b528f23c23cf57..a5a7c6bbed6c0b9ebc309798112621e3b58f526c 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.5 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4RKG3_Stepper.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4RKG3_Stepper
@@ -23,6 +23,7 @@
 
 #include "G4MagIntegratorStepper.hh"
 #include "G4ThreeVector.hh"
+#include "G4Mag_EqRhs.hh"
 
 class G4RKG3_Stepper : public G4MagIntegratorStepper
 {
diff --git a/source/geometry/magneticfield/include/G4SimpleHeum.hh b/source/geometry/magneticfield/include/G4SimpleHeum.hh
index 809771f0c77d93df2d212efaf8f1505685ae5b13..2dfd04f53199c6a2d42bee59e492fff061ac7c23 100644
--- a/source/geometry/magneticfield/include/G4SimpleHeum.hh
+++ b/source/geometry/magneticfield/include/G4SimpleHeum.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleHeum.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4SimpleHeum
diff --git a/source/geometry/magneticfield/include/G4SimpleRunge.hh b/source/geometry/magneticfield/include/G4SimpleRunge.hh
index eb46b1c882959776c89a607df8a4d665ad87786d..8abcb96156e554d6f44518a72b2376c7ad6c9631 100644
--- a/source/geometry/magneticfield/include/G4SimpleRunge.hh
+++ b/source/geometry/magneticfield/include/G4SimpleRunge.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleRunge.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4SimpleRunge
diff --git a/source/geometry/magneticfield/include/G4UniformElectricField.hh b/source/geometry/magneticfield/include/G4UniformElectricField.hh
index 7ff15448b1c14b48c30d3d5b3706816a0cc4bd08..0471e50d32832641036103e7c0ab4ba965eeafb5 100644
--- a/source/geometry/magneticfield/include/G4UniformElectricField.hh
+++ b/source/geometry/magneticfield/include/G4UniformElectricField.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UniformElectricField.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4UniformElectricField
diff --git a/source/geometry/magneticfield/include/G4UniformMagField.hh b/source/geometry/magneticfield/include/G4UniformMagField.hh
index 5722b2a5722f0589adec31baa9f0d2994585f27c..6ac44c05af5f2799e7d5ffaeeed798bc9ba86db3 100644
--- a/source/geometry/magneticfield/include/G4UniformMagField.hh
+++ b/source/geometry/magneticfield/include/G4UniformMagField.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UniformMagField.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4UniformMagField
diff --git a/source/geometry/magneticfield/src/G4CashKarpRKF45.cc b/source/geometry/magneticfield/src/G4CashKarpRKF45.cc
index 9424ebb13e96aa560a1a40fa392aca1450da1392..1bbee871d6929e8058cf8b2195ba47be42c92b74 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.6 2000/11/20 17:29:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4CashKarpRKF45.cc,v 1.8 2001/03/23 18:50:33 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // The Cash-Karp Runge-Kutta-Fehlberg 4/5 method is an embedded fourth
 //  order method (giving fifth-order accuracy) for the solution
@@ -19,12 +19,13 @@
 //
 
 #include "G4CashKarpRKF45.hh"
+#include "G4LineSection.hh"
 
 /////////////////////////////////////////////////////////////////////
 //
 // Constructor
 
-G4CashKarpRKF45::G4CashKarpRKF45(G4Mag_EqRhs *EqRhs, G4int numberOfVariables)
+G4CashKarpRKF45::G4CashKarpRKF45(G4EquationOfMotion *EqRhs, G4int numberOfVariables, G4bool primary)
   : G4MagIntegratorStepper(EqRhs, numberOfVariables)
 {
   fNumberOfVariables = numberOfVariables ;
@@ -36,6 +37,17 @@ G4CashKarpRKF45::G4CashKarpRKF45(G4Mag_EqRhs *EqRhs, G4int numberOfVariables)
   ak6 = new G4double[fNumberOfVariables] ; 
   yTemp = new G4double[fNumberOfVariables] ; 
   yIn = new G4double[fNumberOfVariables] ;
+
+  fLastInitialVector = new G4double[fNumberOfVariables] ;
+  fLastFinalVector = new G4double[fNumberOfVariables] ;
+  fLastDyDx = new G4double[fNumberOfVariables];
+
+  fMidVector = new G4double[fNumberOfVariables];
+  fMidError =  new G4double[fNumberOfVariables];
+  fAuxStepper = 0;   
+  if( primary ) 
+      fAuxStepper = new G4CashKarpRKF45(EqRhs, numberOfVariables, !primary);
+
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -52,6 +64,14 @@ G4CashKarpRKF45::~G4CashKarpRKF45()
   delete[] ak7;
   delete[] yTemp;
   delete[] yIn;
+
+  delete[] fLastInitialVector;
+  delete[] fLastFinalVector;
+  delete[] fLastDyDx;
+  delete[] fMidVector;
+  delete[] fMidError; 
+
+  delete fAuxStepper;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -145,12 +165,21 @@ G4CashKarpRKF45::Stepper(const G4double yInput[],
 
     yErr[i] = Step*(dc1*dydx[i] + dc3*ak3[i] + dc4*ak4[i] +
               dc5*ak5[i] + dc6*ak6[i]) ;
+
+    // Store Input and Final values, for possible use in calculating chord
+    fLastInitialVector[i] = yIn[i] ;
+    fLastFinalVector[i]   = yOut[i];
+    fLastDyDx[i]          = dydx[i];
  }
  // NormaliseTangentVector( yOut ); // Not wanted
 
+ fLastStepLength =Step;
+
  return ;
 
-}   // end of Stepper .......................................................
+} 
+
+///////////////////////////////////////////////////////////////////////////////
 
 void
 G4CashKarpRKF45::StepWithEst(const G4double yInput[],
@@ -283,5 +312,42 @@ G4CashKarpRKF45::StepWithEst(const G4double yInput[],
 
  return ;
 
-}   // end of StepWithEst ....................................................
+}
+
+/////////////////////////////////////////////////////////////////
+
+G4double  G4CashKarpRKF45::DistChord() const
+{
+  G4double distLine, distChord; 
+  G4ThreeVector initialPoint, finalPoint, midPoint;
+
+  // Store last initial and final points (they will be overwritten in self-Stepper call!)
+  initialPoint = G4ThreeVector( fLastInitialVector[0], 
+                                fLastInitialVector[1], fLastInitialVector[2]); 
+  finalPoint   = G4ThreeVector( fLastFinalVector[0],  
+                                fLastFinalVector[1],  fLastFinalVector[2]); 
+
+  // Do half a step using StepNoErr
+
+  fAuxStepper->Stepper( fLastInitialVector, fLastDyDx, 0.5 * fLastStepLength, 
+           fMidVector,   fMidError );
+
+  midPoint = G4ThreeVector( fMidVector[0], fMidVector[1], fMidVector[2]);       
+
+  // Use stored values of Initial and Endpoint + new Midpoint to evaluate
+  //  distance of Chord
+
+
+  if (initialPoint != finalPoint) 
+  {
+     distLine  = G4LineSection::Distline( midPoint, initialPoint, finalPoint );
+     distChord = distLine;
+  }
+  else
+  {
+     distChord = (midPoint-initialPoint).mag();
+  }
+  return distChord;
+}
+
 
diff --git a/source/geometry/magneticfield/src/G4ChordFinder.cc b/source/geometry/magneticfield/src/G4ChordFinder.cc
index 2e3e9971d718b9eb7c37fb655ca2299208e0492e..7f671606189896ac0983afb067bc700841a1454d 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.16 2000/11/20 17:29:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ChordFinder.cc,v 1.18 2001/03/23 18:50:33 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // 25.02.97 John Apostolakis,  design and implimentation 
@@ -34,16 +34,16 @@ G4ChordFinder::G4ChordFinder( G4MagneticField*        theMagField,
 {
   //  Construct the Chord Finder
   //  by creating in inverse order the  Driver, the Stepper and EqRhs ...
-  // G4Mag_EqRhs *
-  fEquation = new G4Mag_UsualEqRhs(theMagField); // Should move q, p to 
-  fLastStepEstimate_Unconstrained = DBL_MAX;
-                                                     //G4FieldTrack ??
+  G4Mag_EqRhs *pEquation = new G4Mag_UsualEqRhs(theMagField);
+  fEquation = pEquation;                            
+  fLastStepEstimate_Unconstrained = DBL_MAX;          // Should move q, p to
+                                                      //    G4FieldTrack ??
   // --->>  Charge    Q = 0 
   // --->>  Momentum  P = 1       NOMINAL VALUES !!!!!!!!!!!!!!!!!!
 
   if( pItsStepper == 0 )
   { 
-     pItsStepper = fDriversStepper = new G4ClassicalRK4(fEquation);
+     pItsStepper = fDriversStepper = new G4ClassicalRK4(pEquation);
      fAllocatedStepper= true;
   }
   else
@@ -290,8 +290,8 @@ G4FieldTrack G4ChordFinder::ApproxCurvePointV(
 
   G4FieldTrack    Current_PointVelocity= CurveA_PointVelocity; 
 
-  G4ThreeVector  CurveA_Point= CurveA_PointVelocity.Position();
-  G4ThreeVector  CurveB_Point= CurveB_PointVelocity.Position();
+  G4ThreeVector  CurveA_Point= CurveA_PointVelocity.GetPosition();
+  G4ThreeVector  CurveB_Point= CurveB_PointVelocity.GetPosition();
 
   G4ThreeVector  ChordAB_Vector= CurveB_Point   - CurveA_Point;
   G4ThreeVector  ChordAE_Vector= CurrentE_Point - CurveA_Point;
@@ -301,7 +301,7 @@ G4FieldTrack G4ChordFinder::ApproxCurvePointV(
   G4double  AE_fraction; 
   
   curve_length= 
-       CurveB_PointVelocity.CurveS() - CurveA_PointVelocity.CurveS();  
+       CurveB_PointVelocity.GetCurveLength() - CurveA_PointVelocity.GetCurveLength();  
 
   // const 
   G4double  integrationInaccuracyLimit= G4std::max( perMillion, 0.5*eps_step ); 
diff --git a/source/geometry/magneticfield/src/G4ClassicalRK4.cc b/source/geometry/magneticfield/src/G4ClassicalRK4.cc
index fc2835fe732cfa12b3364c666008cf5d12740178..e3a75fa291222c68d0a865a93a49ab9bf827681e 100644
--- a/source/geometry/magneticfield/src/G4ClassicalRK4.cc
+++ b/source/geometry/magneticfield/src/G4ClassicalRK4.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClassicalRK4.cc,v 1.3 2000/11/01 15:15:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4ClassicalRK4.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4EqMagElectricField.cc b/source/geometry/magneticfield/src/G4EqMagElectricField.cc
index cae616d6105c931b748e314c4a3d6b1983f0f6cc..68ab0437ceddab99036c60ab643641e7548f3f5c 100644
--- a/source/geometry/magneticfield/src/G4EqMagElectricField.cc
+++ b/source/geometry/magneticfield/src/G4EqMagElectricField.cc
@@ -14,8 +14,8 @@ G4EqMagElectricField::SetChargeMomentumMass(G4double particleCharge, // e+ units
 		                            G4double MomentumXc,
                                             G4double particleMass)
 {
-   fElectroMagCof =  eplus*c_squared ;
-   fElectroMagCof *= particleCharge/particleMass; 
+   fElectroMagCof =  eplus*particleCharge*c_light ;
+   fMassCof = particleMass*particleMass ; 
 }
 
 
@@ -28,28 +28,27 @@ G4EqMagElectricField::EvaluateRhsGivenB(const G4double y[],
 
    // Components of y:
    //    0-2 dr/ds, 
-   //    3-5 dv/ds  
-   //  FCof() = charge/mass
+   //    3-5 dp/ds - momentum derivatives 
 
-   G4double vSquared = y[3]*y[3] + y[4]*y[4] + y[5]*y[5] ;
+   G4double pSquared = y[3]*y[3] + y[4]*y[4] + y[5]*y[5] ;
 
-   G4double vModule = sqrt(vSquared) ;
+   G4double cof2     = sqrt( pSquared + fMassCof )/c_light ;
 
-   G4double vDotE = y[3]*Field[3] + y[4]*Field[4] + y[5]*Field[5] ;
+   G4double pModuleInverse  = 1.0/sqrt(pSquared) ;
 
-   G4double gammaReci = sqrt(1 - vSquared/c_squared) ;
+   G4double cof1     = fElectroMagCof*pModuleInverse ;
 
-   dydx[0] = y[3]/vModule ;                         
-   dydx[1] = y[4]/vModule ;                         
-   dydx[2] = y[5]/vModule ;                        
+   //  G4double vDotE = y[3]*Field[3] + y[4]*Field[4] + y[5]*Field[5] ;
 
-   dydx[3] = fElectroMagCof*(Field[3] + (y[4]*Field[2] - y[5]*Field[1])/c_light -
-                        y[3]*vDotE/c_light/c_light )*gammaReci/vModule ;
+
+   dydx[0] = y[3]*pModuleInverse ;                         
+   dydx[1] = y[4]*pModuleInverse ;                         
+   dydx[2] = y[5]*pModuleInverse ;                        
+
+   dydx[3] = cof1*(cof2*Field[3] + (y[4]*Field[2] - y[5]*Field[1])) ;
    
-   dydx[4] = fElectroMagCof*(Field[4] + (y[5]*Field[0] - y[3]*Field[2])/c_light -
-                        y[4]*vDotE/c_light/c_light )*gammaReci/vModule ; 
+   dydx[4] = cof1*(cof2*Field[4] + (y[5]*Field[0] - y[3]*Field[2])) ; 
  
-   dydx[5] = fElectroMagCof*(Field[5] + (y[3]*Field[1] - y[4]*Field[0])/c_light -
-                        y[5]*vDotE/c_light/c_light)*gammaReci/vModule ;  
+   dydx[5] = cof1*(cof2*Field[5] + (y[3]*Field[1] - y[4]*Field[0])) ;  
    return ;
 }
diff --git a/source/geometry/magneticfield/src/G4EquationOfMotion.cc b/source/geometry/magneticfield/src/G4EquationOfMotion.cc
index 53e9e4a644ff34aa1a3d04c17f1a4e056b69616e..96aab24a3b8e82beddb56457022f99d9e07ecb07 100644
--- a/source/geometry/magneticfield/src/G4EquationOfMotion.cc
+++ b/source/geometry/magneticfield/src/G4EquationOfMotion.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EquationOfMotion.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4EquationOfMotion.hh"
 
diff --git a/source/geometry/magneticfield/src/G4ExplicitEuler.cc b/source/geometry/magneticfield/src/G4ExplicitEuler.cc
index 5cd8794290513eca842cc01fb393310f4d0762df..c3f53dea6e6ac7e8f6c81bb09a305108474b178e 100644
--- a/source/geometry/magneticfield/src/G4ExplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4ExplicitEuler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExplicitEuler.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ff7453690b8457c5f2fab2885a131cedd0648a95..f24c332668749f72be13c44d63ffd732c0c7d90e 100644
--- a/source/geometry/magneticfield/src/G4FieldManager.cc
+++ b/source/geometry/magneticfield/src/G4FieldManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FieldManager.cc,v 1.3 2000/11/09 18:06:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4FieldManager.hh"
 
diff --git a/source/geometry/magneticfield/src/G4FieldTrack.cc b/source/geometry/magneticfield/src/G4FieldTrack.cc
index 4cc8f458284e174283e8214d58a0bf1e45d91215..c9de139e98693609e15cd745d585e6e10a11cbdb 100644
--- a/source/geometry/magneticfield/src/G4FieldTrack.cc
+++ b/source/geometry/magneticfield/src/G4FieldTrack.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4FieldTrack.cc,v 1.2 1999/12/15 14:49:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4FieldTrack.cc,v 1.3 2001/02/20 18:15:54 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4FieldTrack.hh"
 
@@ -15,6 +15,6 @@ G4std::ostream& operator<<( G4std::ostream& os, G4FieldTrack& SixVec)
      G4double *SixV = SixVec.SixVector;
      os << " X= " << SixV[0] << " " << SixV[1] << " " << SixV[2] << " ";
      os << " V= " << SixV[3] << " " << SixV[4] << " " << SixV[5] << " ";
-     os << " l= " << SixVec.CurveS();
+     os << " l= " << SixVec.GetCurveLength();
      return os;
 }
diff --git a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
index ee86953fab52d6a09eaf9150f072903d6ecf3f23..3e12b7c0280591c7afcfb61c1f8151702a59fe96 100644
--- a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixExplicitEuler.cc,v 1.3 2000/04/12 18:29:26 japost Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4HelixExplicitEuler.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixHeum.cc b/source/geometry/magneticfield/src/G4HelixHeum.cc
index e158e45b1f41faedfe9e375f22aea2b3ae392d0f..dd66cd811292739560cd3cc52b5b7e8b3571edf2 100644
--- a/source/geometry/magneticfield/src/G4HelixHeum.cc
+++ b/source/geometry/magneticfield/src/G4HelixHeum.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixHeum.cc,v 1.3 2000/04/12 18:29:26 japost Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4HelixHeum.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
index a8ef7abf8cc6dfed536b60094020f6ce2954d785..2c08ca124b0b6244f9d41f5838aa868df29c4c4a 100644
--- a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixImplicitEuler.cc,v 1.3 2000/04/12 18:29:26 japost Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4HelixImplicitEuler.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
index 7e75823e94fdde82e44d8e9f6336ece84f45d8c0..bc2221bfeea9dc9f8d71c0403c0abc00be0e3931 100644
--- a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
+++ b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HelixSimpleRunge.cc,v 1.4 2000/11/20 17:29:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4HelixSimpleRunge.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4ImplicitEuler.cc b/source/geometry/magneticfield/src/G4ImplicitEuler.cc
index 4f002f437fdb5d2c4b2357725e8881ce23e5f928..79498a3d7cf8ff799f96e8b8b7e9a9c9fbe73d4a 100644
--- a/source/geometry/magneticfield/src/G4ImplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4ImplicitEuler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ImplicitEuler.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  Implicit Euler:
diff --git a/source/geometry/magneticfield/src/G4LineSection.cc b/source/geometry/magneticfield/src/G4LineSection.cc
index 49246c0a132e5b74b71d7e550f924cfb056d7c88..cbb8de0c93bbf9f92c7841c729aae6d03e092102 100644
--- a/source/geometry/magneticfield/src/G4LineSection.cc
+++ b/source/geometry/magneticfield/src/G4LineSection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LineSection.cc,v 1.4 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // typedef double    G4double;  
 
diff --git a/source/geometry/magneticfield/src/G4MagErrorStepper.cc b/source/geometry/magneticfield/src/G4MagErrorStepper.cc
index c0e2e97440e886e473622b2e3ce903251226a25d..e43235411a444be7877ecb4fe2d840b9099ffacc 100644
--- a/source/geometry/magneticfield/src/G4MagErrorStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagErrorStepper.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagErrorStepper.cc,v 1.8 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4MagErrorStepper.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4MagHelicalStepper.cc b/source/geometry/magneticfield/src/G4MagHelicalStepper.cc
index 349ba0b17799ffa0e20414c0749301efc6f3b381..2b1fe4a755550311bce2dbc93c4cf9448cf323a2 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.6 2000/11/20 17:29:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MagHelicalStepper.cc,v 1.7 2001/03/22 18:48:03 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4MagHelicalStepper.hh"
 #include "G4ThreeVector.hh"
@@ -29,6 +29,9 @@ G4MagHelicalStepper::~G4MagHelicalStepper()
 {
 }
 
+// Constant for determining unit conversion when using normal as integrand.
+const G4double G4MagHelicalStepper::fUnitConstant = 0.299792458 * (GeV/(tesla*m));
+
 void
 G4MagHelicalStepper::AdvanceHelix( const G4double  yIn[],
 				   G4ThreeVector   Bfld,    
@@ -48,7 +51,13 @@ G4MagHelicalStepper::AdvanceHelix( const G4double  yIn[],
 
   G4double Bmag = Bfld.mag();
   const G4double *pIn = yIn+3;
-  G4ThreeVector initTangent= G4ThreeVector( pIn[0], pIn[1], pIn[2]);  
+  G4ThreeVector initMomentum= G4ThreeVector( pIn[0], pIn[1], pIn[2]);
+  G4double      momentumVal = initMomentum.mag();
+  G4ThreeVector initTangent = (1.0/momentumVal) * initMomentum;  // .unit();  
+
+  // fCof = fUnitConstant*particleCharge/MomentumXc;
+  G4double particleCharge = fPtrMagEqOfMot->FCof() / (eplus*c_light); 
+  G4double fCoefficient = (fUnitConstant / momentumVal) * particleCharge;
 
   // for too small magnetic fields there is no curvature
   // (include momentum here) FIXME
@@ -74,7 +83,8 @@ G4MagHelicalStepper::AdvanceHelix( const G4double  yIn[],
 
     // calculate the radius^-1 of the helix and the stepping angle
 
-    R_1  = - fPtrMagEqOfMot->FCof() * Bmag;  // / B_v_P - but this cancels
+    // R_1  = - fPtrMagEqOfMot->FCof() * Bmag;  // / B_v_P - but this cancels
+    R_1  = - fCoefficient * Bmag;  // / B_v_P - but this cancels
 
     // again in Theta - so we don't need it.
     if( fabs(R_1) < 1e-10 ) {
@@ -85,7 +95,7 @@ G4MagHelicalStepper::AdvanceHelix( const G4double  yIn[],
 
       // Trigonometrix
       
-      if( Theta < - approc_limit || Theta > approc_limit ) {
+      if( fabs(Theta) > approc_limit ) {
 	SinT2    = sin(0.5 * Theta);
 	CosT2    = cos(0.5 * Theta);
 	// SinT     = sin(Theta);
@@ -104,8 +114,9 @@ G4MagHelicalStepper::AdvanceHelix( const G4double  yIn[],
 
       // the actual "rotation"
 
-      positionMove  = h * ( CosT2 * vperp +
-			    SinT2 * B_x_P + vpar );
+      G4double R = 1.0 / R_1; 
+      // positionMove  = h * ( CosT2 * vperp + SinT2 * B_x_P + vpar );
+      positionMove  = R * ( SinT * vperp + (1-CosT) * B_x_P) + h * vpar;
       endTangent    = (CosT * vperp + SinT * B_x_P + vpar);
 
       // Store the resulting position and tangent
@@ -113,9 +124,9 @@ G4MagHelicalStepper::AdvanceHelix( const G4double  yIn[],
       yHelix[1]   = yIn[1] + positionMove.y(); 
       yHelix[2]   = yIn[2] + positionMove.z(); 
 				
-      yHelix[3] = endTangent.x();
-      yHelix[4] = endTangent.y();
-      yHelix[5] = endTangent.z();
+      yHelix[3] = momentumVal * endTangent.x();
+      yHelix[4] = momentumVal * endTangent.y();
+      yHelix[5] = momentumVal * endTangent.z();
 
       // Store and/or calculate parameters for chord distance.
     }
diff --git a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
index 7c300c79ddc0e5c64baa5399696f09ffe2d4b750..3b598335d14139860e4ff1ed2ecfb8d4963a9bc3 100644
--- a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
+++ b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MagIntegratorDriver.cc,v 1.14 2000/11/20 17:29:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
diff --git a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
index 95eef70cbac99f100d05d98a6eda52b4ed655aa6..ef6ddafec1d92a17ec3108930e567b0a9cb170eb 100644
--- a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
@@ -5,17 +5,17 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MagIntegratorStepper.cc,v 1.4 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MagIntegratorStepper.cc,v 1.5 2001/03/23 18:50:33 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4MagIntegratorStepper.hh"
 
 // Constructor for stepper abstract base class. 
 // 
 
-G4MagIntegratorStepper::G4MagIntegratorStepper(G4Mag_EqRhs *EqRhs,
+G4MagIntegratorStepper::G4MagIntegratorStepper(G4EquationOfMotion* Equation,
 					       G4int       num_var)
-  : fEquation_Rhs(EqRhs),
+  : fEquation_Rhs(Equation),
     fNumberOfVariables(num_var)
 {
 }
diff --git a/source/geometry/magneticfield/src/G4Mag_EqRhs.cc b/source/geometry/magneticfield/src/G4Mag_EqRhs.cc
index 56fe271e4d035a6e0c5e3322b9c5f71c05cdb6c5..cfc86a9ae77c46b1c8004962b85a308399e0a67a 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.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Mag_EqRhs.cc,v 1.6 2001/03/02 10:48:30 grichine Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  This is the standard right-hand side for equation of motion  
 //    in a pure Magnetic Field .
@@ -35,7 +35,8 @@ G4Mag_EqRhs::SetChargeMomentumMass( G4double particleCharge, // e+ units
 			            G4double MomentumXc,
                                     G4double particleMass)
 {
-   fCof_val = fUnitConstant*particleCharge/MomentumXc; //  B must be in Tesla
+   fCof_val = particleCharge*eplus*c_light ; //  B must be in Tesla
+   //  fCof_val = fUnitConstant*particleCharge/MomentumXc; //  B must be in Tesla
    // fMass = particleMass;
 }
 
diff --git a/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc b/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc
index 115a45b5e5ad3665f5687ca68a9b5e1c88cf8cd0..13fd22c5557786979c8c2358e7882681f042b9ca 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.2 1999/12/15 14:49:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Mag_UsualEqRhs.cc,v 1.3 2001/02/19 16:52:05 grichine Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  This is the standard right-hand side for equation of motion.
@@ -24,15 +24,21 @@ G4Mag_UsualEqRhs::EvaluateRhsGivenB( const G4double y[],
 			      const G4double B[3],
 				    G4double dydx[] ) const
 {
-   G4double velocity_mag_square = sqr(y[3]) + sqr(y[4]) + sqr(y[5]);
-   G4double inv_velocity_magnitude = 1.0 / sqrt( velocity_mag_square );
+   G4double momentum_mag_square = sqr(y[3]) + sqr(y[4]) + sqr(y[5]);
+   G4double inv_momentum_magnitude = 1.0 / sqrt( momentum_mag_square );
 
-   dydx[0] = y[3] * inv_velocity_magnitude;       //  (d/ds)x = Vx/V
-   dydx[1] = y[4] * inv_velocity_magnitude;       //  (d/ds)y = Vy/V
-   dydx[2] = y[5] * inv_velocity_magnitude;       //  (d/ds)z = Vz/V
-   dydx[3] = FCof()*(y[4]*B[2] - y[5]*B[1]) ;   // Ax = a*(Vy*Bz - Vz*By)
-   dydx[4] = FCof()*(y[5]*B[0] - y[3]*B[2]) ;   // Ay = a*(Vz*Bx - Vx*Bz)
-   dydx[5] = FCof()*(y[3]*B[1] - y[4]*B[0]) ;   // Az = a*(Vx*By - Vy*Bx)
+   G4double cof = FCof()*inv_momentum_magnitude;
+
+   dydx[0] = y[3]*inv_momentum_magnitude;       //  (d/ds)x = Vx/V
+   dydx[1] = y[4]*inv_momentum_magnitude;       //  (d/ds)y = Vy/V
+   dydx[2] = y[5]*inv_momentum_magnitude;       //  (d/ds)z = Vz/V
+
+   dydx[3] = cof*(y[4]*B[2] - y[5]*B[1]) ;   // Ax = a*(Vy*Bz - Vz*By)
+   dydx[4] = cof*(y[5]*B[0] - y[3]*B[2]) ;   // Ay = a*(Vz*Bx - Vx*Bz)
+   dydx[5] = cof*(y[3]*B[1] - y[4]*B[0]) ;   // Az = a*(Vx*By - Vy*Bx)
 
    return ;
 }
+
+
+
diff --git a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
index 141506734adf473fb182b70b506575daba03a811..6efd49de3cbfe28903773834fc43b2c10b0eb66e 100644
--- a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
+++ b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RKG3_Stepper.cc,v 1.5 2000/11/20 17:29:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 bd025850e71a615819bafdb5c1a59045804bb8b8..fedc6cf74d40c5546bee24ea7727cdf0b0911ca1 100644
--- a/source/geometry/magneticfield/src/G4SimpleHeum.cc
+++ b/source/geometry/magneticfield/src/G4SimpleHeum.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleHeum.cc,v 1.4 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0231be1218277d02e17bb471ab9cfb3e75d3b528..c902bae69b4931c06a8df8724817c1042fe258df 100644
--- a/source/geometry/magneticfield/src/G4SimpleRunge.cc
+++ b/source/geometry/magneticfield/src/G4SimpleRunge.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SimpleRunge.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  Simple Runge:
 //
diff --git a/source/geometry/magneticfield/src/G4UniformElectricField.cc b/source/geometry/magneticfield/src/G4UniformElectricField.cc
index 73078095d667e9e59a0f145c8dfa1f7f87df6942..7417e3a86f0ac4526f8c1360ffb669de4a036106 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.2 1999/12/15 14:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UniformElectricField.cc,v 1.3 2001/03/27 09:43:22 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
@@ -20,6 +20,9 @@
 
 G4UniformElectricField::G4UniformElectricField(const G4ThreeVector FieldVector )
 {
+      fFieldComponents[0] = 0.0;
+      fFieldComponents[1] = 0.0;
+      fFieldComponents[2] = 0.0;
       fFieldComponents[3] = FieldVector.x();
       fFieldComponents[4] = FieldVector.y();
       fFieldComponents[5] = FieldVector.z();
@@ -33,6 +36,9 @@ G4UniformElectricField::G4UniformElectricField(G4double vField,
       vTheta >= 0 && vTheta <= pi && 
       vPhi >= 0 && vPhi <= twopi)
    {
+      fFieldComponents[0] = 0.0;
+      fFieldComponents[1] = 0.0;
+      fFieldComponents[2] = 0.0;
       fFieldComponents[3] = vField*sin(vTheta)*cos(vPhi) ;
       fFieldComponents[4] = vField*sin(vTheta)*sin(vPhi) ;
       fFieldComponents[5] = vField*cos(vTheta) ;
@@ -50,13 +56,13 @@ G4UniformElectricField::~G4UniformElectricField()
 
 G4UniformElectricField::G4UniformElectricField (const G4UniformElectricField &p)
 {
-   for (G4int i=3; i<6; i++)
+   for (G4int i=0; i<6; i++)
       fFieldComponents[i] = p.fFieldComponents[i];
 }
 
 G4UniformElectricField& G4UniformElectricField::operator = (const G4UniformElectricField &p)
 {
-   for (G4int i=3; i<6; i++)
+   for (G4int i=0; i<6; i++)
       fFieldComponents[i] = p.fFieldComponents[i];
    return *this;
 }
@@ -65,11 +71,14 @@ G4UniformElectricField& G4UniformElectricField::operator = (const G4UniformElect
 
 
 void G4UniformElectricField::GetFieldValue (const G4double [3],
-                                             G4double E[3]  ) const 
+                                             G4double fieldBandE[6]  ) const 
 {
-   E[0]= fFieldComponents[3] ;
-   E[1]= fFieldComponents[4] ;
-   E[2]= fFieldComponents[5] ;
+   fieldBandE[0]= 0.0;
+   fieldBandE[1]= 0.0;
+   fieldBandE[2]= 0.0;
+   fieldBandE[3]= fFieldComponents[3] ;
+   fieldBandE[4]= fFieldComponents[4] ;
+   fieldBandE[5]= fFieldComponents[5] ;
    return ;
 }
 
diff --git a/source/geometry/magneticfield/src/G4UniformMagField.cc b/source/geometry/magneticfield/src/G4UniformMagField.cc
index 2022a9414664e20bfa62945074ba3f29f6420c95..7b18f8a7f13c1e8d5e826d4d950335361e3b488e 100644
--- a/source/geometry/magneticfield/src/G4UniformMagField.cc
+++ b/source/geometry/magneticfield/src/G4UniformMagField.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UniformMagField.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
diff --git a/source/geometry/management/History b/source/geometry/management/History
index 5af1884def7d3628f39770d54291ee7667e6c61b..f7da2a342290a2c3572527188361f6c3c52d8687 100644
--- a/source/geometry/management/History
+++ b/source/geometry/management/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.15 2000/11/20 17:31:33 gcosmo Exp $
+$Id: History,v 1.19 2001/03/08 13:21:11 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,23 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+March 07, 2001  G. Cosmo                   geommng-V03-00-01
+- G4PVPlacement.hh: corrected comments to constructor with G4RotationMatrix*
+  as argument, to correspond to specifications in the User's Manual.
+- G4AssemblyVolume.cc: corrected comments about unique PV identifiers
+  (by R.Chytracek).
+
+February 07, 2001  G. Cosmo                geommng-V03-00-00
+- Introduced first implementation of G4AssemblyVolume, a helper class to
+  combine several volumes together in an arbitrary way in the 3D space.
+  Added files: G4AssemblyVolume[.hh.icc.cc], G4AssemblyTriplet[.hh.icc]
+  (by R.Chytracek).
+- Added unit test suite for G4AssemblyVolume class: TestAssemblyVolume
+  (by R.Chytracek).
+
+December 04, 2000  G. Cosmo
+- Minor fix to private assignment operator.
+
 November 20, 2000  G. Cosmo                geommng-V02-00-04
 - Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
   o commented out variables declared and not used.
diff --git a/source/geometry/management/include/G4AffineTransform.hh b/source/geometry/management/include/G4AffineTransform.hh
index dfb19610a5739efc3fc6ca085ac2153ce4d52a6c..60899e857bf857abe3379b4bec1e1a7238981303 100644
--- a/source/geometry/management/include/G4AffineTransform.hh
+++ b/source/geometry/management/include/G4AffineTransform.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AffineTransform.hh,v 1.3 2000/04/20 16:49:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4AffineTransform
diff --git a/source/geometry/management/include/G4AffineTransform.icc b/source/geometry/management/include/G4AffineTransform.icc
index f658d571e5849d311cf5c85f3717e53b3851e51a..a263e0d590e1d6d7c82b843e9168c8e374254c66 100644
--- a/source/geometry/management/include/G4AffineTransform.icc
+++ b/source/geometry/management/include/G4AffineTransform.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AffineTransform.icc,v 1.3 1999/12/15 14:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4AffineTransformation Inline implementation
diff --git a/source/geometry/management/include/G4AssemblyTriplet.hh b/source/geometry/management/include/G4AssemblyTriplet.hh
new file mode 100644
index 0000000000000000000000000000000000000000..3cd0a8cb6b80f2a40d75882f55c26ef0042b0f01
--- /dev/null
+++ b/source/geometry/management/include/G4AssemblyTriplet.hh
@@ -0,0 +1,90 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AssemblyTriplet.hh,v 1.4 2001/02/07 17:30:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// Class G4AssemblyTriplet
+//
+// Class description:
+//
+// A class to help place logical volumes inside a generic containers (like
+// STL vector ) together with information about its rotation and placement.
+// How to interpret the rotation and translation depends on the class which
+// uses a container of these triplets. The first class using G4AssemblyTriplet
+// is G4AssemblyVolume class.
+// The pointer to the logical volume is copied so this class does not take
+// its ownership and does not delete the object behind.
+
+// Author:      Radovan Chytracek
+// Version:     1.0
+// Date:        November 2000
+// ----------------------------------------------------------------------
+#ifndef G4_ASSEMBLYTRIPLET_H
+#define G4_ASSEMBLYTRIPLET_H 
+
+#include "G4LogicalVolume.hh"
+#include "G4ThreeVector.hh"
+#include "G4RotationMatrix.hh"
+
+class G4AssemblyTriplet
+{
+ public:  // with description
+
+    G4AssemblyTriplet();
+      // Default constructor
+
+    G4AssemblyTriplet( G4LogicalVolume* pVolume,
+                       G4ThreeVector& translation,
+                       G4RotationMatrix* pRotation);
+      // An explicit constructor
+    
+    G4AssemblyTriplet( const G4AssemblyTriplet& second );
+      // Copy constructor
+
+    ~G4AssemblyTriplet();    
+      // Destructor
+
+    G4AssemblyTriplet& operator=( const G4AssemblyTriplet& second );
+      // Assignment operator
+
+    G4LogicalVolume* GetVolume() const;
+      // Retrieve the logical volume reference
+
+    void SetVolume( G4LogicalVolume* pVolume );
+      // Update the logical volume reference
+
+    G4ThreeVector GetTranslation() const;
+      // Retrieve the logical volume translation
+
+    void SetTranslation( G4ThreeVector& pVolume );
+      // Update the logical volume translation
+
+    G4RotationMatrix* GetRotation() const;
+      // Retrieve the logical volume rotation
+
+    void SetRotation( G4RotationMatrix* pVolume );
+      // Update the logical volume rotation
+   
+
+ private:
+
+    G4LogicalVolume*  fVolume;
+      // A logical volume
+
+    G4ThreeVector     fTranslation;
+      // A logical volume translation
+
+    G4RotationMatrix* fRotation;
+      // A logical volume rotation
+};
+
+#include "G4AssemblyTriplet.icc"
+
+#endif // G4_ASSEMBLYTRIPLET_H
+
diff --git a/source/geometry/management/include/G4AssemblyTriplet.icc b/source/geometry/management/include/G4AssemblyTriplet.icc
new file mode 100644
index 0000000000000000000000000000000000000000..788b1fd089e809ed32a6987f78a11532cb2c3eb9
--- /dev/null
+++ b/source/geometry/management/include/G4AssemblyTriplet.icc
@@ -0,0 +1,93 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AssemblyTriplet.icc,v 1.4 2001/02/07 17:30:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// Class G4AssemblyTriplet - inline implementation
+//
+// ----------------------------------------------------------------------
+
+inline
+G4AssemblyTriplet::G4AssemblyTriplet()
+  : fVolume( 0 ), fRotation( 0 )
+{
+  G4ThreeVector v(0.,0.,0.);
+  fTranslation = v;
+}
+
+inline
+G4AssemblyTriplet::G4AssemblyTriplet( G4LogicalVolume* pVolume,
+                                      G4ThreeVector& translation,
+                                      G4RotationMatrix* pRotation )
+  : fVolume( pVolume ), fTranslation( translation ), fRotation( pRotation )
+{
+}
+
+inline
+G4AssemblyTriplet::G4AssemblyTriplet( const G4AssemblyTriplet& second )
+{
+  fVolume      = second.GetVolume();
+  fRotation    = second.GetRotation();
+  fTranslation = second.GetTranslation();
+}
+
+inline
+G4AssemblyTriplet::~G4AssemblyTriplet()
+{
+}
+
+inline
+G4LogicalVolume* G4AssemblyTriplet::GetVolume() const
+{
+  return fVolume;
+}
+
+inline
+void G4AssemblyTriplet::SetVolume( G4LogicalVolume* pVolume )
+{
+  fVolume = pVolume;
+}
+
+inline
+G4ThreeVector G4AssemblyTriplet::GetTranslation() const
+{
+  return fTranslation;
+}
+
+inline
+void G4AssemblyTriplet::SetTranslation( G4ThreeVector& translation )
+{
+  fTranslation = translation;
+}
+
+inline
+G4RotationMatrix* G4AssemblyTriplet::GetRotation() const
+{
+  return fRotation;
+}
+
+inline
+void G4AssemblyTriplet::SetRotation( G4RotationMatrix* pRotation )
+{
+  fRotation = pRotation;
+}
+
+inline
+G4AssemblyTriplet&
+G4AssemblyTriplet::operator=( const G4AssemblyTriplet& second )
+{
+  if( this != &second )
+  {
+    fVolume      = second.GetVolume();
+    fRotation    = second.GetRotation();
+    fTranslation = second.GetTranslation();
+  }
+  
+  return *this;
+}
diff --git a/source/geometry/management/include/G4AssemblyVolume.hh b/source/geometry/management/include/G4AssemblyVolume.hh
new file mode 100644
index 0000000000000000000000000000000000000000..ce7ffc172d163f86995ff96d0672bac160046025
--- /dev/null
+++ b/source/geometry/management/include/G4AssemblyVolume.hh
@@ -0,0 +1,148 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AssemblyVolume.hh,v 1.4 2001/02/07 17:30:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// Class G4AssemblyVolume
+//
+// Class description:
+//
+// G4AssemblyVolume is a helper class to make the build process of geometry
+// easier. It allows to combine several volumes together in an arbitrary way
+// in 3D space and then work with the result as with a single logical volume
+// for placement.
+// The resulting objects are independent copies of each of the assembled
+// logical volumes. The placements are not, however, bound one to each other
+// when placement is done. They are seen as independent physical volumes in
+// space. This is the main difference when compared to the boolean solids or
+// parametrised physical volumes.
+
+// Author:      Radovan Chytracek, John Apostolakis, Gabriele Cosmo
+// Version:     1.0
+// Date:        November 2000
+// ----------------------------------------------------------------------
+
+#ifndef G4_ASSEMBLYVOLUME_H
+#define G4_ASSEMBLYVOLUME_H 
+
+#include "g4std/vector"
+#include "G4Transform3D.hh"
+#include "G4AssemblyTriplet.hh"
+
+class G4VPhysicalVolume;
+
+class G4AssemblyVolume
+{
+ public:  // with description
+
+  G4AssemblyVolume();    
+  G4AssemblyVolume( G4LogicalVolume* volume,
+                    G4ThreeVector& translation,
+                    G4RotationMatrix* rotation);
+  ~G4AssemblyVolume();
+    //
+    // Constructors & destructor.
+    // At destruction all the generated physical volumes and associated
+    // rotation matrices of the imprints will be destroyed.
+
+  void AddPlacedVolume( G4LogicalVolume* pPlacedVolume,
+                        G4ThreeVector& translation,
+                        G4RotationMatrix* rotation);
+    //
+    // Place the given volume 'pPlacedVolume' inside the assembly.
+    //
+    // The taken approach:
+    //
+    // - Place it w.r.t. the assembly coordinate system.
+    //   This step is applied to each of the participating volumes.
+    //
+    // The other possible approaches:
+    //
+    // - Place w.r.t. the firstly added volume.
+    //   When placed the first, the virtual coordinate system becomes
+    //   the coordinate system of the first one.
+    //   Every next volume being added into the assembly will be placed
+    //   w.r.t to the first one.
+    //
+    // - Place w.r.t the last placed volume.
+    //   When placed the first, the virtual coordinate system becomes
+    //   the coordinate system of the first one.
+    //   Every next volume being added into the assembly will be placed
+    //   w.r.t to the previous one.
+
+  void AddPlacedVolume( G4LogicalVolume* pPlacedVolume,
+                        G4Transform3D&   transformation);
+    //
+    // The same as previous but takes complete 3D transformation in space
+    // as its argument.
+
+  void MakeImprint( G4LogicalVolume* pMotherLV,
+                    G4ThreeVector& translationInMother,
+                    G4RotationMatrix* pRotationInMother);
+    //
+    // Creates instance of an assembly volume inside the given mother volume.
+
+  void MakeImprint( G4LogicalVolume* pMotherLV,
+                    G4Transform3D&   transformation);
+    //
+    // The same as previous but takes complete 3D transformation in space
+    // as its argument.
+
+private:    
+
+  G4std::vector<G4AssemblyTriplet> fTriplets;
+    //
+    // Participating volumes represented as a vector of
+    // <logical volume, translation, rotation>.
+
+  G4std::vector<G4VPhysicalVolume*> fPVStore;
+    //
+    // We need to keep list of physical volumes created by MakeImprint() method
+    // in order to be able to cleanup the objects when not needed anymore.
+    // This requires the user to keep assembly objects in memory during the
+    // whole job or during the life-time of G4Navigator, log. vol store
+    // and phys. vol. store may keep pointers to physical volumes generated by
+    // the assembly volume.
+    // When an assembly object is about to die it will destroy all its
+    // generated physical volumes and rotation matrices as well !
+    // This may affect validity of detector contruction !
+
+ protected:
+
+  unsigned int GetImprintsCount() const;
+  void         SetImprintsCount( unsigned int value );
+  void         ImprintsCountPlus();
+  void         ImprintsCountMinus();
+    //
+    // Internal counting mechanism, used to compute unique the names of
+    // phys. volumes created by MakeImprint(...) method(s).
+
+ private:
+
+  unsigned int fImprintsCounter;
+    //
+    // Number of imprints of the given assembly volume.
+
+ protected:
+
+  unsigned int GetInstanceCount() const;
+  void         SetInstanceCount( unsigned int value );
+  void         InstanceCountPlus();
+  void         InstanceCountMinus();
+
+ private:
+
+  static unsigned int fsInstanceCounter;
+
+};
+
+#include "G4AssemblyVolume.icc"
+
+#endif // G4_ASSEMBLYVOLUME_H
+
diff --git a/source/geometry/management/include/G4AssemblyVolume.icc b/source/geometry/management/include/G4AssemblyVolume.icc
new file mode 100644
index 0000000000000000000000000000000000000000..80dfe734da9fb91d6efea2f983f16a6c18b325b8
--- /dev/null
+++ b/source/geometry/management/include/G4AssemblyVolume.icc
@@ -0,0 +1,39 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AssemblyVolume.icc,v 1.2 2001/02/07 17:30:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// Class G4AssemblyVolume - inline implementation
+//
+// ----------------------------------------------------------------------
+
+inline 
+unsigned int G4AssemblyVolume::GetImprintsCount() const
+{
+  return fImprintsCounter;
+}
+
+inline 
+void         G4AssemblyVolume::SetImprintsCount( unsigned int value )
+{
+  fImprintsCounter = value;
+}
+
+
+inline 
+void         G4AssemblyVolume::ImprintsCountPlus()
+{
+  fImprintsCounter++;
+}
+
+inline 
+void         G4AssemblyVolume::ImprintsCountMinus()
+{
+  fImprintsCounter--;
+}
diff --git a/source/geometry/management/include/G4DrawVoxels.hh b/source/geometry/management/include/G4DrawVoxels.hh
index 0ebb07d6b1b7e3282cd2c3fad01799645f12f27f..26ca502eeaec9579539162e2858f05692cef9f47 100644
--- a/source/geometry/management/include/G4DrawVoxels.hh
+++ b/source/geometry/management/include/G4DrawVoxels.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DrawVoxels.hh,v 1.9 2000/06/06 13:18:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4DrawVoxels
diff --git a/source/geometry/management/include/G4GeometryManager.hh b/source/geometry/management/include/G4GeometryManager.hh
index 92dbfa22395132b1e50b9159c3d091b885068c76..35ac7288a2a42425b091dcc07348fb600ca20b5b 100644
--- a/source/geometry/management/include/G4GeometryManager.hh
+++ b/source/geometry/management/include/G4GeometryManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometryManager.hh,v 1.3 2000/04/20 16:49:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4GeometryManager
 //
diff --git a/source/geometry/management/include/G4LogicalSurface.hh b/source/geometry/management/include/G4LogicalSurface.hh
index 89865a1c878ae6bcec123b6a65418cf644549755..35a19892e27574f92005775e779f5de27b37fb4e 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.4 2000/11/01 15:39:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LogicalSurface.hh,v 1.5 2000/12/04 09:36:31 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Class G4LogicalSurface
@@ -92,17 +92,13 @@ class G4LogicalSurface
  public:
    virtual ~G4LogicalSurface();
 
- private:
-   G4LogicalSurface(const G4LogicalSurface &right); // Copying restricted
-
-        //////////////
-        // Operators
-        //////////////
  public:
    G4int operator==(const G4LogicalSurface &right) const;
    G4int operator!=(const G4LogicalSurface &right) const;
 
  private:
+
+   G4LogicalSurface(const G4LogicalSurface &right); // Copying restricted
    const G4LogicalSurface& operator=(const G4LogicalSurface& right);
 
 	// ------------------
@@ -110,6 +106,7 @@ class G4LogicalSurface
 	// ------------------
 
  private:
+
    G4String theName;		// Surface name
 
    G4OpticalSurface*              theOpticalSurface;
diff --git a/source/geometry/management/include/G4LogicalSurface.icc b/source/geometry/management/include/G4LogicalSurface.icc
index ac863988602ca130a5be2eee25827e1390584092..02adbeb5736c24ac21ed71357e0a4132e6f2d71a 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.3 2000/04/20 16:49:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LogicalSurface.icc,v 1.4 2000/12/04 09:36:31 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Surface Class Inline Methods
@@ -69,7 +69,12 @@ G4LogicalSurface::SetTransitionRadiationSurface(G4TransitionRadiationSurface*
 inline const G4LogicalSurface &
 G4LogicalSurface::operator=(const G4LogicalSurface &right)
 {
-	return right;
+	if (&right == this) return *this;
+	theName = right.theName;
+	theOpticalSurface = right.theOpticalSurface;
+	theTransRadSurface = right.theTransRadSurface;
+	
+	return *this;
 }
 
 inline G4int
diff --git a/source/geometry/management/include/G4LogicalVolume.hh b/source/geometry/management/include/G4LogicalVolume.hh
index 4356c80c42114e97b7f773d66a57818861831c81..bca222be41718f6f410a0bbdc7f1212bc6b9f137 100644
--- a/source/geometry/management/include/G4LogicalVolume.hh
+++ b/source/geometry/management/include/G4LogicalVolume.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalVolume.hh,v 1.6 2000/11/01 15:39:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4LogicalVolume
diff --git a/source/geometry/management/include/G4LogicalVolume.icc b/source/geometry/management/include/G4LogicalVolume.icc
index 244aaf302f8f74ddb79ea250141c31bbc8327911..79f303c9047b40add99295acbf48fb62d1c22ed5 100644
--- a/source/geometry/management/include/G4LogicalVolume.icc
+++ b/source/geometry/management/include/G4LogicalVolume.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalVolume.icc,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4LogicalVolume Inline Implementation file
diff --git a/source/geometry/management/include/G4LogicalVolumeStore.hh b/source/geometry/management/include/G4LogicalVolumeStore.hh
index 275692852e3b39585e518672f56d225a02d6ac35..e79d5cf846f2e1929452ae62e7099bc1ccb67613 100644
--- a/source/geometry/management/include/G4LogicalVolumeStore.hh
+++ b/source/geometry/management/include/G4LogicalVolumeStore.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalVolumeStore.hh,v 1.4 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4LogicalVolumeStore
 //
diff --git a/source/geometry/management/include/G4PVParameterised.hh b/source/geometry/management/include/G4PVParameterised.hh
index f958e9189fc1a0abef25835e17e1f6697cca8d91..34f315e1b1e8e81c6854a5b42b5e849c12fed78c 100644
--- a/source/geometry/management/include/G4PVParameterised.hh
+++ b/source/geometry/management/include/G4PVParameterised.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVParameterised.hh,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVParameterised
diff --git a/source/geometry/management/include/G4PVPlacement.hh b/source/geometry/management/include/G4PVPlacement.hh
index aafdd0f9717d76a1cf327c4ba7bf851c5570924b..69194e10cc2fea05f753dcaf3673c76742bd0e46 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.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PVPlacement.hh,v 1.5 2001/03/07 17:34:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVPlacement
@@ -42,9 +42,8 @@ class G4PVPlacement : public G4VPhysicalVolume
 		  G4bool pMany,
 		  G4int pCopyNo);
       // Initialise a single volume, positioned in a frame which is rotated by
-      // *pFrameRot, relative to the coordinate system of the mother volume
-      // pMother. The center of the object is then placed at volumeCenterCrd
-      // in the new coordinates. 
+      // *pRot and traslated by tlate, relative to the coordinate system of the
+      // mother volume pMother.
       // If pRot=0 the volume is unrotated with respect to its mother.
       // The physical volume is added to the mother's logical volume.
       //   (The above are exactly the arguments of G4VPhysicalVolume)
@@ -63,12 +62,12 @@ class G4PVPlacement : public G4VPhysicalVolume
       // the direct rotation and translation of the solid (NOT of the frame).  
       // The G4Transform3D argument should be constructed by:
       //  i) First rotating it to align the solid to the system of 
-      //      reference of its mother volume *pMother, and 
+      //     reference of its mother volume *pMother, and 
       // ii) Then placing the solid at the location Transform3D.getTranslation(),
-      //      with respect to the origin of the system of coordinates of the
-      //      mother volume.  
+      //     with respect to the origin of the system of coordinates of the
+      //     mother volume.  
       // [ This is useful for the people who prefer to think in terms 
-      // of moving objects in a given reference frame. ]
+      //   of moving objects in a given reference frame. ]
       // All other arguments are the same as for the previous constructor.
 
     G4PVPlacement(G4RotationMatrix *pRot,
diff --git a/source/geometry/management/include/G4PVReplica.hh b/source/geometry/management/include/G4PVReplica.hh
index dafb2445ea6d2a6d979fdb80ced4a62a4dd46387..48920876e2759b52d93f712c6b2ae13a638c6112 100644
--- a/source/geometry/management/include/G4PVReplica.hh
+++ b/source/geometry/management/include/G4PVReplica.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVReplica.hh,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVReplica
diff --git a/source/geometry/management/include/G4PhysicalVolumeStore.hh b/source/geometry/management/include/G4PhysicalVolumeStore.hh
index 7c8798841c206b9ab1bd02b6ec786ea6a70344ac..9f08f9d88a9a4d28165052ce1bb4880c1c6d634d 100644
--- a/source/geometry/management/include/G4PhysicalVolumeStore.hh
+++ b/source/geometry/management/include/G4PhysicalVolumeStore.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicalVolumeStore.hh,v 1.5 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PhysicalVolume
 //
diff --git a/source/geometry/management/include/G4SmartVoxelHeader.hh b/source/geometry/management/include/G4SmartVoxelHeader.hh
index 23d16d3001123e29df4d1691be19aca08398f737..1c12afb86c1b57e005e126bd20bbecaba74c3268 100644
--- a/source/geometry/management/include/G4SmartVoxelHeader.hh
+++ b/source/geometry/management/include/G4SmartVoxelHeader.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelHeader.hh,v 1.4 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4SmartVoxelHeader
 //
diff --git a/source/geometry/management/include/G4SmartVoxelHeader.icc b/source/geometry/management/include/G4SmartVoxelHeader.icc
index 9cd9e02b86ac557cbb18f653458b18c20d69868d..ba34fe5fd65014abde979ee736c3914f13931c93 100644
--- a/source/geometry/management/include/G4SmartVoxelHeader.icc
+++ b/source/geometry/management/include/G4SmartVoxelHeader.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelHeader.icc,v 1.1 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4SmartVoxelHeader Inline implementation
diff --git a/source/geometry/management/include/G4SmartVoxelNode.hh b/source/geometry/management/include/G4SmartVoxelNode.hh
index 7078e1ad5b53ec8a56b299f6a218ade044131043..e640169be090c1cfdae43924ae7a8f1ba1271a7f 100644
--- a/source/geometry/management/include/G4SmartVoxelNode.hh
+++ b/source/geometry/management/include/G4SmartVoxelNode.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelNode.hh,v 1.4 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4SmartVoxelNode
 //
diff --git a/source/geometry/management/include/G4SmartVoxelNode.icc b/source/geometry/management/include/G4SmartVoxelNode.icc
index ab58e92d10539a13dd9704a37e35c7f9224fa970..bfb2bb25a1c4bae53c5957cf0b56041d8e8dc2c2 100644
--- a/source/geometry/management/include/G4SmartVoxelNode.icc
+++ b/source/geometry/management/include/G4SmartVoxelNode.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelNode.icc,v 1.1 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4SmartVoxelNode Inline implementation
diff --git a/source/geometry/management/include/G4SmartVoxelProxy.hh b/source/geometry/management/include/G4SmartVoxelProxy.hh
index 749399851b64be32cc904cabccf44724e39b0349..0a443997be1b029ef80d8e8597308ecc7913c0b2 100644
--- a/source/geometry/management/include/G4SmartVoxelProxy.hh
+++ b/source/geometry/management/include/G4SmartVoxelProxy.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelProxy.hh,v 1.4 2000/11/20 17:31:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4SmartVoxelProxy
 //
diff --git a/source/geometry/management/include/G4SmartVoxelProxy.icc b/source/geometry/management/include/G4SmartVoxelProxy.icc
index fa45b119d26f51b0a8ffb71347c623627cf02a97..516599a69e35177e6e9893efcaf77549017772b7 100644
--- a/source/geometry/management/include/G4SmartVoxelProxy.icc
+++ b/source/geometry/management/include/G4SmartVoxelProxy.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelProxy.icc,v 1.1 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4SmartVoxelProxy Inline implementation
diff --git a/source/geometry/management/include/G4SolidStore.hh b/source/geometry/management/include/G4SolidStore.hh
index be779f281f9c178a560dfc93f694f8be159f3b10..7899d3502583513f61ae34b73710a171866fb97f 100644
--- a/source/geometry/management/include/G4SolidStore.hh
+++ b/source/geometry/management/include/G4SolidStore.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SolidStore.hh,v 1.4 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4SolidStore
 //
diff --git a/source/geometry/management/include/G4VPVParameterisation.hh b/source/geometry/management/include/G4VPVParameterisation.hh
index f2e0bc7b6a5b3b845f9827fe7445b756521a24e6..cf98e8e583d151504436cfcdd1140d6e38b6c5b1 100644
--- a/source/geometry/management/include/G4VPVParameterisation.hh
+++ b/source/geometry/management/include/G4VPVParameterisation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPVParameterisation.hh,v 1.3 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VPVParamterisation
 //
diff --git a/source/geometry/management/include/G4VPhysicalVolume.hh b/source/geometry/management/include/G4VPhysicalVolume.hh
index 4e87a264f84d31558bb07b449941fef40eb8ed20..530ecedf732c4eb9a85370d8ae9d7c527b39114e 100644
--- a/source/geometry/management/include/G4VPhysicalVolume.hh
+++ b/source/geometry/management/include/G4VPhysicalVolume.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPhysicalVolume.hh,v 1.5 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4VPhysicalVolume
diff --git a/source/geometry/management/include/G4VPhysicalVolume.icc b/source/geometry/management/include/G4VPhysicalVolume.icc
index 3465efd7170c8018bc0a2b24c62187f8db365705..bb60b8607e54b71a5bc5e34d2252b7cc77971905 100644
--- a/source/geometry/management/include/G4VPhysicalVolume.icc
+++ b/source/geometry/management/include/G4VPhysicalVolume.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPhysicalVolume.icc,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4VPhysicalVolume Inline Implementation
diff --git a/source/geometry/management/include/G4VSolid.hh b/source/geometry/management/include/G4VSolid.hh
index 693b25d5d77c7a43223af0cd791a9ed518c749e2..10b13f10de86a6798643f6b7ca754da40a132d38 100644
--- a/source/geometry/management/include/G4VSolid.hh
+++ b/source/geometry/management/include/G4VSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSolid.hh,v 1.7 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4VSolid
diff --git a/source/geometry/management/include/G4VSolid.icc b/source/geometry/management/include/G4VSolid.icc
index d6fab5868d4b9e0902ae37176f9c43165d452f01..f13920b6432590097543110d83135f95582849e2 100644
--- a/source/geometry/management/include/G4VSolid.icc
+++ b/source/geometry/management/include/G4VSolid.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSolid.icc,v 1.4 2000/11/01 15:39:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4VSolid Inline implementation
diff --git a/source/geometry/management/include/G4VTouchable.hh b/source/geometry/management/include/G4VTouchable.hh
index 5ffc023dfa814dbb68e8064ed44bada1f4f7efa4..3c422e5f0d23d160e533dd95beda694bbe4bedf3 100644
--- a/source/geometry/management/include/G4VTouchable.hh
+++ b/source/geometry/management/include/G4VTouchable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VTouchable.hh,v 1.4 2000/11/01 15:39:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4VTouchable
diff --git a/source/geometry/management/include/G4VTouchable.icc b/source/geometry/management/include/G4VTouchable.icc
index ea4dc03c628e0f82f019639ee27c017dba189513..ad8e61919999fb2958d383df6bdcd0c93af0e9d9 100644
--- a/source/geometry/management/include/G4VTouchable.icc
+++ b/source/geometry/management/include/G4VTouchable.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VTouchable.icc,v 1.4 2000/11/01 15:39:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4VTouchable Inline implementation
diff --git a/source/geometry/management/include/G4VoxelLimits.hh b/source/geometry/management/include/G4VoxelLimits.hh
index 8485a55ac2a6fc9713cd1edc7c05d5ed1fd37c0a..06007ef3ed4e84da35dc6d4e314d0b2b17d3be77 100644
--- a/source/geometry/management/include/G4VoxelLimits.hh
+++ b/source/geometry/management/include/G4VoxelLimits.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VoxelLimits.hh,v 1.4 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VoxelLimits
 //
diff --git a/source/geometry/management/include/G4VoxelLimits.icc b/source/geometry/management/include/G4VoxelLimits.icc
index 5eec130a2ce1ccd7b061ec1949c9424d509e8540..09e8a785a2b742a753a10ddcde10e9ae811e3d9a 100644
--- a/source/geometry/management/include/G4VoxelLimits.icc
+++ b/source/geometry/management/include/G4VoxelLimits.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VoxelLimits.icc,v 1.1 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4VoxelLimits Inline implementation
diff --git a/source/geometry/management/include/meshdefs.hh b/source/geometry/management/include/meshdefs.hh
index 423f7270b29ae52a5bd6abf8b4f0d3d59cfd4c0a..fbc5e9794e7bbdd97955dd27dbdd5f715b988333 100644
--- a/source/geometry/management/include/meshdefs.hh
+++ b/source/geometry/management/include/meshdefs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: meshdefs.hh,v 1.3 2000/04/20 16:49:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 9581cf7cb6c923f80c99ba78075bc448146fdb59..6c397b379ad47e1af5f13515e595add9fa56ff98 100644
--- a/source/geometry/management/include/voxeldefs.hh
+++ b/source/geometry/management/include/voxeldefs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: voxeldefs.hh,v 1.4 2000/04/20 16:49:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/geometry/management/src/G4AssemblyVolume.cc b/source/geometry/management/src/G4AssemblyVolume.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0f24cee6d39ddc67389f03978594280c4a973f36
--- /dev/null
+++ b/source/geometry/management/src/G4AssemblyVolume.cc
@@ -0,0 +1,239 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AssemblyVolume.cc,v 1.5 2001/02/08 12:33:56 radoone Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// Class G4AssemblyVolume - implementation
+//
+// ----------------------------------------------------------------------
+
+#include "G4PVPlacement.hh"
+#include "G4RotationMatrix.hh"
+#include "G4Transform3D.hh"
+#include "G4AffineTransform.hh"
+#include "G4AssemblyVolume.hh"
+
+#include "g4std/strstream"
+
+unsigned int G4AssemblyVolume::fsInstanceCounter = 0;
+
+// Default constructor
+//
+G4AssemblyVolume::G4AssemblyVolume()
+{
+  InstanceCountPlus();
+  SetImprintsCount( 0 );
+}
+
+// Destructor
+//
+G4AssemblyVolume::~G4AssemblyVolume()
+{
+  fTriplets.clear();
+  
+  unsigned int howmany = fPVStore.size();
+  if( howmany != 0 )
+  {
+    for( unsigned int i = 0; i < howmany; i++ )
+    {
+      G4RotationMatrix* pRotToClean = fPVStore[i]->GetRotation();
+      if( pRotToClean != 0 ) delete pRotToClean;
+      delete fPVStore[i];
+    }
+  }
+  
+  fPVStore.clear();
+  InstanceCountMinus();
+}
+
+// Add and place the given volume according to the specified
+// translation and rotation.
+//
+void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume*  pVolume,
+                                        G4ThreeVector&    translation,
+                                        G4RotationMatrix* pRotation )
+{
+  G4AssemblyTriplet toAdd( pVolume, translation, pRotation );
+  fTriplets.push_back( toAdd );
+}
+
+// Add and place the given volume according to the specified transformation
+//
+void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume*  pVolume,
+                                        G4Transform3D&    transformation )
+{
+  G4ThreeVector v   = transformation.getTranslation();
+  G4RotationMatrix r = transformation.getRotation();
+  G4AssemblyTriplet toAdd( pVolume, v, &r );
+  fTriplets.push_back( toAdd );
+}
+
+/**
+ * Create an instance of an assembly volume inside of the specified
+ * mother volume. This works analogically to making stamp imprints.
+ * This method makes use of the Geant4 affine transformation class.
+ * The algorithm is defined as follows:
+ * 
+ * Having rotation matrix Rm and translation vector Tm to be applied
+ * inside the mother and rotation matrix Ra and translation vector Ta
+ * to be applied inside the assembly itself for each of the participating
+ * volumes the resulting transformation is
+ *
+ * Tfinal = Ta * Tm
+ *
+ * where Ta and Tm are constructed as
+ *
+ *       -1                                     -1
+ * Ta = Ra  * Ta           and            Tm = Rm  * Tm
+ *
+ * which in words means that we create first the affine transformations
+ * by inverse rotation matrices and translations for mother and assembly.
+ * The resulting final transformation to be applied to each of the
+ * participating volumes is their product.
+ * IMPORTANT NOTE!
+ * The order of multiplication is reversed when comparing to CLHEP 3D
+ * transformation matrix(G4Transform3D class).
+ */
+void G4AssemblyVolume::MakeImprint( G4LogicalVolume*  pMotherLV,
+                                    G4ThreeVector&    translationInMother,
+                                    G4RotationMatrix* pRotationInMother )
+{
+  unsigned int        numberOfDaughters = pMotherLV->GetNoDaughters();
+
+  // We start from the first available index
+  numberOfDaughters++;
+
+  ImprintsCountPlus();
+
+  for( unsigned int   i = 0; i < fTriplets.size(); i++ )
+  {
+    // Generate the unique name for the next PV instance
+    // The name has format:
+    //
+    // av_WWW_impr_XXX_YYY_ZZZ
+    // where the fields mean:
+    // WWW - assembly volume instance number
+    // XXX - assembly volume imprint number
+    // YYY - the name of a log. volume we want to make a placement of
+    // ZZZ - the log. volume index inside the assembly volume
+    G4std::strstream pvName;
+    pvName << "av_"
+           << GetInstanceCount()
+           << "_impr_"
+           << GetImprintsCount()
+           << "_"
+           << fTriplets[i].GetVolume()->GetName().c_str()
+           << "_pv_"
+           << i
+           << G4std::ends;
+
+    // Create the transformation in this assembly volume
+    G4AffineTransform  Ta( fTriplets[i].GetRotation()->inverse(),
+                           fTriplets[i].GetTranslation() );
+    // Create the transformation in a mother volume
+    G4AffineTransform  Tm( pRotationInMother->inverse(),
+                           translationInMother );
+    
+    // Combine them together
+    G4AffineTransform  Tfinal = Ta * Tm;
+
+    // Extract the final absolute transformation inside a mother
+    G4RotationMatrix*  pFinalRotation = new G4RotationMatrix(
+                                                          Tfinal.NetRotation()
+                                                            );
+    G4ThreeVector      finalTranslation = Tfinal.NetTranslation();
+
+    // Generate a new physical volume instance inside a mother
+    G4VPhysicalVolume* pPlaced = new G4PVPlacement(
+                                 pFinalRotation
+                                ,finalTranslation
+                                ,fTriplets[i].GetVolume()
+                                ,pvName.str()
+                                ,pMotherLV
+                                ,false
+                                ,numberOfDaughters + i
+                              );
+    
+    // Register the physical volume created by us so we can delete it later
+    fPVStore.push_back( pPlaced );
+  }
+}
+
+void G4AssemblyVolume::MakeImprint( G4LogicalVolume*  pMotherLV,
+                                    G4Transform3D&    transformation )
+{
+  unsigned int        numberOfDaughters = pMotherLV->GetNoDaughters();
+
+  // We start from the first available index
+  numberOfDaughters++;
+
+  for( unsigned int   i = 0; i < fTriplets.size(); i++ )
+  {
+    // Generate the unique name for the next PV instance
+    // The name has format:
+    //
+    // av_WWW_impr_XXX_YYY_ZZZ
+    // where the fields mean:
+    // WWW - assembly volume instance number
+    // XXX - assembly volume imprint number
+    // YYY - the name of a log. volume we want to make a placement of
+    // ZZZ - the log. volume index inside the assembly volume
+    G4std::strstream pvName;
+    pvName << "av_"
+           << GetInstanceCount()
+           << "_impr_"
+           << GetImprintsCount()
+           << "_"
+           << fTriplets[i].GetVolume()->GetName().c_str()
+           << "_pv_"
+           << i
+           << G4std::ends;
+
+    G4Transform3D Ta( *(fTriplets[i].GetRotation()),
+                      fTriplets[i].GetTranslation()
+                    );
+
+    G4Transform3D Tfinal = transformation * Ta;
+    
+//  G4RotationMatrix* pFinalRotation =
+//                    new G4RotationMatrix( Tfinal.getRotation().inverse() );
+//  G4ThreeVector     finalTranslation = Tfinal.getTranslation();
+
+    // Generate a new physical volume instance inside a mother
+    G4VPhysicalVolume* pPlaced = new G4PVPlacement( Tfinal,
+                                                    fTriplets[i].GetVolume(),
+                                                    pvName.str(),
+                                                    pMotherLV,
+                                                    false,
+                                                    numberOfDaughters + i );
+
+    // Register the physical volume created by us so we can delete it later
+    fPVStore.push_back( pPlaced );
+  }
+}
+
+unsigned int G4AssemblyVolume::GetInstanceCount() const
+{
+  return G4AssemblyVolume::fsInstanceCounter;
+}
+
+void         G4AssemblyVolume::SetInstanceCount( unsigned int value )
+{
+  G4AssemblyVolume::fsInstanceCounter = value;
+}
+
+void         G4AssemblyVolume::InstanceCountPlus()
+{
+  G4AssemblyVolume::fsInstanceCounter++;
+}
+
+void         G4AssemblyVolume::InstanceCountMinus()
+{
+  G4AssemblyVolume::fsInstanceCounter--;
+}
diff --git a/source/geometry/management/src/G4DrawVoxels.cc b/source/geometry/management/src/G4DrawVoxels.cc
index 725bb6d60237c59ef97038b181da2d1e9a4be22c..e017eab44f7bfc615623f3d1201a5686a243edbe 100644
--- a/source/geometry/management/src/G4DrawVoxels.cc
+++ b/source/geometry/management/src/G4DrawVoxels.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DrawVoxels.cc,v 1.12 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4DrawVoxels
diff --git a/source/geometry/management/src/G4GeometryManager.cc b/source/geometry/management/src/G4GeometryManager.cc
index a6e9f37c6157e74de897661393d23e326b92e43c..396559b3afe8489b721776b96c488ed152d796ed 100644
--- a/source/geometry/management/src/G4GeometryManager.cc
+++ b/source/geometry/management/src/G4GeometryManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometryManager.cc,v 1.2 1999/12/15 14:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4GeometryManager
 //
diff --git a/source/geometry/management/src/G4LogicalVolume.cc b/source/geometry/management/src/G4LogicalVolume.cc
index 1d3c0a1bd4bb1c1b165ca01b2af3abc78abf190b..0dce736d287d6a342be8d44be43bef017adad30c 100644
--- a/source/geometry/management/src/G4LogicalVolume.cc
+++ b/source/geometry/management/src/G4LogicalVolume.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalVolume.cc,v 1.5 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4LogicalVolume Implementation
diff --git a/source/geometry/management/src/G4LogicalVolumeStore.cc b/source/geometry/management/src/G4LogicalVolumeStore.cc
index 6712de2cea510cb3a2dd1da6ae062034b27b2d9a..f05f20b924e6baabce53c3f4ed98c9f8d0fccb3e 100644
--- a/source/geometry/management/src/G4LogicalVolumeStore.cc
+++ b/source/geometry/management/src/G4LogicalVolumeStore.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalVolumeStore.cc,v 1.4 1999/12/15 14:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4LogicalVolumeStore
 //
diff --git a/source/geometry/management/src/G4PVParameterised.cc b/source/geometry/management/src/G4PVParameterised.cc
index 98415c82c68869c461fe73a3a3b462e2415b137b..f15d92fec207d1632c625a13d1e5f64f6cce93e7 100644
--- a/source/geometry/management/src/G4PVParameterised.cc
+++ b/source/geometry/management/src/G4PVParameterised.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVParameterised.cc,v 1.3 2000/11/01 15:39:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVParameterised
diff --git a/source/geometry/management/src/G4PVPlacement.cc b/source/geometry/management/src/G4PVPlacement.cc
index ea9a3d682b56016fa534275acac6b07544969f2b..2ae5864863815b8de243dd284afce2ec2b784dc0 100644
--- a/source/geometry/management/src/G4PVPlacement.cc
+++ b/source/geometry/management/src/G4PVPlacement.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVPlacement.cc,v 1.3 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVPlacement Implementation
diff --git a/source/geometry/management/src/G4PVReplica.cc b/source/geometry/management/src/G4PVReplica.cc
index 70f92ea4056e08af915977b624fbe208ba2d5abe..6dd7e6281fa1696c99655f7476451ee08c10d3e1 100644
--- a/source/geometry/management/src/G4PVReplica.cc
+++ b/source/geometry/management/src/G4PVReplica.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVReplica.cc,v 1.2 1999/12/15 14:49:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVReplica Implementation
diff --git a/source/geometry/management/src/G4PhysicalVolumeStore.cc b/source/geometry/management/src/G4PhysicalVolumeStore.cc
index 2917d139e37b6d42a791b4e86de226dcd1a2e940..0b8141ed187eab523df407cb80908c00c3062095 100644
--- a/source/geometry/management/src/G4PhysicalVolumeStore.cc
+++ b/source/geometry/management/src/G4PhysicalVolumeStore.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicalVolumeStore.cc,v 1.5 2000/11/01 15:39:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4PhysicalVolumeStore
 //
diff --git a/source/geometry/management/src/G4SmartVoxelHeader.cc b/source/geometry/management/src/G4SmartVoxelHeader.cc
index 413b56af51165a9978a4e2bc140fdff386c730d7..b925999b13d6aa4f0814d5b203caeca884b89d94 100644
--- a/source/geometry/management/src/G4SmartVoxelHeader.cc
+++ b/source/geometry/management/src/G4SmartVoxelHeader.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelHeader.cc,v 1.7 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4SmartVoxelHeader
diff --git a/source/geometry/management/src/G4SmartVoxelNode.cc b/source/geometry/management/src/G4SmartVoxelNode.cc
index 061b6dd97a3166ca1ab55bd841e440762d13b450..f39724ecd3ff0221fdf9dc5b0f1454f2ecb08518 100644
--- a/source/geometry/management/src/G4SmartVoxelNode.cc
+++ b/source/geometry/management/src/G4SmartVoxelNode.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SmartVoxelNode.cc,v 1.2 1999/12/15 14:49:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class G4SmartVoxelNode
 //
diff --git a/source/geometry/management/src/G4SolidStore.cc b/source/geometry/management/src/G4SolidStore.cc
index ce69bd0a27740bdac67cff9ff44dd030ecdd6285..431346d7d6236732657c757ff78c675f83bead57 100644
--- a/source/geometry/management/src/G4SolidStore.cc
+++ b/source/geometry/management/src/G4SolidStore.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SolidStore.cc,v 1.5 2000/09/11 11:09:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4SolidStore
 //
diff --git a/source/geometry/management/src/G4VPVParameterisation.cc b/source/geometry/management/src/G4VPVParameterisation.cc
index 764de60e5ca16064331d5950a70249b6a66a4c5d..eefaca77cde692de7784bbae4d00da9a623d94c3 100644
--- a/source/geometry/management/src/G4VPVParameterisation.cc
+++ b/source/geometry/management/src/G4VPVParameterisation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPVParameterisation.cc,v 1.2 1999/12/15 14:49:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8ade86421c117ce7e2a8a03c33fc283591c63ab2..9f49eafef5d50e2e64b085f8c260ed624be53746 100644
--- a/source/geometry/management/src/G4VPhysicalVolume.cc
+++ b/source/geometry/management/src/G4VPhysicalVolume.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPhysicalVolume.cc,v 1.3 1999/12/15 14:49:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4VPhysicalVolume Implementation
diff --git a/source/geometry/management/src/G4VSolid.cc b/source/geometry/management/src/G4VSolid.cc
index a820135b28ed1128c929ab308c29f6a5342e36cb..ae560b17f0e97dccb7ea5d42f50101b6b058c23e 100644
--- a/source/geometry/management/src/G4VSolid.cc
+++ b/source/geometry/management/src/G4VSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSolid.cc,v 1.6 2000/11/16 14:29:23 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VSolid
 //
diff --git a/source/geometry/management/src/G4VoxelLimits.cc b/source/geometry/management/src/G4VoxelLimits.cc
index c2597af60bf5c62d9e65c0c45c8849fa64d3c042..63f3b0efa6566f0829c319e41b269404ab4fe55f 100644
--- a/source/geometry/management/src/G4VoxelLimits.cc
+++ b/source/geometry/management/src/G4VoxelLimits.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VoxelLimits.cc,v 1.3 2000/11/01 15:39:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VoxelLimits
 // 
diff --git a/source/geometry/solids/BREPS/History b/source/geometry/solids/BREPS/History
index 16f4f44ab6a642f5b019c947cdb2ef3248d2c16d..8e641ac3cd9960b47f4bde5658de25a90232424e 100644
--- a/source/geometry/solids/BREPS/History
+++ b/source/geometry/solids/BREPS/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.20 2000/11/20 17:54:36 gcosmo Exp $
+$Id: History,v 1.21 2001/02/05 18:45:32 gcosmo Exp $
 ----------------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,10 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+05/01/2001 : G. Cosmo            breps-V03-00-00
+- Removed useless inclusion of G4OrderedTable.hh from G4Assembly.hh and
+  G4STEPEntity.hh.
+
 20/11/2000 : G. Cosmo            breps-V02-00-03
 - Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
   o commented out variables declared and not used.
diff --git a/source/geometry/solids/BREPS/include/G4Assembly.hh b/source/geometry/solids/BREPS/include/G4Assembly.hh
index 7638c22eb662ce1e5e614863f2d5f43b2e229c58..ce7886a3c555a39f2958ec7a7d5c7e7582766fdf 100644
--- a/source/geometry/solids/BREPS/include/G4Assembly.hh
+++ b/source/geometry/solids/BREPS/include/G4Assembly.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Assembly.hh,v 1.5 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Assembly.hh,v 1.6 2001/02/05 18:45:32 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Assembly
@@ -28,7 +28,6 @@
 #define G4ASSEMBLY_HH
 
 #include "G4PlacedSolid.hh"
-#include "G4OrderedTable.hh"   
 #include "G4BREPSolid.hh"
 
 typedef G4RWTPtrOrderedVector<G4PlacedSolid> G4PlacedVector;  
diff --git a/source/geometry/solids/BREPS/include/G4Assembly.icc b/source/geometry/solids/BREPS/include/G4Assembly.icc
index 9c74942386a49823d6c6e65e2de3738022da6e2f..cc6582c2a3fb03192e087fffbb89e8019facc3f9 100644
--- a/source/geometry/solids/BREPS/include/G4Assembly.icc
+++ b/source/geometry/solids/BREPS/include/G4Assembly.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Assembly.icc,v 1.2 2000/08/28 15:00:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
index a30d0fabfcba5a1bc93e0aa6061dee337e80d84d..d16b3fcd0d31803b65ad751a78b3fc548befe919 100644
--- a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
+++ b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2Placement3D.hh,v 1.3 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement3D
diff --git a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
index aee7b78d19c07ac335961a56c03eddd912d1dd47..ce8a85605acf705866edefd1d6925361b80eb723 100644
--- a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
+++ b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2Placement3D.icc,v 1.4 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolid.hh b/source/geometry/solids/BREPS/include/G4BREPSolid.hh
index 0efe53e58c78b3e07b09a819452f35093ba05065..2f9a87bb40f260f40965b269ab02b9a9a83e9995 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolid.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolid.hh,v 1.8 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolid
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolid.icc b/source/geometry/solids/BREPS/include/G4BREPSolid.icc
index 458c76207c3c6454601330b879b9a327ed628cb9..b00aea478e2ef2320c9fd89a242c5a47eb11db94 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolid.icc
+++ b/source/geometry/solids/BREPS/include/G4BREPSolid.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolid.icc,v 1.3 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
index ac218dec00f138049586ef616be24fd53968f60d..139c01d22418464ea74dfd4783333cb861a629f2 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidBox.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidBox
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
index b17850d061ced7aacf83d18128022935c44b9e43..eb7b07f7558994512f16b75ad8cbbf754cff7337 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidCone.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidCone
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
index 07e2ec8d1d01d5b473f605103feb88ad451cfbc7..00e19132efa248b53fa5f9a52f5e93a37737eda4 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidCylinder.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidCylinder
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
index 872c749c3b20a7d1449c7b724642f0c1833ce69f..4019bc87d93970d0f5c2d3a069b3c332b7588051 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidOpenPCone.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidOpenPCone
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
index 9251f68e3b96cddcb4a520d479ac7c30d9f35994..c7985dad771aa2fe5da04946127a37ae2a09c01d 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidPCone.hh,v 1.5 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidPCone
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
index a3823d5231a17a65540dda9181e44d2d5175d6a5..1e0096ce917d8cf82d1842cf5778534419a9145e 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidPolyhedra.hh,v 1.6 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidPolyhedra
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
index b917b2981b81fbc3e9b02e8d3774675ab7e1928f..b360b49f7b293991a8ac48539d5bc17842eff528 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidSphere.hh,v 1.5 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidSphere
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
index 1ed1d7d844d50d029f91fcd1d1df1632f8b11dfd..8251e13ad646de2b9c29b3c7887fa89679f19b5d 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidTorus.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidTorus
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
index 1150840d2dc1f612486a4e3f34316ab476443bac..555e9f18b9d406d76491db055cb98d6122404326 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurve.hh,v 1.8 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurve
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurve.icc b/source/geometry/solids/BREPS/include/G4BSplineCurve.icc
index be07853520323488f6bf5d674ee184129b1788da..5555d138e1c695a4360352138db09503100c5448 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurve.icc
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurve.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurve.icc,v 1.4 2000/08/28 15:00:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
index 393dd46a5c640b3a49748b064dcfad0f132b4c6e..c267661665a8fe15db219b488440928f417fbfa0 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurveWithKnots.hh,v 1.3 2000/08/28 08:57:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurveWithKnots
diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
index cc4ebb15f2a67f48edf1d069fc45a7e01d99de2d..7a4832a1619aafd513c5623325c2bdc4c008977b 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurface.hh,v 1.9 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurface
diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurface.icc b/source/geometry/solids/BREPS/include/G4BSplineSurface.icc
index 4465e2cf7c06e24b8e1ed8c4c8301f9d63b0cda1..75ad6f2fde7b7f31e1e267a55d7d7295d5c668b5 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4BSplineSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurface.icc,v 1.3 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh b/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
index 4820e7e9f063ae85e5dc90f333e90ef57fbb6f36..379ba4359f9cef2b0a1ae3946b288dbf04948fc2 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurfaceWithKnots.hh,v 1.2 2000/08/28 08:57:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceWithKnots
diff --git a/source/geometry/solids/BREPS/include/G4BezierSurface.hh b/source/geometry/solids/BREPS/include/G4BezierSurface.hh
index 2839a61c689ff2396404c4d70608cd88f5a21a6f..7052054f9975fbdfdfa4f280cf5511f4a666c5a5 100644
--- a/source/geometry/solids/BREPS/include/G4BezierSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4BezierSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BezierSurface.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BezierSurface
diff --git a/source/geometry/solids/BREPS/include/G4BezierSurface.icc b/source/geometry/solids/BREPS/include/G4BezierSurface.icc
index 66b7f977a2cd347ed6ac3027ffbf7df75dbdaedb..1178175e5467feba46d090f9d503709b24b69376 100644
--- a/source/geometry/solids/BREPS/include/G4BezierSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4BezierSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BezierSurface.icc,v 1.2 2000/08/28 15:00:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh b/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
index 52c22f837077af3640bc81050118a81ea29a9b13..b2da9d99dd259ed68ab720b0b1249171c085a1aa 100644
--- a/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
+++ b/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BoundingBox3D.hh,v 1.4 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BoundingBox3D
diff --git a/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc b/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
index 82ef12965d1812ef6f7912b3684c06e4e54d0aba..70c89da9d6b1fe6494bf4455f4530d626b99c44f 100644
--- a/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
+++ b/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BoundingBox3D.icc,v 1.2 2000/08/28 08:57:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CircularCurve.hh b/source/geometry/solids/BREPS/include/G4CircularCurve.hh
index 5ad8b642feb0ea857dbeb097248bbf73c0680142..4d7b3adfb8b68365cd7918e1f4f70fcb97d3368b 100644
--- a/source/geometry/solids/BREPS/include/G4CircularCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4CircularCurve.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CircularCurve.hh,v 1.6 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CircularCurve
diff --git a/source/geometry/solids/BREPS/include/G4CircularCurve.icc b/source/geometry/solids/BREPS/include/G4CircularCurve.icc
index efe561a9c6db0420de51bc9d6cdff554e425237f..d39014c7dcf28dc541865b46cdb235d9e30624e4 100644
--- a/source/geometry/solids/BREPS/include/G4CircularCurve.icc
+++ b/source/geometry/solids/BREPS/include/G4CircularCurve.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CircularCurve.icc,v 1.4 2000/08/28 15:00:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CompositeCurve.hh b/source/geometry/solids/BREPS/include/G4CompositeCurve.hh
index 57ba6bf8880244f9562b94a016da485ce500a254..d3d767ef5e52fcd00b67767ccb217a22e4b6f22c 100644
--- a/source/geometry/solids/BREPS/include/G4CompositeCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4CompositeCurve.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CompositeCurve.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CompositeCurve
diff --git a/source/geometry/solids/BREPS/include/G4CompositeCurve.icc b/source/geometry/solids/BREPS/include/G4CompositeCurve.icc
index 7ad83fd019e39e5c6efd4e7e9cb146f08badacd9..b1cdd92002837d6c2ace1e6704e118c2d4977e7c 100644
--- a/source/geometry/solids/BREPS/include/G4CompositeCurve.icc
+++ b/source/geometry/solids/BREPS/include/G4CompositeCurve.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CompositeCurve.icc,v 1.3 2000/08/28 15:00:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Conic.hh b/source/geometry/solids/BREPS/include/G4Conic.hh
index 341823b058c580fcaecda00be4abe6d52193a1a1..7bc70410a571d5ffeb179a29157c5f08630c5cc5 100644
--- a/source/geometry/solids/BREPS/include/G4Conic.hh
+++ b/source/geometry/solids/BREPS/include/G4Conic.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Conic.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Conic
diff --git a/source/geometry/solids/BREPS/include/G4Conic.icc b/source/geometry/solids/BREPS/include/G4Conic.icc
index 0943bb524c24a211ad12fcebc1d8f5f24e7deaed..353167bf0a8f04832d43201e472475be37cce807 100644
--- a/source/geometry/solids/BREPS/include/G4Conic.icc
+++ b/source/geometry/solids/BREPS/include/G4Conic.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Conic.icc,v 1.2 2000/08/28 08:57:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
index 1552a31ed9a6da4848fac946739c44fc632e025a..a42422774ec5169d931c6ed1576662472edd2f7b 100644
--- a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConicalSurface.hh,v 1.7 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicalSurface
diff --git a/source/geometry/solids/BREPS/include/G4ConicalSurface.icc b/source/geometry/solids/BREPS/include/G4ConicalSurface.icc
index b29bba15ff91382381ad47d7474a8947e8df3c08..38e65ce17d7dcfabc3b0bfe3119dfdb7fd4d499f 100644
--- a/source/geometry/solids/BREPS/include/G4ConicalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4ConicalSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConicalSurface.icc,v 1.2 2000/08/28 15:00:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ControlPoints.hh b/source/geometry/solids/BREPS/include/G4ControlPoints.hh
index cd48a19563f986d4cb2fa30aa82fa4868d7ffe70..f66af2367f72f6e29f8a82cadf7321421f959cb3 100644
--- a/source/geometry/solids/BREPS/include/G4ControlPoints.hh
+++ b/source/geometry/solids/BREPS/include/G4ControlPoints.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ControlPoints.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ControlPoints
diff --git a/source/geometry/solids/BREPS/include/G4ControlPoints.icc b/source/geometry/solids/BREPS/include/G4ControlPoints.icc
index 8654c45040c4d10199927d93b8ade621d02a7bd0..66dd03304457e4b76157da6afac47f16ccc48f8c 100644
--- a/source/geometry/solids/BREPS/include/G4ControlPoints.icc
+++ b/source/geometry/solids/BREPS/include/G4ControlPoints.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ControlPoints.icc,v 1.1 2000/08/28 08:57:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ConvexHull.hh b/source/geometry/solids/BREPS/include/G4ConvexHull.hh
index 7f67e1e1d5e6fad54f5e9213c911d59dd9e370ac..ff0b3da644b1811cc9b6f0fb10f90c6c932bd871 100644
--- a/source/geometry/solids/BREPS/include/G4ConvexHull.hh
+++ b/source/geometry/solids/BREPS/include/G4ConvexHull.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConvexHull.hh,v 1.4 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConvexHull
diff --git a/source/geometry/solids/BREPS/include/G4Curve.hh b/source/geometry/solids/BREPS/include/G4Curve.hh
index c8663de1489ea30814a9fcac080238f0e9b2d0ba..788fd8520432660dd1121e51ae947e4dcaea88ce 100644
--- a/source/geometry/solids/BREPS/include/G4Curve.hh
+++ b/source/geometry/solids/BREPS/include/G4Curve.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Curve.hh,v 1.7 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Curve
diff --git a/source/geometry/solids/BREPS/include/G4Curve.icc b/source/geometry/solids/BREPS/include/G4Curve.icc
index c72902cb64e3b8813b6bd83c3efe57f332904acc..e7ef64868ad44839a2018fe7b0c2add7c66e8ad3 100644
--- a/source/geometry/solids/BREPS/include/G4Curve.icc
+++ b/source/geometry/solids/BREPS/include/G4Curve.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Curve.icc,v 1.4 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CurvePoint.hh b/source/geometry/solids/BREPS/include/G4CurvePoint.hh
index 598cdd385d2d2d3eb8a771cab4b274aa36fc63a4..f326be9525c2c807b73ed8f80a96a80510e19fb6 100644
--- a/source/geometry/solids/BREPS/include/G4CurvePoint.hh
+++ b/source/geometry/solids/BREPS/include/G4CurvePoint.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurvePoint.hh,v 1.4 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CurvePoint
diff --git a/source/geometry/solids/BREPS/include/G4CurvePoint.icc b/source/geometry/solids/BREPS/include/G4CurvePoint.icc
index 807a29c73606ebcd40d3f5fa90ef50ca33e00a24..118e206f9d4ecbbfc2c0382d19eafd3806e3bba9 100644
--- a/source/geometry/solids/BREPS/include/G4CurvePoint.icc
+++ b/source/geometry/solids/BREPS/include/G4CurvePoint.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurvePoint.icc,v 1.2 2000/08/28 08:57:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
index 0ca5061799c6d9a2c0a4d4d82adec94b78a08b48..353f3f32c501172a3f169db9a1c5b6279a8eaff0 100644
--- a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
+++ b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurveRayIntersection.hh,v 1.3 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveRayIntersection
diff --git a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
index dafae3b705ccfee05bb99453a8654eb29e86e24a..5bfc4e3bb7b3d396cea42fe2d690d0fc587038d4 100644
--- a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
+++ b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurveRayIntersection.icc,v 1.2 2000/08/28 08:57:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CurveVector.hh b/source/geometry/solids/BREPS/include/G4CurveVector.hh
index 1dcaac2b80f1b7c27c71eaab2eb763e39f7411d1..e37cff600750e48009299fa724221deb0511a9a2 100644
--- a/source/geometry/solids/BREPS/include/G4CurveVector.hh
+++ b/source/geometry/solids/BREPS/include/G4CurveVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurveVector.hh,v 1.3 2000/08/28 08:57:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveVector
diff --git a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
index 8e35dfb8337fdbb218d17afa0a067e5a9420bcdc..3a15ae794fb240831ec4962a00d99480bc2d4cbf 100644
--- a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CylindricalSurface.hh,v 1.7 2000/11/08 20:26:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CylindricalSurface
diff --git a/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc b/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
index 4abab178f13e2bd95da6b3cb8d21eb59dc8f6601..26346dccbc0a4cbafcfcdbe34c93b8fe988e0bed 100644
--- a/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CylindricalSurface.icc,v 1.2 2000/08/28 15:00:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Ellipse.hh b/source/geometry/solids/BREPS/include/G4Ellipse.hh
index cbfe56682d72c238b233ca6da974f370a6d21756..aacf09ffd502e91cfeedbb880754db70929e1e74 100644
--- a/source/geometry/solids/BREPS/include/G4Ellipse.hh
+++ b/source/geometry/solids/BREPS/include/G4Ellipse.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ellipse.hh,v 1.7 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Ellipse
diff --git a/source/geometry/solids/BREPS/include/G4Ellipse.icc b/source/geometry/solids/BREPS/include/G4Ellipse.icc
index efec4d7a57aa3141bcc58c0a0482d585f16ae25e..9a7ff3dc3d4c99de9702a4d478cd205e769e6279 100644
--- a/source/geometry/solids/BREPS/include/G4Ellipse.icc
+++ b/source/geometry/solids/BREPS/include/G4Ellipse.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ellipse.icc,v 1.5 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
index 07d2410cad177f950c7bb45ad7e51d620dde7538..ef6e5c0d288781700bd31dd0b9dfc675a9f1dee5 100644
--- a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FConicalSurface.hh,v 1.10 2000/11/20 17:54:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FConicalSurface
diff --git a/source/geometry/solids/BREPS/include/G4FConicalSurface.icc b/source/geometry/solids/BREPS/include/G4FConicalSurface.icc
index c59b6282b15087c09ecc95bdbdd006a013593245..6ec80e37fa2588ac16864896bd696db171c7525c 100644
--- a/source/geometry/solids/BREPS/include/G4FConicalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4FConicalSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FConicalSurface.icc,v 1.2 2000/08/28 15:00:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
index 8d2296e324364b9c8d34babb509a5cd86fe8010d..2d090edb4360434345d4c6e14cc5e5f36d269fe7 100644
--- a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FCylindricalSurface.hh,v 1.10 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FCylindricalSurface
diff --git a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
index 474ef0f2caf1915768a1bae0e363309bb2abd044..6fde40f16c9f64d39d5e6f086e96c009544a2985 100644
--- a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FCylindricalSurface.icc,v 1.2 2000/08/28 15:00:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4FPlane.hh b/source/geometry/solids/BREPS/include/G4FPlane.hh
index bdbb8bc672b7774f3093c516339fad77d65d7817..91fc7f9fb38a6301e469f242f0a1c7f09db758b6 100644
--- a/source/geometry/solids/BREPS/include/G4FPlane.hh
+++ b/source/geometry/solids/BREPS/include/G4FPlane.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FPlane.hh,v 1.10 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FPlane
diff --git a/source/geometry/solids/BREPS/include/G4FPlane.icc b/source/geometry/solids/BREPS/include/G4FPlane.icc
index 6f0adb044b8932e407e2964bee0cb6d9976392c1..12353959ccc040acd39eb3eebbc993f5360ca7ae 100644
--- a/source/geometry/solids/BREPS/include/G4FPlane.icc
+++ b/source/geometry/solids/BREPS/include/G4FPlane.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FPlane.icc,v 1.3 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Globals.hh b/source/geometry/solids/BREPS/include/G4Globals.hh
index 44c00851f74a186f811312603d2c5a1d185b3466..76c5fe4f1743ad3a95a68d52ecd7fd59fda17b4f 100644
--- a/source/geometry/solids/BREPS/include/G4Globals.hh
+++ b/source/geometry/solids/BREPS/include/G4Globals.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Globals.hh,v 1.3 2000/08/28 08:57:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Author: A.Breakstone
 // Adaptation: J.Sulkimo, P.Urban.
diff --git a/source/geometry/solids/BREPS/include/G4Hyperbola.hh b/source/geometry/solids/BREPS/include/G4Hyperbola.hh
index 2b8cc67391555beacafc2dd0d2422774b95008e6..5d52130e294592dbfd79fb22ddbfd6363c8c544e 100644
--- a/source/geometry/solids/BREPS/include/G4Hyperbola.hh
+++ b/source/geometry/solids/BREPS/include/G4Hyperbola.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Hyperbola.hh,v 1.7 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Hyperbola
diff --git a/source/geometry/solids/BREPS/include/G4Hyperbola.icc b/source/geometry/solids/BREPS/include/G4Hyperbola.icc
index 20175918331fa82e2e5155e801ae406130d7e8d3..57f3fda8429d0e1ba19f435b6b642e2729327f88 100644
--- a/source/geometry/solids/BREPS/include/G4Hyperbola.icc
+++ b/source/geometry/solids/BREPS/include/G4Hyperbola.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Hyperbola.icc,v 1.5 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4KnotVector.hh b/source/geometry/solids/BREPS/include/G4KnotVector.hh
index 6fa7105843f1a301a355a435d9cb90a484da97ed..64b4a4ae0491a5e807da3872173479204db67bc6 100644
--- a/source/geometry/solids/BREPS/include/G4KnotVector.hh
+++ b/source/geometry/solids/BREPS/include/G4KnotVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KnotVector.hh,v 1.6 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4KnotVector
diff --git a/source/geometry/solids/BREPS/include/G4KnotVector.icc b/source/geometry/solids/BREPS/include/G4KnotVector.icc
index b11db7916ce1a15db1cecc8b8b5584dc0a4f789c..aae91eef3d84c1dbc965283f6039d8dc1b83736b 100644
--- a/source/geometry/solids/BREPS/include/G4KnotVector.icc
+++ b/source/geometry/solids/BREPS/include/G4KnotVector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KnotVector.icc,v 1.2 2000/08/28 15:00:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Line.hh b/source/geometry/solids/BREPS/include/G4Line.hh
index 73ce46efa9e658dc7d90b0773a2d18f481de893b..e830fdab362dce58758a6952a9eab061aeb6f9cb 100644
--- a/source/geometry/solids/BREPS/include/G4Line.hh
+++ b/source/geometry/solids/BREPS/include/G4Line.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Line.hh,v 1.6 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Line
diff --git a/source/geometry/solids/BREPS/include/G4Line.icc b/source/geometry/solids/BREPS/include/G4Line.icc
index 940454d308d082034d19d7a1541bea2b804ad8e4..f76c6aa5f4280bfbdb363be2d292bcc8fa9620ae 100644
--- a/source/geometry/solids/BREPS/include/G4Line.icc
+++ b/source/geometry/solids/BREPS/include/G4Line.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Line.icc,v 1.6 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
index 90d145738e8d475b3f184443d6896c7356ebb90f..638dfa33aabe53a4c37bf5b1ab6972624784bab6 100644
--- a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
+++ b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OsloMatrix.hh,v 1.4 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4OsloMatrix
diff --git a/source/geometry/solids/BREPS/include/G4OsloMatrix.icc b/source/geometry/solids/BREPS/include/G4OsloMatrix.icc
index f7698aee8b7aa3eae201d8a5e48993a7092ea240..adfc218f723d72008598f35085d231114d52e8f3 100644
--- a/source/geometry/solids/BREPS/include/G4OsloMatrix.icc
+++ b/source/geometry/solids/BREPS/include/G4OsloMatrix.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OsloMatrix.icc,v 1.2 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Parabola.hh b/source/geometry/solids/BREPS/include/G4Parabola.hh
index dd82a19d48e0e0f4221939abef7610c9821565a1..1c31f5b81a292432153fe5c7ffc53b4966d7d3c5 100644
--- a/source/geometry/solids/BREPS/include/G4Parabola.hh
+++ b/source/geometry/solids/BREPS/include/G4Parabola.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Parabola.hh,v 1.7 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Parabola
diff --git a/source/geometry/solids/BREPS/include/G4Parabola.icc b/source/geometry/solids/BREPS/include/G4Parabola.icc
index a7661f3183620a158687553fa7a5ac80b51559ae..9a63252f8c193e22fe368917b091550e61ab1871 100644
--- a/source/geometry/solids/BREPS/include/G4Parabola.icc
+++ b/source/geometry/solids/BREPS/include/G4Parabola.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Parabola.icc,v 1.5 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
index 15a4b07eed8996220b7eb50982700263db160edf..526ae078d90478e98de9d536014bd3c26c4e9651 100644
--- a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
+++ b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlacedSolid.hh,v 1.6 2000/11/09 19:12:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PlacedSolid
diff --git a/source/geometry/solids/BREPS/include/G4PlacedSolid.icc b/source/geometry/solids/BREPS/include/G4PlacedSolid.icc
index b2f0c20a33d4fd5e2d0c81227cd7300648d301d1..1ceb1bdb6cd4c6d0c98a2e3a53a4e3ccdec2519e 100644
--- a/source/geometry/solids/BREPS/include/G4PlacedSolid.icc
+++ b/source/geometry/solids/BREPS/include/G4PlacedSolid.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlacedSolid.icc,v 1.4 2000/11/09 19:12:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4PlacementVector.hh b/source/geometry/solids/BREPS/include/G4PlacementVector.hh
index 6f5f85b3079d3fd752f9b6da4798b1c2abdccad9..c2e10b5a31bf617e1adf4488b167adfcbe7900ef 100644
--- a/source/geometry/solids/BREPS/include/G4PlacementVector.hh
+++ b/source/geometry/solids/BREPS/include/G4PlacementVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlacementVector.hh,v 1.3 2000/08/28 08:57:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PlacementVector
diff --git a/source/geometry/solids/BREPS/include/G4Plane.hh b/source/geometry/solids/BREPS/include/G4Plane.hh
index 1f1a0861311039082cb6756278f3d83c182f4746..ce16741ccc962d0f70e31a2f75fca4dd07f6897c 100644
--- a/source/geometry/solids/BREPS/include/G4Plane.hh
+++ b/source/geometry/solids/BREPS/include/G4Plane.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Plane.hh,v 1.4 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Plane
diff --git a/source/geometry/solids/BREPS/include/G4Point3DVector.hh b/source/geometry/solids/BREPS/include/G4Point3DVector.hh
index ae5cdd8fc4fd0482fe5d3b60aed504205e69738c..898ea784301790cc32aaae1bf74ebb9fd82e7f9a 100644
--- a/source/geometry/solids/BREPS/include/G4Point3DVector.hh
+++ b/source/geometry/solids/BREPS/include/G4Point3DVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Point3DVector.hh,v 1.4 2000/08/28 08:57:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Point3DVector
diff --git a/source/geometry/solids/BREPS/include/G4PointRat.hh b/source/geometry/solids/BREPS/include/G4PointRat.hh
index 04aea17cf2579fa859da1489c9f378ebfc4441b3..922aedc90d0063c807d7d061d7d85077f93c4298 100644
--- a/source/geometry/solids/BREPS/include/G4PointRat.hh
+++ b/source/geometry/solids/BREPS/include/G4PointRat.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointRat.hh,v 1.8 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PointRat
diff --git a/source/geometry/solids/BREPS/include/G4PointRat.icc b/source/geometry/solids/BREPS/include/G4PointRat.icc
index 2440cc379d749b771b56cb9a00cf0caa5c60988a..cfe47d334c924fefab61a919549322d0c29cf474 100644
--- a/source/geometry/solids/BREPS/include/G4PointRat.icc
+++ b/source/geometry/solids/BREPS/include/G4PointRat.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointRat.icc,v 1.2 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
index 07e78df128c33268dce61280f968f398b0af02b5..346113318019e456e79692aa6b8fb58bd72bb5cf 100644
--- a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProjectedSurface.hh,v 1.5 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ProjectedSurface
diff --git a/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc b/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
index 424cce41ff58c9596e46c3f4491a99d4a0bc38c9..eb836ea9a254816c50bceb42b9facfca73240c72 100644
--- a/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProjectedSurface.icc,v 1.2 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Ray.hh b/source/geometry/solids/BREPS/include/G4Ray.hh
index 8f2564db82db83e4a47e2cb30a426890c7de85bd..7325976d59def7e25bbefff5362b50f2074d28e7 100644
--- a/source/geometry/solids/BREPS/include/G4Ray.hh
+++ b/source/geometry/solids/BREPS/include/G4Ray.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ray.hh,v 1.5 2000/11/20 17:54:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Ray
diff --git a/source/geometry/solids/BREPS/include/G4Ray.icc b/source/geometry/solids/BREPS/include/G4Ray.icc
index e4c166787bafcce8cc081c0dabb9e5cb75606d55..c3d4961ccecb6b1ba5e91fd37aae2e968fdb14cd 100644
--- a/source/geometry/solids/BREPS/include/G4Ray.icc
+++ b/source/geometry/solids/BREPS/include/G4Ray.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ray.icc,v 1.4 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
index f9f94b32fd60c4bd3f4338850f77e9fdbd2fc16e..708f3d117dcdc6b07dae51bc6cf4c138b6eb3a12 100644
--- a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RectangularTrimmedSurface.hh,v 1.6 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BezierSurface
diff --git a/source/geometry/solids/BREPS/include/G4STEPEntity.hh b/source/geometry/solids/BREPS/include/G4STEPEntity.hh
index b698122346ef835445f81e12cfb419928c918c1b..158b8c8547633414dad3bb67d60f9d1f116251d9 100644
--- a/source/geometry/solids/BREPS/include/G4STEPEntity.hh
+++ b/source/geometry/solids/BREPS/include/G4STEPEntity.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4STEPEntity.hh,v 1.4 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4STEPEntity.hh,v 1.5 2001/02/05 18:45:32 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4STEPEntity
@@ -21,7 +21,6 @@
 #define __G4STEPENTITY
 
 #include "globals.hh"
-#include "G4OrderedTable.hh"
 
 class G4STEPEntity
 {
diff --git a/source/geometry/solids/BREPS/include/G4Sort.hh b/source/geometry/solids/BREPS/include/G4Sort.hh
index dba58f062f4a1a0deaaedb150023efd0387cc7cd..0c7dfd55ead9fb86cc2e00cd1c331c5c1168a955 100644
--- a/source/geometry/solids/BREPS/include/G4Sort.hh
+++ b/source/geometry/solids/BREPS/include/G4Sort.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Sort.hh,v 1.3 2000/08/28 08:57:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 //
diff --git a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
index d68e5b2ce3fb36678c85ccc8d1a6f99901599da7..58f3816403bb545a7f33f9c25bf2db4475bfe352 100644
--- a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SphericalSurface.hh,v 1.7 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4SphericalSurface
diff --git a/source/geometry/solids/BREPS/include/G4SphericalSurface.icc b/source/geometry/solids/BREPS/include/G4SphericalSurface.icc
index 1b4ef497416a67499ea2126edc134339cea58fe8..fb56bed51ccf715fb814c33575fc7d33e69b532b 100644
--- a/source/geometry/solids/BREPS/include/G4SphericalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4SphericalSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SphericalSurface.icc,v 1.2 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Surface.hh b/source/geometry/solids/BREPS/include/G4Surface.hh
index 1beb553290099e5710e42b749f2c7dcde1ca2446..f9493253ca48a764c0d6942d26883f46ab049c26 100644
--- a/source/geometry/solids/BREPS/include/G4Surface.hh
+++ b/source/geometry/solids/BREPS/include/G4Surface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Surface.hh,v 1.6 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Surface
diff --git a/source/geometry/solids/BREPS/include/G4Surface.icc b/source/geometry/solids/BREPS/include/G4Surface.icc
index cb1aa60a65fed24995dd86f67545b95b91e23eee..930e90e71f633de67accd9683b055212907f61ac 100644
--- a/source/geometry/solids/BREPS/include/G4Surface.icc
+++ b/source/geometry/solids/BREPS/include/G4Surface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Surface.icc,v 1.2 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
index da6171faa79d8500320447ed8472953529fcdb6d..a3d20359bf548d9975470e1caea67fd96bc87802 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceBoundary.hh,v 1.5 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceBoundary
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
index 4f8665c3e556f0f1ed5b1f0d73b4d712bc6e728c..90b863ad4af2c5dfdae426c6fe40378e77948ac4 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
+++ b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceBoundary.icc,v 1.2 2000/08/28 15:00:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceList.hh b/source/geometry/solids/BREPS/include/G4SurfaceList.hh
index 5aac96635941a70b35f1164c8a0ba3a0f2c3b027..f520bdb5df5fda8322472b7f0ee5071710c0f278 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceList.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceList.hh,v 1.4 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceList
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh b/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
index 8d8799bf86878ec049d6611bee9a3028ba6c065e..dfc5f3c32494e3f58eaa90ecb98b45ad8f5216ce 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceOfLinearExtrusion.hh,v 1.3 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceOfLinearExtrusion
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh b/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
index e616a92d7d774ac70acd8a1bac6ae13d20d00028..1ea5ee0e0bbdc013272e8588185c0811a1849649 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceOfRevolution.hh,v 1.3 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceOfRevolution
diff --git a/source/geometry/solids/BREPS/include/G4ThreeMat.hh b/source/geometry/solids/BREPS/include/G4ThreeMat.hh
index a73ee514a48afb44e9b60a74febf0a5396ff7049..0dffdd614dfabc4f510d99ff1681f04fc9c93dea 100644
--- a/source/geometry/solids/BREPS/include/G4ThreeMat.hh
+++ b/source/geometry/solids/BREPS/include/G4ThreeMat.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ThreeMat.hh,v 1.7 2000/11/08 14:22:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ThreeMat
diff --git a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
index 5e81929693cb933279b6e93ee0c499e15705a4bd..5a5fe2649c1c62e0fbc3e04220a8d5bf43d85dd2 100644
--- a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ToroidalSurface.hh,v 1.5 2000/11/08 14:22:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ToroidalSurface
diff --git a/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc b/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
index 6facd6eff5f75026b50ea41ffa43ba8beecf5f5c..21774d509412049e8f5bce8c5f558899c31abcd2 100644
--- a/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ToroidalSurface.icc,v 1.2 2000/08/28 15:00:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4UVHit.hh b/source/geometry/solids/BREPS/include/G4UVHit.hh
index afbf44bba817a436898676ea54a11fd3b9a4d086..3bf8f2c7c6a02f857a26823c084191f9bbb630d4 100644
--- a/source/geometry/solids/BREPS/include/G4UVHit.hh
+++ b/source/geometry/solids/BREPS/include/G4UVHit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UVHit.hh,v 1.5 2000/11/08 14:22:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4UVHit
diff --git a/source/geometry/solids/BREPS/src/G4Assembly.cc b/source/geometry/solids/BREPS/src/G4Assembly.cc
index 4405a21fe97a64e18577bb75e3321d071cd9dab2..4a6598a3804d8b89ab17e8b9c9911e18854ada12 100644
--- a/source/geometry/solids/BREPS/src/G4Assembly.cc
+++ b/source/geometry/solids/BREPS/src/G4Assembly.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Assembly.cc,v 1.3 2000/11/08 14:22:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc b/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
index 7fb0ef7bab440403d02e30a144c9d639ec9dff2e..bfa9c8ba90e087c23ab6a881411ae5a9a4266098 100644
--- a/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
+++ b/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2Placement3D.cc,v 1.5 2000/11/20 17:54:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolid.cc b/source/geometry/solids/BREPS/src/G4BREPSolid.cc
index 08e3d9c9bf63d38de940f39fbe02b7475e820f9f..672baa785046ac078400facabe3911a2d55ee9fd 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolid.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolid.cc,v 1.17 2000/11/20 17:54:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
index 5ca50a6874e50cd57382149977b7fffea06f18fc..f245cba4f7681dab9f628c4967994beed8356868 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidBox.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
index 416a79449ff133a3f0d4654616c03e5d64adef6c..2c2e098150dfd36cbc888f08acf512b5bb87ed7b 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidCone.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
index f074d2e0ff99cb664ef92568aee0ea72f600aa18..0158b18a667745fea52bc2c4658aa71aaee7d117 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidCylinder.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
index 65b116b966eda2b5ac983d29b457e48a738945b7..d94401d53b76c555cee53b9f4bd33efc9246bcb5 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidOpenPCone.cc,v 1.5 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
index 024136ac61bf8affc90141343fff63b589a71b07..2312326ba55bfab2fa6f07f3f0db045292306fec 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidPCone.cc,v 1.17 2000/11/20 17:54:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
index 173f4a347ed77d3c77501b889f23f53f90e0d5e4..41076615a688de9435940ee7b096edd033fda0e3 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidPolyhedra.cc,v 1.15 2000/11/20 17:54:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
index 903ff1dfafa56ed036bdcf8aee82d197eb17f68d..3e05f2fbdc62da422b17df44b4a2af5b39bd29da 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidSphere.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
index 17699cbc1f10e1ffa8e8f99256386121733877a1..6284740fc54296c63a99876b7d74702caaa3185a 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BREPSolidTorus.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
index d4b2352d114be7040b30ca4df4a402532e6932cf..e82fe67e1fef48d870d5cc817cee219e548e88e5 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurve.cc,v 1.5 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
index 3a4be9704286d347cab10682e652c57ede691a6c..c6cf65f399b0b506d7dd0db3cb0afb8e2ea1a551 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurveWithKnots.cc,v 1.3 2000/08/28 08:57:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
index 985412f83b15f2355bd97772f79338c6d780427a..98028aecc8a6d47bedd2c85d876ddbfb30c14871 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurface.cc,v 1.10 2000/11/20 17:54:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc b/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc
index 807e9386d0862b89b51a3b04e7f1afca658f0f77..f951f725fc24105fc6f0731e34feb8d2f0bb3049 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurfaceWithKnots.cc,v 1.2 2000/08/28 08:57:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BezierSurface.cc b/source/geometry/solids/BREPS/src/G4BezierSurface.cc
index f95ca75c2d31083effa3aba708e6b1bf45e0d65c..7ae9601d6e7b59823e64239988c2efcbb4602d35 100644
--- a/source/geometry/solids/BREPS/src/G4BezierSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4BezierSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BezierSurface.cc,v 1.5 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
index 43fa1021e25d420e9cb49a6b29938ba75cc2d385..fae6bc114be5b898404d3f65b5bcb2c26a7f5711 100644
--- a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
+++ b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BoundingBox3D.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CircularCurve.cc b/source/geometry/solids/BREPS/src/G4CircularCurve.cc
index bcf75c60d263b2d5cdc457c3b75b51aa9f433c9e..cd09f39c14e49741a7df2b21488e3389fbb64600 100644
--- a/source/geometry/solids/BREPS/src/G4CircularCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4CircularCurve.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CircularCurve.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CompositeCurve.cc b/source/geometry/solids/BREPS/src/G4CompositeCurve.cc
index ed9f3dea32d038cc920cec5496eba236876c872f..b7542add84a3712a81fa7c3ee62f40fa73285c7a 100644
--- a/source/geometry/solids/BREPS/src/G4CompositeCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4CompositeCurve.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CompositeCurve.cc,v 1.8 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Conic.cc b/source/geometry/solids/BREPS/src/G4Conic.cc
index 18f8d8b97f942706f52914e74cd50698efd88455..0b082fae9774618914563b0ef615bc0213dbe2d7 100644
--- a/source/geometry/solids/BREPS/src/G4Conic.cc
+++ b/source/geometry/solids/BREPS/src/G4Conic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Conic.cc,v 1.5 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
index 765badc61c11aa5ce71eb3302965936d50143fbc..faffd3e450198a6ccd7fb94367e1c986335e2083 100644
--- a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConicalSurface.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ControlPoints.cc b/source/geometry/solids/BREPS/src/G4ControlPoints.cc
index 335cdf60454fa78261b4a871e64815df8d060ceb..938771ff1db39212802c9ad9e85da5629ab54eeb 100644
--- a/source/geometry/solids/BREPS/src/G4ControlPoints.cc
+++ b/source/geometry/solids/BREPS/src/G4ControlPoints.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ControlPoints.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Curve.cc b/source/geometry/solids/BREPS/src/G4Curve.cc
index 3838355aca148da1fb1f094210f69dea2ab4aefc..30a9db92ff95b415bb1bcc7310f087b8a15d0270 100644
--- a/source/geometry/solids/BREPS/src/G4Curve.cc
+++ b/source/geometry/solids/BREPS/src/G4Curve.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Curve.cc,v 1.5 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CurvePoint.cc b/source/geometry/solids/BREPS/src/G4CurvePoint.cc
index 74dc49e18757607f58b27a35a01461e07e81b7a0..43f53e7fce26d87708d37d91882890546751df90 100644
--- a/source/geometry/solids/BREPS/src/G4CurvePoint.cc
+++ b/source/geometry/solids/BREPS/src/G4CurvePoint.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurvePoint.cc,v 1.3 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc b/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc
index 42b5bf467ca190fce73f1de378eb649e720a8077..63c2261bf4cbe5f0be54054a3f5330af910bf21d 100644
--- a/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc
+++ b/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurveRayIntersection.cc,v 1.3 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
index d40fa58dc3ce9837d50313b23a21d5a0523fcc66..5e3d0afc9997e52c7ffab0dad7fb76713d3ada19 100644
--- a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CylindricalSurface.cc,v 1.3 2000/08/28 08:57:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Ellipse.cc b/source/geometry/solids/BREPS/src/G4Ellipse.cc
index a362d5fae03183f20066ccb78591a73acbc096ca..c12f522c820d165a3106ad631a4e126d721947d0 100644
--- a/source/geometry/solids/BREPS/src/G4Ellipse.cc
+++ b/source/geometry/solids/BREPS/src/G4Ellipse.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ellipse.cc,v 1.6 2000/11/10 17:41:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
index 96fff7dd9b80abb292e05061afbb5f9ca7b30296..8cda2bd559c30c7f791a50245788e75da26cf774 100644
--- a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FConicalSurface.cc,v 1.14 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
index 05ea106e254c1595751bd5edee2f1a5376bd80c7..72d93349b49a19bb8d2856c01d69ca143cd61f28 100644
--- a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FCylindricalSurface.cc,v 1.11 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4FPlane.cc b/source/geometry/solids/BREPS/src/G4FPlane.cc
index 0acac155fecb909a85a5f0bdfd953e1ae0272433..16bbc87732c3cb137785a2f5407ef103b76c8a71 100644
--- a/source/geometry/solids/BREPS/src/G4FPlane.cc
+++ b/source/geometry/solids/BREPS/src/G4FPlane.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FPlane.cc,v 1.11 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Hyperbola.cc b/source/geometry/solids/BREPS/src/G4Hyperbola.cc
index 73d2a6ce6da8e9ed98d83a36d6db66bc0531bab2..4fd2fcb64163bf5708e8e2ea1d6719e1598b321b 100644
--- a/source/geometry/solids/BREPS/src/G4Hyperbola.cc
+++ b/source/geometry/solids/BREPS/src/G4Hyperbola.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Hyperbola.cc,v 1.5 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4KnotVector.cc b/source/geometry/solids/BREPS/src/G4KnotVector.cc
index 4594011aeb0d0be905e95ca63a790531a74ffd49..11083b112a4aa856b96576af0fa3b4584a8c52de 100644
--- a/source/geometry/solids/BREPS/src/G4KnotVector.cc
+++ b/source/geometry/solids/BREPS/src/G4KnotVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KnotVector.cc,v 1.5 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Line.cc b/source/geometry/solids/BREPS/src/G4Line.cc
index 068b389f90cc32cb749bca15fc4d6650e6bfa845..a26c9832accfafe1e7e24cb65932ef47a895fa1e 100644
--- a/source/geometry/solids/BREPS/src/G4Line.cc
+++ b/source/geometry/solids/BREPS/src/G4Line.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Line.cc,v 1.6 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
index 222cf1c08fa74f9ff7bbe943674d38e9634c1b6f..133798d76a8730f8e8e0b7cc90a92f31d3865d2a 100644
--- a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
+++ b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OsloMatrix.cc,v 1.4 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Parabola.cc b/source/geometry/solids/BREPS/src/G4Parabola.cc
index b597a09dbf4f9d952ec56a7f4377edaff9d9debf..eaac8fde71ea8c1d4e63da8b9a18de82ac7834bd 100644
--- a/source/geometry/solids/BREPS/src/G4Parabola.cc
+++ b/source/geometry/solids/BREPS/src/G4Parabola.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Parabola.cc,v 1.4 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
index 3555c3906bbc6f323f8856e87c702078cd5412e4..2d473455c696f09046665d92a18ee348de5d1595 100644
--- a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
+++ b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlacedSolid.cc,v 1.3 2000/08/28 08:57:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4PointRat.cc b/source/geometry/solids/BREPS/src/G4PointRat.cc
index fccc232ee54f496fb57c784783e3bac9ab62cedd..ccd54f9b11ec27ecc2dedb664020c90310b8521b 100644
--- a/source/geometry/solids/BREPS/src/G4PointRat.cc
+++ b/source/geometry/solids/BREPS/src/G4PointRat.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointRat.cc,v 1.4 2000/08/28 08:57:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
index ae8b77f85b8abc8356c0e359b68096f13e05f246..5277ee9675a911b7673cb669471e5dba393d4288 100644
--- a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProjectedSurface.cc,v 1.6 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Ray.cc b/source/geometry/solids/BREPS/src/G4Ray.cc
index 368ef65b6403bedd15168dd953c9269008e5b76e..f5fcabe2af512abf32aa0a15b7db92837743c7a0 100644
--- a/source/geometry/solids/BREPS/src/G4Ray.cc
+++ b/source/geometry/solids/BREPS/src/G4Ray.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ray.cc,v 1.5 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
index d8cdc5aa5d0eae08aea89d3205bc6ea677b34d5c..2caed6f020a4667b89daf71d1f51c90f25fea8e5 100644
--- a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RectangularTrimmedSurface.cc,v 1.5 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Sort.cc b/source/geometry/solids/BREPS/src/G4Sort.cc
index 6dda45cf986c9605d30e04da93b990bdb3e7c690..ef7940322565ddbdf9659487bf1c3c90c3e77f7e 100644
--- a/source/geometry/solids/BREPS/src/G4Sort.cc
+++ b/source/geometry/solids/BREPS/src/G4Sort.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Sort.cc,v 1.3 2000/08/28 08:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 source file
diff --git a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
index 518053f7e6b2d567109bf25be4650cc6a7b422c9..e5c9001f19e39dcab1b9e358f8d9bda04b09816f 100644
--- a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SphericalSurface.cc,v 1.4 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Surface.cc b/source/geometry/solids/BREPS/src/G4Surface.cc
index 7f54a80f3cd43b35860ff2cbb38a8c109a5bc3eb..504f25c87f43e94a2a65102ea17acb4b05af1036 100644
--- a/source/geometry/solids/BREPS/src/G4Surface.cc
+++ b/source/geometry/solids/BREPS/src/G4Surface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Surface.cc,v 1.7 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc b/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc
index bcde52eb9270d5929d4cef38d90d9840b2cc0188..9deccaa7b33a1e7d3d5a242387700f0f1c203428 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceBoundary.cc,v 1.8 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceList.cc b/source/geometry/solids/BREPS/src/G4SurfaceList.cc
index 0a107ef69b1ae85d3f263c693530ea8a01f3ae74..2b03e46aa0e15372436b3f0b60eb6c7a04fc90d7 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceList.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceList.cc,v 1.5 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc b/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc
index 5ebe40c7ffa4253ebb4b5ada96022bf2282ca9df..d6a9ad7290cfcff99851d5e6df836e0afd925748 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceOfLinearExtrusion.cc,v 1.2 2000/08/28 08:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc b/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc
index c5c42774c5d2469e8373531f596acf3c350d8c7e..18568a4a04f371708fe5f5cbbfb55d2049b9ce36 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc
@@ -3,7 +3,7 @@
 // and all its terms.
 //
 // $Id: G4SurfaceOfRevolution.cc,v 1.2 2000/08/28 08:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ThreeMat.cc b/source/geometry/solids/BREPS/src/G4ThreeMat.cc
index 9ab805cd1880d2783e154b63e6e9cb922d9a0d9a..5b59e403342cd5b0349ab8999f35990fa242f281 100644
--- a/source/geometry/solids/BREPS/src/G4ThreeMat.cc
+++ b/source/geometry/solids/BREPS/src/G4ThreeMat.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ThreeMat.cc,v 1.5 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
index 56012c1bb63a17531c2b23411698f529fd92ffb6..0f301724b8828bbdb08bbd4c182ff88e646799a6 100644
--- a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ToroidalSurface.cc,v 1.5 2000/11/20 17:54:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/Boolean/History b/source/geometry/solids/Boolean/History
index bab243aff507b9164ac2f0a6c6307aa4527317d6..41c2e20bad9a8e192d2d795a0db082720614ba35 100644
--- a/source/geometry/solids/Boolean/History
+++ b/source/geometry/solids/Boolean/History
@@ -1,5 +1,5 @@
 
-$Id: History,v 1.16 2000/11/22 16:10:43 gcosmo Exp $
+$Id: History,v 1.20 2001/03/19 10:30:34 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -20,6 +20,36 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+ Mar 19  2001  Gabriele Cosmo       geom-solid-bool-V03-00-03
+
+  - G4IntersectionSolid:
+    o fix in CalculateExtent() for computation of pMin and pMax, to avoid
+      assignment in case CalculateExtent() of one component solid fails.
+    o fix in Inside() to return kOutside in case first component solid's
+      Inside() returns kOutside.
+  - G4UnionSolid:
+    o fix in CalculateExtent() for computation of pMin and pMax: initialised
+      local variables.
+
+ Jan 31  2001  Gabriele Cosmo       geom-solid-bool-V03-00-02
+
+  - Fix in G4UnionSolid::DistanceToOut(p,v,...) for assignment of
+    argument *n. Previous fix was incomplete!
+
+ Jan 23  2001  Gabriele Cosmo       geom-solid-bool-V03-00-01
+ 
+  - Fixed wrong labels for G4Exception calls in G4UnionSolid.cc and
+    G4SubtractionSolid.cc to identify the correct class.
+    Fixes bug report #200.
+
+ Jan 08  2001  Vladimir Grichine    geom-solid-bool-V03-00-00
+
+  - Fix in G4UnionSolid::DistanceToOut(p,v,...) for assignment of
+    argument *n to happen only if calcNorm is false.
+    (courtesy of D.Williams)
+  - Updated unit tests testG4IntersectionSolid.cc, testG4SubtractionSolid.cc
+    and test/testG4UnionSolid.cc.
+
  Nov 22  2000  Vladimir Grichine    geom-solid-bool-V02-00-03
 
   - Added new set methods for matrix/vectors to G4DisplacedSolid:
diff --git a/source/geometry/solids/Boolean/include/G4BooleanSolid.hh b/source/geometry/solids/Boolean/include/G4BooleanSolid.hh
index c42c753afd00f18e578a0415f8f0a6c6481b184f..806348fe2880673b6cf01a08865c3b5601702ff6 100644
--- a/source/geometry/solids/Boolean/include/G4BooleanSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4BooleanSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BooleanSolid.hh,v 1.4 2000/11/02 12:25:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4BooleanSolid
diff --git a/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh b/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh
index a37bafed0a6bf9a0851b841a810fbef212e5f0d0..9b9e925ef879bd777d4574d5bb703889f2374e29 100644
--- a/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DisplacedSolid.hh,v 1.10 2000/11/22 16:09:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4DisplacedSolid
diff --git a/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh b/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh
index 9dde6b1421ed9087555478d44d48db38084bc07a..8009f076be5e3441d560c6c8cfd0fc350e6ffcc1 100644
--- a/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IntersectionSolid.hh,v 1.4 2000/11/02 12:25:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4IntersectionSolid
diff --git a/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh b/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh
index d1215c2eb8472979295161927050af9bd6821959..37d2b48691aac01c2d558a7fde297bdb593e7bef 100644
--- a/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SubtractionSolid.hh,v 1.4 2000/11/02 12:25:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4SubtractionSolid
diff --git a/source/geometry/solids/Boolean/include/G4UnionSolid.hh b/source/geometry/solids/Boolean/include/G4UnionSolid.hh
index f1311d83ec2be16d35885962185f72738e718c0e..dfec494fa92248bebc75079a8d3df4430bfd0e23 100644
--- a/source/geometry/solids/Boolean/include/G4UnionSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4UnionSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UnionSolid.hh,v 1.5 2000/11/02 12:25:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4UnionSolid
diff --git a/source/geometry/solids/Boolean/src/G4BooleanSolid.cc b/source/geometry/solids/Boolean/src/G4BooleanSolid.cc
index 421e80bb034ce8223985bd57d6d590d8e6f12ab6..8f91a834d6716e51275cd613326d47d2dcf151a0 100644
--- a/source/geometry/solids/Boolean/src/G4BooleanSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4BooleanSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BooleanSolid.cc,v 1.4 2000/11/20 17:56:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Implementation for the abstract base class for solids created by boolean 
 // operations between other solids
diff --git a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
index 0fe0014aa99d982cf02978dbfef21d400f82029a..4c7da6cd0576f0f1590de5d90f21afa855d3fe65 100644
--- a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DisplacedSolid.cc,v 1.13 2000/11/22 15:19:20 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Implementation for G4DisplacedSolid class for boolean 
 // operations between other solids
diff --git a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
index 364af245eb302f3475326bad5c9b02deb1c097dc..56adf05c2e49c1054843b0244fcbbc65c7d2ed16 100644
--- a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IntersectionSolid.cc,v 1.9 2000/11/02 12:25:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IntersectionSolid.cc,v 1.11 2001/03/19 10:30:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Implementation of methods for the class G4IntersectionSolid
 //
@@ -14,6 +14,8 @@
 //
 // 12.09.98 V.Grichine 
 // 29.07.99 V.Grichine, modifications in DistanceToIn(p,v)
+// 16.03.01 V.Grichine, modifications in CalculateExtent() and Inside()
+//                      based on D.Williams proposal
 
 #include "G4IntersectionSolid.hh"
 // #include "G4DisplacedSolid.hh"
@@ -90,16 +92,20 @@ G4IntersectionSolid::CalculateExtent(const EAxis pAxis,
 				     const G4AffineTransform& pTransform,
 				     G4double& pMin, G4double& pMax) const 
 {
-  G4bool   retA, retB;
-  G4double minA, minB, maxA, maxB; 
+  G4bool   retA, retB, out ;
+  G4double minA, minB, maxA, maxB ; 
 
   retA= fPtrSolidA->CalculateExtent( pAxis, pVoxelLimit, pTransform, minA, maxA);
   retB= fPtrSolidB->CalculateExtent( pAxis, pVoxelLimit, pTransform, minB, maxB);
+  if(retA && retB)
+  {
+    pMin = G4std::max( minA, minB ) ; 
+    pMax = G4std::min( maxA, maxB ) ;
+    out  = true ;
+  }
+  else out = false ;
 
-  pMin = G4std::max( minA, minB ); 
-  pMax = G4std::min( maxA, maxB ); 
-
-  return retA && retB ; // It exists in this slice only if both exist in it.
+  return out ; // It exists in this slice only if both exist in it.
 }
  
 /////////////////////////////////////////////////////
@@ -109,6 +115,9 @@ G4IntersectionSolid::CalculateExtent(const EAxis pAxis,
 EInside G4IntersectionSolid::Inside(const G4ThreeVector& p) const
 {
   EInside positionA = fPtrSolidA->Inside(p) ;
+
+  if( positionA == kOutside ) return kOutside ;
+
   EInside positionB = fPtrSolidB->Inside(p) ;
   
   if(positionA == kInside && positionB == kInside)
diff --git a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
index ac16582e277be51f24d29b8fe28146607d67808d..1a2feaed647f34f9c16d3dfb04239344cdd2b376 100644
--- a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SubtractionSolid.cc,v 1.11 2000/11/20 17:56:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SubtractionSolid.cc,v 1.12 2001/01/23 08:26:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Implementation of methods for the class G4IntersectionSolid
 //
@@ -295,7 +295,7 @@ G4SubtractionSolid::DistanceToOut( const G4ThreeVector& p,
       G4cout << "v.x() = "   << v.x() << G4endl;
       G4cout << "v.y() = "   << v.y() << G4endl;
       G4cout << "v.z() = "   << v.z() << G4endl << G4endl;
-      G4Exception("Invalid call in G4IntersectionSolid::DistanceToOut(p,v), point p is outside") ;
+      G4Exception("Invalid call in G4SubtractionSolid::DistanceToOut(p,v), point p is outside") ;
     }
 
     G4double distout;
@@ -328,7 +328,7 @@ G4SubtractionSolid::DistanceToOut( const G4ThreeVector& p ) const
 
   if( Inside(p) == kOutside )
   { 
-    G4Exception("Invalid call in G4IntersectionSolid::DistanceToOut(p),  point p is outside") ;
+    G4Exception("Invalid call in G4SubtractionSolid::DistanceToOut(p),  point p is outside") ;
   }
   else
   {
diff --git a/source/geometry/solids/Boolean/src/G4UnionSolid.cc b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
index db82e7fe8b78792ab35b6b348c979aaf4a5d38b2..7d4789fc8e2fd661f065b1b8dc3ec315aeae3f13 100644
--- a/source/geometry/solids/Boolean/src/G4UnionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnionSolid.cc,v 1.11 2000/11/20 17:56:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UnionSolid.cc,v 1.16 2001/03/19 10:30:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Implementation of methods for the class G4IntersectionSolid
 //
@@ -16,6 +16,8 @@
 // 28.11.98 V.Grichine, J. Apostolakis, while loops in DistToIn/Out 
 // 27.07.99 V.Grichine, modifications in Distance ToOut(p,v,...)
 //                      while -> do-while
+// 16.03.01 V.Grichine, modifications in CalculateExtent() 
+//                      based on D.Williams proposal
 
 #include "G4UnionSolid.hh"
 // #include "G4PlacedSolid.hh"
@@ -92,16 +94,23 @@ G4UnionSolid::CalculateExtent(const EAxis pAxis,
 				     const G4AffineTransform& pTransform,
 				     G4double& pMin, G4double& pMax) const 
 {
-  G4bool   touchesA, touchesB;
-  G4double minA, minB, maxA, maxB; 
-
-  touchesA= fPtrSolidA->CalculateExtent( pAxis, pVoxelLimit, pTransform, minA, maxA);
-  touchesB= fPtrSolidB->CalculateExtent( pAxis, pVoxelLimit, pTransform, minB, maxB);
-
-  pMin = G4std::min( minA, minB ); 
-  pMax = G4std::max( maxA, maxB ); 
+  G4bool   touchesA, touchesB, out ;
+  G4double minA =  kInfinity, minB =  kInfinity, 
+           maxA = -kInfinity, maxB = -kInfinity; 
+
+  touchesA = fPtrSolidA->CalculateExtent( pAxis, pVoxelLimit, 
+                                          pTransform, minA, maxA);
+  touchesB= fPtrSolidB->CalculateExtent( pAxis, pVoxelLimit, 
+                                         pTransform, minB, maxB);
+  if( touchesA || touchesB )
+  {
+    pMin = G4std::min( minA, minB ); 
+    pMax = G4std::max( maxA, maxB );
+    out  = true ; 
+  }
+  else out = false ;
 
-  return touchesA || touchesB ;  // It exists in this slice if either one does.
+  return out ;  // It exists in this slice if either one does.
 }
  
 /////////////////////////////////////////////////////
@@ -145,7 +154,7 @@ G4UnionSolid::SurfaceNormal( const G4ThreeVector& p ) const
 
     if( Inside(p) == kOutside )
     {
-       G4Exception("Invalid call in G4IntersectionSolid::SurfaceNormal(p),  point p is outside") ;
+       G4Exception("Invalid call in G4UnionSolid::SurfaceNormal(p),  point p is outside") ;
     }
 
     if(fPtrSolidA->Inside(p) == kSurface && fPtrSolidB->Inside(p) != kInside) 
@@ -159,7 +168,7 @@ G4UnionSolid::SurfaceNormal( const G4ThreeVector& p ) const
     }
     else 
     {
-      G4Exception("Invalid call in G4IntersectionSolid::SurfaceNormal(p),  point p is inside") ;
+      G4Exception("Invalid call in G4UnionSolid::SurfaceNormal(p),  point p is inside") ;
     }
 
     return normal;
@@ -175,7 +184,7 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p,
 {
   if( Inside(p) == kInside )
   {
-    G4Exception("Invalid call in G4IntersectionSolid::DistanceToIn(p,v),  point p is inside") ;
+    G4Exception("Invalid call in G4UnionSolid::DistanceToIn(p,v),  point p is inside") ;
   }
   return G4std::min(fPtrSolidA->DistanceToIn(p,v),
                     fPtrSolidB->DistanceToIn(p,v) ) ;
@@ -224,7 +233,7 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p,
      G4cout << "v.x() = "   << v.x() << G4endl;
      G4cout << "v.y() = "   << v.y() << G4endl;
      G4cout << "v.z() = "   << v.z() << G4endl << G4endl;
-    G4Exception("Invalid call in G4IntersectionSolid::DistanceToOut(p,v),  point p is outside") ;
+    G4Exception("Invalid call in G4UnionSolid::DistanceToOut(p,v),  point p is outside") ;
   }
   else
   {
@@ -249,7 +258,6 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p,
       //     while( Inside(p+dist*v) == kInside ) ;
            while( fPtrSolidA->Inside(p+dist*v) != kOutside && 
                   disTmp > 0.5*kCarTolerance ) ;
-      *n = *nTmp ; 
     }
     else // if( positionB != kOutside )
     {
@@ -269,12 +277,13 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p,
       //  while( Inside(p+dist*v) == kInside ) ;
         while( fPtrSolidB->Inside(p+dist*v) != kOutside && 
               disTmp > 0.5*kCarTolerance ) ;
-      *n = *nTmp ;   
     }
   }
-  if( calcNorm ) 
+  if( calcNorm )
+  { 
      *validNorm = false ;
-
+     *n         = *nTmp ;   
+  }
   return dist ;
 }
 
@@ -288,7 +297,7 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p ) const
   G4double distout = kInfinity;
   if( Inside(p) == kOutside )
   {
-    G4Exception("Invalid call in G4IntersectionSolid::DistanceToOut(p),  point p is outside") ;
+    G4Exception("Invalid call in G4UnionSolid::DistanceToOut(p),  point p is outside") ;
   }
   else
   {
diff --git a/source/geometry/solids/CSG/GNUmakefile b/source/geometry/solids/CSG/GNUmakefile
index 27a7ae1b4e8a6908ba897b155e508e59df7751e1..5d76f48d23bf9b343d4cb048e75288cc59629ed6 100644
--- a/source/geometry/solids/CSG/GNUmakefile
+++ b/source/geometry/solids/CSG/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.2 1999/04/15 12:23:43 johna Exp $
+# $Id: GNUmakefile,v 1.3 2001/01/29 13:23:47 gcosmo Exp $
 # ----------------------------------------------------------------
 # GNUmakefile for geometry/CSG library.  Gabriele Cosmo, 16/11/96.
 # ----------------------------------------------------------------
@@ -14,6 +14,7 @@ include $(G4INSTALL)/config/architecture.gmk
 CPPFLAGS += -I$(G4BASE)/intercoms/include \
             -I$(G4BASE)/graphics_reps/include \
             -I$(G4BASE)/global/management/include \
+            -I$(G4BASE)/global/HEPNumerics/include \
             -I$(G4BASE)/global/HEPRandom/include \
             -I$(G4BASE)/global/HEPGeometry/include \
             -I$(G4BASE)/geometry/volumes/include \
diff --git a/source/geometry/solids/CSG/History b/source/geometry/solids/CSG/History
index ef28ea232d1eec39121ff4760c4336d1b9f7259a..034bce01b2d3a62d242119c52d52a91cb2d00cc6 100644
--- a/source/geometry/solids/CSG/History
+++ b/source/geometry/solids/CSG/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.34 2000/12/01 11:49:23 gcosmo Exp $
+$Id: History,v 1.39 2001/02/21 15:47:36 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,32 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Feb 21,   01   V. Grichine               geom-solids-csg-V03-00-03
+- G4Tubs.cc:
+  o Fixed bug in function Inside(p) in computation of pPhi
+    for points at phi = 0 if the (start phi)+(delta phi) is at phi = 0.
+  o Temporarly modified CalculateExtent(...), now simply based on
+    G4Box::CalculateExtent(...). Updated unit test testG4Tubs.cc.
+
+Feb 01,   01   V. Grichine               geom-solids-csg-V03-00-02
+- G4Box: introduced checks against negative (or <2*kCarTolerance) dimensions
+  in methods SetXHalfLength(), SetYHalfLength() and SetZHalfLength().
+
+Jan 29,   00   G. Cosmo                  geom-solids-csg-V03-00-01
+- G4Box: introduced fixes to algorithm for computation of rotated vertices
+  in CalculateExtent() as previously committed in tag geom-solids-csg-V02-00-10.
+- G4Torus: extracted logic for G4PolynomialSolver now included in
+  global/HEPNumerics. Coworks with tag global-V03-00-02.
+- Added dependency to global/HEPNumerics in GNUmakefile.
+
+Jan 18,   00   V. Grichine               geom-solids-csg-V03-00-00
+- Fixed condition from (pPhi<0) to (pPhi<-0.5*kAngleTolerance) in
+  G4Tubs::Inside(p). Fixes problem report #198.
+
+Dec 07,   00   V. Grichine               geom-solids-csg-V02-00-14
+- G4Tubs.cc: corrections in phi-section algorithm of Inside(p).
+
 Dec 01,   00   G. Cosmo                  geom-solids-csg-V02-00-13
 - Increased basic number of iterations from 8 to 12 for Newton algorithm
   in G4Torus.cc to assure root retrivial.
diff --git a/source/geometry/solids/CSG/include/G4Box.hh b/source/geometry/solids/CSG/include/G4Box.hh
index d2ee2dbee4aec41a76fe96e38d8dc3d86c6d8d9a..d2ebf5e20706e7741b8baf9603cb4113438143fa 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.5 2000/11/02 17:06:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Box.hh,v 1.6 2001/01/31 17:30:42 grichine Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 class header file
@@ -85,11 +85,11 @@ class G4Box : public G4CSGSolid
     
     G4double GetZHalfLength() const { return fDz; }
 
-    void SetXHalfLength(G4double dx) { fDx=dx; }
+    void SetXHalfLength(G4double dx) ;
 
-    void SetYHalfLength(G4double dy) { fDy=dy; }
+    void SetYHalfLength(G4double dy) ;
 
-    void SetZHalfLength(G4double dz) { fDz=dz; }
+    void SetZHalfLength(G4double dz) ;
     
     EInside Inside(const G4ThreeVector& p) const;
 
diff --git a/source/geometry/solids/CSG/include/G4CSGSolid.hh b/source/geometry/solids/CSG/include/G4CSGSolid.hh
index 004d54929c07d938fa31acccc5c0c7e731635591..fadf94b4bee5975d3232f6b9608d8fdd99aa0ef5 100644
--- a/source/geometry/solids/CSG/include/G4CSGSolid.hh
+++ b/source/geometry/solids/CSG/include/G4CSGSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CSGSolid.hh,v 1.4 2000/11/02 17:06:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Cons.hh b/source/geometry/solids/CSG/include/G4Cons.hh
index a9af6ba2d7c3d13caad20d6719f7cdaa712042b1..42d84cb55e6d256c7e294f2251899593691b00b8 100644
--- a/source/geometry/solids/CSG/include/G4Cons.hh
+++ b/source/geometry/solids/CSG/include/G4Cons.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Cons.hh,v 1.5 2000/11/02 17:06:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Para.hh b/source/geometry/solids/CSG/include/G4Para.hh
index 287d82fa6f0600155a9547b0f8797d80eab5876b..c8900fb9ccf143797509111d81eb74c2f109525e 100644
--- a/source/geometry/solids/CSG/include/G4Para.hh
+++ b/source/geometry/solids/CSG/include/G4Para.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Para.hh,v 1.6 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Sphere.hh b/source/geometry/solids/CSG/include/G4Sphere.hh
index d3e8fff5103ff76d5683c6e50a18d565751ff573..8a24f729280e9ed616447273979f0328261b79cc 100644
--- a/source/geometry/solids/CSG/include/G4Sphere.hh
+++ b/source/geometry/solids/CSG/include/G4Sphere.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Sphere.hh,v 1.5 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Torus.hh b/source/geometry/solids/CSG/include/G4Torus.hh
index 4bd5c25aae34e2aede1c6f8577407687a74d350c..d95d59563fc09938fa24511aaf1a5d28aa1e54e5 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.11 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Torus.hh,v 1.12 2001/01/12 09:01:53 medernac Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
@@ -228,17 +228,138 @@ private:
   G4double DistanceToTorus (G4double x, G4double y, G4double z,
                             G4double dx, G4double dy, G4double dz,
                             G4double R0,G4double R1) const;
+};
+
+
+class TorusEquationClass
+{
+public:
+  TorusEquationClass()
+  {
+    ;    
+  }
 
-  G4int SafeNewton(G4double x, G4double y, G4double z,
-		   G4double dx, G4double dy, G4double dz,
-		   G4double Rmax, G4double Rmin,
-		   G4double *Lmin,G4double *Lmax) const;
+  TorusEquationClass(G4double Rmax, G4double Rmin)		
+  {
+    R0 = Rmax;
+    R1 = Rmin;
+  }
   
-  G4double Newton (G4double guess,
-		   G4double x, G4double y, G4double z,
-		   G4double dx, G4double dy, G4double dz,
-		   G4double Rmax, G4double Rmin,
-		   G4double Lmin,G4double Lmax) const;
-};
-   	
+  ~TorusEquationClass() {;}
+
+  void setRadius (G4double Rmax, G4double Rmin)		
+  {
+    R0 = Rmax;
+    R1 = Rmin;
+  }
+  
+  
+  void setPosition (G4double x,G4double y,G4double z)
+  {
+    Px = x;
+    Py = y;
+    Pz = z;
+  }
+
+  void setPosition (const G4ThreeVector& p)
+  {
+    Px = p.x();
+    Py = p.y();
+    Pz = p.z();
+  }
+
+  
+  void setDirection (G4double dirx,G4double diry,G4double dirz)
+  {
+    dx = dirx;
+    dy = diry;
+    dz = dirz;    
+  }
+
+  void setDirection (const G4ThreeVector& v)
+  {
+    dx = v.x();
+    dy = v.y();
+    dz = v.z();    
+  }
+
+  
+
+private:
+  G4double R0;
+  G4double R1;
+
+  G4double Px,Py,Pz;
+  G4double dx,dy,dz;
+  
+  
+  G4double TorusEquation (G4double x, G4double y, G4double z) //const
+  {
+	/*
+	  An interesting property is that the sign
+	  tell if the point is inside or outside
+	  or if > EPSILON on the surface
+	*/
+	G4double temp;
+
+	temp = ((x*x + y*y + z*z) + R0*R0 - R1*R1) ;
+	temp = temp*temp ;
+	temp = temp - 4*R0*R0*(x*x + y*y) ;
+
+	/*
+	  > 0 Outside
+	  < 0 Inside
+	*/
+	return temp ;
+  }
+  
+  G4double TorusDerivativeX (G4double x, G4double y, G4double z) // const
+  {
+	return 4*x*(x*x + y*y + z*z +  R0*R0 - R1*R1) - 8*R0*R0*x ;
+  }
+
+  G4double TorusDerivativeY (G4double x, G4double y, G4double z) // const
+  {
+	return 4*y*(x*x + y*y + z*z +  R0*R0 - R1*R1) - 8*R0*R0*y ;
+  }
+
+  G4double TorusDerivativeZ (G4double x, G4double y, G4double z) // const
+  {
+	return 4*z*(x*x + y*y + z*z +  R0*R0 - R1*R1) ;
+  }
+
+public:  
+  G4double Function (G4double value)
+  {
+    G4double Lx,Ly,Lz;
+    G4double result;  
+       
+    Lx = Px + value*dx;
+    Ly = Py + value*dy;
+    Lz = Pz + value*dz;
+       
+    result = TorusEquation(Lx,Ly,Lz);
+         
+    return result ;  
+  }
+
+  G4double Derivative(G4double value)
+  {
+    G4double Lx,Ly,Lz;
+    G4double result;
+
+     Lx = Px + value*dx;
+     Ly = Py + value*dy;
+     Lz = Pz + value*dz;
+      
+     result = dx*TorusDerivativeX(Lx,Ly,Lz);
+     result += dy*TorusDerivativeY(Lx,Ly,Lz);
+     result += dz*TorusDerivativeZ(Lx,Ly,Lz);
+   
+     return result;
+  }
+} ;
+
+
+
 #endif
diff --git a/source/geometry/solids/CSG/include/G4Trap.hh b/source/geometry/solids/CSG/include/G4Trap.hh
index a3ca23bc3b5966ddef332f4bcdcbde35dab204c8..996402498ac5523583db5fde01b9ee9c2837f7c0 100644
--- a/source/geometry/solids/CSG/include/G4Trap.hh
+++ b/source/geometry/solids/CSG/include/G4Trap.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Trap.hh,v 1.5 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Trd.hh b/source/geometry/solids/CSG/include/G4Trd.hh
index ab223085ee82949287c41164b6c556d1ed247148..55d5ac27875cc267e3b2604a212f169fb57d2a27 100644
--- a/source/geometry/solids/CSG/include/G4Trd.hh
+++ b/source/geometry/solids/CSG/include/G4Trd.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Trd.hh,v 1.6 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Tubs.hh b/source/geometry/solids/CSG/include/G4Tubs.hh
index c8c42233051b9d20eb0849afeb86bbb0b955a9da..bb1350bc7f143b0adc4aad375e6ebb401ec09219 100644
--- a/source/geometry/solids/CSG/include/G4Tubs.hh
+++ b/source/geometry/solids/CSG/include/G4Tubs.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Tubs.hh,v 1.5 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/src/G4Box.cc b/source/geometry/solids/CSG/src/G4Box.cc
index 3f0110efa39a472a0ed0affe12f560ed8a974be7..2b9f5bcec93f1810384b9d6a4b5f080d978d4b2b 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.10 2000/11/20 18:05:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Box.cc,v 1.13 2001/02/01 08:22:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
@@ -17,8 +17,10 @@
 //  07.05.00 - V.Grichine: d= DistanceToIn(p,v), if d<e/2, d=0
 //  09.06.00 - V.Grichine: safety in DistanceToIn(p) against Inside(p)=kOutside
 //             and information before exception in DistanceToOut(p,v,...)
-
-
+//  15.11.00 - D.Williams, V.Grichine: bug fixed in CalculateExtent - change
+//                                     algorithm for rotated vertices
+// 
+//
 
 #include "G4Box.hh"
 
@@ -37,10 +39,11 @@
 //
 // Constructor - check & set half widths
 
-G4Box::G4Box(const G4String& pName, G4double pX,
-	  G4double pY, G4double pZ) : G4CSGSolid(pName)
+G4Box::G4Box(const G4String& pName,
+             G4double pX, G4double pY, G4double pZ)
+  : G4CSGSolid(pName)
 {
-  if ( pX > 0 && pY > 0 && pZ > 0 )
+  if ( pX > 2*kCarTolerance && pY > 2*kCarTolerance&& pZ > 2*kCarTolerance)
   {
     fDx = pX ;
     fDy = pY ; 
@@ -48,7 +51,7 @@ G4Box::G4Box(const G4String& pName, G4double pX,
   }
   else
   {
-    G4Exception("Error in G4Box::Box - negative parameters");
+    G4Exception("G4Box::G4Box(...) - invalid dimensions");
   }	
 
 }
@@ -62,6 +65,34 @@ G4Box::~G4Box()
   ;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+
+void G4Box::SetXHalfLength(G4double dx)
+{
+  if(dx > 2*kCarTolerance)
+    fDx = dx;
+  else
+    G4Exception("G4Box::SetXHalfLength(...) - invalid dimensions");
+} 
+
+void G4Box::SetYHalfLength(G4double dy) 
+{
+  if(dy > 2*kCarTolerance)
+    fDy = dy;
+  else
+    G4Exception("G4Box::SetYHalfLength(...) - invalid dimensions");
+} 
+
+void G4Box::SetZHalfLength(G4double dz) 
+{
+  if(dz > 2*kCarTolerance)
+    fDz = dz;
+  else
+    G4Exception("G4Box::SetZHalfLength(...) - invalid dimensions");
+} 
+    
+
+
 ////////////////////////////////////////////////////////////////////////
 //
 // Dispatch to parameterisation for replication mechanism dimension
@@ -189,39 +220,70 @@ G4bool G4Box::CalculateExtent(const EAxis pAxis,
     ClipCrossSection(vertices,0,pVoxelLimit,pAxis,pMin,pMax) ;
     ClipCrossSection(vertices,4,pVoxelLimit,pAxis,pMin,pMax) ;
     ClipBetweenSections(vertices,0,pVoxelLimit,pAxis,pMin,pMax) ;
-	    
-    if ( pMin != kInfinity || pMax != -kInfinity )
-    {
-      existsAfterClip = true ;
-		    
+
+    if (pVoxelLimit.IsLimited(pAxis) == false) 
+    {	
+      if ( pMin != kInfinity || pMax != -kInfinity ) 
+      {
+          existsAfterClip = true ;
+
 // Add 2*tolerance to avoid precision troubles
 
-      pMin -= kCarTolerance ;
-      pMax += kCarTolerance ;		    
-    }
+          pMin           -= kCarTolerance;
+	  pMax           += kCarTolerance;
+      }
+    }	    
     else
     {
+      G4ThreeVector clipCentre(
+		( pVoxelLimit.GetMinXExtent()+pVoxelLimit.GetMaxXExtent())*0.5,
+		( pVoxelLimit.GetMinYExtent()+pVoxelLimit.GetMaxYExtent())*0.5,
+		( pVoxelLimit.GetMinZExtent()+pVoxelLimit.GetMaxZExtent())*0.5);
+
+      if ( pMin != kInfinity || pMax != -kInfinity )
+      {
+        existsAfterClip = true ;
+	
+
+        // Check to see if endpoints are in the solid
+
+	clipCentre(pAxis) = pVoxelLimit.GetMinExtent(pAxis);
+
+	if (Inside(pTransform.Inverse().TransformPoint(clipCentre)) != kOutside)
+        {
+      	  pMin = pVoxelLimit.GetMinExtent(pAxis);
+        }
+	else
+        {
+      	  pMin -= kCarTolerance;
+        }
+	clipCentre(pAxis) = pVoxelLimit.GetMaxExtent(pAxis);
+
+	if (Inside(pTransform.Inverse().TransformPoint(clipCentre)) != kOutside)
+        {
+	  pMax = pVoxelLimit.GetMaxExtent(pAxis);
+        }
+	else
+        {
+          pMax += kCarTolerance;
+        }
+      }
 // Check for case where completely enveloping clipping volume
 // If point inside then we are confident that the solid completely
 // envelopes the clipping volume. Hence set min/max extents according
 // to clipping volume extents along the specified axis.
-
-      G4ThreeVector clipCentre(
-	     ( pVoxelLimit.GetMinXExtent()+pVoxelLimit.GetMaxXExtent())*0.5,
-	     ( pVoxelLimit.GetMinYExtent()+pVoxelLimit.GetMaxYExtent())*0.5,
-	     ( pVoxelLimit.GetMinZExtent()+pVoxelLimit.GetMaxZExtent())*0.5);
 		    
-      if (Inside(pTransform.Inverse().TransformPoint(clipCentre))!=kOutside)
+      else if (Inside(pTransform.Inverse().TransformPoint(clipCentre)) != kOutside)
       {
-        existsAfterClip = true ;
-        pMin            = pVoxelLimit.GetMinExtent(pAxis) ;
-        pMax            = pVoxelLimit.GetMaxExtent(pAxis) ;
+         existsAfterClip = true ;
+         pMin            = pVoxelLimit.GetMinExtent(pAxis) ;
+         pMax            = pVoxelLimit.GetMaxExtent(pAxis) ;
       }
-    }
+    } 
     delete vertices;
     return existsAfterClip;
-  }
-}
+  } 
+} 
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -646,8 +708,8 @@ G4double G4Box::DistanceToOut(const G4ThreeVector& p) const
      G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
      G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
      G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
- // G4Exception("Invalid call in G4Box::DistanceToOut(p),  point p is outside") ;
-     G4cout<<"G4Box::DistanceToOut(p),point p is outside ?!" << G4endl ;
+  G4Exception("Invalid call in G4Box::DistanceToOut(p),  point p is outside") ;
+     //    G4cout<<"G4Box::DistanceToOut(p),point p is outside ?!" << G4endl ;
   }
   safx1 = fDx - p.x() ;
   safx2 = fDx + p.x() ;
diff --git a/source/geometry/solids/CSG/src/G4CSGSolid.cc b/source/geometry/solids/CSG/src/G4CSGSolid.cc
index 4e1a122ff2e13e1be036f70e98994659322084be..99a7f79a634f06e686479bd8de0fd1a623622f75 100644
--- a/source/geometry/solids/CSG/src/G4CSGSolid.cc
+++ b/source/geometry/solids/CSG/src/G4CSGSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CSGSolid.cc,v 1.2 1999/12/15 14:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4CSGSolid.hh"
 
diff --git a/source/geometry/solids/CSG/src/G4Cons.cc b/source/geometry/solids/CSG/src/G4Cons.cc
index 29cf4fe9894c99b0eacb96aa554941552c100e24..bd2ecd601d6a6372d1e1b32bdc23f4fb66313e71 100644
--- a/source/geometry/solids/CSG/src/G4Cons.cc
+++ b/source/geometry/solids/CSG/src/G4Cons.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Cons.cc,v 1.16 2000/11/20 17:57:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4Cons
 //
diff --git a/source/geometry/solids/CSG/src/G4Para.cc b/source/geometry/solids/CSG/src/G4Para.cc
index bee2dc9b8d4b19daf966bd7cefc82fd1fa488d14..8303b838ee26a8d0ea9bab12b96937d889178fb3 100644
--- a/source/geometry/solids/CSG/src/G4Para.cc
+++ b/source/geometry/solids/CSG/src/G4Para.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Para.cc,v 1.6 2000/11/20 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4Para
 //
diff --git a/source/geometry/solids/CSG/src/G4Sphere.cc b/source/geometry/solids/CSG/src/G4Sphere.cc
index 95f8a0d813050db6e76d901c53f25bf0948774e6..10a174dde54df341772bf772d9416f7a2590f95f 100644
--- a/source/geometry/solids/CSG/src/G4Sphere.cc
+++ b/source/geometry/solids/CSG/src/G4Sphere.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Sphere.cc,v 1.8 2000/11/20 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4Sphere
 //
diff --git a/source/geometry/solids/CSG/src/G4Torus.cc b/source/geometry/solids/CSG/src/G4Torus.cc
index a9fbe35d16f8700fa68f053556583b9ac752dbcd..aa237aeaf768d5e087b52e3aa15556cbb9612c2c 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.20 2000/12/01 11:49:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Torus.cc,v 1.23 2001/01/29 13:12:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4Torus
@@ -20,6 +20,7 @@
 // 26.05.00 V.Grichine, new fuctions developed by O.Cremonesi were added
 // 31.08.00 E.Medernach, numerical computation of roots with bounding volume technique
 // 03.10.00 E.Medernach, SafeNewton added
+// 11.01.01 E.Medernach, Use G4PolynomialSolver to find roots
 //
 
 
@@ -38,6 +39,7 @@
 #include "G4NURBStube.hh"
 #include "G4NURBScylinder.hh"
 #include "G4NURBStubesector.hh"
+#include "G4PolynomialSolver.hh"
 
 // #define DEBUGTORUS 1
 
@@ -1124,6 +1126,16 @@ G4double G4Torus::DistanceToIn(const G4ThreeVector& p,
 			       const G4ThreeVector& v) const
 {
 
+  /*
+    On voudrait arriver a cela:
+    return SolveNumeric(p, v, true);
+    Mais des problemes avec la tolerance sur la section Phi
+    ne le permet pas pour le moment
+  */
+
+  /*
+    Le tore mathematique peut etre vu comme une equation implicite
+   */
   G4double snxt=kInfinity, sphi=kInfinity;// snxt = default return value
 
   G4double c[5], s[4] ;
@@ -2189,14 +2201,10 @@ G4NURBS* G4Torus::CreateNURBS () const
 
 /** Important : the precision could be tuned by TORUSPRECISION **/
 
-#define EPSILON 1e-12
-#define INFINITY 1e+12
 #define TORUSPRECISION 1.0  // or whatever you want for precision
                             // (it is TorusEquation related)
+#define HOLEBVM 0
 #define NBPOINT 6
-#define ITERATION 12 // 20 But 8 is really enough for Newton with a good guess
-#define NOINTERSECTION kInfinity
-
 
 /*
   Torus implementation with Newton Method and Bounding volume
@@ -2229,14 +2237,13 @@ G4double G4Torus::SolveNumeric(const G4ThreeVector& p,
   G4double Value = TorusEquation(p.x(),p.y(),p.z(),GetRtor(),GetRmax());
   EInside inside ;
 
-  /*** Check from only the exterior torus TORUSPRECISION ? ***/
-  /** Note that we could be on the surface from the interior torus **/
 
 #if DEBUGTORUS
   G4cout << "G4Torus::SolveNumeric  " << p << ", " << v << G4endl ;
   G4cout << "G4Torus::SolveNumeric  Value = " << Value << G4endl;
 #endif
 
+  
   if (Value < -TORUSPRECISION) {
     inside = kInside ;
   } else {
@@ -2255,7 +2262,7 @@ G4double G4Torus::SolveNumeric(const G4ThreeVector& p,
            << " Rtor = " << GetRtor()
 	   << " Rmax = " << GetRmax() << G4endl ;
 #endif
-    if (fabs(GetRmin()) > EPSILON) {
+    if (fabs(GetRmin()) > POLEPSILON) {
 #if DEBUGTORUS
       G4cout << "G4Torus::SolveNumeric    Testing interior torus .." << G4endl ;
 #endif
@@ -2420,7 +2427,10 @@ G4double G4Torus::SolveNumeric(const G4ThreeVector& p,
   /** Now check Phi .. **/
 
   /* Eliminate the case of point (0,0,0) */
-  if ((p.x()*p.x() + p.y()*p.y() + p.z()*p.z()) > EPSILON)
+  //  if ((p.x()*p.x() + p.y()*p.y() + p.z()*p.z()) > POLEPSILON)
+  if (((p.x()+ lambda*v.x())*(p.x()+ lambda*v.x()) +
+       (p.y()+ lambda*v.y())*(p.y()+ lambda*v.y()) +
+       (p.z()+ lambda*v.z())*(p.z()+ lambda*v.z())) > POLEPSILON)
   {
     G4double theta ;
 
@@ -2436,11 +2446,14 @@ G4double G4Torus::SolveNumeric(const G4ThreeVector& p,
 #if DEBUGTORUS
     G4cout << "G4Torus::SolveNumeric    theta = " << theta
            << " Phi = " << fSPhi 
-	   << " Phi + dPhi = " << fSPhi + fDPhi << G4endl ;
+	   << " Phi + dPhi = " << fSPhi + fDPhi
+	   << " kAngTolerance = " << kAngTolerance << G4endl ;
+    G4cout << " theta - Phi = " << theta - fSPhi << G4endl ;
+    
 #endif 
     
-    if ((theta >= fSPhi - kAngTolerance*0.5) &&
-        (theta <= (fSPhi + fDPhi + kAngTolerance*0.5))) {
+    if ((theta - fSPhi >= - kAngTolerance*0.5) &&
+        (theta - (fSPhi + fDPhi) <=  kAngTolerance*0.5)) {
       /*** If this is the case we return this solution ***/
 #if DEBUGTORUS
       G4cout << "G4Torus::SolveNumeric    Correct Phi section" << G4endl ;
@@ -2511,7 +2524,12 @@ G4double G4Torus::SolveNumeric(const G4ThreeVector& p,
 	                                      v,IsDistanceToIn);
       }
     }
+  } else {
+#if DEBUGTORUS
+    G4cout << "G4Torus::SolveNumeric    Phi not checked because point is " << p + lambda*v << G4endl << G4endl;
+#endif
   }
+  
 
   return lambda;
 }
@@ -2534,13 +2552,17 @@ void G4Torus::BVMIntersection(G4double x,G4double y,G4double z,
     DistToZ = (x+NewL[0]*dx)*(x+NewL[0]*dx) + (y+NewL[0]*dy)*(y+NewL[0]*dy);
     if (DistToZ	- (Rmax + Rmin)*(Rmax + Rmin) > 0)
       valid[0] = 0;
+#if HOLEBVM 
     if (DistToZ	- (Rmax - Rmin)*(Rmax - Rmin) < 0)
       valid[0] = 0;
+#endif
     DistToZ = (x+NewL[1]*dx)*(x+NewL[1]*dx) + (y+NewL[1]*dy)*(y+NewL[1]*dy);
     if (DistToZ	- (Rmax + Rmin)*(Rmax + Rmin) > 0)
       valid[1] = 0;
+#if HOLEBVM
     if (DistToZ	- (Rmax - Rmin)*(Rmax - Rmin) < 0)
       valid[1] = 0;
+#endif    
   } else {
     /* if dz == 0 we could know the exact solution */
     /* Well, this is true but we have not expected precision issue from sqrt .. */
@@ -2564,63 +2586,65 @@ void G4Torus::BVMIntersection(G4double x,G4double y,G4double z,
       valid[3] = 0;
       NewL[2] = -1.0;
       NewL[3] = -1.0;
-    } else {
+    } else{
       d = sqrt(d) ;
       NewL[2] = (d - b)/(2*a);
       NewL[3] = (-d - b)/(2*a);
       if (NewL[2] < 0.0) valid[2] = 0;
-      if (fabs(z + NewL[2]*dz) - Rmin > EPSILON) valid[2] = 0;
+      if (fabs(z + NewL[2]*dz) - Rmin > POLEPSILON) valid[2] = 0;
       if (NewL[3] < 0.0) valid[3] = 0;
-      if (fabs(z + NewL[3]*dz) - Rmin > EPSILON) valid[3] = 0;
+      if (fabs(z + NewL[3]*dz) - Rmin > POLEPSILON) valid[3] = 0;
     }
-  } else {
-    /* only dz != 0 so we could know the exact solution */
-    /* this depends only for the distance to Z axis */
-    /* BUT big precision problem near the border.. */
-    /* I like so much Newton to increase precision you know.. */
-
-    NewL[2] = -1.0;
-    NewL[3] = -1.0;
-    valid[2] = 0;
-    valid[3] = 0;
+  } else
+    {
+      /* only dz != 0 so we could know the exact solution */
+      /* this depends only for the distance to Z axis */
+      /* BUT big precision problem near the border.. */
+      /* I like so much Newton to increase precision you know.. */
+
+      NewL[2] = -1.0;
+      NewL[3] = -1.0;
+      valid[2] = 0;
+      valid[3] = 0;
 	
-    /*** Try This to see precision issue with sqrt(~ 0)
-	 G4double DistToZ ;
-	 G4double result;
-	 G4double guess;
+      /*** Try This to see precision issue with sqrt(~ 0)
+	   G4double DistToZ ;
+	   G4double result;
+	   G4double guess;
 	
-	 DistToZ = sqrt(x*x + y*y) ;
+	   DistToZ = sqrt(x*x + y*y) ;
 	
-	 if ((DistToZ < (Rmax - Rmin)) || (DistToZ > (Rmax + Rmin))) {
-	 return -1.0 ;
-	 }
+	   if ((DistToZ < (Rmax - Rmin)) || (DistToZ > (Rmax + Rmin))) {
+	   return -1.0 ;
+	   }
 	
-	 result = sqrt((Rmin + Rmax - DistToZ)*(Rmin - Rmax + DistToZ));
-
-	 if (dz < 0) {
-	 if (z > result) {
-	 return (result - z)/dz;
-	 } else {
-	 if (z > -result) {
-	 return (-result - z)/dz;
-	 } else 
-	 return -1.0;
-	 }
-	 } else {
-	 if (z < -result) {
-	 return (z + result)/dz;
-	 } else {
-	 if (z < result) {
-	 return (z - result)/dz;
-	 } else 
-	 return -1.0;
-	 }
-	 }
-    */
-  }
+	   result = sqrt((Rmin + Rmax - DistToZ)*(Rmin - Rmax + DistToZ));
+
+	   if (dz < 0) {
+	   if (z > result) {
+	   return (result - z)/dz;
+	   } else {
+	   if (z > -result) {
+	   return (-result - z)/dz;
+	   } else 
+	   return -1.0;
+	   }
+	   } else {
+	   if (z < -result) {
+	   return (z + result)/dz;
+	   } else {
+	   if (z < result) {
+	   return (z - result)/dz;
+	   } else 
+	   return -1.0;
+	   }
+	   }
+      */
+    }
   
 
   /* x� + y� = (Rmax - Rmin)� */
+#if HOLEBVM
   if ((dx != 0) || (dy != 0)) {
     G4double a,b,c,d;
     
@@ -2639,18 +2663,20 @@ void G4Torus::BVMIntersection(G4double x,G4double y,G4double z,
       NewL[4] = (d - b)/(2*a);
       NewL[5] = (-d - b)/(2*a);
       if (NewL[4] < 0.0) valid[4] = 0;
-      if (fabs(z + NewL[4]*dz) - Rmin > EPSILON) valid[4] = 0;
+      if (fabs(z + NewL[4]*dz) - Rmin > POLEPSILON) valid[4] = 0;
       if (NewL[5] < 0.0) valid[5] = 0;
-      if (fabs(z + NewL[5]*dz) - Rmin > EPSILON) valid[5] = 0;
+      if (fabs(z + NewL[5]*dz) - Rmin > POLEPSILON) valid[5] = 0;
+    }
+  } else
+#endif            
+    {
+      /* only dz != 0 so we could know the exact solution */
+      /* OK but same as above .. */
+      valid[4] = 0;
+      valid[5] = 0;
+      NewL[4] = -1.0;
+      NewL[5] = -1.0;
     }
-  } else {
-    /* only dz != 0 so we could know the exact solution */
-    /* OK but same as above .. */
-    valid[4] = 0;
-    valid[5] = 0;
-    NewL[4] = -1.0;
-    NewL[5] = -1.0;
-  }
 }
 
 void G4Torus::SortIntervals (G4double *SortL, G4double *NewL,
@@ -2660,7 +2686,7 @@ void G4Torus::SortIntervals (G4double *SortL, G4double *NewL,
   G4double swap;
 	
   (*NbIntersection) = 0;
-  SortL[0] = -INFINITY;
+  SortL[0] = -kInfinity;
 	
   for (i=0;i<6;i++) {
     if (valid[i] != 0) {
@@ -2679,7 +2705,7 @@ void G4Torus::SortIntervals (G4double *SortL, G4double *NewL,
   /* Delete double values */
   /* When the ray hits a corner we have a double value */
   for (i=0;i<(*NbIntersection)-1;i++) {
-    if (SortL[i+1] - SortL[i] < EPSILON) {
+    if (SortL[i+1] - SortL[i] < POLEPSILON) {
       if (((*NbIntersection) & (1)) == 1) {
 	/* If the NbIntersection is odd then we keep one value */
 	for (j=i+1;j<(*NbIntersection);j++) {
@@ -2706,7 +2732,8 @@ G4double G4Torus::DistanceToTorus (G4double x,G4double y,G4double z,
 				   G4double dx,G4double dy,G4double dz,
 				   G4double Rmax,G4double Rmin) const
 {
-  G4double Lmin,Lmax;
+  G4double Lmin=0.;
+  G4double Lmax=0.;
   G4double guess;
   G4double SortL[4];
    
@@ -2733,16 +2760,16 @@ G4double G4Torus::DistanceToTorus (G4double x,G4double y,G4double z,
   SortIntervals(SortL,NewL,valid,&NbIntersection);
   
   {
-    /*** Length check ***/
+    /*** Length check (Torus specific) ***/
     G4double LengthMin = 0.82842712*Rmin;
 				
     switch(NbIntersection) {
     case 1:
-      if (SortL[0] < EPSILON) {
+      if (SortL[0] < POLEPSILON) {
 	if (fabs(TorusEquation(x,y,z,Rmax,Rmin)) < TORUSPRECISION) {
 	  return 0.0;
 	} else {
-	  return NOINTERSECTION;
+	  return kInfinity;
 	}
       }
       break;
@@ -2750,7 +2777,7 @@ G4double G4Torus::DistanceToTorus (G4double x,G4double y,G4double z,
       if ((SortL[1] - SortL[0]) < LengthMin) NbIntersection = 0;
       break;
     case 3:
-      if (SortL[0] < EPSILON) {
+      if (SortL[0] < POLEPSILON) {
 	if (fabs(TorusEquation(x,y,z,Rmax,Rmin)) < TORUSPRECISION) {
 	  return 0.0;
 	} else {
@@ -2785,454 +2812,93 @@ G4double G4Torus::DistanceToTorus (G4double x,G4double y,G4double z,
   }
 #endif
 
-  /*** If the ray intersects the torus it necessary intersects the BVMax ***/
-  /*** So it is necessary into *an* interval from the BVM ***/
-
-  /** Note : In general there are only 2 intersections so computing the second
-      interval could be done only if the first one does not contain any root */
-
-  /* NOW there is 2 possibilities */
-  /* If inside the BVM (or Torus instead), take "0, SortL[0] .." */
-  /* If outside the BVM, we have intervals where if there is an intersection
-     the root must be */
-  /* Now Lmin1 <= Lambda <= Lmax and there is a root */
-  /* Newton Methods in this interval from the guess */
-
-  /*** Beware The first interval could be the bad one and we have to see other one ***/
-  /*** We must have a way to decide if an interval contains root or not .. ***/
-
-  /*** 
-       Beware: If the original point is near the torus (into the BVM not the torus)
-       we have serious precision issue (bad guess value) try it with a big Rmin
-  ***/
-
-  /* We are Inside the BVM if the number of intersection is odd */
-  /* Not necessary an intersection with Torus if point outside Torus and Inside BVM ! */
-
-  if (((NbIntersection) & (1)) != 0) {
-    /*** If we are Inside the BVM Lmin = 0. Lmax is the point ***/
-    /***    there is necessary an intersection if the point is inside the Torus ***/
-    G4int InsideTorus = 0;
-
+  switch (NbIntersection) {
+  case 0:
+    return kInfinity ;				
+    break;
+  case 1:
     Lmin = 0.0 ;
     Lmax  = SortL[0] ;
+    break;
+  case 2:
+    Lmin = SortL[0] ;
+    Lmax = SortL[1] ;
+    break;
+#if HOLEBVM
+  case 3:
+    Lmin = 0.0 ;
+    Lmax = SortL[0] ;
+    
+    TorusEquationClass torus (Rmax,Rmin);
+    torus.setPosition(x,y,z);
+    torus.setDirection(dx,dy,dz);
+  
+    G4PolynomialSolver<TorusEquationClass,G4double(TorusEquationClass::*)(G4double)>
+      PolySolver(&torus,
+		 &TorusEquationClass::Function,
+		 &TorusEquationClass::Derivative,
+		 TORUSPRECISION) ;
 
-    if (TorusEquation(x,y,z,Rmax,Rmin) < 0.0) {
-      
-      InsideTorus = 1;
-      /* As we are inside the torus it must have an intersection */
-      /* To have a good guess we take Lmax - Rmin/8.0 */
-      /* If we are inside the torus the upper bound is better */
-      guess = Lmax - Rmin*0.125;
-#if DEBUGTORUS
-      G4cout << "G4Torus::DistanceToTorus    Inside the torus" << G4endl ;
-      G4cout << "G4Torus::DistanceToTorus    Initial Guess is "
-             << guess << G4endl ;
-#endif
-      
-    } else {
-#if DEBUGTORUS
-      G4cout.precision(16);
-      G4cout << "G4Torus::DistanceToTorus    point " << x << ", " << y
-             << ", " << z << ", "  << " is outside the torus "
-	     << " Rmax = " << Rmax << " Rmin = " << Rmin << " Teq = "
-	     << TorusEquation(x,y,z,Rmax,Rmin) << G4endl ;
-#endif
-      InsideTorus = 0;
-      /* PROBLEMS what to choose ? */
-      guess = 0.0; //0.0 ?
-    }
-	
-
-    /* Ready to do Newton */
-    guess = Newton(guess,x,y,z,dx,dy,dz,Rmax,Rmin,Lmin,Lmax);
-
-#if DEBUGTORUS
-    G4cout << "G4Torus::DistanceToTorus    First Newton guess = "
-           << guess << G4endl ;
-    G4cout << "G4Torus::DistanceToTorus    Lmin = " << Lmin
-           << "  Lmax = " << Lmax << G4endl ;
-#endif
-
-    /* In case the origin point is just in the surface 
-       the NbIntersection will be odd and guess will be zero
-       Anyway, it is correct to say that distance is zero but
-       we want to return +inf if we are exiting the solid
-       So ..
-    */
-
-    /* Check here is the root found is into interval */
+    guess = PolySolver.solve(Lmin,Lmax);
 
-    if ((guess >= (Lmin - EPSILON)) && (guess <= (Lmax + EPSILON))) {
+    if ((guess >= (Lmin - POLEPSILON)) && (guess <= (Lmax + POLEPSILON))) {
       return guess ;
     } else {
-#if DEBUGTORUS
-      G4cout << "G4Torus::DistanceToTorus    Point does not appear to be in the interval guess = "
-             << guess
-	     << " Lmin = " << Lmin - EPSILON << " Lmax = "
-	     << Lmax + EPSILON << G4endl ;
-#endif
-      
-      if (NbIntersection == 3) {
-				/** OK we are in the small part around the BVM **/
-				/** So we check the second interval **/
-	Lmin = SortL[1];
-	Lmax = SortL[2];
-	guess = Lmin;
-	
-	guess = Newton(guess,x,y,z,dx,dy,dz,Rmax,Rmin,Lmin,Lmax);
-#if DEBUGTORUS
-	G4cout << "G4Torus::DistanceToTorus    Second Newton guess = "
-	       << guess << G4endl ;
-	G4cout << "G4Torus::DistanceToTorus    Lmin = " << Lmin
-	       << "  Lmax = " << Lmax << G4endl ;
-#endif
-	if ((guess >= (Lmin - EPSILON)) && (guess <= (Lmax + EPSILON))) {
-	  return guess;
-	} else {
-	  return NOINTERSECTION;
-	}
-      } else {
-	if (InsideTorus == 1) {
-	  /* Incredible : sometimes precisions errors bring us here 
-	     with guess = SortL[0]
-	     So we return guess ..
-	  */
-										
-	  G4cout << "G4Torus: Root not found .." << G4endl ;
-	  G4cout << "Point: "<< x << " " << y << " " << z << G4endl ;
-	  G4cout << "Dir  : "<< dx << " " << dy << " " << dz << G4endl ;
-	  return guess;
-	}
-	return NOINTERSECTION;
-      }
+      Lmin = SortL[1] ;
+      Lmax = SortL[2] ;
     }
-
-  } else { // Outside
-    /*** If we are Out then we need more to know if intersection exists ***/
-    /***  there is 2 intersection points at least (perhaps the same) with BVMax ***/
-
-    /*** Return if no intersection with BVMax ***/
-
-    if (NbIntersection == 0) 
-      return NOINTERSECTION ;
-				
-
+    break;
+  case 4:
     Lmin = SortL[0] ;
     Lmax = SortL[1] ;
-    /** Lmin because it is probably near the BVM entry point **/
-    /** PROBLEM if the ray hits the top of BVM with a small angle
-	then the interval is too big and the guess is bad **/
-    guess = Lmin  ; 
-				
-
-    /*** We know only that if there is a solution, it is between Lmin and Lmax ***/
-    /*** But we are not sure that there is one ... ***/
-	
-    /* Ready to do Newton */
-    guess = Newton(guess,x,y,z,dx,dy,dz,Rmax,Rmin,Lmin,Lmax);
-
-#if DEBUGTORUS
-    G4cout << "G4Torus::DistanceToTorus    Newton with 2 or 4 points : "
-           << guess << G4endl ;
-#endif    
-
-    /* Check here is the root found is into interval */
-    if ((guess >= (Lmin - EPSILON)) && (guess <= (Lmax + EPSILON))) {
-#if DEBUGTORUS
-    G4cout << "G4Torus::DistanceToTorus    Newton gives a point into interval (Ok)"
-           << G4endl ;
-#endif    
-      return guess;
-    } else { 				
-#if DEBUGTORUS
-    G4cout << "G4Torus::DistanceToTorus    Newton does not give a point into interval (Ko)"
-           << G4endl ;
-#endif    
-      if (NbIntersection == 4) {
-	/* Well if that does not converge with the first interval try with the other one */
-	Lmin = SortL[2] ;
-	Lmax = SortL[3] ;
-
-	guess = Lmin;
-	guess = Newton(guess,x,y,z,dx,dy,dz,Rmax,Rmin,Lmin,Lmax);
-	if ((guess >= (Lmin - EPSILON)) && (guess <= (Lmax + EPSILON))) {
-	  return guess;
-	} else {
-	  return NOINTERSECTION;
-	}
-      } else {
-	/* Certainly this is due to the BVM part that is not in Torus */
-
-	return NOINTERSECTION ;
-      }
-    }
-  }
-}
-
-
-G4int G4Torus::SafeNewton(G4double x, G4double y, G4double z,
-			  G4double dx, G4double dy, G4double dz,
-			  G4double Rmax, G4double Rmin,
-			  G4double *Lmin,G4double *Lmax) const
-{
-  /** SafeNewton is a clipping interval Newton method **/
-  /** This method is at least 3 times slower than Newton but is sure to work **/
-  /** So it could be better to use it when Newton is not enough **/
-  
-  G4double P[5][2],D[2] ;
-  G4double Lx,Ly,Lz ;
-  G4double NewMin,NewMax;
-  
-  G4int IntervalIsVoid = 1;
-  G4int NewtonIsSafe = 0;
-  
-  /*** Calculating Control Points  ***/
-  
-  /*
-    0     p0 = F((*Lmin))
-    1/4   p1 = F((*Lmin)) + ((*Lmax) - (*Lmin))/4 * F'((*Lmin))
-    2/4   p2 = 1/6 * (16*F(((*Lmax) + (*Lmin))/2) - (p0 + 4*p1 + 4*p3 + p4))  
-    3/4   p3 = F((*Lmax)) - ((*Lmax) - (*Lmin))/4 * F'((*Lmax))
-    1     p4 = F((*Lmax))
-  */
 
+    TorusEquationClass torus (Rmax,Rmin);
+    torus.setPosition(x,y,z);
+    torus.setDirection(dx,dy,dz);
   
-  Lx = x + (*Lmin)*dx;
-  Ly = y + (*Lmin)*dy;
-  Lz = z + (*Lmin)*dz;
+    G4PolynomialSolver<TorusEquationClass,G4double(TorusEquationClass::*)(G4double)>
+      PolySolver(&torus,
+		 &TorusEquationClass::Function,
+		 &TorusEquationClass::Derivative,
+		 TORUSPRECISION) ;
 
-  D[0] = dx*TorusDerivativeX(Lx,Ly,Lz,Rmax,Rmin);
-  D[0] += dy*TorusDerivativeY(Lx,Ly,Lz,Rmax,Rmin);
-  D[0] += dz*TorusDerivativeZ(Lx,Ly,Lz,Rmax,Rmin);
-
-  P[0][0] = (*Lmin);
-  P[0][1] = TorusEquation(Lx,Ly,Lz,Rmax,Rmin);
-
-  if (fabs(P[0][1]) < TORUSPRECISION) {
-    NewtonIsSafe = 1;
-    return NewtonIsSafe;
-  }
-  
-  if (((*Lmax) - (*Lmin)) < EPSILON) {
-    return 1;
-  }
-
-  P[1][0] = (*Lmin) + ((*Lmax) - (*Lmin))/4;
-  P[1][1] = P[0][1] + (((*Lmax) - (*Lmin))/4.0) * D[0];
-  
-  Lx = x + (*Lmax)*dx;
-  Ly = y + (*Lmax)*dy;
-  Lz = z + (*Lmax)*dz;
-
-  D[1] = dx*TorusDerivativeX(Lx,Ly,Lz,Rmax,Rmin);
-  D[1] += dy*TorusDerivativeY(Lx,Ly,Lz,Rmax,Rmin);
-  D[1] += dz*TorusDerivativeZ(Lx,Ly,Lz,Rmax,Rmin);
-
-  P[4][0] = (*Lmax);
-  P[4][1] = TorusEquation(Lx,Ly,Lz,Rmax,Rmin);
-  P[3][0] = (*Lmax) - ((*Lmax) - (*Lmin))/4;
-  P[3][1] = P[4][1] - ((*Lmax) - (*Lmin))/4 * D[1];
-
-  Lx = x + ((*Lmax)+(*Lmin))/2*dx;
-  Ly = y + ((*Lmax)+(*Lmin))/2*dy;
-  Lz = z + ((*Lmax)+(*Lmin))/2*dz;
-
-  P[2][0] = ((*Lmax) + (*Lmin))/2;
-  P[2][1] = (16*TorusEquation(Lx,Ly,Lz,Rmax,Rmin)
-            - (P[0][1] + 4*P[1][1] + 4*P[3][1] + P[4][1]))/6 ;
-
-#if DEBUGTORUS
-  G4cout << "G4Torus::SafeNewton    Lmin = " << (*Lmin) << G4endl ;
-  G4cout << "G4Torus::SafeNewton    Lmax = " << (*Lmax) << G4endl ;
-  G4cout << "G4Torus::SafeNewton    P[0] = " << P[0][1] << G4endl ;
-  G4cout << "G4Torus::SafeNewton    P[1] = " << P[1][1] << G4endl ;
-  G4cout << "G4Torus::SafeNewton    P[2] = " << P[2][1] << G4endl ;
-  G4cout << "G4Torus::SafeNewton    P[3] = " << P[3][1] << G4endl ;
-  G4cout << "G4Torus::SafeNewton    P[4] = " << P[4][1] << G4endl ;
-#endif
-
-  /** Ok now we have all control points, we could compute the convex area **/
-  /** Problems:
-      - if there is one point with a ~ 0 coordinate and all the other the
-        same sign we miss the value
-      - if there are more than a root in the interval then the interval
-        length does not decrease to 0. A solution may be to split intervals
-        in the middle but how to know when we must split ?
-  **/
-
-  /*** For each points make 2 sets. A set of positive points and a set
-       of negative points ***/
-  /*** Note: could be better done with scalar product .. ***/
-  /**
-     We have to compute convex area of the control point before
-     applying intersection  with y=0
-  **/
-
-  /* there is an intersection only if each have different signs */
-  /* PROBLEM : If a control point have a 0.00 value the sign check is wrong
-     try to solve that with TORUSPRECISION ..
-   */
-  {
-    G4double Intersection ;
-    G4int i,j;
-
-    NewMin = (*Lmax) ;
-    NewMax = (*Lmin) ;
-
-    for (i=0;i<5;i++)
-      for (j=i+1;j<5;j++)
-	{
-	  /* there is an intersection only if each have different signs */
-	  if (((P[j][1] > -TORUSPRECISION) && (P[i][1] < TORUSPRECISION)) ||
-	      ((P[j][1] < TORUSPRECISION) && (P[i][1] > -TORUSPRECISION))) {
-	    IntervalIsVoid  = 0;
-	    Intersection = P[j][0] - P[j][1]*((P[i][0] - P[j][0])
-	                                     /(P[i][1] - P[j][1]));
-	    if (Intersection < NewMin) {
-	      NewMin = Intersection;
-	    }
-	    if (Intersection > NewMax) {
-	      NewMax = Intersection;
-	    }
-	  }
-	}
-    if (IntervalIsVoid != 1) {
+    guess = PolySolver.solve(Lmin,Lmax);
 
-      (*Lmax) = NewMax;
-      (*Lmin) = NewMin;
+    if ((guess >= (Lmin - POLEPSILON)) && (guess <= (Lmax + POLEPSILON))) {
+      return guess ;
+    } else {
+      Lmin = SortL[2] ;
+      Lmax = SortL[3] ;
     }
-  }
-  
-  if (IntervalIsVoid == 1) {
-    return -1;
-  }
-  
-  
-  return NewtonIsSafe;
-}
-
-
-G4double G4Torus::Newton (G4double guess,
-			  G4double x, G4double y, G4double z,
-			  G4double dx, G4double dy, G4double dz,
-			  G4double Rmax, G4double Rmin,
-			  G4double Lmin,G4double Lmax) const
-{
-  /* So now we have a good guess and an interval where
-     if there are an intersection the root must be */
-
-  G4double Lx = 0;
-  G4double Ly = 0;
-  G4double Lz = 0;
-  G4double Value = 0;
-  G4double Gradient = 0;
-  G4double Lambda ;
-
-  G4int i=0;
-
-  /* Reduce interval before applying Newton Method */
-#if DEBUGTORUS
-  G4cout << "G4Torus::Newton    Lmin = " << Lmin
-         << " Lmax = " << Lmax << G4endl ;
+    break;
 #endif
-  
-  {
-    G4int NewtonIsSafe ;
-    G4int k;
-    /*
-      Here we stop to compute after ITERATION loop
-    */
-    for (k=0;
-        ((k<ITERATION) &&
-        ((NewtonIsSafe = SafeNewton(x,y,z,dx,dy,dz,Rmax,Rmin,&Lmin,&Lmax))==0));
-	k++);
-    
-
-    /* But in fact it is safer to compute while this is safe 
-    while ((NewtonIsSafe = SafeNewton(x,y,z,dx,dy,dz,Rmax,Rmin,&Lmin,&Lmax)) == 0) ;
-
-    Problem: the mathematical algorithm is the one with the while loop
-    but because of precision issue we could have TorusEquation(point) never equal to zero..
-    But we see that all initial points are on the bounding volume. So there is a superior limit
-    to the number of iteration in the while loop to reach the point with the given precision.
-    
-    */
     
-    guess = Lmin;
+  default:
+    G4cerr << "G4Torus::DistanceToTorus    NbIntersection = " << NbIntersection << G4endl;    
+    break;    
   }
+
+  TorusEquationClass torus (Rmax,Rmin);
+  torus.setPosition(x,y,z);
+  torus.setDirection(dx,dy,dz);
   
-  /** So with SafeNewton we do not need a guess **/
+  G4PolynomialSolver<TorusEquationClass,G4double(TorusEquationClass::*)(G4double)>
+    PolySolver(&torus,
+	       &TorusEquationClass::Function,
+	       &TorusEquationClass::Derivative,
+	       TORUSPRECISION) ;
 
-  Lambda = guess;
-  Value = TorusEquation(x + Lambda*dx,y + Lambda*dy,z + Lambda*dz,Rmax,Rmin);
+  guess = PolySolver.solve(Lmin,Lmax);
 
-  //If we want a gnuplot graphics af the function
-#if 0
-  {
-    FILE *fi;
-    G4int i;
-    fi = fopen("GNUplot.out","w+");
-    fprintf(fi,"# Newton plot\n");
-	  
-    for (i = 0; i < 1000 ; i ++) {
-      Lx = x + (Lmin + i*(Lmax - Lmin)/1000.0)*dx;
-      Ly = y + (Lmin + i*(Lmax - Lmin)/1000.0)*dy;
-      Lz = z + (Lmin + i*(Lmax - Lmin)/1000.0)*dz;
-      Value = TorusEquation(Lx,Ly,Lz,Rmax,Rmin);
-      fprintf(fi," %f %f\n",Lmin + i*(Lmax - Lmin)/1000.0,Value );
-    }
-	  
-    fclose(fi);
-  }
-#endif
-      
-  /* In fact The Torus Equation give big number
-     so TORUS PRECISION is not EPSILON */	  
-  while (fabs(Value) > TORUSPRECISION) {
-	  
-    Lx = x + Lambda*dx;
-    Ly = y + Lambda*dy;
-    Lz = z + Lambda*dz;
-    Value = TorusEquation(Lx,Ly,Lz,Rmax,Rmin);
-
-    Gradient = dx*TorusDerivativeX(Lx,Ly,Lz,Rmax,Rmin);
-    Gradient += dy*TorusDerivativeY(Lx,Ly,Lz,Rmax,Rmin);
-    Gradient += dz*TorusDerivativeZ(Lx,Ly,Lz,Rmax,Rmin);
-
-    /**
-    if (Gradient > -EPSILON) { // then the current point is repulsive
-                                  and may not converge
-                                  Seems to be solved by SafeNewton
-    **/
-    Lambda = Lambda - Value/Gradient ;
-    
-    
+  if ((guess >= (Lmin - POLEPSILON)) && (guess <= (Lmax + POLEPSILON))) {
 #if DEBUGTORUS
-    G4cout << "G4Torus::Newton    Iteration " << i << G4endl ;
-    G4cout << "G4Torus::Newton     Lambda = " << Lambda
-           << " Value = " << Value << " Grad = " << Gradient << G4endl;
-    G4cout << "G4Torus::Newton     Lmin = " << Lmin
-           << " Lmax = " << Lmax << G4endl ;
+    G4cout << "G4Torus::DistanceToTorus    distance = " << guess << G4endl ;    
 #endif
-
-    i ++;
-
-    if (i > ITERATION) 
-      return NOINTERSECTION; //no convergency ??
-
-  }
-
-#if DEBUGTORUS
-  G4cout << "G4Torus::Newton    Exiting with Lambda = " << Lambda << G4endl ;
-  G4cout << "G4Torus::Newton    Exiting with Value = " << Value << G4endl ;
-  if (Gradient > 0.0) {
-    G4cout << "G4Torus::Newton    Gradient: Exiting surface" << G4endl ;
+    return guess ;
   } else {
-    G4cout << "G4Torus::Newton    Gradient: Entering surface" << G4endl ;
-  }
+#if DEBUGTORUS
+    G4cout << "G4Torus::DistanceToTorus  :  kInfinity" << G4endl ;    
 #endif
-
-  
-  return Lambda ;
+    return kInfinity;
+  }
 }
diff --git a/source/geometry/solids/CSG/src/G4Trap.cc b/source/geometry/solids/CSG/src/G4Trap.cc
index 2da34b5eedfc373efdf40c3aa9ca4d8e609d6225..d9c2c0e860c064e2da0869e9e0d39797c2e190fc 100644
--- a/source/geometry/solids/CSG/src/G4Trap.cc
+++ b/source/geometry/solids/CSG/src/G4Trap.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Trap.cc,v 1.8 2000/11/20 17:58:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4Trap
 //
diff --git a/source/geometry/solids/CSG/src/G4Trd.cc b/source/geometry/solids/CSG/src/G4Trd.cc
index fc99c3c78f48846cdbe25e941f8e0918ff71587c..8410fbc8a296f1ac8e07be995067b13b8851dbfb 100644
--- a/source/geometry/solids/CSG/src/G4Trd.cc
+++ b/source/geometry/solids/CSG/src/G4Trd.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Trd.cc,v 1.7 2000/11/20 17:58:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // Implementation for G4Trd class
diff --git a/source/geometry/solids/CSG/src/G4Tubs.cc b/source/geometry/solids/CSG/src/G4Tubs.cc
index 10e99e9dd09fca29367fd9ef975d2915608cc283..452ca70f98cead117de5f31b3808184502444b6d 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.23 2000/11/28 15:05:52 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Tubs.cc,v 1.28 2001/02/21 15:47:14 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4Tubs
@@ -28,6 +28,9 @@
 // 08.08.00 V.Grichine, more stable roots of 2-equation in Distance ToOut(p,v,...)
 // 31.10.00 V.Grichine, assign sr, sphi in Distance ToOut(p,v,...)
 // 28.11.00 V.Grichine, bug fixed in Inside(p)
+// 07.12.00 V.Grichine, phi-section algorithm was changed in Inside(p)
+// 20.02.01 V.Grichine, bug fixed in Inside(p) and CalculateExtent was 
+//                      simplified base on G4Box::CalculateExtent
 
 #include "G4Tubs.hh"
 
@@ -44,6 +47,7 @@
 #include "G4NURBStube.hh"
 #include "G4NURBScylinder.hh"
 #include "G4NURBStubesector.hh"
+#include "G4Box.hh"
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -139,6 +143,9 @@ G4bool G4Tubs::CalculateExtent( const EAxis              pAxis,
 			              G4double&          pMin, 
                                       G4double&          pMax    ) const
 {
+  G4Box box("box",fRMax,fRMax,fDz) ;
+  return box.CalculateExtent(pAxis,pVoxelLimit,pTransform,pMin,pMax) ;
+/*
   if ( !pTransform.IsRotated() && fDPhi == 2.0*M_PI && fRMin == 0 )
   {
 // Special case handling for unrotated solid tubes
@@ -324,8 +331,10 @@ G4bool G4Tubs::CalculateExtent( const EAxis              pAxis,
     delete vertices;
     return existsAfterClip;
   }
+*/
 }
 
+
 ///////////////////////////////////////////////////////////////////////////
 //
 // Return whether point inside/outside/on surface
@@ -354,25 +363,32 @@ EInside G4Tubs::Inside(const G4ThreeVector& p) const
 
         pPhi = atan2(p.y(),p.x()) ;
 
-	if ( pPhi < 0 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
+	if ( pPhi < -kAngTolerance*0.5 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
 
 	if ( fSPhi >= 0 )
 	{
+	  if ( abs(pPhi) < kAngTolerance*0.5 &&
+               abs(fSPhi + fDPhi - 2*M_PI) < kAngTolerance*0.5 )
+          { 
+            pPhi += 2*M_PI ; // 0 <= pPhi < 2pi
+          }
 	  if ( pPhi >= fSPhi + kAngTolerance*0.5 &&
-               pPhi <= fSPhi + fDPhi-kAngTolerance*0.5 ) in = kInside ;
+               pPhi <= fSPhi + fDPhi - kAngTolerance*0.5 ) in = kInside ;
 
 	  else if ( pPhi >= fSPhi - kAngTolerance*0.5 &&
 		    pPhi <= fSPhi + fDPhi + kAngTolerance*0.5 ) in = kSurface ;
+	    
+
 	}
-	else
+	else  // fSPhi < 0
 	{
-	  // if (pPhi < fSPhi + 2*M_PI) pPhi += 2*M_PI ;
+	  if ( pPhi <= fSPhi + 2*M_PI - kAngTolerance*0.5 &&
+	         pPhi >= fSPhi + fDPhi  + kAngTolerance*0.5)  ;
 
-	  if ( pPhi >= fSPhi + 2*M_PI + kAngTolerance*0.5 &&
-	       pPhi <= fSPhi + fDPhi + 2*M_PI - kAngTolerance*0.5) in = kInside ;
+	  else if ( pPhi <= fSPhi + 2*M_PI + kAngTolerance*0.5 &&
+	            pPhi >= fSPhi + fDPhi  - kAngTolerance*0.5) in = kSurface ;
 
-	  else if (pPhi >= fSPhi+2*M_PI-kAngTolerance*0.5 &&
-		   pPhi <= fSPhi+fDPhi+2*M_PI+kAngTolerance*0.5) in = kSurface ;
+          else in = kInside ;
 	}			    			    
       }
     }
@@ -393,25 +409,30 @@ EInside G4Tubs::Inside(const G4ThreeVector& p) const
 	{
 	  pPhi = atan2(p.y(),p.x()) ;
 
-	  if ( pPhi < 0 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
+	  if ( pPhi < -kAngTolerance*0.5 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
 
 	  if ( fSPhi >= 0 )
 	  {
-	    if (pPhi >= fSPhi-kAngTolerance*0.5 &&
-		  pPhi <= fSPhi+fDPhi+kAngTolerance*0.5) in = kSurface ;	
+	    if ( abs(pPhi) < kAngTolerance*0.5 &&
+               abs(fSPhi + fDPhi - 2*M_PI) < kAngTolerance*0.5 )
+            { 
+              pPhi += 2*M_PI ; // 0 <= pPhi < 2pi
+            }
+	    if ( pPhi >= fSPhi - kAngTolerance*0.5 &&
+		 pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) in = kSurface ;	
 	  }
-	  else
+	  else  // fSPhi < 0
 	  {
-	    //  if (pPhi < fSPhi + 2*M_PI ) pPhi += 2*M_PI ;
+	    if ( pPhi <= fSPhi + 2*M_PI - kAngTolerance*0.5 &&
+	         pPhi >= fSPhi + fDPhi  + kAngTolerance*0.5)  ;
 
-	    if (pPhi >= fSPhi+2*M_PI-kAngTolerance*0.5 &&
-		pPhi <= fSPhi+fDPhi+2*M_PI+kAngTolerance*0.5) in=kSurface;
+	    else  in = kSurface ;
 	  }
 	}
       }
     }
   }
-  else if (fabs(p.z()) <= fDz+kCarTolerance*0.5) // Check within tolerant r limits
+  else if (fabs(p.z()) <= fDz + kCarTolerance*0.5) // Check within tolerant r limits
   {
     r2      = p.x()*p.x() + p.y()*p.y() ;
     tolRMin = fRMin - kRadTolerance*0.5 ;
@@ -429,19 +450,23 @@ EInside G4Tubs::Inside(const G4ThreeVector& p) const
       {
 	pPhi = atan2(p.y(),p.x()) ;
 
-	if ( pPhi < 0 ) pPhi += 2*M_PI ;		// 0<=pPhi<2pi
+	if ( pPhi < -kAngTolerance*0.5 ) pPhi += 2*M_PI ;   // 0<=pPhi<2pi
 
 	if ( fSPhi >= 0 )
 	{
-	  if (pPhi >= fSPhi-kAngTolerance*0.5 &&
-	      pPhi <= fSPhi+fDPhi+kAngTolerance*0.5) in=kSurface; 	
+	    if ( abs(pPhi) < kAngTolerance*0.5 &&
+               abs(fSPhi + fDPhi - 2*M_PI) < kAngTolerance*0.5 )
+            { 
+              pPhi += 2*M_PI ; // 0 <= pPhi < 2pi
+            }
+	  if ( pPhi >= fSPhi - kAngTolerance*0.5 &&
+	       pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) in = kSurface; 	
 	}
-	else
+	else  // fSPhi < 0
 	{
-	  if ( pPhi < fSPhi + 2*M_PI ) pPhi += 2*M_PI ;
-
-	  if ( pPhi >= fSPhi+2*M_PI-kAngTolerance*0.5 &&
-	       pPhi <= fSPhi+fDPhi+2*M_PI+kAngTolerance*0.5) in = kSurface ;
+	  if ( pPhi <= fSPhi + 2*M_PI - kAngTolerance*0.5 &&
+	       pPhi >= fSPhi + fDPhi  + kAngTolerance*0.5)  ;
+	  else  in = kSurface ;
 	}	    
       }
     }
@@ -449,6 +474,8 @@ EInside G4Tubs::Inside(const G4ThreeVector& p) const
   return in ;
 }
 
+
+
 ///////////////////////////////////////////////////////////////////////////
 //
 // Return unit normal of surface closest to p
diff --git a/source/geometry/solids/STEP/include/classes.h b/source/geometry/solids/STEP/include/classes.h
index af1dcf0e6317bf8659cd31e08f1e99f6ed2117da..6434c78405c59c79c4ea564f1e9b53d59bf4780b 100644
--- a/source/geometry/solids/STEP/include/classes.h
+++ b/source/geometry/solids/STEP/include/classes.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: classes.h,v 1.3 2000/01/21 13:42:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
 ** Fed-x parser output module for generating C++  class definitions
diff --git a/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh
index 3a109ac687fc79085523cc3da31dfbf4346543c5..d6b1bc3bb44d5849f006e0e989ea5c48c5bd3816 100644
--- a/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AdvancedBrepShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedBrepShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh
index 1ed78b823180888d925071a8d4fdb427edf21329..018fcd765d51ce5c5f83ca2784b3716b84d7685b 100644
--- a/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AdvancedFaceCreator.hh,v 1.3 2000/11/09 16:35:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedFaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh b/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh
index d4cc2d92db988b8288fb71eeb54be69d4bf77d4b..35654ff2c8adcaa4a9d6945f16e207fc98758ba5 100644
--- a/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AssemblyCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4AssemblyCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh
index f3108cb1bf0b933f3f86e4f844c3e75faec34450..d676337212d3ffc05256c72cda98cd176373c520 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis1PlacementCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis1PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh
index 3eb9a2c99e2ea6abb54909b3efc7116efef0e2ab..e6f8b2c6ce81ac80150aabf376d0ecab08a2c8d8 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2Placement2dCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement2dCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh
index a36b522d48a14f6ce31b85ea70771bcec413c177..6c93d22074e7b5da6d7187693a5fbacd2196cd6f 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2Placement3dCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement3dCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh
index 962834398c042412debef27f292d8d2fab27a675..5558882e670ba6c79ed752995da628a858ed847b 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2PlacementCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh
index 87e8987158f934319fbacd0d59c3a881b6f4e52b..031908b925ae7ce2f06a0cbfc7807d31da66795d 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2PlacementsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementsCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh b/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh
index f9ecd487a9f6a6b681b48a1fdf43d70b42794eb6..306e00cd045947bbff27aaedb69a110ea61240e2 100644
--- a/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurveWithKnotsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurveWithKnotsCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh
index cb5ac35e1bc5546deb1c3e82f523302b858902fa..cb7b88d1703f9e4a9a911f132883e4ae14e04963 100644
--- a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurfaceCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh
index ec26c1482803765666160396172572cc8c438ced..2048b9c22e92b0eb068d063f806847b869d7d988 100644
--- a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurfaceWithKnotsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceWithKnotsCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh
index 7d5f57531b36b346b0145b2fc33b96916e1e49b8..705ea3802a23e4fba6c54c3ab59a3e412a2dbc22 100644
--- a/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BoundedSurfaceCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BoundedSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh b/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh
index e1ab47ed14ae91d53defa197eaa06e42a1a7d837..f887f305cf013b87c645dcf23c5b9c38d061c23b 100644
--- a/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CartesianPointCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CartesianPointCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh b/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh
index 6d84404d2b3357fa769bb7a6593762fcc8f19366..ab20ff99bde5f12f0f0f763bd9f35f98310f7325 100644
--- a/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CircleCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CircleCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh b/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh
index 14ea08800608652c8d420847e8ae12caffce4e31..cf389bf9d118f086b45362c1162f1b7cc84466aa 100644
--- a/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClosedShellCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ClosedShellCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh b/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh
index 0467eeca53f5fcb7b41a8813e4d4fc3f4475c182..c111b8dc419cb9f20ed18bca004519daf1ee935c 100644
--- a/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConicCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh
index 6748f9bda39d265702e54346d81b8af38047333e..6fec7844b7b7eaf675539ac177cd2b13b7535696 100644
--- a/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConicalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh b/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh
index 4ad0e18707ea12840fd33a1cf11ae34163a736dd..2d28ba85f11a9a0af4e6293edc6ac724faaa0b14 100644
--- a/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConnectedFaceSetCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConnectedFaceSetCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh
index 6a6ded21bf163226561287a337a96a932f74eeee..9bba516d3659867514d4fba95ffc9a33d8a51c16 100644
--- a/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ContextDependentShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ContextDependentShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh b/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh
index b37f5936cd9a42aa7ead58bc15646d05c02dcbf2..50b2ecd721823d92e62ecab8fd8b2501674ef858 100644
--- a/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurveCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh
index 10916484956f25c6b6c8e037924dcc317dacdff0..4d0c36c86dc47c7a402331bbe2ae6e0779e9829b 100644
--- a/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CylindricalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CylindricalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh b/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh
index 4272a1f545ec82d0a661923630f8cd163afbe7aa..83b99a8a437aaf49bc8a88e8272982c5f931ac04 100644
--- a/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DirectionCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4DirectionCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh b/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh
index fa0c6ae23e6104a2184fbc7bd3d95085e32f2ced..3d4d6d81a323ef649ad83bc7ee0ab4d16b7055fe 100644
--- a/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EdgeCurveCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeCurveCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh b/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh
index 307c673e54f7fbfa992f8ce3a7a3b1985316a480..4bd7caca1cd5b8ae3a541aa4603a787fd809e250 100644
--- a/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EdgeLoopCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeLoopCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh b/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh
index d64b89964b5672bdf648e7932d421a60c054c59c..960b826f61f0849f1fc2229bc8eef864fa7d8534 100644
--- a/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EllipseCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4EllipseCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh b/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh
index 48b3c2a16813040f36bb0e3d55feec45966cce78..04ff44226bb5c7d898da53f85ccc80041ede98a1 100644
--- a/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FaceBoundCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceBoundCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh b/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh
index 364ed5e727eb939aae88d6c9a0853654a05c0a82..39a43411d50b2e0cf96e792fbe9e78bd3cfd5581 100644
--- a/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FaceOuterBoundCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceOuterBoundCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh
index e3b49fc4220f418164271aada0ef8dbafa218c2a..04875fb62f6bf52c0be9a6637371b178d9377158 100644
--- a/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FaceSurfaceCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh b/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh
index 416aba8b7c685448305fe31188284292ba5e0a04..806eeb6f1ea0f44c40b66dcbb4df8e81ddfba378 100644
--- a/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometricRepresentationContextCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometricRepresentationContextCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh b/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh
index b6275eb14b686c6d5ed3a5078026871bd540651f..f0fb7bc58e698248af043b5e94d94b760c59777f 100644
--- a/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometryCreator.hh,v 1.5 2000/11/10 17:44:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometryCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh b/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh
index 1e2f89da81afdbfdd8cbd65769ab7eae0c8e1580..d82cabf76aa15b2ec342dfa0eb653770ddaf6774 100644
--- a/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh
+++ b/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometryTable.hh,v 1.4 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometryTable
diff --git a/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh b/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh
index 709fbfcebad05548a22128180971837ab39a7518..ce77de6dfe6a03b47c72cb5a71d2f4847d2d0d19 100644
--- a/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HyperbolaCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4HyperbolaCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh
index 17353c1ebdfb9db152b25938fb72daeb02a445b3..5d7675f828302f14e5413339dbbd69f534effaf4 100644
--- a/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ItemDefinedTransformationCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ItemDefinedTransformationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4LineCreator.hh b/source/geometry/solids/STEPinterface/include/G4LineCreator.hh
index cdd9032150ba228a8995cc7dd10d130b022646a6..63ab7134f7388e5cbd51ebd302c9ba3c87600544 100644
--- a/source/geometry/solids/STEPinterface/include/G4LineCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4LineCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LineCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4LineCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh b/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh
index 61af47677cca75df9c50a5676f08bc9c7aba194b..4563af52ad3ecc2bfeb165ccedfb666fe4f1b099 100644
--- a/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ManifoldSolidBrepCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ManifoldSolidBrepCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh b/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
index 6de4f8a4f3bc218c7305712250b3a56ba13be158..c694ffcef94cf0a2f10d2f219261e3774319b348 100644
--- a/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
+++ b/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NISTStepReader.hh,v 1.4 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4NISTStepReader
diff --git a/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh b/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh
index 3862aa65a49a0775bc07c54695d3921e6d7f22db..99c7e05228ab2769c8994564ae3ecea838c56fab 100644
--- a/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenShellCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4OpenShellCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh b/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh
index 73e1016e79887aa49d8cf3d8ce5f76dd52cdb0c1..d2a404951bd0ea706082c7fa39224523ba622fed 100644
--- a/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OrientedEdgeCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4OrientedEdgeCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh b/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh
index 11e58f44a701259a2b35b6da6315137ad7ac7c8c..8fef14e456dac6063916d235a236105f283aa528 100644
--- a/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParabolaCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ParabolaCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh b/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh
index 041f310a7a8585e9bb6b1a900d2d4ebc1dc48837..4c6881e0bd04cff2555278733f6a71b84bed1f3d 100644
--- a/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlaneCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PlaneCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointCreator.hh
index d51efd956640da1c345957de357a5f9f347d9e61..ec243e87bc43fbf4ce13192ad902612a01832b78 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PointCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh
index 98996c82019a9a137195846382f03f296310a00e..f22c947022209261e5c666f5c1c4163582b184c7 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointOnCurveCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PointOnCurveCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh
index 871ad0535e4bd855c373295fdea785e5663438d6..ffbb398ba55c4f0c4319d9d0bb074ed427201d93 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointOnSurfaceCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PointOnSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh
index 7afde9d19c5b8d4f6106ecb48bffe7a4294ad137..cf8978be6c111fd5d4b20cfa178fa39c9c4d1616 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointReplicaCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4PointReplicaCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh b/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh
index 256530f5f6a48cbd1992c7fba551d2c77967da36..ca6c17a420dfeb0a517c4e4754af9ce154ea08e6 100644
--- a/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProductDefinitionShapeCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ProductDefinitionShapeCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh
index 7e879ee1330a24ea291dc7fce8bd4312dd8fa36b..6cf228c98d12adbb8e8849f9f2aa73d8727d4b3b 100644
--- a/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RationalBSplineSurfaceCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4RationalBSplineSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh
index 1a20a5e3514c1368be7b1d5d2c5cf8ff3ea26feb..ace49a157c9cd49373956780fab6382a11c87901 100644
--- a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RepresentationRelationshipCreator.hh,v 1.4 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4RepresentationRelationshipCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh
index 2ad9bad47dad9045c20f8dd73e052360153f1d48..ee29b2b97e950d6114440cb936fe97f78921861d 100644
--- a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RepresentationRelationshipWithTransformationCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4RepresentationRelationshipWithTransformationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh
index 56f3d47ed782141e9b2f835956e05cb680eab666..e556634c29f4100dc1a7c99eabe18daea8c2e4be 100644
--- a/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShapeDefinitionRepresentationCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ShapeDefinitionRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh
index fe3851dc0cbcedd56ce440087b71444772086a70..ab19317a9fe1c604982da5f97f068388ed0225f8 100644
--- a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh
index 731c39a8743537f853ce1b7dfb939461f20b89ae..c7f877ae55a0d87e4bda903564a0afec45400905 100644
--- a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShapeRepresentationRelationshipCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ShapeRepresentationRelationshipCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh
index f71d92ee6a7f249775bff423942f53228d0607b3..7ff97076eb9f4b90e2b5f179cb31fbe4b3256b13 100644
--- a/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SphericalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4SphericalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh b/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
index 6f281df38a23e21b52ba4f41bccc29671f65b543..dfabd241bcd07825e6979698250b84c2c32908b1 100644
--- a/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
+++ b/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StepFileReader.hh,v 1.4 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4StepFileReader
diff --git a/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh
index bd075058dff0467f928e9abc6ef0143d612b428d..9259ef188bc846b54a32996ae3ea32f0684362ee 100644
--- a/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ToroidalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ToroidalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh b/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh
index eb3ec872b52c73a39777488a5467833b058d724c..20d0c010ed8b7cbe560a3a83c1b5cfab130265e2 100644
--- a/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VectorCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4VectorCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh b/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh
index 2bebb5ca448c3666c2839fc3cecb8a6e05b54ec7..ef510dbb9a37cdf5be1ac6501b618823e39ac58b 100644
--- a/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VertexPointCreator.hh,v 1.3 2000/11/09 16:35:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4VertexPointCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc
index d4d554efe41875c6c25c13c2ca25c04372801231..ca9a4657ec7c116effb0add7db42976ad001a334 100644
--- a/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AdvancedBrepShapeRepresentationCreator.cc,v 1.4 2000/11/20 18:17:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedBrepShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc
index 75e29e10a5482deddc4f809068e8a694431dcdfd..753772f80877cd3a63e34e8e29df626419b6b3b5 100644
--- a/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AdvancedFaceCreator.cc,v 1.3 2000/02/25 16:36:17 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedFaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc b/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
index 1e016265ed416132522b24bac2cefe5b14f75eb0..20871ed83c970f4de414b26536312b60f16bbf52 100644
--- a/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AssemblyCreator.cc,v 1.7 2000/11/20 18:17:27 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4AssemblyCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc
index 89706a0967a9c8fe6f7a4340263f7e4b4c8601f4..f11a5fb0e75f2fe89dea46275172ec3845435f66 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis1PlacementCreator.cc,v 1.2 2000/01/21 13:45:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis1PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc
index e5dd195f0bd9531321424ad9e21e8cf7e6818270..86a7dee3ab162708b8679e19440a37fdd566d93b 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2Placement2dCreator.cc,v 1.2 2000/01/21 13:45:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement2dCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc
index 9365867d6b520a370668fdeb47dde6c10dd43b51..f1eae9aee0946839b86e0328ab2128713b7506b1 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2Placement3dCreator.cc,v 1.4 2000/11/09 16:35:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement3dCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc
index b30b9ce7d857d9fdb3496b6f93ac8d7b1fa8e236..f3713e3d03e2e96b7fb99d5f4f53a01f9c4c8d2b 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2PlacementCreator.cc,v 1.2 2000/01/21 13:45:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
index a1ceae51c2dd671e5c63d0c54cf87e9b4b650b11..b0d5707497f4ad400da98e7f48752946cff11e25 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Axis2PlacementsCreator.cc,v 1.3 2000/01/21 13:45:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementsCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc b/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc
index 2370b2d4cec24196b9fdebd639f39d24a23f1b69..fff71d1401f07c30115ae6a463985e453e8e5599 100644
--- a/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineCurveWithKnotsCreator.cc,v 1.5 2000/11/20 18:17:27 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurveWithKnotsCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc
index 9aac36d5a57014c8cf37cba80b1a66b9c5130e5f..2c590342f9c013fd07d65b1c403eb0af9987c4e4 100644
--- a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurfaceCreator.cc,v 1.4 2000/11/20 18:17:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc
index 585e100c5757cbe382f9e5e875b1e3d5eb1a73ee..f06aa92c8aad590344b9899a351ad1720e26a0e3 100644
--- a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BSplineSurfaceWithKnotsCreator.cc,v 1.4 2000/11/20 18:17:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceWithKnotsCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc
index 8e38e4c0979e87bb69b17e2acd6041cd8349b714..41a4dc029b4bb45d369d678b2011da03d24658c3 100644
--- a/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BoundedSurfaceCreator.cc,v 1.5 2000/11/20 18:17:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4BoundedSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc b/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc
index 1865fc244e3da3265e99f8c4f7cb4d2fe03591c5..a50bd70bbe52f57c8637ed1401ab72a7348f1199 100644
--- a/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CartesianPointCreator.cc,v 1.2 2000/01/21 13:45:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CartesianPointCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc b/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc
index f87027f3f0117f5856ad17694d98528b3bb1ab0e..8804c95e617203228556f9cc47e4ce6d491c3921 100644
--- a/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CircleCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CircleCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc b/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc
index 57af5cd6c8669f707c43526b2c741eb0b9178389..06df61e52c1d99c77b8f595c292df0df7eaf01e0 100644
--- a/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClosedShellCreator.cc,v 1.5 2000/11/20 18:17:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ClosedShellCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc b/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc
index 220d26e8db48e1e75651b0fd2479b5f069112f67..ee67eac57f4ec2e4bbbe3edd25999268959bc9b3 100644
--- a/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConicCreator.cc,v 1.3 2000/11/20 18:17:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc
index 7b02e993efafef5a357d4255734fbff76a68fe8a..88e035bd34f3fdf4f43beeb03f029f7e47e6c757 100644
--- a/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConicalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc b/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc
index 73f3c10d866b2a35d563f0895e2701bd01f67453..87af4a991d2f3f5f9b339ceecfd08c00ae18a093 100644
--- a/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ConnectedFaceSetCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ConnectedFaceSetCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc
index fd0697d7582dca8c8b4d8bf3386aac563128649b..a3dd0c7c00a93a6b00ff4521e80aa8d00f697a39 100644
--- a/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ContextDependentShapeRepresentationCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4ContextDependentShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc b/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc
index bc85107aaf1722a68344e5e886e5e31efdebf6e4..2443becb603ccfe2c83ba4bc9c0d9e0d134d1a85 100644
--- a/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CurveCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc
index 9af3a10140ac5deb29af52e9a21dab5b3cbe36bc..d5430e608140079e75c59809b72b098db4b68179 100644
--- a/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CylindricalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4CylindricalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc b/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc
index 89800c8d0cfe8278fbc8eac41bcd3ebe6d39ced0..7787edab84296faa5fb4414d227eb07f29b6464f 100644
--- a/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DirectionCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4DirectionCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc b/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc
index 44aae5d6a64cbf7dd135261fd5e98b90ebdd4cd7..58da699ea954d433e7f44923726938e587b25194 100644
--- a/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EdgeCurveCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeCurveCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc b/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc
index 2f9e9cbf35d49283d757b38b4cf37033e525ba1e..23830593efc73da810d6f99bfe54f24f5cd8f474 100644
--- a/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EdgeLoopCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeLoopCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc b/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc
index 4e202265ca35cf61afa016b390539936812ad198..9cb26716e0c85ec4271dbf2417b1bc131d15f362 100644
--- a/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EllipseCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4EllipseCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc b/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc
index 9b43c778d11ca9e1272fe2f183cd6770ead54ca2..90b22d02087f881159e0f61e65d1d53e9fbc9483 100644
--- a/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FaceBoundCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceBoundCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc b/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc
index 35c899c8d0455f4886ab031de28ee9c85a1724b6..b903c739b9e0f4a8d550ea701fbfee2a32c9e626 100644
--- a/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FaceOuterBoundCreator.cc,v 1.2 2000/01/21 13:46:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceOuterBoundCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc
index 7dbfd5b33ad20178b8777641afed30e8fb14a4e7..4e00a83023d9be7538fe503de56f6f9e7586ee5a 100644
--- a/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FaceSurfaceCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc b/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc
index fa8dc6ae5e189086a6281eda8718498b38dbfe09..48758292a55a724c7850862360287a233c7e8278 100644
--- a/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometricRepresentationContextCreator.cc,v 1.4 2000/11/20 18:17:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometricRepresentationContextCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc b/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc
index 2a92778fa2c955554d05b84808aa5e00067bf498..a975c3c9cddb516ec8d44dfcb1d78029742d96dc 100644
--- a/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometryCreator.cc,v 1.5 2000/11/10 17:44:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc b/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
index 80e564d26003a4c76f1b892670c186c34e8549c5..e3832884276a411869b2c2435e97e0bfed1adfbd 100644
--- a/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
+++ b/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeometryTable.cc,v 1.7 2000/11/20 18:17:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc b/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc
index 8b94b20ca0aadcac8783ec7f7e113bc312d49595..7c354b85f0df7bd9aee5aedd955ec6f4524c26c3 100644
--- a/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HyperbolaCreator.cc,v 1.2 2000/01/21 13:46:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc
index 9fdce16da487f97dd8d0541f252e666cdd250624..cad89de92072a0fa03bacf262197e2fe360842d9 100644
--- a/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ItemDefinedTransformationCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4LineCreator.cc b/source/geometry/solids/STEPinterface/src/G4LineCreator.cc
index a27e24311a17d9abdb6e6d3972a7c25bbd6c7e30..da585f6f08ed9860709bbc1b527220e09d5a7aad 100644
--- a/source/geometry/solids/STEPinterface/src/G4LineCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4LineCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LineCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc b/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc
index 9963275892a94c20d87b2b7645deea49c285fa30..670748af426b2f1bfe1d8db76b982b1b4fe94bba 100644
--- a/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ManifoldSolidBrepCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc b/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
index d257c835de59055bf483d86048a06b6a56bbf103..bc55b522b4d226d759b0d5d31b99f0c33993e939 100644
--- a/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
+++ b/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NISTStepReader.cc,v 1.4 2000/11/09 16:35:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc b/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc
index 2dd084d97feae74903f81f5c3e56f421e515c958..f23ccb791ae28e885c0708a96217094512f7f2b8 100644
--- a/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenShellCreator.cc,v 1.2 2000/01/21 13:46:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc b/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc
index e7cf7cd5a096233c18f0e66b0900623a7e6cdf12..e2919533c19fc4ca7b580fd93f7858ac443d2f9a 100644
--- a/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OrientedEdgeCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc b/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc
index 7a807ffbbddd8780f8fa87ee7cdc7d40206b5be0..57d71ca61354e0ae2dc92bb55a0a73aba7740c69 100644
--- a/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParabolaCreator.cc,v 1.2 2000/01/21 13:46:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc b/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc
index 37b8e875ff3ef3d462af202930ed58aee4691933..a8b385d84dfc436c0d39d47245f0306c9b46ed77 100644
--- a/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlaneCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointCreator.cc
index ceb56c73ce86425020ca231de6a819218c3051f1..8aa9305c4fa0e20f82bfcdad4f90ddfe2647a775 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointCreator.cc,v 1.2 2000/01/21 13:46:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc
index f6a4cc509a1f1594e57897caff3b7dd03aefaef3..de5dbe6595728192a0ebb429ad24c4b4337f55ed 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointOnCurveCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc
index e83e2f92b48a701d8fccf8ab73056de2d569ef7f..a19571e814cdb26bc0bcddbcf9227d4136e055de 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointOnSurfaceCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc
index 66105d4e7a729090b8f1120116391b3361701601..11ca5ee01d7f4b3b23deb63e2b3dab96faacb54f 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PointReplicaCreator.cc,v 1.2 2000/01/21 13:46:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc b/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc
index 355ad9f0bbd7ec8d45e118626c49d55f8885a2b2..d6c3680535247da56847dd0bc4af76b580b0f586 100644
--- a/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProductDefinitionShapeCreator.cc,v 1.3 2000/01/21 13:46:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc
index c4693a0d3ac16d24fce3c71ca94f4ee27bc13d95..9db56e4cfe7771c6d209884dbeaa2edc00e11379 100644
--- a/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RationalBSplineSurfaceCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc
index a9d6077ea39a0671410dbdc36d1181ecd4f02f86..5265552cf02753ebe832691a063a6a94854fbddf 100644
--- a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RepresentationRelationshipCreator.cc,v 1.5 2000/11/20 18:17:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc
index 2fc1034badeb7f31f4249c78826772f067965a2b..70e7925b9a20d50478fcb9ad8154f998569b9741 100644
--- a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RepresentationRelationshipWithTransformationCreator.cc,v 1.2 2000/01/21 13:46:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
index 1e5b8416d663f8d80e1aa6d5a3da41696b897de0..fd5a90b3dbaeee61e8ca10e31b10f4cda190587a 100644
--- a/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShapeDefinitionRepresentationCreator.cc,v 1.5 2000/11/09 16:35:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc
index 41839786a9d392510ea4ddcf8914ac6abad1e895..99c6568a9115011b3e0b25fac0224a34ebc2d176 100644
--- a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShapeRepresentationCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc
index 71b8225ac1fffafcf058023b1176dbe342cdcd3d..46fe69ee3bc19b62771c98683d97533b4dfffbdc 100644
--- a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShapeRepresentationRelationshipCreator.cc,v 1.2 2000/01/21 13:46:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc
index 27d5e76263b5dfc11a6d7a72ed72ea3f6617a2a4..994649238425fc6783eb39e9d6930c7758aa8865 100644
--- a/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SphericalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc
index f395cbf9fc17c05b01a77275e1bbcbd3d93efdcf..3544d83182ed421728d7d4cd6919b24e1adf6035 100644
--- a/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ToroidalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc b/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc
index 6440e688b9338b0555b1d03f79b3ccc126337aaa..d09fa09bed2f064e4c8e8f8a13c8310917b092bf 100644
--- a/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VectorCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc b/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc
index 220037ebdff55c7b1506d62599426396f1e68126..e20d1416e5eaa62a48fb3a99dbd0c5d2c5b7b48e 100644
--- a/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VertexPointCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/History b/source/geometry/solids/specific/History
index b27265c588e39f5d6e0f3c831e8a30871f6d45a4..ec393e1347945e33a10f8d81d93f56f36fb3c09a 100644
--- a/source/geometry/solids/specific/History
+++ b/source/geometry/solids/specific/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.15 2000/11/20 18:18:57 gcosmo Exp $
+$Id: History,v 1.17 2001/04/03 08:28:31 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,7 +17,16 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-20-Nov-2000, G. Cosmo    (geom-solids-specific-V02-00-04)
+03-Apr-2001, D.Williams  (geom-solids-specific-V03-00-01)
+-----------------------
+- G4IntersectingCone.cc: make small adjustment to help with roundoff error
+  in LineHitsCone1() and LineHitsCone2().
+
+08-Jan-2001, D.Williams  (geom-solids-specific-V03-00-00)
+-----------------------
+- G4Hype.cc: Added protecton against zero v.z in DistanceToOut.
+
+20-Nov-2000, G.Cosmo     (geom-solids-specific-V02-00-04)
 ---------------------
 - Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
   o commented out variables declared and not used.
diff --git a/source/geometry/solids/specific/include/G4ClippablePolygon.hh b/source/geometry/solids/specific/include/G4ClippablePolygon.hh
index 7859720c456d581839eee113dfa9da8e32e72da3..01dd9baa5f486c018b4ef066d04fd47c8be49005 100644
--- a/source/geometry/solids/specific/include/G4ClippablePolygon.hh
+++ b/source/geometry/solids/specific/include/G4ClippablePolygon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClippablePolygon.hh,v 1.4 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4ClippablePolygon.icc b/source/geometry/solids/specific/include/G4ClippablePolygon.icc
index a2db82cb63d4a5dce570c8a096be2b1d585a2740..f0493381cc6b646731514a49a3cc82cc451a75ab 100644
--- a/source/geometry/solids/specific/include/G4ClippablePolygon.icc
+++ b/source/geometry/solids/specific/include/G4ClippablePolygon.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClippablePolygon.icc,v 1.1 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/specific/include/G4EllipticalTube.hh b/source/geometry/solids/specific/include/G4EllipticalTube.hh
index 4b0e1d3ba8ea5dd24641e0b20d6e46021f927634..59fdbf97ccf7ccb25157af321231960f95771225 100644
--- a/source/geometry/solids/specific/include/G4EllipticalTube.hh
+++ b/source/geometry/solids/specific/include/G4EllipticalTube.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EllipticalTube.hh,v 1.8 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 class header file
diff --git a/source/geometry/solids/specific/include/G4EnclosingCylinder.hh b/source/geometry/solids/specific/include/G4EnclosingCylinder.hh
index 8ad08c4a3b23a124858387d0b9c58f3b1a917e3b..f48917410a8f651f0f2e558957645e44ca4dfec9 100644
--- a/source/geometry/solids/specific/include/G4EnclosingCylinder.hh
+++ b/source/geometry/solids/specific/include/G4EnclosingCylinder.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnclosingCylinder.hh,v 1.3 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Hype.hh b/source/geometry/solids/specific/include/G4Hype.hh
index ea7bbccbe4ef61ec36744e0afeb325ca9e7c15c4..2ec0d87b615d83018d8fc9514eb0237c67acafb3 100644
--- a/source/geometry/solids/specific/include/G4Hype.hh
+++ b/source/geometry/solids/specific/include/G4Hype.hh
@@ -7,7 +7,7 @@
 //
 // $Id: G4Hype.hh,v 1.4 2000/11/02 16:54:48 gcosmo Exp $
 // $Original: G4Hype.hh,v 1.0 1998/06/09 16:57:50 safai Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Hype.icc b/source/geometry/solids/specific/include/G4Hype.icc
index b87e61bd8d23a0783ed9b8198e4b8981d50986bd..e67d9106eb05b03cec019849b880ce349e56489d 100644
--- a/source/geometry/solids/specific/include/G4Hype.icc
+++ b/source/geometry/solids/specific/include/G4Hype.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Hype.icc,v 1.1 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/specific/include/G4IntersectingCone.hh b/source/geometry/solids/specific/include/G4IntersectingCone.hh
index 0e2ab5a49d8a4cf108d03a0107572df1af0337bf..07603b183586520bc854e388ff93a7d1ba9231e6 100644
--- a/source/geometry/solids/specific/include/G4IntersectingCone.hh
+++ b/source/geometry/solids/specific/include/G4IntersectingCone.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IntersectingCone.hh,v 1.3 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyPhiFace.hh b/source/geometry/solids/specific/include/G4PolyPhiFace.hh
index 045a287563143ea9db2c3f6ad7f2b4ff963a7a88..61af0605d809b263a77c9e9f9b2b6ac66f64b22d 100644
--- a/source/geometry/solids/specific/include/G4PolyPhiFace.hh
+++ b/source/geometry/solids/specific/include/G4PolyPhiFace.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolyPhiFace.hh,v 1.3 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyPhiFace.icc b/source/geometry/solids/specific/include/G4PolyPhiFace.icc
index b23728df65d7c61d7531c30f1d550c780a99dc15..c8b6bba251feb26e3752bdf9638d42e66f243a5f 100644
--- a/source/geometry/solids/specific/include/G4PolyPhiFace.icc
+++ b/source/geometry/solids/specific/include/G4PolyPhiFace.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolyPhiFace.icc,v 1.2 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Polycone.hh b/source/geometry/solids/specific/include/G4Polycone.hh
index 7a343d7a84a59ed12adc769b6afc273c31830075..b7bee90975e1cd8664820352f9e4d99d1ad2a32f 100644
--- a/source/geometry/solids/specific/include/G4Polycone.hh
+++ b/source/geometry/solids/specific/include/G4Polycone.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Polycone.hh,v 1.5 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyconeSide.hh b/source/geometry/solids/specific/include/G4PolyconeSide.hh
index daac1d71d31f41577bd1a5fa28cda1dc9e405c2b..952c810e92aa49cf1ab4dfd8bad6d86ee992db27 100644
--- a/source/geometry/solids/specific/include/G4PolyconeSide.hh
+++ b/source/geometry/solids/specific/include/G4PolyconeSide.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolyconeSide.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Polyhedra.hh b/source/geometry/solids/specific/include/G4Polyhedra.hh
index 59aa0bc23d124fe0ed2b4c828a6944a5c494c0ad..46ba3c666bc5a3ec18311b478242e690cd3d7cec 100644
--- a/source/geometry/solids/specific/include/G4Polyhedra.hh
+++ b/source/geometry/solids/specific/include/G4Polyhedra.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Polyhedra.hh,v 1.4 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyhedraSide.hh b/source/geometry/solids/specific/include/G4PolyhedraSide.hh
index 9ed12fd64429e368357f0d02f234aeed7a730d50..ca75b0dd86b053c04052bfb6e6d064a8a09bf91a 100644
--- a/source/geometry/solids/specific/include/G4PolyhedraSide.hh
+++ b/source/geometry/solids/specific/include/G4PolyhedraSide.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolyhedraSide.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4ReduciblePolygon.hh b/source/geometry/solids/specific/include/G4ReduciblePolygon.hh
index 47735b777ee43bd82b76c7906e7511ff597f50f8..77ac611afe0eecc8e67c74a9a0043156586f6fc9 100644
--- a/source/geometry/solids/specific/include/G4ReduciblePolygon.hh
+++ b/source/geometry/solids/specific/include/G4ReduciblePolygon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReduciblePolygon.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4SolidExtentList.hh b/source/geometry/solids/specific/include/G4SolidExtentList.hh
index b8b3edda7035d2159f674b90a9a9b6debb883b23..7e86a72824c8118b0e84d3f25b342dd6b15e7454 100644
--- a/source/geometry/solids/specific/include/G4SolidExtentList.hh
+++ b/source/geometry/solids/specific/include/G4SolidExtentList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SolidExtentList.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4VCSGface.hh b/source/geometry/solids/specific/include/G4VCSGface.hh
index 329801ad004c3507bccaa7a4cd86a8d196b86bc6..b3c1ca58141e4f829c52c5d9e320ee0f277ddea3 100644
--- a/source/geometry/solids/specific/include/G4VCSGface.hh
+++ b/source/geometry/solids/specific/include/G4VCSGface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VCSGface.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4VCSGfaceted.hh b/source/geometry/solids/specific/include/G4VCSGfaceted.hh
index b70072626741dbbd4ce8e4a2ba8c9f892f075c4b..ea0e7c3beca44b383c6bfb925cd88c5d2b245391 100644
--- a/source/geometry/solids/specific/include/G4VCSGfaceted.hh
+++ b/source/geometry/solids/specific/include/G4VCSGfaceted.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VCSGfaceted.hh,v 1.5 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4ClippablePolygon.cc b/source/geometry/solids/specific/src/G4ClippablePolygon.cc
index 81bde7409b0b69cfe1ba0da65fcadbe3de492106..ed40c679d04d62124172bd4abfd9a5162a6e7589 100644
--- a/source/geometry/solids/specific/src/G4ClippablePolygon.cc
+++ b/source/geometry/solids/specific/src/G4ClippablePolygon.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ClippablePolygon.cc,v 1.4 2000/11/13 08:11:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4EllipticalTube.cc b/source/geometry/solids/specific/src/G4EllipticalTube.cc
index 558d597cea6656226b601584b5e0658c54ef9bbf..4bf2f436f85994c86f1a88abb607fd9e9aca983f 100644
--- a/source/geometry/solids/specific/src/G4EllipticalTube.cc
+++ b/source/geometry/solids/specific/src/G4EllipticalTube.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EllipticalTube.cc,v 1.9 2000/11/20 18:18:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4EnclosingCylinder.cc b/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
index 4186a39f5770ea0d6f50e00a0c9aa9f8f27a5e29..0f62d67b43de2919f6f18bd4150d49e1982594be 100644
--- a/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
+++ b/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnclosingCylinder.cc,v 1.2 2000/11/02 16:54:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4Hype.cc b/source/geometry/solids/specific/src/G4Hype.cc
index da4d35eefc26466d63834940b9d04483e2ed61be..2f6d7650730a2da1459b8b19391f57f5a0b1c79e 100644
--- a/source/geometry/solids/specific/src/G4Hype.cc
+++ b/source/geometry/solids/specific/src/G4Hype.cc
@@ -5,9 +5,9 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Hype.cc,v 1.5 2000/11/20 18:18:58 gcosmo Exp $
+// $Id: G4Hype.cc,v 1.6 2001/01/04 18:30:50 davidw Exp $
 // $Original: G4Hype.cc,v 1.0 1998/06/09 16:57:50 safai Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
@@ -842,9 +842,9 @@ G4double G4Hype::DistanceToOut( const G4ThreeVector& p,const G4ThreeVector& v,
 	}
 
 	//
-	// Nope. Get distance.
+	// Nope. Get distance. Beware of zero vz.
 	//
-	sBest = (halfLenZ - pz)/vz;
+	sBest = (vz > DBL_MIN) ? (halfLenZ - pz)/vz : kInfinity;
 	vBest = true;
 	
 	//
diff --git a/source/geometry/solids/specific/src/G4IntersectingCone.cc b/source/geometry/solids/specific/src/G4IntersectingCone.cc
index 6939056b1e6b5b9673656850cbb6046433ee1611..bb16a8e53c0c3d14dd98bbf75d8f0052c599ed1d 100644
--- a/source/geometry/solids/specific/src/G4IntersectingCone.cc
+++ b/source/geometry/solids/specific/src/G4IntersectingCone.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IntersectingCone.cc,v 1.2 2000/10/20 16:02:30 davidw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IntersectingCone.cc,v 1.3 2001/03/30 18:44:10 davidw Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
@@ -177,7 +177,7 @@ G4int G4IntersectingCone::LineHitsCone1( const G4ThreeVector &p, const G4ThreeVe
 	
 	G4double radical = b*b - 4*a*c;
 	
-	if (radical < -1E-6) return 0;		// No solution
+	if (radical < -1E-6*fabs(b)) return 0;		// No solution
 	
 	if (radical < 1E-6*fabs(b)) {
 		//
@@ -269,7 +269,7 @@ G4int G4IntersectingCone::LineHitsCone2( const G4ThreeVector &p, const G4ThreeVe
 	
 	G4double radical = b*b - 4*a*c;
 	
-	if (radical < -1E-6) return 0;		// No solution
+	if (radical < -1E-6*fabs(b)) return 0;		// No solution
 	
 	if (radical < 1E-6*fabs(b)) {
 		//
diff --git a/source/geometry/solids/specific/src/G4PolyPhiFace.cc b/source/geometry/solids/specific/src/G4PolyPhiFace.cc
index e7faf69f9618a02a956215b37b96253efe5f69ff..0ca56537598147db6854675773893b9b33b3d913 100644
--- a/source/geometry/solids/specific/src/G4PolyPhiFace.cc
+++ b/source/geometry/solids/specific/src/G4PolyPhiFace.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolyPhiFace.cc,v 1.3 2000/11/20 18:18:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4Polycone.cc b/source/geometry/solids/specific/src/G4Polycone.cc
index e457e32e29f4baa0aa5330158a34b023b65a618e..f0f13dc52c0f3b3887b52fe4c0caa1a9ad57dd61 100644
--- a/source/geometry/solids/specific/src/G4Polycone.cc
+++ b/source/geometry/solids/specific/src/G4Polycone.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Polycone.cc,v 1.4 2000/11/02 16:54:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4PolyconeSide.cc b/source/geometry/solids/specific/src/G4PolyconeSide.cc
index 3081e6a755bcd78258c08c549a6b5b028f2cf88e..0cd8f2235b1e461aea6e76c00d8a38dcb57a14b9 100644
--- a/source/geometry/solids/specific/src/G4PolyconeSide.cc
+++ b/source/geometry/solids/specific/src/G4PolyconeSide.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolyconeSide.cc,v 1.3 2000/11/20 18:18:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4Polyhedra.cc b/source/geometry/solids/specific/src/G4Polyhedra.cc
index cf9fbe5225b8da40100bda8000d584b0c8daf153..239130beee0d9303b7058538d0d1a41c73128e03 100644
--- a/source/geometry/solids/specific/src/G4Polyhedra.cc
+++ b/source/geometry/solids/specific/src/G4Polyhedra.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Polyhedra.cc,v 1.2 2000/11/02 16:54:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4PolyhedraSide.cc b/source/geometry/solids/specific/src/G4PolyhedraSide.cc
index f637d7aecfe47081eed68088d022f8fb77954f87..4eb011097bb7b4d36e620cf4b97662f8b7e59cec 100644
--- a/source/geometry/solids/specific/src/G4PolyhedraSide.cc
+++ b/source/geometry/solids/specific/src/G4PolyhedraSide.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PolyhedraSide.cc,v 1.3 2000/11/20 18:19:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4ReduciblePolygon.cc b/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
index 813bc4adcd78abd76ff3ef5cfb63f1085f8908e7..5424d51cb38a0cf97e2a3b3ae41359bca6fc48b0 100644
--- a/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
+++ b/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReduciblePolygon.cc,v 1.3 2000/11/20 18:19:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4SolidExtentList.cc b/source/geometry/solids/specific/src/G4SolidExtentList.cc
index 12f9efce77de5bc2308d25817bdfb0b3385a9fac..6e6237b2dcda16691a99629a1f5762f6fe4b2562 100644
--- a/source/geometry/solids/specific/src/G4SolidExtentList.cc
+++ b/source/geometry/solids/specific/src/G4SolidExtentList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SolidExtentList.cc,v 1.1 2000/04/07 11:03:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4VCSGfaceted.cc b/source/geometry/solids/specific/src/G4VCSGfaceted.cc
index c7122c2be672d8adfbad3f21848f62f9b880aeb2..9f9da08f2c9fdb181f74d4e93a0404f9af9bf78f 100644
--- a/source/geometry/solids/specific/src/G4VCSGfaceted.cc
+++ b/source/geometry/solids/specific/src/G4VCSGfaceted.cc
@@ -5,7 +5,7 @@
 // and all its terms.
 //
 // $Id: G4VCSGfaceted.cc,v 1.6 2000/11/20 18:19:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/volumes/History b/source/geometry/volumes/History
index c8c8b974299890cd6af29b1c1ea6018841fb1712..40bb37e81406feb185f9217899d7e5c7677d0cd3 100644
--- a/source/geometry/volumes/History
+++ b/source/geometry/volumes/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.29 2000/11/20 19:07:52 gcosmo Exp $
+$Id: History,v 1.33 2001/03/19 12:10:41 japost Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,29 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+March 12th, 2001     J. Apostolakis - geomvol-V03-00-03
+- G4PropagatorInField: 
+     Modified to use new (not obsolete) methods of G4FieldTrack. 
+     Deleted old/obsolete ComputeStep method 
+         (that was being used only for testing purposes, but
+          could not be used anymore after change to Momentum Integration.)
+
+March 12th, 2001     G. Cosmo - geomvol-V03-00-02
+- G4ReplicaNavigation::ComputeStep(): apply push of kCarTolerance to ourStep
+  in case the proposed step is zero.
+
+February 23rd, 2001  G. Cosmo - geomvol-V03-00-01
+- Restored original 0.5 shift for kPhi transformation in ComputeTransformation()
+  methods, as original specifications from P.Kent impose.
+- Fixed bug in ComputeTransformation(const G4int rNo, G4VPhysicalVolume* pVol)
+  where 'pVol' was NOT passed to SetPhiTransformation() in the kPhi case (!).
+
+February 15th, 2001  G. Cosmo - geomvol-V03-00-00
+
+- Fix in G4ReplicaNavigation::ComputeTransformation(...) for kPhi case.
+  Removed shift of 0.5 to center of replica volume to conform with original
+  specifications for replica transformations in Phi.
+- Cosmetics in G4ReplicaNavigation.cc.
 
 November 20th, 2000  G. Cosmo - geomvol-V02-00-01
 
diff --git a/source/geometry/volumes/include/G4AuxiliaryNavServices.hh b/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
index 489aeba3a4351d697ed9827853ccc61539d88b3f..d34c556a6a124c4c46c67f32d1b94e939c6c5b75 100644
--- a/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
+++ b/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AuxiliaryNavServices.hh,v 1.3 2000/04/25 16:15:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4NormalNavigation
diff --git a/source/geometry/volumes/include/G4BlockingList.hh b/source/geometry/volumes/include/G4BlockingList.hh
index 95bf29ac606c282bcbdbb222016863d9504e75cb..6325eefeac7180435ee5f825c67de6d10a68f230 100644
--- a/source/geometry/volumes/include/G4BlockingList.hh
+++ b/source/geometry/volumes/include/G4BlockingList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BlockingList.hh,v 1.4 2000/04/25 16:15:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4BlockingList
 //
diff --git a/source/geometry/volumes/include/G4BlockingList.icc b/source/geometry/volumes/include/G4BlockingList.icc
index 4cce6e21b117c26195c68b7216feaf85372da0c4..e972635ba4f9605730cb5d345995accf29929317 100644
--- a/source/geometry/volumes/include/G4BlockingList.icc
+++ b/source/geometry/volumes/include/G4BlockingList.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BlockingList.icc,v 1.3 2000/11/20 18:59:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4BlockingList  Inlined Implementation
diff --git a/source/geometry/volumes/include/G4GRSSolid.hh b/source/geometry/volumes/include/G4GRSSolid.hh
index d9a580a59a94879d41618ff730a9da179dcc5b67..ea8acd0e0e35e33e2479570cc064d8d89ffa58f5 100644
--- a/source/geometry/volumes/include/G4GRSSolid.hh
+++ b/source/geometry/volumes/include/G4GRSSolid.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GRSSolid.hh,v 1.4 2000/11/01 16:51:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4GRSSolid
diff --git a/source/geometry/volumes/include/G4GRSSolid.icc b/source/geometry/volumes/include/G4GRSSolid.icc
index abbd8120f111d99231c6d2f6dfd3fef6c58a752a..3e07b3f005b45929e756f9098ababbbf42cf474d 100644
--- a/source/geometry/volumes/include/G4GRSSolid.icc
+++ b/source/geometry/volumes/include/G4GRSSolid.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GRSSolid.icc,v 1.4 2000/11/20 18:59:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4GRSSolid inline implementation
diff --git a/source/geometry/volumes/include/G4GRSVolume.hh b/source/geometry/volumes/include/G4GRSVolume.hh
index 18ecb7d318e830f5d677a2a36cae8e32b45de909..a9d7a486bb95f188fa50c033c531084d2ffed031 100644
--- a/source/geometry/volumes/include/G4GRSVolume.hh
+++ b/source/geometry/volumes/include/G4GRSVolume.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GRSVolume.hh,v 1.4 2000/11/01 16:51:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4GRSVolume
diff --git a/source/geometry/volumes/include/G4GRSVolume.icc b/source/geometry/volumes/include/G4GRSVolume.icc
index 30497143ab97b2c4e0f3dc554f9681f430cd87f2..86493c4fe95356fa94b6df60e9e46ec901988228 100644
--- a/source/geometry/volumes/include/G4GRSVolume.icc
+++ b/source/geometry/volumes/include/G4GRSVolume.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GRSVolume.icc,v 1.5 2000/11/20 18:59:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4GRSVolume inline implementation
diff --git a/source/geometry/volumes/include/G4LogicalBorderSurface.hh b/source/geometry/volumes/include/G4LogicalBorderSurface.hh
index 8a9d3772f89781f4b531ef2973a6459121ce45c2..5fd3ec7a76e588450c11d771da104c26b73876d5 100644
--- a/source/geometry/volumes/include/G4LogicalBorderSurface.hh
+++ b/source/geometry/volumes/include/G4LogicalBorderSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalBorderSurface.hh,v 1.5 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // class G4LogicalBorderSurface
diff --git a/source/geometry/volumes/include/G4LogicalBorderSurface.icc b/source/geometry/volumes/include/G4LogicalBorderSurface.icc
index abc5739ce1febb5b83e7fd48e31dd9c3ec5f2bf7..c52f656ebdc45807ef8600a7502d9b15504bec40 100644
--- a/source/geometry/volumes/include/G4LogicalBorderSurface.icc
+++ b/source/geometry/volumes/include/G4LogicalBorderSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalBorderSurface.icc,v 1.2 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4LogicalBorderSurface inline implementation
diff --git a/source/geometry/volumes/include/G4LogicalSkinSurface.hh b/source/geometry/volumes/include/G4LogicalSkinSurface.hh
index 59941daf4ddbead73f52302b7e6ae7bdd0cc8be8..f8269a5a3a038f75d0e7fcc3b6d3aca3a378078c 100644
--- a/source/geometry/volumes/include/G4LogicalSkinSurface.hh
+++ b/source/geometry/volumes/include/G4LogicalSkinSurface.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalSkinSurface.hh,v 1.5 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // class G4LogicalSkinSurface
diff --git a/source/geometry/volumes/include/G4LogicalSkinSurface.icc b/source/geometry/volumes/include/G4LogicalSkinSurface.icc
index 3bde489c362b69716640026137ba4a1296ff2b87..7cc2faa5020b21248e1981ffc30218e13c2b73a0 100644
--- a/source/geometry/volumes/include/G4LogicalSkinSurface.icc
+++ b/source/geometry/volumes/include/G4LogicalSkinSurface.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalSkinSurface.icc,v 1.2 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4LogicalSkinSurface inline implementation
diff --git a/source/geometry/volumes/include/G4NavigationHistory.hh b/source/geometry/volumes/include/G4NavigationHistory.hh
index 3a62772723ea8429c16c3e47714a388be1e64249..29170f156a4a83d6aecadea6f6dda68a9791614c 100644
--- a/source/geometry/volumes/include/G4NavigationHistory.hh
+++ b/source/geometry/volumes/include/G4NavigationHistory.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NavigationHistory.hh,v 1.7 2000/11/20 18:59:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4NavigationHistory
 //
diff --git a/source/geometry/volumes/include/G4NavigationHistory.icc b/source/geometry/volumes/include/G4NavigationHistory.icc
index cf7cc8e19f60c3a7faac78696de5eb5234fa9a46..51a9de2d0f0d21565d01320085b2ff66a4605a62 100644
--- a/source/geometry/volumes/include/G4NavigationHistory.icc
+++ b/source/geometry/volumes/include/G4NavigationHistory.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NavigationHistory.icc,v 1.3 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4NavigationHistory Inline implementation
diff --git a/source/geometry/volumes/include/G4NavigationLevel.hh b/source/geometry/volumes/include/G4NavigationLevel.hh
index 23af556c0283a4e5d961115d6dae5c3d9607e82b..948f62109f4f7c728211e71a9a6d214ed12e0e17 100644
--- a/source/geometry/volumes/include/G4NavigationLevel.hh
+++ b/source/geometry/volumes/include/G4NavigationLevel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NavigationLevel.hh,v 1.12 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4NavigationLevel
 //
diff --git a/source/geometry/volumes/include/G4NavigationLevel.icc b/source/geometry/volumes/include/G4NavigationLevel.icc
index f897297eaec5b43ea3733c38177ce24ff242f472..1e54926054566c1dc97900993635ac1d371dea28 100644
--- a/source/geometry/volumes/include/G4NavigationLevel.icc
+++ b/source/geometry/volumes/include/G4NavigationLevel.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NavigationLevel.icc,v 1.10 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 6904f5ab151635a44df53c8a146a83a7ad10f20f..183e11abd2503b465826ab6ea2d65e232e1e2259 100644
--- a/source/geometry/volumes/include/G4NavigationLevelRep.hh
+++ b/source/geometry/volumes/include/G4NavigationLevelRep.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NavigationLevelRep.hh,v 1.5 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4NavigationLevelRep
 //
diff --git a/source/geometry/volumes/include/G4NavigationLevelRep.icc b/source/geometry/volumes/include/G4NavigationLevelRep.icc
index f47721ab31c9fff8988f81f214d241e1c98c89f1..03abb9398b9895efceee4e0d374825d14daa9479 100644
--- a/source/geometry/volumes/include/G4NavigationLevelRep.icc
+++ b/source/geometry/volumes/include/G4NavigationLevelRep.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NavigationLevelRep.icc,v 1.4 2000/11/20 18:59:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 278f63c54a6a8fbef0d877e4474dad9cdcfe6f8e..b0c1e88ceaca92259452d950b5880c8f0c425420 100644
--- a/source/geometry/volumes/include/G4Navigator.hh
+++ b/source/geometry/volumes/include/G4Navigator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Navigator.hh,v 1.6 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4Navigator
diff --git a/source/geometry/volumes/include/G4Navigator.icc b/source/geometry/volumes/include/G4Navigator.icc
index 59cd112a9322bfd04612968828bcac6faf8cd160..f0a632836aff6cfaf6fa5ae4392dcf519d2e64b0 100644
--- a/source/geometry/volumes/include/G4Navigator.icc
+++ b/source/geometry/volumes/include/G4Navigator.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Navigator.icc,v 1.3 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4Navigator Inline implementation
diff --git a/source/geometry/volumes/include/G4NormalNavigation.hh b/source/geometry/volumes/include/G4NormalNavigation.hh
index 21babcf69ca9148d275557bd64c1f778a52c89f9..6ca0a5bb0421308812f6240dc5021d28a1d6bafa 100644
--- a/source/geometry/volumes/include/G4NormalNavigation.hh
+++ b/source/geometry/volumes/include/G4NormalNavigation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NormalNavigation.hh,v 1.3 2000/04/25 16:15:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4NormalNavigation
diff --git a/source/geometry/volumes/include/G4NormalNavigation.icc b/source/geometry/volumes/include/G4NormalNavigation.icc
index 69034e0523470cadac03c0829694fff99f5a630e..222d0dc314d96488152ad4d2d6523c254f39323b 100644
--- a/source/geometry/volumes/include/G4NormalNavigation.icc
+++ b/source/geometry/volumes/include/G4NormalNavigation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NormalNavigation.icc,v 1.3 2000/11/20 18:59:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4NormalNavigation Inline Implementation
diff --git a/source/geometry/volumes/include/G4ParameterisedNavigation.hh b/source/geometry/volumes/include/G4ParameterisedNavigation.hh
index 404b2dbca6b150e09adb5dd66c74ec7e10cdc32e..80d74453f16794d0b25c99546f5d756ceb0b29c8 100644
--- a/source/geometry/volumes/include/G4ParameterisedNavigation.hh
+++ b/source/geometry/volumes/include/G4ParameterisedNavigation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParameterisedNavigation.hh,v 1.3 2000/04/25 16:15:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4ParameterisedNavigation
diff --git a/source/geometry/volumes/include/G4ParameterisedNavigation.icc b/source/geometry/volumes/include/G4ParameterisedNavigation.icc
index 0501d53d5e77a8655dd768dd4b19bb8a2365bee4..9c5597d8e65922a274debc58b13b53b8c3e6f61d 100644
--- a/source/geometry/volumes/include/G4ParameterisedNavigation.icc
+++ b/source/geometry/volumes/include/G4ParameterisedNavigation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParameterisedNavigation.icc,v 1.3 2000/11/20 18:59:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4ParameterisedNavigation Inline implementation
diff --git a/source/geometry/volumes/include/G4PropagatorInField.hh b/source/geometry/volumes/include/G4PropagatorInField.hh
index 96de92eb5ee1656ed8657233b4b65ea225682cc8..9af8415927f8d0efbc29dadcadfb78be434b4be5 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.10 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PropagatorInField.hh,v 1.10.4.1 2001/02/20 18:23:31 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PropagatorInField 
@@ -57,15 +57,15 @@ class G4PropagatorInField
   ~G4PropagatorInField(){};
 
    G4double ComputeStep(G4FieldTrack  &pFieldTrack,
-			G4double pCurrentProposedStepLength,
-			G4double       &pNewSafety, 
+ 			G4double pCurrentProposedStepLength,
+ 			G4double       &pNewSafety, 
 			G4VPhysicalVolume *pPhysVol=0 );
 
-   G4double ComputeStep(const G4ThreeVector &pGlobalPoint,
-		        const G4ThreeVector &pCurveTangent,    // Unit vector
-		              G4double pCurrentProposedStepLength,
-			      G4double       &pNewSafety, 
-                       	      G4VPhysicalVolume *pPhysVol=0 );
+  //  G4double ComputeStep(const G4ThreeVector &pGlobalPoint,
+  // 		        const G4ThreeVector &pCurveTangent,    // Unit vector
+  //		              G4double pCurrentProposedStepLength,
+  // 			      G4double       &pNewSafety, 
+  //                          G4VPhysicalVolume *pPhysVol=0 );
      // Compute the next geometric Step
 
    inline G4ThreeVector  EndPosition() const;       
diff --git a/source/geometry/volumes/include/G4PropagatorInField.icc b/source/geometry/volumes/include/G4PropagatorInField.icc
index 4f329b3dc9d03b3c25b99405ab6d45adee305326..b6e7e610e5a5ab1ee185c3490ea3c4c5fd943041 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.13 2000/11/20 19:02:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PropagatorInField.icc,v 1.13.4.1 2001/02/20 18:23:32 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------------------
@@ -31,7 +31,7 @@ G4PropagatorInField::G4PropagatorInField(G4Navigator    *theNavigator,
   : fDetectorFieldMgr(detectorFieldMgr),
     fNavigator(theNavigator),
     End_PointAndTangent(G4ThreeVector(0.,0.,0.),
-			G4ThreeVector(0.,0.,0.),0.0,0.0),
+			G4ThreeVector(0.,0.,0.),0.0,0.0,0.0,0.0),
     fVerboseLevel(0),
     fDelta_One_Step_Value(fDefault_Delta_One_Step_Value),
     fDelta_Intersection_Val(fDefault_Delta_Intersection_Val),
@@ -68,7 +68,7 @@ void G4PropagatorInField::SetChargeMomentumMass(
 inline
 G4ThreeVector  G4PropagatorInField::EndPosition() const
 {
-      return   End_PointAndTangent.Position(); 
+      return   End_PointAndTangent.GetPosition(); 
 }
 
 inline
diff --git a/source/geometry/volumes/include/G4ReplicaNavigation.hh b/source/geometry/volumes/include/G4ReplicaNavigation.hh
index b0d7e40a93a3fa3342f8cd998f2b05b6bcc11d29..45af520aecf964456ec81cfb94d6f64dee37c771 100644
--- a/source/geometry/volumes/include/G4ReplicaNavigation.hh
+++ b/source/geometry/volumes/include/G4ReplicaNavigation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReplicaNavigation.hh,v 1.3 2000/04/25 16:15:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4ReplicaNavigation
diff --git a/source/geometry/volumes/include/G4ReplicaNavigation.icc b/source/geometry/volumes/include/G4ReplicaNavigation.icc
index 51d8e4c0260f7fcecc33abf378d037d83a25140c..b47c7a52b2d8434a4401883e5bb67757eabfc36d 100644
--- a/source/geometry/volumes/include/G4ReplicaNavigation.icc
+++ b/source/geometry/volumes/include/G4ReplicaNavigation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ReplicaNavigation.icc,v 1.3 2000/11/20 18:59:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4ReplicaNavigation Inline implementation
diff --git a/source/geometry/volumes/include/G4TouchableHistory.hh b/source/geometry/volumes/include/G4TouchableHistory.hh
index 6eaaca98dbbd4d449cd4f25ecf7d465fc2290c4d..5a233ae27710d807f80e213af11307e2778add30 100644
--- a/source/geometry/volumes/include/G4TouchableHistory.hh
+++ b/source/geometry/volumes/include/G4TouchableHistory.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TouchableHistory.hh,v 1.4 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4TouchableHistory
diff --git a/source/geometry/volumes/include/G4TouchableHistory.icc b/source/geometry/volumes/include/G4TouchableHistory.icc
index c9f6b8c945e026a2d851db4c5ee0f378d34a6463..606ccd25d4bd1b743db9820607b6201e7b184626 100644
--- a/source/geometry/volumes/include/G4TouchableHistory.icc
+++ b/source/geometry/volumes/include/G4TouchableHistory.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TouchableHistory.icc,v 1.5 2000/11/20 18:59:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4TouchableHistory inline implementation
diff --git a/source/geometry/volumes/include/G4TransportationManager.hh b/source/geometry/volumes/include/G4TransportationManager.hh
index d8c2e4ac63fa938d5ceedfc7cc9672e310a907d0..7cb14c3372a6d134fff989b975182453d6442366 100644
--- a/source/geometry/volumes/include/G4TransportationManager.hh
+++ b/source/geometry/volumes/include/G4TransportationManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TransportationManager.hh,v 1.5 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4TransportationManager
 //
diff --git a/source/geometry/volumes/include/G4TransportationManager.icc b/source/geometry/volumes/include/G4TransportationManager.icc
index 7111c7983a1edcf4fd3a54e8b430df81ee4035d4..cef72ae5ac408fcf9829f20591df2c7e4750ccf8 100644
--- a/source/geometry/volumes/include/G4TransportationManager.icc
+++ b/source/geometry/volumes/include/G4TransportationManager.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TransportationManager.icc,v 1.4 2000/11/01 16:51:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //	GEANT 4  inlined function members implementation
 // ------------------------------------------------------------
diff --git a/source/geometry/volumes/include/G4VoxelNavigation.hh b/source/geometry/volumes/include/G4VoxelNavigation.hh
index 472aa7bff23e15faee5c1461b28351b60f4399a5..7b1ab76c22fa0659988ee0818506914a093d6c8e 100644
--- a/source/geometry/volumes/include/G4VoxelNavigation.hh
+++ b/source/geometry/volumes/include/G4VoxelNavigation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VoxelNavigation.hh,v 1.7 2000/11/01 16:51:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4VoxelNavigation
diff --git a/source/geometry/volumes/include/G4VoxelNavigation.icc b/source/geometry/volumes/include/G4VoxelNavigation.icc
index fe5cf572158d5af7015d13d557e7b446272508bb..37280548fb68d7826a43960e973f0317dc834fcd 100644
--- a/source/geometry/volumes/include/G4VoxelNavigation.icc
+++ b/source/geometry/volumes/include/G4VoxelNavigation.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VoxelNavigation.icc,v 1.4 2000/11/20 18:59:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4VoxelNavigation Inline implementation
diff --git a/source/geometry/volumes/src/G4BlockingList.cc b/source/geometry/volumes/src/G4BlockingList.cc
index b9ebc8cad8de27c428bf6a1029c49e1695348d88..02f186aa7057571344fd7658aea6b2a2b86e4f76 100644
--- a/source/geometry/volumes/src/G4BlockingList.cc
+++ b/source/geometry/volumes/src/G4BlockingList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BlockingList.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4BlockingList Implementation
diff --git a/source/geometry/volumes/src/G4GRSSolid.cc b/source/geometry/volumes/src/G4GRSSolid.cc
index b3413da260e3e2ffba73802face2022102a8ab5c..0d8c5f4a49c69af33d574e1714b91d193c2815c1 100644
--- a/source/geometry/volumes/src/G4GRSSolid.cc
+++ b/source/geometry/volumes/src/G4GRSSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GRSSolid.cc,v 1.3 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4GRSSolid Implementation
diff --git a/source/geometry/volumes/src/G4GRSVolume.cc b/source/geometry/volumes/src/G4GRSVolume.cc
index 6faa184d00716f40d0becd8c842a90349a2899f5..511ec0de51e276ecac4b5c3e756605f9f5564435 100644
--- a/source/geometry/volumes/src/G4GRSVolume.cc
+++ b/source/geometry/volumes/src/G4GRSVolume.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GRSVolume.cc,v 1.3 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4GRSVolume Implementation
diff --git a/source/geometry/volumes/src/G4LogicalBorderSurface.cc b/source/geometry/volumes/src/G4LogicalBorderSurface.cc
index 536a28ea97626a6ea14739864413971725ce4ea6..e0b4f5cbb17254035997ff80663b4086cb24bfe3 100644
--- a/source/geometry/volumes/src/G4LogicalBorderSurface.cc
+++ b/source/geometry/volumes/src/G4LogicalBorderSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalBorderSurface.cc,v 1.5 2000/11/20 19:05:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalBorderSurface Implementation
diff --git a/source/geometry/volumes/src/G4LogicalSkinSurface.cc b/source/geometry/volumes/src/G4LogicalSkinSurface.cc
index 7388e72f2ad061ca58a0e6a9cbe98417583caef0..1a6a3a5288f3e1e1a0eb24f02acccae3a7e1eacb 100644
--- a/source/geometry/volumes/src/G4LogicalSkinSurface.cc
+++ b/source/geometry/volumes/src/G4LogicalSkinSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalSkinSurface.cc,v 1.5 2000/11/20 19:05:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalSkinSurface Implementation
diff --git a/source/geometry/volumes/src/G4NavigationHistory.cc b/source/geometry/volumes/src/G4NavigationHistory.cc
index 6dbe66ae563371a4ba2112c11f506f8df300e906..c72a1c6e399468aa37e7126f4c98e0c550e61e6c 100644
--- a/source/geometry/volumes/src/G4NavigationHistory.cc
+++ b/source/geometry/volumes/src/G4NavigationHistory.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NavigationHistory.cc,v 1.3 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4NavigationHistory Implementation P.Kent August 96
diff --git a/source/geometry/volumes/src/G4Navigator.cc b/source/geometry/volumes/src/G4Navigator.cc
index 1dce1aaecded88a52d760f22220d979d38b30091..6f7fd85c3cf36a81fb0447b059d300e86867de85 100644
--- a/source/geometry/volumes/src/G4Navigator.cc
+++ b/source/geometry/volumes/src/G4Navigator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Navigator.cc,v 1.11 2000/11/20 19:05:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4Navigator Implementation  Paul Kent July 95/96
diff --git a/source/geometry/volumes/src/G4NormalNavigation.cc b/source/geometry/volumes/src/G4NormalNavigation.cc
index 5838557c9bf122120712b8fd245beabf7ec4d7e1..361ae6f6f5cf8579e965ea083fc30583b13beb96 100644
--- a/source/geometry/volumes/src/G4NormalNavigation.cc
+++ b/source/geometry/volumes/src/G4NormalNavigation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NormalNavigation.cc,v 1.3 2000/11/20 19:05:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4NormalNavigation Implementation
diff --git a/source/geometry/volumes/src/G4ParameterisedNavigation.cc b/source/geometry/volumes/src/G4ParameterisedNavigation.cc
index b6253e4602ea82847a4ef6fc8a04a64e62ac592e..3d52a68d025526eed252b70515e201779f706d6b 100644
--- a/source/geometry/volumes/src/G4ParameterisedNavigation.cc
+++ b/source/geometry/volumes/src/G4ParameterisedNavigation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParameterisedNavigation.cc,v 1.3 2000/11/20 19:05:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4ParameterisedNavigation Implementation
diff --git a/source/geometry/volumes/src/G4PropagatorInField.cc b/source/geometry/volumes/src/G4PropagatorInField.cc
index ce263157ade60aa56def1528de6b39f339a63293..5fe0832d83736b6762cfdc82d5310a56fa7a4fef 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.12 2000/11/20 19:05:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PropagatorInField.cc,v 1.12.4.1 2001/02/20 18:23:32 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // 
@@ -33,6 +33,7 @@
 //const G4double G4PropagatorInField::fDefault_Delta_One_Step_Value = 0.25 * mm;
 
 // -------------------------------------------------------------------------
+#if OLD_SIGNATURE_IS_INVALID
 G4double 
 G4PropagatorInField::
   ComputeStep(const  G4ThreeVector &   StartPointA,
@@ -47,6 +48,7 @@ G4PropagatorInField::
 		   Velocity, 
 		   0.0,          // length of path
 		   0.0,          // energy
+	      // PROBLEM ---> zero energy will create zero momentum !!
                    0.0,          // lab tof
 		   0.0,          // proper tof
 		   0 );
@@ -56,6 +58,7 @@ G4PropagatorInField::
 			    CurrentProposedStepLength, 
 			    currentSafety );
 }
+#endif
 
 // -------------------------------------------------------------------------
 G4double 
@@ -158,7 +161,7 @@ G4PropagatorInField::
      //    On Exit:
      //         CurrentState is updated with the final position and velocity. 
 
-     G4ThreeVector  EndPointB= CurrentState.Position(); 
+     G4ThreeVector  EndPointB= CurrentState.GetPosition(); 
 
      // Calculate the direction and length of the chord AB
      
@@ -204,8 +207,8 @@ G4PropagatorInField::
 	   //  G is our EndPoint ...
 	   End_PointAndTangent= IntersectPointVelct_G;
 	   StepTaken = 
-	   TruePathLength= IntersectPointVelct_G.CurveS()
-	                         - OriginalState.CurveS(); // which is Zero now.
+	   TruePathLength= IntersectPointVelct_G.GetCurveLength()
+	                         - OriginalState.GetCurveLength(); // which is Zero now.
 #ifdef G4VERBOSE
 	   if( Verbose() > 0 )
 	      G4cout << " Found intersection after Step of length " << 
@@ -272,16 +275,16 @@ G4PropagatorInField::
 
 #ifdef G4VERBOSE
   // Check that "s" is correct 
-  if( fabs(OriginalState.CurveS() + TruePathLength 
-            - End_PointAndTangent.CurveS()) > 3.e-4 * TruePathLength )
+  if( fabs(OriginalState.GetCurveLength() + TruePathLength 
+            - End_PointAndTangent.GetCurveLength()) > 3.e-4 * TruePathLength )
   {
       G4cerr << " Error in G4PropagatorInField: Curve lenght mis-match, is advancement wrong ? ";
       G4cerr << " The curve length of the endpoint should be " 
-	   << OriginalState.CurveS() + TruePathLength 
-           << " and is " <<  End_PointAndTangent.CurveS() 
+	   << OriginalState.GetCurveLength() + TruePathLength 
+           << " and is " <<  End_PointAndTangent.GetCurveLength() 
            << " a difference of " 
-	   << OriginalState.CurveS() + TruePathLength 
-              - End_PointAndTangent.CurveS() << G4endl;
+	   << OriginalState.GetCurveLength() + TruePathLength 
+              - End_PointAndTangent.GetCurveLength() << G4endl;
   }
 #endif
 
@@ -352,8 +355,8 @@ G4PropagatorInField::LocateIntersectionPoint(
 
   do{					      // REPEAT
 
-    G4ThreeVector  Point_A=  CurrentA_PointVelocity.Position();  
-    G4ThreeVector  Point_B=  CurrentB_PointVelocity.Position();  
+    G4ThreeVector  Point_A=  CurrentA_PointVelocity.GetPosition();  
+    G4ThreeVector  Point_B=  CurrentB_PointVelocity.GetPosition();  
 
     // F = a point on true AB path close to point E  (the closest if possible)
     //
@@ -365,7 +368,7 @@ G4PropagatorInField::LocateIntersectionPoint(
 
     //  The above function is the most difficult part ...
     //        
-    G4ThreeVector CurrentF_Point= ApproxIntersecPointV.Position();
+    G4ThreeVector CurrentF_Point= ApproxIntersecPointV.GetPosition();
       // fMidPoint_CurveLen_of_LastAttempt = 
       //                         ApproxIntersecPointV.  GetCurveLength() -
       //                         CurrentA_PointVelocity.GetCurveLength(); 
@@ -386,7 +389,7 @@ G4PropagatorInField::LocateIntersectionPoint(
 	// IntersectPointVelocity.SetCurvePnt( 
 	//		  CurrentE_Point, 
 	//		  ApproxIntersecPointV.GetVelocity(), 
-	//		  ApproxIntersecPointV.CurveS() );
+	//		  ApproxIntersecPointV.GetCurveLength() );
 	IntersectPointVelocity = ApproxIntersecPointV;
         IntersectPointVelocity.SetPosition( CurrentE_Point );
 
@@ -493,10 +496,10 @@ G4PropagatorInField::LocateIntersectionPoint(
        // Ensure that the new endpoints are not further apart in space than on the curve
        //  due to different errors in the integration
        G4double linDistSq, curveDist; 
-       linDistSq= (  CurrentB_PointVelocity.Position() 
-		   - CurrentA_PointVelocity.Position() ).mag2(); 
-       curveDist=  CurrentB_PointVelocity.CurveS() -
-                   CurrentA_PointVelocity.CurveS();
+       linDistSq= (  CurrentB_PointVelocity.GetPosition() 
+		   - CurrentA_PointVelocity.GetPosition() ).mag2(); 
+       curveDist=  CurrentB_PointVelocity.GetCurveLength() -
+                   CurrentA_PointVelocity.GetCurveLength();
        if( curveDist*(curveDist+2*perMillion ) < linDistSq ){
 	  //  Re-integrate to obtain a new B
 	  G4FieldTrack   newEndpoint= CurrentA_PointVelocity;
diff --git a/source/geometry/volumes/src/G4ReplicaNavigation.cc b/source/geometry/volumes/src/G4ReplicaNavigation.cc
index 57750b95da245b99abfee65338c9467cc9ffc021..c0038322af858a39d5d130ea56447db4f76eed93 100644
--- a/source/geometry/volumes/src/G4ReplicaNavigation.cc
+++ b/source/geometry/volumes/src/G4ReplicaNavigation.cc
@@ -5,11 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ReplicaNavigation.cc,v 1.4 2000/11/20 19:06:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ReplicaNavigation.cc,v 1.8 2001/03/09 15:32:50 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
-// class G4REplicaNavigation Implementation
+// class G4ReplicaNavigation Implementation
+//
+// -------------------------------------------------------------------
 
 #include "G4ReplicaNavigation.hh"
 
@@ -19,9 +21,10 @@ G4ReplicaNavigation::G4ReplicaNavigation()
 {
 }
 
-EInside G4ReplicaNavigation::Inside(const G4VPhysicalVolume *pVol,
-				    const G4int replicaNo,
-				    const G4ThreeVector &localPoint) const
+EInside
+G4ReplicaNavigation::Inside(const G4VPhysicalVolume *pVol,
+			    const G4int replicaNo,
+			    const G4ThreeVector &localPoint) const
 {
   EInside in=kOutside;
   // Replication data
@@ -71,7 +74,6 @@ EInside G4ReplicaNavigation::Inside(const G4VPhysicalVolume *pVol,
     case kRho:
       rad2=localPoint.perp2();
       rmax=(replicaNo+1)*width+offset;
-
       tolRMax2=rmax-kRadTolerance*0.5;
       tolRMax2*=tolRMax2;
       if (rad2>tolRMax2)
@@ -118,9 +120,10 @@ EInside G4ReplicaNavigation::Inside(const G4VPhysicalVolume *pVol,
   return in;
 }
 
-G4double G4ReplicaNavigation::DistanceToOut(const G4VPhysicalVolume *pVol,
-			 const G4int replicaNo,
-			 const G4ThreeVector &localPoint) const
+G4double
+G4ReplicaNavigation::DistanceToOut(const G4VPhysicalVolume *pVol,
+				   const G4int replicaNo,
+				   const G4ThreeVector &localPoint) const
 {
   // Replication data
   EAxis axis;
@@ -176,10 +179,11 @@ G4double G4ReplicaNavigation::DistanceToOut(const G4VPhysicalVolume *pVol,
   return (safety >= kCarTolerance) ? safety : 0;
 }
 
-G4double G4ReplicaNavigation::DistanceToOut(const G4VPhysicalVolume *pVol,
-		       const G4int replicaNo,
-		       const G4ThreeVector &localPoint,
-		       const G4ThreeVector &localDirection) const
+G4double
+G4ReplicaNavigation::DistanceToOut(const G4VPhysicalVolume *pVol,
+				   const G4int replicaNo,
+				   const G4ThreeVector &localPoint,
+				   const G4ThreeVector &localDirection) const
 {
   // Replication data
   EAxis axis;
@@ -199,7 +203,6 @@ G4double G4ReplicaNavigation::DistanceToOut(const G4VPhysicalVolume *pVol,
     case kZAxis:
       coord=localPoint(axis);
       Comp=localDirection(axis);
-
       if (Comp>0)
 	{
 	  lindist=width*0.5-coord;
@@ -229,9 +232,10 @@ G4double G4ReplicaNavigation::DistanceToOut(const G4VPhysicalVolume *pVol,
 }
 
 
-G4double G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
-					       const G4ThreeVector &localDirection,
-					       const G4double width) const
+G4double
+G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
+				      const G4ThreeVector &localDirection,
+				      const G4double width) const
 {
   // Phi Intersection
   // NOTE: width<=M_PI by definition
@@ -242,21 +246,28 @@ G4double G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
     {
       sinSPhi=sin(-width*0.5);	// SIN of starting phi plane
       cosSPhi=cos(width*0.5);	// COS of starting phi plane
-// pDist -ve when inside
+
+      // pDist -ve when inside
+      //
       pDistS=localPoint.x()*sinSPhi-localPoint.y()*cosSPhi;
       pDistE=localPoint.x()*sinSPhi+localPoint.y()*cosSPhi;
-// Comp -ve when in direction of outwards normal
+
+      // Comp -ve when in direction of outwards normal
+      //
       compS=-sinSPhi*localDirection.x()+cosSPhi*localDirection.y();
       compE=-sinSPhi*localDirection.x()-cosSPhi*localDirection.y();
 
       if (pDistS<=0&&pDistE<=0)
 	{
 	  // Inside both phi *full* planes
+	  //
 	  if (compS<0)
 	    {
 	      dist2=pDistS/compS;
 	      yi=localPoint.y()+dist2*localDirection.y();
+
 	      // Check intersecting with correct half-plane (no -> no intersect)
+	      //
 	      if (yi<=0)
 		{
 		  Dist=(pDistS<=-kCarTolerance*0.5) ? dist2 : 0;
@@ -270,47 +281,56 @@ G4double G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
 	    {
 	      Dist=kInfinity;
 	    }
-	  
 	  if (compE<0)
 	    {
 	      dist2=pDistE/compE;
+	      
 	      // Only check further if < starting phi intersection
+	      //
 	      if (dist2<Dist)
 		{
 		  yi=localPoint.y()+dist2*localDirection.y();
-// Check intersecting with correct half-plane 
+
+                  // Check intersecting with correct half-plane
+		  //
 		  if (yi>=0)
 		    {
-// Leaving via ending phi
+                      // Leaving via ending phi
+		      //
 		      Dist=(pDistE<=-kCarTolerance*0.5) ? dist2 : 0;
 		    }
 		}
 	    }
-	  
 	}
       else if (pDistS>=0&&pDistE>=0)
 	{
-// Outside both *full* phi planes
-// if towards both >=0 then once inside will remain inside
+          // Outside both *full* phi planes
+          // if towards both >=0 then once inside will remain inside
+	  //
 	  Dist= (compS>=0&&compE>=0) ? kInfinity : 0;
 	}
       else if (pDistS>0&&pDistE<0)
 	{
 	  // Outside full starting plane, inside full ending plane
+	  //
 	  if (compS>=0)
 	    {
 	      if (compE<0)
 		{		  
 		  dist2=pDistE/compE;
 		  yi=localPoint.y()+dist2*localDirection.y();
-		  // Check intersection in correct half-plane (if not -> remain in extent)
+
+		  // Check intersection in correct half-plane
+		  // (if not -> remain in extent)
+		  //
 		  Dist=(yi>0) ? dist2 : kInfinity;
 		}
 	      else Dist=kInfinity;
 	    }
 	  else
 	    {
-	      // leaving immediately by starting phi
+	      // Leaving immediately by starting phi
+	      //
 	      Dist=0;
 	    }
 	}
@@ -318,6 +338,7 @@ G4double G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
 	{
 	  // Must be pDistS<0&&pDistE>0
 	  // Inside full starting plane, outside full ending plane
+	  //
 	  if (compE>=0)
 	    {
 	      if (compS<0)
@@ -325,7 +346,10 @@ G4double G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
 		  
 		  dist2=pDistS/compS;
 		  yi=localPoint.y()+dist2*localDirection.y();
-		  // Check intersection in correct half-plane (if not -> remain in extent)
+
+		  // Check intersection in correct half-plane
+		  // (if not -> remain in extent)
+		  //
 		  Dist=(yi<0) ? dist2 : kInfinity;
 		}
 	      else
@@ -335,7 +359,8 @@ G4double G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
 	    }
 	  else
 	    {
-	      // leaving immediately by ending phi
+	      // Leaving immediately by ending phi
+	      //
 	      Dist=0;
 	    }
 	}
@@ -343,17 +368,18 @@ G4double G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
   else
     {
       // On z axis + travel not || to z axis -> use direction vector
+      //
       Dist = (fabs(localDirection.phi())<=width*0.5) ? kInfinity : 0;
     }
-
   return Dist;
 }
 
-G4double G4ReplicaNavigation::DistanceToOutRad(const G4ThreeVector &localPoint,
-					       const G4ThreeVector &localDirection,
-					       const G4double width,
-					       const G4double offset,
-					       const G4int replicaNo) const
+G4double
+G4ReplicaNavigation::DistanceToOutRad(const G4ThreeVector &localPoint,
+				      const G4ThreeVector &localDirection,
+				      const G4double width,
+				      const G4double offset,
+				      const G4int replicaNo) const
 {
 
   G4double rmin,rmax,t1,t2,t3,deltaR;
@@ -378,18 +404,23 @@ G4double G4ReplicaNavigation::DistanceToOutRad(const G4ThreeVector &localPoint,
   rmin=replicaNo*width+offset;
   rmax=(replicaNo+1)*width+offset;
 
-  t1=1.0-localDirection.z()*localDirection.z();			// since v normalised
+  t1=1.0-localDirection.z()*localDirection.z();	 // since v normalised
   t2=localPoint.x()*localDirection.x()+localPoint.y()*localDirection.y();
   t3=localPoint.x()*localPoint.x()+localPoint.y()*localPoint.y();
   
   if (t1>0)				// Check not parallel
     {
-      // Calculate sr, r exit distance	   
+      // Calculate sr, r exit distance
+      //
       if (t2>=0)
 	{
-// Delta r not negative => leaving via rmax
+          // Delta r not negative => leaving via rmax
+	  //
 	  deltaR=t3-rmax*rmax;
-// NOTE: Should use rho-rmax<-kRadTolerance*0.5 - [no sqrts for efficiency]
+	  
+          // NOTE: Should use
+	  // rho-rmax<-kRadTolerance*0.5 - [no sqrts for efficiency]
+	  //
 	  if (deltaR<-kRadTolerance*0.5)
 	    {
 	      b=t2/t1;
@@ -398,14 +429,16 @@ G4double G4ReplicaNavigation::DistanceToOutRad(const G4ThreeVector &localPoint,
 	    }
 	  else
 	    {
-// On tolerant boundary & heading outwards (or locally perpendicular to)
-// outer radial surface -> leaving immediately
+	      // On tolerant boundary & heading outwards (or locally
+	      // perpendicular to) outer radial surface -> leaving immediately
+	      //
 	      sr=0;
 	    }
 	}
       else
 	{
 	  // Possible rmin intersection
+	  //
 	  if (rmin)
 	    {
 	      deltaR=t3-rmin*rmin;
@@ -415,12 +448,15 @@ G4double G4ReplicaNavigation::DistanceToOutRad(const G4ThreeVector &localPoint,
 	      if (d2>=0)
 		{
 		  // Leaving via rmin
-		  // NOTE: Should use rho-rmin>kRadTolerance*0.5 - [no sqrts for efficiency]
+		  // NOTE: Should use
+		  // rho-rmin>kRadTolerance*0.5 - [no sqrts for efficiency]
+		  //
 		  sr= (deltaR>kRadTolerance*0.5) ? -b-sqrt(d2) : 0;
 		}
 	      else
 		{
 		  // No rmin intersect -> must be rmax intersect
+		  //
 		  deltaR=t3-rmax*rmax;
 		  c=deltaR/t1;
 		  sr=-b+sqrt(b*b-c);
@@ -429,6 +465,7 @@ G4double G4ReplicaNavigation::DistanceToOutRad(const G4ThreeVector &localPoint,
 	  else
 	    {
 	      // No rmin intersect -> must be rmax intersect
+	      //
 	      deltaR=t3-rmax*rmax;
 	      b=t2/t1;
 	      c=deltaR/t1;
@@ -443,13 +480,17 @@ G4double G4ReplicaNavigation::DistanceToOutRad(const G4ThreeVector &localPoint,
   return sr;
 }
 
-// Setup transformation and transform point into local system
-void G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
-						G4VPhysicalVolume *pVol,
-						G4ThreeVector& point) const
+void
+G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
+					   G4VPhysicalVolume *pVol,
+					   G4ThreeVector& point) const
+  //
+  // Setup transformation and transform point into local system
 {
-  G4double val,cosv,sinv,tmp;
+  G4double val,cosv,sinv,tmpx,tmpy;
+
   // Replication data
+  //
   EAxis axis;
   G4int nReplicas;
   G4double width,offset;
@@ -480,9 +521,10 @@ void G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
       SetPhiTransformation(val,pVol);
       cosv=cos(val);
       sinv=sin(val);
-      tmp=point.x()*cosv-point.y()*sinv;
-      point.setY(point.x()*sinv+point.y()*cosv);
-      point.setX(tmp);
+      tmpx=point.x()*cosv-point.y()*sinv;
+      tmpy=point.x()*sinv+point.y()*cosv;
+      point.setY(tmpy);
+      point.setX(tmpx);
       break;
     case kRho:
       // No setup required for radial case
@@ -491,12 +533,15 @@ void G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
     }
 }
 
-// Setup transformation
-void G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
-						G4VPhysicalVolume *pVol) const
+void
+G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
+					   G4VPhysicalVolume *pVol) const
+  // Setup transformation.
 {
   G4double val;
+
   // Replication data
+  //
   EAxis axis;
   G4int nReplicas;
   G4double width,offset;
@@ -521,7 +566,7 @@ void G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
       break;
     case kPhi:
       val=-(offset+width*(replicaNo+0.5));
-      SetPhiTransformation(val);
+      SetPhiTransformation(val,pVol);
       break;
     case kRho:
       // No setup required for radial case
@@ -530,19 +575,20 @@ void G4ReplicaNavigation::ComputeTransformation(const G4int replicaNo,
     }
 }
 
-G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
-					  const G4ThreeVector &globalDirection,
-					  const G4ThreeVector &localPoint,
-					  const G4ThreeVector &localDirection,
-					  const G4double currentProposedStepLength,
-					  G4double &newSafety,
-					  G4NavigationHistory &history,
-					  G4bool &validExitNormal,
-					  G4ThreeVector &exitNormal,
-					  G4bool &exiting,
-					  G4bool &entering,
-					  G4VPhysicalVolume *(*pBlockedPhysical),
-					  G4int &blockedReplicaNo)
+G4double
+G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
+				 const G4ThreeVector &globalDirection,
+				 const G4ThreeVector &localPoint,
+				 const G4ThreeVector &localDirection,
+				 const G4double currentProposedStepLength,
+				 G4double &newSafety,
+				 G4NavigationHistory &history,
+				 G4bool &validExitNormal,
+				 G4ThreeVector &exitNormal,
+				 G4bool &exiting,
+				 G4bool &entering,
+				 G4VPhysicalVolume *(*pBlockedPhysical),
+				 G4int &blockedReplicaNo)
 {
   G4VPhysicalVolume *repPhysical,*motherPhysical;
   G4VPhysicalVolume *samplePhysical,*blockedExitedVol=0;
@@ -555,12 +601,14 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
   G4int localNoDaughters,sampleNo;
   G4int depth;
 
-// Exiting normal optimisation
+  // Exiting normal optimisation
+  //
   if (exiting&&validExitNormal)
     {
       if (localDirection.dot(exitNormal)>=kMinExitingNormalCosine)
 	{
-// Block exited daughter volume
+          // Block exited daughter volume
+	  //
 	  blockedExitedVol=*pBlockedPhysical;
 	  ourSafety=0;
 	}
@@ -591,10 +639,12 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
 			localDirection);
       if (sampleStep<ourStep)
 	{
-	  if (sampleStep != 0)
-	    ourStep=sampleStep;
 	  exiting=true;
 	  validExitNormal=false;
+	  if (sampleStep != 0)
+	    ourStep=sampleStep;
+	  else
+	    ourStep=sampleStep+kCarTolerance;
 	}
     }
 
@@ -612,9 +662,8 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
       if (sampleSafety<ourStep)
 	{
 	  sampleStep=DistanceToOut(history.GetVolume(depth),
-				history.GetReplicaNo(depth),
-				repPoint,
-				history.GetTransform(depth).TransformAxis(globalDirection));
+		history.GetReplicaNo(depth), repPoint,
+		history.GetTransform(depth).TransformAxis(globalDirection));
 	  if (sampleStep<ourStep)
 	    {
 	      ourStep=sampleStep;
@@ -625,7 +674,8 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
       depth--;
     }
 
-  // Compute mother safety & intersection 
+  // Compute mother safety & intersection
+  //
   repPoint=history.GetTransform(depth).TransformPoint(globalPoint);
   motherPhysical=history.GetVolume(depth);
   motherSolid=motherPhysical->GetLogicalVolume()->GetSolid();
@@ -637,15 +687,13 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
     }
 
   // May need precision protection
+  //
   if (sampleSafety<=ourStep)
     {
       repDirection=history.GetTransform(depth).TransformAxis(globalDirection);
       sampleStep=motherSolid
-	->DistanceToOut(repPoint,
-			repDirection,
-			true,
-			&validExitNormal,
-			&exitNormal);
+	->DistanceToOut(repPoint,repDirection,true,
+	                &validExitNormal,&exitNormal);
       if (sampleStep<=ourStep)
 	{
 	  ourStep=sampleStep;
@@ -664,10 +712,9 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
 	  validExitNormal=false;
 	}
     }
-	
-//
-// Compute daughter safeties & intersections
-//
+  //
+  // Compute daughter safeties & intersections
+  //
   localNoDaughters=repLogical->GetNoDaughters();
   for (sampleNo=localNoDaughters-1;sampleNo>=0;sampleNo--)
     {
@@ -679,11 +726,10 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
 				     samplePhysical->GetTranslation());
 	  sampleTf.Invert();
 	  const G4ThreeVector samplePoint=sampleTf.TransformPoint(localPoint);
-	  const G4VSolid *sampleSolid=samplePhysical
-	    ->GetLogicalVolume()
-	    ->GetSolid();
-	  const G4double sampleSafety=sampleSolid
-	    ->DistanceToIn(samplePoint);
+	  const G4VSolid *sampleSolid=
+	                  samplePhysical->GetLogicalVolume()->GetSolid();
+	  const G4double sampleSafety=
+	                  sampleSolid->DistanceToIn(samplePoint);
 	  if (sampleSafety<ourSafety)
 	    {
 	      ourSafety=sampleSafety;
@@ -691,9 +737,8 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
 	  if (sampleSafety<=ourStep)
 	    {
 	      sampleDirection=sampleTf.TransformAxis(localDirection);
-	      const G4double sampleStep=sampleSolid
-		->DistanceToIn(samplePoint,
-			       sampleDirection);
+	      const G4double sampleStep=
+	            sampleSolid->DistanceToIn(samplePoint,sampleDirection);
 	      if (sampleStep<=ourStep)
 		{
 		  ourStep=sampleStep;
@@ -705,20 +750,19 @@ G4double G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
 	    }
 	}
     }
-
   newSafety=ourSafety;
   return ourStep;
 }
 
-//   Compute the isotropic distance to current volume's boundaries and
-//    to daughter volumes.
+G4double
+G4ReplicaNavigation::ComputeSafety(const G4ThreeVector &globalPoint,
+				   const G4ThreeVector &localPoint,
+					 G4NavigationHistory &history,
+				   const G4double pProposedMaxLength )
 //
+// Compute the isotropic distance to current volume's boundaries and
+// to daughter volumes.
 
-G4double G4ReplicaNavigation::ComputeSafety(const G4ThreeVector &globalPoint,
-					    const G4ThreeVector &localPoint,
-					          G4NavigationHistory &history,
-					 // const G4NavigationHistory &history, // -> NON-CONST
-					    const G4double pProposedMaxLength )
 {
   G4VPhysicalVolume *repPhysical,*motherPhysical;
   G4VPhysicalVolume *samplePhysical,*blockedExitedVol=0;
@@ -759,7 +803,8 @@ G4double G4ReplicaNavigation::ComputeSafety(const G4ThreeVector &globalPoint,
       depth--;
     }
 
-  // Compute mother safety & intersection 
+  // Compute mother safety & intersection
+  //
   repPoint=history.GetTransform(depth).TransformPoint(globalPoint);
   motherPhysical=history.GetVolume(depth);
   motherSolid=motherPhysical->GetLogicalVolume()->GetSolid();
@@ -770,9 +815,8 @@ G4double G4ReplicaNavigation::ComputeSafety(const G4ThreeVector &globalPoint,
       ourSafety=sampleSafety;
     }
 
-//
-// Compute daughter safeties & intersections
-//
+  // Compute daughter safeties & intersections
+  //
   localNoDaughters=repLogical->GetNoDaughters();
   for (sampleNo=localNoDaughters-1;sampleNo>=0;sampleNo--)
     {
@@ -799,13 +843,12 @@ G4double G4ReplicaNavigation::ComputeSafety(const G4ThreeVector &globalPoint,
   return ourSafety;
 }
 
-
-
-EInside G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
-					const G4ThreeVector &globalPoint,
-					G4ThreeVector &localPoint,
-					const G4bool &exiting,
-					G4bool &notKnownInside) const
+EInside
+G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
+				const G4ThreeVector &globalPoint,
+				G4ThreeVector &localPoint,
+				const G4bool &exiting,
+				G4bool &notKnownInside) const
 {
   G4VPhysicalVolume *pNRMother=0;
   G4VSolid *motherSolid;
@@ -814,7 +857,9 @@ EInside G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
   EInside insideCode;
 
   cdepth=history.GetDepth();
+  
   // Find non replicated mother
+  //
   for (mdepth=cdepth-1;mdepth>=0;mdepth--)
     {
       if (history.GetVolumeType(mdepth)!=kReplica)
@@ -828,6 +873,7 @@ EInside G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
     {
        // All the tree of mother volumes were Replicas. 
        // This is an error, as the World volume must be a Placement
+       //
        G4Exception( "G4ReplicaNavigation::BackLocate - World volume must be a Placement" );
     }
 
@@ -839,15 +885,18 @@ EInside G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
     {
       // Outside mother -> back up to mother level
       // Locate.. in Navigator will back up one more level
-      // localPoint not reqd
+      // localPoint not required
+      //
       history.BackLevel(cdepth-mdepth);
       //      localPoint=goodPoint;
     }
   else
     {
       notKnownInside=false;
+
       // Still within replications
       // Check down: if on outside stop at this level
+      //
       for (depth=mdepth+1;depth<cdepth;depth++)
 	{
 	  repPoint=history.GetTransform(depth).TransformPoint(globalPoint);
@@ -872,6 +921,7 @@ EInside G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
       // If outside level, set localPoint = coordinates in reference system
       // of *previous* level - location code in navigator will back up one
       // level [And also manage blocking]
+      //
       if (insideCode==kOutside||insideCode==kSurface&&exiting)
 	{
 	  localPoint=goodPoint;
@@ -880,4 +930,3 @@ EInside G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
 
   return insideCode;
 }
-
diff --git a/source/geometry/volumes/src/G4TouchableHistory.cc b/source/geometry/volumes/src/G4TouchableHistory.cc
index 62278a1a3d054c20717e226de7e1c4a0eff801f9..b8129428831144798d34cfb7fdcd30491c156b64 100644
--- a/source/geometry/volumes/src/G4TouchableHistory.cc
+++ b/source/geometry/volumes/src/G4TouchableHistory.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TouchableHistory.cc,v 1.4 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4TouchableHistory Implementation
diff --git a/source/geometry/volumes/src/G4TransportationManager.cc b/source/geometry/volumes/src/G4TransportationManager.cc
index 808d7a19f5555268f62def9fd1d82b65eea619e7..acaa6a7c705763aa8ee035bde078bdb004b31d8a 100644
--- a/source/geometry/volumes/src/G4TransportationManager.cc
+++ b/source/geometry/volumes/src/G4TransportationManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TransportationManager.cc,v 1.5 1999/12/15 14:50:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //  G4TransportationManager 
diff --git a/source/geometry/volumes/src/G4VoxelNavigation.cc b/source/geometry/volumes/src/G4VoxelNavigation.cc
index abda83f5afd0ca949cab5232b7e0977de17308cd..72913678e9c5694a745ca8ccc3fff7a044bd523c 100644
--- a/source/geometry/volumes/src/G4VoxelNavigation.cc
+++ b/source/geometry/volumes/src/G4VoxelNavigation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VoxelNavigation.cc,v 1.6 2000/11/20 19:06:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // class G4VoxelNavigation Implementation
diff --git a/source/global/HEPGeometry/include/G4LorentzRotation.hh b/source/global/HEPGeometry/include/G4LorentzRotation.hh
index 1219b520de21e9b72fed622eb0a3026c29d0112e..10cbf71e6c1670012247dee1877351153980c117 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4LorentzRotation_hh
 #define G4LorentzRotation_hh
diff --git a/source/global/HEPGeometry/include/G4LorentzVector.hh b/source/global/HEPGeometry/include/G4LorentzVector.hh
index c91c5ec4a52a64db366f17ba8ef691b059d93c79..476678dfb133f56e498d766ae8073974263723b2 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4LorentzVector_hh
 #define G4LorentzVector_hh
diff --git a/source/global/HEPGeometry/include/G4Normal3D.hh b/source/global/HEPGeometry/include/G4Normal3D.hh
index 27323b985d365f3f165e0593c880c18ee693db3a..17fa2e72fb40c8945f56d0a170915bfb6c087b7a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NORMAL3D_HH
 #define G4NORMAL3D_HH
diff --git a/source/global/HEPGeometry/include/G4Plane3D.hh b/source/global/HEPGeometry/include/G4Plane3D.hh
index 359275329d737985df7054a09c2c9201ac3e1b66..efc8efbf3fdb36c7cda3d1818aba2780a98e6696 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4PLANE3D_HH
 #define G4PLANE3D_HH
diff --git a/source/global/HEPGeometry/include/G4Point3D.hh b/source/global/HEPGeometry/include/G4Point3D.hh
index 52f4fa4d4fba777f54f0725d55ad06ba8db56190..d8e487cbdbe0a22a06f6d770e48bfd8dab479c57 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4POINT3D_HH
 #define G4POINT3D_HH
diff --git a/source/global/HEPGeometry/include/G4Transform3D.hh b/source/global/HEPGeometry/include/G4Transform3D.hh
index eaaaabddc13792f1e5df5a13463aea47c08097a7..8558e383c4488bd75ee701a38bd71685c149af06 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4TRANSFORM3D_HH
 #define G4TRANSFORM3D_HH
diff --git a/source/global/HEPGeometry/include/G4Vector3D.hh b/source/global/HEPGeometry/include/G4Vector3D.hh
index 2940189574228a93a9a53766dd17307c9f4c0ead..1a82a63c73f4a31db09f22851626681d2d555930 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4VECTOR3D_HH
 #define G4VECTOR3D_HH
diff --git a/source/global/HEPGeometry/include/geomdefs.hh b/source/global/HEPGeometry/include/geomdefs.hh
index c63af0345e6e8dba90f31483ee2122e50149ab69..c1d21ba8d7a2e1b36caaa0fc0f11281fccc645a8 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.3 2000/11/01 15:23:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh b/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
index 0a6bbafa1d994790247cb24c38242132e8cdefc4..a33278340db4735c3ba2be6e59304f79b25a14d1 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.3 2000/11/20 17:26:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4DataInterpolation.hh b/source/global/HEPNumerics/include/G4DataInterpolation.hh
index df429275e08974aeefaf51026c06e0cf963f423c..d88c00e767607da8cc389a0cb02ddaf62fb0699b 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.3 2000/11/20 17:26:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh b/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
index 30f39d4d75a8a41e3eb82fade34f4e9fb5966ed5..1dd53bb9663f2477950a3c5308c1e74571dcdf88 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.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussHermiteQ.hh b/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
index 794d235d88a84aee99c14ef312a31d767d9a39cd..9cff43c25c2698fa959f2ac6c4c9bc6e7ed0f6ef 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.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussJacobiQ.hh b/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
index ca3e5d8d230f4de0a8638ea98e44772109a20976..10b6a01960a4c2c43d4408404c8f30a9cad8dca6 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.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh b/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
index 80c004515c527dade10de771fed73d94278758e7..ebd0f04b80e19ee860ef1875be8ce049e3a94bb8 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.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussLegendreQ.hh b/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
index 3c4b26d75c4b800bcc78b8501a4a0676925dcc20..e2d7d1e4be8551a55aee83bd75d4046c31c6585e 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.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4Integrator.hh b/source/global/HEPNumerics/include/G4Integrator.hh
index 2613d73a1c6c2c115b8a1d5a8768914cd802f77a..6340ce14ec7c509197d797ec7686806fb72d1710 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.4 2000/06/15 17:31:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4Integrator.icc b/source/global/HEPNumerics/include/G4Integrator.icc
index 33850bc0f92bf9c3b20ba65b7caef334f4287975..2a31a0e95decd1c64e7fdffddf35994bbd45b5d1 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.6 2000/06/15 17:31:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Implementation of G4Integrator methods. 
 //
diff --git a/source/global/HEPNumerics/include/G4PolynomialSolver.hh b/source/global/HEPNumerics/include/G4PolynomialSolver.hh
new file mode 100644
index 0000000000000000000000000000000000000000..eb4a37e78977bc91d646ca7561c1eb8aae3547d3
--- /dev/null
+++ b/source/global/HEPNumerics/include/G4PolynomialSolver.hh
@@ -0,0 +1,118 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PolynomialSolver.hh,v 1.2 2001/01/29 09:49:54 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// 
+// class G4PolynomialSolver
+//
+// Class description:
+//
+//   G4PolynomialSolver allows the user to solve a polynomial equation
+//   with a great precision. This is used by Implicit Equation solver.
+//
+//   The Bezier clipping method is used to solve the polynomial.
+//
+// How to use it:
+//   Create a class that is the function to be solved.
+//   This class could have internal parameters to allow to change
+//   the equation to be solved without recreating a new one.
+//
+//   Define a Polynomial solver, example:
+//   G4PolynomialSolver<MyFunctionClass,G4double(MyFunctionClass::*)(G4double)>
+//     PolySolver (&MyFunction,
+//                 &MyFunctionClass::Function,
+//                 &MyFunctionClass::Derivative,
+//                 precision);
+//
+//   The precision is relative to the function to solve.
+//
+//   In MyFunctionClass, provide the function to solve and its derivative:
+//   Example of function to provide :
+//
+//   x,y,z,dx,dy,dz,Rmin,Rmax are internal variables of MyFunctionClass
+//
+//   G4double MyFunctionClass::Function(G4double value)
+//   {
+//     G4double Lx,Ly,Lz;
+//     G4double result;  
+//   
+//     Lx = x + value*dx;
+//     Ly = y + value*dy;
+//     Lz = z + value*dz;
+//   
+//     result = TorusEquation(Lx,Ly,Lz,Rmax,Rmin);
+//     
+//     return result ;  
+//   }    
+// 
+//   G4double MyFunctionClass::Derivative(G4double value)
+//   {
+//     G4double Lx,Ly,Lz;
+//     G4double result;  
+//     
+//     Lx = x + value*dx;
+//     Ly = y + value*dy;
+//     Lz = z + value*dz;
+//      
+//     result = dx*TorusDerivativeX(Lx,Ly,Lz,Rmax,Rmin);
+//     result += dy*TorusDerivativeY(Lx,Ly,Lz,Rmax,Rmin);
+//     result += dz*TorusDerivativeZ(Lx,Ly,Lz,Rmax,Rmin);
+//   
+//     return result;
+//   }
+//   
+//   Then to have a root inside an interval [IntervalMin,IntervalMax] do the
+//   following:
+//
+//   MyRoot = PolySolver.solve(IntervalMin,IntervalMax);
+//
+
+// History:
+//
+// - 19.12.00 E.Medernach, First implementation
+//
+
+#ifndef G4POL_SOLVER_HH
+#define G4POL_SOLVER_HH
+
+#include  "globals.hh"
+
+template <class T, class F>
+class G4PolynomialSolver 
+{
+public:  // with description
+  
+  G4PolynomialSolver(T* typeF, F func, F deriv, G4double precision);  
+  ~G4PolynomialSolver();
+  
+
+  G4double solve (G4double IntervalMin, G4double IntervalMax);
+  
+private:
+
+  G4double Newton (G4double IntervalMin, G4double IntervalMax);
+    //General Newton method with Bezier Clipping
+
+  // Works for polynomial of order less or equal than 4.
+  // But could be changed to work for polynomial of any order providing
+  // that we find the bezier control points.
+
+  G4int BezierClipping(G4double *IntervalMin, G4double *IntervalMax);
+    //   This is just one iteration of Bezier Clipping
+
+
+  T* FunctionClass ;
+  F Function ;
+  F Derivative ;
+  
+  G4double Precision;
+};
+
+#include "G4PolynomialSolver.icc"
+
+#endif 
diff --git a/source/global/HEPNumerics/include/G4PolynomialSolver.icc b/source/global/HEPNumerics/include/G4PolynomialSolver.icc
new file mode 100644
index 0000000000000000000000000000000000000000..a9586f2f1cb7d59fd48e93cc144474b781db4609
--- /dev/null
+++ b/source/global/HEPNumerics/include/G4PolynomialSolver.icc
@@ -0,0 +1,201 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PolynomialSolver.icc,v 1.5 2001/01/29 13:13:34 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+// 
+// class G4PolynomialSolver
+//
+// 19.12.00 E.Medernach, First implementation
+//
+
+#define POLEPSILON   1e-12
+#define POLINFINITY  9.0E99
+#define ITERATION  12 // 20 But 8 is really enough for Newton with a good guess
+
+template <class T, class F>
+G4PolynomialSolver<T,F>::G4PolynomialSolver (T* typeF, F func, F deriv,
+                                             G4double precision)
+{
+  Precision = precision ;
+  FunctionClass = typeF ;
+  Function = func ;
+  Derivative = deriv ;  
+}
+
+template <class T, class F>
+G4PolynomialSolver<T,F>::~G4PolynomialSolver ()
+{
+}
+
+template <class T, class F>
+G4double G4PolynomialSolver<T,F>::solve(G4double IntervalMin,
+					G4double IntervalMax)
+{
+  return Newton(IntervalMin,IntervalMax);  
+}
+
+
+/* If we want to be general this could work for any
+   polynomial of order more that 4 if we find the (ORDER + 1)
+   control points
+*/
+#define NBBEZIER 5
+
+template <class T, class F>
+G4int
+G4PolynomialSolver<T,F>::BezierClipping(/*T* typeF,F func,F deriv,*/
+					G4double *IntervalMin,
+					G4double *IntervalMax)
+{
+  /** BezierClipping is a clipping interval Newton method **/
+  /** It works by clipping the area where the polynomial is **/
+
+  G4double P[NBBEZIER][2],D[2];
+  G4double NewMin,NewMax;
+
+  G4int IntervalIsVoid = 1;
+  
+  /*** Calculating Control Points  ***/
+  /* We see the polynomial as a Bezier curve for some control points to find */
+
+  /*
+    For 5 control points (polynomial of degree 4) this is:
+    
+    0     p0 = F((*IntervalMin))
+    1/4   p1 = F((*IntervalMin)) + ((*IntervalMax) - (*IntervalMin))/4
+                 * F'((*IntervalMin))
+    2/4   p2 = 1/6 * (16*F(((*IntervalMax) + (*IntervalMin))/2)
+                      - (p0 + 4*p1 + 4*p3 + p4))  
+    3/4   p3 = F((*IntervalMax)) - ((*IntervalMax) - (*IntervalMin))/4
+                 * F'((*IntervalMax))
+    1     p4 = F((*IntervalMax))
+  */  
+
+  /* x,y,z,dx,dy,dz are constant during searching */
+
+  D[0] = (FunctionClass->*Derivative)(*IntervalMin);
+  
+  P[0][0] = (*IntervalMin);
+  P[0][1] = (FunctionClass->*Function)(*IntervalMin);
+  
+
+  if (fabs(P[0][1]) < Precision) {
+    return 1;
+  }
+  
+  if (((*IntervalMax) - (*IntervalMin)) < POLEPSILON) {
+    return 1;
+  }
+
+  P[1][0] = (*IntervalMin) + ((*IntervalMax) - (*IntervalMin))/4;
+  P[1][1] = P[0][1] + (((*IntervalMax) - (*IntervalMin))/4.0) * D[0];
+
+  D[1] = (FunctionClass->*Derivative)(*IntervalMax);
+
+  P[4][0] = (*IntervalMax);
+  P[4][1] = (FunctionClass->*Function)(*IntervalMax);
+  
+  P[3][0] = (*IntervalMax) - ((*IntervalMax) - (*IntervalMin))/4;
+  P[3][1] = P[4][1] - ((*IntervalMax) - (*IntervalMin))/4 * D[1];
+
+  P[2][0] = ((*IntervalMax) + (*IntervalMin))/2;
+  P[2][1] = (16*(FunctionClass->*Function)(((*IntervalMax)+(*IntervalMin))/2)
+             - (P[0][1] + 4*P[1][1] + 4*P[3][1] + P[4][1]))/6 ;
+
+  {
+    G4double Intersection ;
+    G4int i,j;
+  
+    NewMin = (*IntervalMax) ;
+    NewMax = (*IntervalMin) ;    
+
+    for (i=0;i<5;i++)
+      for (j=i+1;j<5;j++)
+	{
+	  /* there is an intersection only if each have different signs */
+	  if (((P[j][1] > -Precision) && (P[i][1] < Precision)) ||
+	      ((P[j][1] < Precision) && (P[i][1] > -Precision))) {
+	    IntervalIsVoid  = 0;
+	    Intersection = P[j][0] - P[j][1]*((P[i][0] - P[j][0])/
+	                                      (P[i][1] - P[j][1]));
+	    if (Intersection < NewMin) {
+	      NewMin = Intersection;
+	    }
+	    if (Intersection > NewMax) {
+	      NewMax = Intersection;
+	    }
+	  }
+	}
+
+    
+    if (IntervalIsVoid != 1) {
+      (*IntervalMax) = NewMax;
+      (*IntervalMin) = NewMin;
+    }
+  }
+  
+  if (IntervalIsVoid == 1) {
+    return -1;
+  }
+  
+  return 0;
+}
+
+template <class T, class F>
+G4double G4PolynomialSolver<T,F>::Newton (G4double IntervalMin,
+                                          G4double IntervalMax)
+{
+  /* So now we have a good guess and an interval where
+     if there are an intersection the root must be */
+
+  G4double Value = 0;
+  G4double Gradient = 0;
+  G4double Lambda ;
+
+  G4int i=0;
+  G4int j=0;
+  
+  
+  /* Reduce interval before applying Newton Method */
+  {
+    G4int NewtonIsSafe ;
+
+    while ((NewtonIsSafe = BezierClipping(&IntervalMin,&IntervalMax)) == 0) ;
+
+    if (NewtonIsSafe == -1) {
+      return POLINFINITY;
+    }
+  }
+
+  Lambda = IntervalMin;
+  Value = (FunctionClass->*Function)(Lambda);
+
+
+  //  while ((fabs(Value) > Precision)) {
+  while (j != -1) {
+	  
+    Value = (FunctionClass->*Function)(Lambda);
+
+    Gradient = (FunctionClass->*Derivative)(Lambda);
+
+    Lambda = Lambda - Value/Gradient ;
+
+    if (fabs(Value) <= Precision) {
+      j ++;
+      if (j == 2) {
+	j = -1;	
+      }      
+    } else {
+      i ++;
+      
+      if (i > ITERATION) 
+	return POLINFINITY;
+    }    
+  }
+  return Lambda ;
+}
diff --git a/source/global/HEPNumerics/include/G4SimpleIntegration.hh b/source/global/HEPNumerics/include/G4SimpleIntegration.hh
index 03c7879a179bf24600bbad3674b8315610cbd043..ef79715acdd05e5249c5917092cb100d83f2edca 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh b/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
index cb79d98cf6a6191949f46bd7513833f5777cda11..0df9c006f35b6ed5b932d0c5f342f07e99d75b72 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.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc b/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
index 0c4a62e73292723c329ce2bd272c1e8653b74ae3..0ec74d7643a579008af18c1deaff7bd1f4efb2db 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4ChebyshevApproximation.hh"
diff --git a/source/global/HEPNumerics/src/G4DataInterpolation.cc b/source/global/HEPNumerics/src/G4DataInterpolation.cc
index 2559ce5cd004ad2cd83011cc2d6c0ccdbaf55b95..f6197d67688436647e8ca19740a7a4ef8eb3cea5 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4DataInterpolation.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc b/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
index 1fe080d68b2e8990d597904336c98f3d2f74f204..e6b2988bb77db664446ae6bd279a786bd9a68d0b 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4GaussChebyshevQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussHermiteQ.cc b/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
index 157d87a29b342c2dc39c8431996d387b0afa2450..a8d9c9bcdf8a78e89f08893a229dcd8651c42ccf 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.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4GaussHermiteQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussJacobiQ.cc b/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
index a64faf8cc79f462d7d3447adf329879516d2a9c7..93958d30e0e1f6f69da37363b8745d70282aad93 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.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4GaussJacobiQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc b/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
index 525b76444ff9957c540b24c41cb053bf97af0bc0..07eb9581681fb989dfe83190e47e26fa4f477de7 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.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4GaussLaguerreQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussLegendreQ.cc b/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
index abfe5c1b533c74303b4901a5a6cdccdfc31663ae..31b2a46795485b16306b9eba9a492af5f2b50243 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4GaussLegendreQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4SimpleIntegration.cc b/source/global/HEPNumerics/src/G4SimpleIntegration.cc
index 01aa96130a22af4dfcf75c4d68dea10d6063358a..9cb1887b5b89be6b272c2e0d4de054ff4b0e1c9c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Implementation file for simple integration methods
 //
diff --git a/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc b/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
index c1709bbb4d951c4add8fcdcff305c82bed1b5eb2..0ce47885e82e93a84e7b30bb63863e4a0b950b00 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 467a3f9f31d0450d33e5d9efa7f313e744418e44..c92613c4880c18a087c8a52d5f3c49ebfe7239d1 100644
--- a/source/global/HEPRandom/include/G4Poisson.hh
+++ b/source/global/HEPRandom/include/G4Poisson.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Poisson.hh,v 1.5 2000/01/06 14:13:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/HEPRandom/include/Randomize.hh b/source/global/HEPRandom/include/Randomize.hh
index 02cb6916c701544daae8a53b96833a2fec59d8cc..c3e0570e9e5f355633e2ef2c9b93c8913c0fb8c1 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.4 2000/08/02 15:21:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef randomize_h
 #define randomize_h 1
diff --git a/source/global/History b/source/global/History
index f7ba49a649f253de816276b07c0b8cbf9c532a37..3f85cd737297d61fa0131f16b99ef0147897599d 100644
--- a/source/global/History
+++ b/source/global/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.59 2000/12/13 08:22:26 gcosmo Exp $
+$Id: History,v 1.78 2001/04/05 09:05:37 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,79 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+April 05, 2001 G.Cosmo (global-V03-00-11)
+- Added patch to management/GNUmakefile for allowing compilation of G4UnitsTable.cc
+  on SUN-CC5 (CC 5.2 Patch 109508-02), removing optimisation.
+
+April 03, 2001 G.Cosmo (global-V03-00-10)
+- Fixed minor bug in constructor of G4PhysicsLinearVector, G4PhysicsLnVector
+  and G4PhysicsLogVector (H.Kurasige).
+
+April 02, 2001 G.Cosmo (global-V03-00-09)
+- G4UnitsTable.cc: resolved ambiguity of old/new style iostream for
+  formatting in G4UnitsTable::operator<<.
+- Fix for compilation on WIN32-VC: added typedef to base collection G4PhysCollection
+  in G4PhysicsTable.
+ 
+March 09, 2001 G.Cosmo (global-V03-00-08)
+- Tyde up comments.
+- Added patch to G4PhysicsTable::Store/Retrieve methods for non-ISO setup
+  where 'binary' streams are not implemented. Binary mode is allowed only
+  with ISO setup (native-STL).
+- Removed 'virtual' specifier from Retrieve (...) methods in G4PhysicsVector
+  derived classes.
+- Fixed bug in constructor of G4PhysicsLnVector:
+  added initialisation of 'dataVector' to zero (H.Kurasige).
+
+March 09, 2001 H.Kurasige
+- Added Store/RetrievePhysicsTable methods (G4PhysicsTable).
+- Added Store/Retrieve and GetType methods (G4PhysicsVector and related).
+- Introduced G4PhysicsVectorType class (enumeration).
+- Added unit test PhysicsTableTest.cc.
+
+March 06, 2001 G.Cosmo (global-V03-00-07)
+- Completed migration to STL vector for all classes in "global/management"
+  o Migrated G4UnitsTable
+  o Migrated G4StateManager
+
+March 05, 2001 G.Cosmo (global-V03-00-06)
+- Added new unit 'parsec' to SystemOfUnits.h (M.Maire).
+- Updated G4UnitsTable unit test (M.Maire).
+- Removed file G4UnitsTest.hh now replaced by G4SIunits.hh.
+
+February 24, 2001 G.Cosmo (global-V03-00-05)
+- Implemented migration to STL vectors for G4PhysicsTable (H.Kurasige).
+  Added class description and comments for Software Reference Manual.
+
+February 05, 2001 H.Kurasige (global-V03-00-04)
+- Added default constructors to G4DataVector and G4OrderedTable. Removed
+  default size.
+
+February 01, 2001 G.Cosmo, H.Kurasige (global-V03-00-03)
+- Migration to STL vectors for G4OrderedTable and G4DataVector. In
+  G4OrderedTable, G4ValVector type has been removed and is now replaced
+  with G4DataVector.
+- Removed from G4PhysicsVector dependency over G4PhysicsTable.
+  Removed methods: LinkPhysicsTable(), IsLinkedTableExist() and
+  GetNextTable(). Removed data-member ptrNextTable.
+  Updated all related subclasses.
+- Updated unit tests in management/test.
+
+January 29, 2001 G.Cosmo (global-V03-00-02)
+- Added generic class G4PolynomialSolver in HEPNumerics module, extracting
+  logic from class G4Torus in geometry/solids/CSG.
+
+January 16, 2001 G.Cosmo (global-V03-00-01)
+- Minor fixes to last migration in management classes
+  tagged global-STLmigration-V02.
+
+January 09, 2001 H.Kurashige
+- Full STL migration for G4PhysicsVector and related.
+
+January 09, 2001 G.Cosmo (global-V03-00-00)
+- Fixed bug in destructor of G4Allocator (report #181): use "delete"
+  instead of "free" for deleting a page allocated with "new". 
+
 December 13, 2000 G.Folger (global-V02-00-06)
 - Added GNUmakefile to HEPRandom to handle "includes" gmake target.
 
diff --git a/source/global/STLInterface/g4rw/cstring.h b/source/global/STLInterface/g4rw/cstring.h
index 694d5e00e8b6c77793e50a2a7b9a0c707f1b5c1e..ecadad0010037676bb56cf313ccca9b3177440b6 100644
--- a/source/global/STLInterface/g4rw/cstring.h
+++ b/source/global/STLInterface/g4rw/cstring.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: cstring.h,v 1.9 2000/11/20 17:26:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/cstring.icc b/source/global/STLInterface/g4rw/cstring.icc
index e65524fe9fdaf3d4cd0d4b76e5874eaef31e986f..32fd56820b23366fa1f478c4cad39b1f035f153b 100644
--- a/source/global/STLInterface/g4rw/cstring.icc
+++ b/source/global/STLInterface/g4rw/cstring.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: cstring.icc,v 1.9 2000/11/20 20:03:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/ctoken.h b/source/global/STLInterface/g4rw/ctoken.h
index b480dd73c572edd280b8d8dc77965c2021f6cd37..0538c6a8a4ac6955bcee64c654e4b2bc9daf93aa 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/defs.h b/source/global/STLInterface/g4rw/defs.h
index 0c961c9f39ecdba193bbadb0b4f0af08b4a3f6ef..176e720f36d214f8361f5ec21446ac0b92667b9b 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.8 2000/06/26 16:25:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/rstream.h b/source/global/STLInterface/g4rw/rstream.h
index 08c85e5332770e819a1105b189e691997d8b44cd..5ff8c85abc2756d2be31ddf68c07a46be58ddf7b 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/rw2stl_algo.h b/source/global/STLInterface/g4rw/rw2stl_algo.h
index 2d274fb6b22757b37646da45f31d4fd04ec672c4..08baf0397f1190ad5d1ee8f48d3fc74ebd30d2f0 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpordvec.h b/source/global/STLInterface/g4rw/tpordvec.h
index ae18c335f3735ab42dad8b7ce69fb9aa92e89565..c0a4551b0459c0eade8bd93c957effe1373eff4a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpordvec.icc b/source/global/STLInterface/g4rw/tpordvec.icc
index 200eaa4f3de3c258c01098abe42d697aa3664e50..c5caf08d8656c1b642d8a7a2ebfe7043ca33dae5 100644
--- a/source/global/STLInterface/g4rw/tpordvec.icc
+++ b/source/global/STLInterface/g4rw/tpordvec.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpordvec.icc,v 1.5 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpsrtvec.h b/source/global/STLInterface/g4rw/tpsrtvec.h
index 1fee563a33be55af85518ba5f066e2c8e30db478..58818711887bd63bc4283054a03ea906dc157b73 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpsrtvec.icc b/source/global/STLInterface/g4rw/tpsrtvec.icc
index 9f2db985a85109b0ef50d188c90f202e39ea0523..7515ebcc7aba479afcf839161f3c326446653d62 100644
--- a/source/global/STLInterface/g4rw/tpsrtvec.icc
+++ b/source/global/STLInterface/g4rw/tpsrtvec.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpsrtvec.icc,v 1.7 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpvector.h b/source/global/STLInterface/g4rw/tpvector.h
index 82a497415c3cb928b68421e56bcf9e477b7343b8..817f20eb90f87e7f388f27c865d62d594dab8286 100644
--- a/source/global/STLInterface/g4rw/tpvector.h
+++ b/source/global/STLInterface/g4rw/tpvector.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpvector.h,v 1.9 2000/02/11 14:09:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpvector.icc b/source/global/STLInterface/g4rw/tpvector.icc
index b9ec1fa853ce1ec2ac9c738c05f3a0df8c6d9479..24ff2d86495b207b26b6bf2372c93b509976b0e1 100644
--- a/source/global/STLInterface/g4rw/tpvector.icc
+++ b/source/global/STLInterface/g4rw/tpvector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tpvector.icc,v 1.8 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvordvec.h b/source/global/STLInterface/g4rw/tvordvec.h
index 4906ac92b33d550f126b799362bf4c09aa754350..785c722bae537d43c13e2af62db1cdbcb0385ef1 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.8 2000/03/10 15:53:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvordvec.icc b/source/global/STLInterface/g4rw/tvordvec.icc
index f2439350175cb7d41b8080bb7822a15a8fbc240e..ee962b3660a0567d29018c314a8d0588a3f68fd0 100644
--- a/source/global/STLInterface/g4rw/tvordvec.icc
+++ b/source/global/STLInterface/g4rw/tvordvec.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tvordvec.icc,v 1.6 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvvector.h b/source/global/STLInterface/g4rw/tvvector.h
index af04e51c9b0372da25b73b1ecc27d564f04efe1c..49d0ebdcdfc1cc66450d0b2058253f704bbc889d 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.8 2000/03/10 15:53:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvvector.icc b/source/global/STLInterface/g4rw/tvvector.icc
index 8d22acecb1688b6fb2d96015f91bab18f928fde3..1426cf3597da3a6bb9fd4def17135c0e8d0683c8 100644
--- a/source/global/STLInterface/g4rw/tvvector.icc
+++ b/source/global/STLInterface/g4rw/tvvector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: tvvector.icc,v 1.4 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/management/GNUmakefile b/source/global/management/GNUmakefile
index 4bbff9e17947740529713686d87dc946efb5a638..e4257d0cea4316573c45416559a4d18c822e6dd2 100644
--- a/source/global/management/GNUmakefile
+++ b/source/global/management/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.2 2000/11/03 16:40:30 gunter Exp $
+# $Id: GNUmakefile,v 1.3 2001/04/05 09:02:19 gcosmo Exp $
 # --------------------------------------------------------------
 # GNUmakefile for global management.  Gabriele Cosmo, 26/9/96.
 # --------------------------------------------------------------
@@ -13,6 +13,19 @@ include $(G4INSTALL)/config/architecture.gmk
 
 include $(G4INSTALL)/config/common.gmk
 
+# Fix for Solaris CC 5.2 Patch 109508-02 to compile without optimization.
+#
+CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS))
+CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O))
+
+ifeq ($(G4SYSTEM),SUN-CC5)
+COMPILER := $(shell CC -V 2>&1)
+ifeq ($(findstring 109508-02,$(COMPILER)),109508-02)
+$(G4TMP)/$(G4SYSTEM)/$(name)/G4UnitsTable.o: src/G4UnitsTable.cc
+	@echo Compiling G4UnitsTable.cc ...
+	@$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/G4UnitsTable.cc
+endif
+endif
 
 G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4INCLUDE)/g4std ] && mkdir -p $(G4INCLUDE)/g4std )
 
diff --git a/source/global/management/include/G4Allocator.hh b/source/global/management/include/G4Allocator.hh
index 16954c9d45f1d917e801a16daa1547212b569be5..a9fc3da540ebda592f1ffdf5d8b444d5db8d2d9c 100644
--- a/source/global/management/include/G4Allocator.hh
+++ b/source/global/management/include/G4Allocator.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Allocator.hh,v 1.5 2000/11/20 20:16:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Allocator.hh,v 1.6 2001/01/09 07:50:57 stesting Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -103,7 +103,7 @@ G4Allocator<Type>::~G4Allocator()
   {
     aNextPage = aPage->fNext;
     free(aPage->fUnits);
-    free(aPage);
+    delete aPage;
     aPage = aNextPage;
   }
   fPages = NULL;
diff --git a/source/global/management/include/G4AllocatorPage.hh b/source/global/management/include/G4AllocatorPage.hh
index 8430360375198a326d08c1a8b573557d32360ad5..6b3cd3993eb233755e70a9bb85716182161ada79 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4AllocatorUnit.hh b/source/global/management/include/G4AllocatorUnit.hh
index 6b959e33954c4f4ec064c2601f051c85a3bea159..696f6a4cba90d1ad8a388ff139a1d6da1c6bc6b3 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4ApplicationState.hh b/source/global/management/include/G4ApplicationState.hh
index 58c47e4de42f1f75f342d80be04be55a20112c3b..0913be5e027c28b6f2edd09187b7660ed056ed89 100644
--- a/source/global/management/include/G4ApplicationState.hh
+++ b/source/global/management/include/G4ApplicationState.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ApplicationState.hh,v 1.1 2000/07/22 10:45:34 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4APPLICATIONSTATE_H
diff --git a/source/global/management/include/G4DataVector.hh b/source/global/management/include/G4DataVector.hh
index 0f22b74ed16919bfc3e7bab341605f106e53a83e..4d337bd193c6452a209ea7ec65a0d2ddc8ac0e02 100644
--- a/source/global/management/include/G4DataVector.hh
+++ b/source/global/management/include/G4DataVector.hh
@@ -5,20 +5,127 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DataVector.hh,v 1.4 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4DataVector.hh,v 1.7 2001/03/06 15:56:47 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 // ------------------------------------------------------------
+//
+// Class Description:
+//
+//   Utility class providing similar behaviour of vector<G4double>.
+//   It includes additional methods for compatibility with Rogue Wave
+//   collection.
+//
 
 #ifndef G4DataVector_h
 #define G4DataVector_h 1
 
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
+
+class G4DataVector : public G4std::vector<G4double> 
+{
+
+ public: // with description
+
+  G4DataVector();
+   // Default constructor.
+
+  G4DataVector(size_t capacity);
+   // Constructor given a 'capacity' defining the initial number of elements.
+
+  virtual ~G4DataVector(){;}
+   // Empty destructor
+
+  inline void insertAt(size_t, const G4double&);
+    // Insert an element at given position
+
+  inline size_t index(const G4double&);
+    // Returns back index of the element same as given value
+
+  inline G4bool contains(const G4double&) const;
+    // Returns 'true' if it contains the element same as given value 
+
+  inline G4bool remove(const G4double&);
+    // Removes the first element same as given value  
+
+  inline size_t removeAll(const G4double&);
+    // Remove all elements same as given value  
+};
+
+inline
+G4DataVector::G4DataVector()
+  : G4std::vector<G4double>()
+{
+}
+
+inline
+G4DataVector::G4DataVector(size_t capacity)
+  : G4std::vector<G4double>(capacity)
+{
+}
+
+inline
+void G4DataVector::insertAt(size_t pos, const G4double& a) 
+{ 
+  iterator i = begin();
+  for (size_t ptn=0; (ptn<pos)&&(i!=end()); i++,ptn++);
+  if (i==end())
+    push_back(a);
+  else
+    insert(i,a);
+}
+
+inline
+size_t G4DataVector::index(const G4double& a) 
+{ 
+  size_t ptn = 0;
+  for (iterator i=begin(); i!=end(); i++,ptn++)
+    if (*i==a) return ptn;
+
+  return (ptn=~(size_t)0);
+}
+
+inline
+G4bool G4DataVector::contains(const G4double& a) const
+{
+  for (const_iterator i=begin(); i!=end(); i++)
+    if (*i==a) return true;
+
+  return false;
+}
+
+inline 
+G4bool G4DataVector::remove(const G4double& a)
+{
+  G4bool found =false;
+
+  for (iterator i=begin(); i!=end(); i++){
+    if (*i==a) {
+      erase(i);
+      found = true;
+      break;
+    }
+  }
+  return found;
+}
+
+inline 
+size_t G4DataVector::removeAll(const G4double& a)
+{
+  size_t ptn=0;
 
-typedef G4RWTValOrderedVector<G4double> G4DataVector;
+  for (iterator i=begin(); i!=end(); i++){
+    if (*i==a) {
+      erase(i);
+      ptn++;
+      i--;
+    } 
+  }
+  return ptn;
+}
 
 #endif
diff --git a/source/global/management/include/G4FastVector.hh b/source/global/management/include/G4FastVector.hh
index 08691b4c4dcdbe56f2c09549f471247ad6899e64..3367bae22eca1a990699f4e139eb303aaee1d4a2 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4LPhysicsFreeVector.hh b/source/global/management/include/G4LPhysicsFreeVector.hh
index cf67f23871d9a67184ce0cfb1ed73fb0d4ac513a..9104eeb0bc4a39d524b9dc4723044b85a2576a10 100644
--- a/source/global/management/include/G4LPhysicsFreeVector.hh
+++ b/source/global/management/include/G4LPhysicsFreeVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LPhysicsFreeVector.hh,v 1.2 1999/11/16 17:40:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LPhysicsFreeVector.hh,v 1.6 2001/03/09 12:08:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------------
@@ -27,6 +27,7 @@
 //
 // 27-MAR-97 FWJ: first version for Alpha release
 // 20-JUN-97 FWJ: added comment re GetValue(): no longer virtual
+// 11-NOV-00 H.Kurashige: use STL vector for dataVector and binVector
 //
 
 #ifndef G4LPhysicsFreeVector_h
@@ -36,19 +37,23 @@
 
 class G4LPhysicsFreeVector : public G4PhysicsVector  
 {
-public:
+
+public: 
 
    G4LPhysicsFreeVector();
+
+public: // with description
+
    G4LPhysicsFreeVector(size_t nbin, G4double binmin, G4double binmax);
 
    ~G4LPhysicsFreeVector();
 
    void PutValues(size_t binNumber, G4double binValue, G4double dataValue);
-   // G4PhysicsVector has PutValue() but it is inconvenient.
-   // Want to simultaneously fill the bin and data vectors.
+     // G4PhysicsVector has PutValue() but it is inconvenient.
+     // Want to simultaneously fill the bin and data vectors.
 
    G4double GetValue(G4double theEnergy, G4bool& isOutRange);
-   // Note that theEnergy could be energy, momentum, or whatever.
+     // Note that theEnergy could be energy, momentum, or whatever.
 
    void SetVerboseLevel(G4int value);
 
@@ -65,7 +70,7 @@ private:
    G4int verboseLevel;
 
    size_t FindBinLocation(G4double theEnergy) const;
-   // Pure virtual in G4PhysicsVector
+     // Pure virtual in G4PhysicsVector
 };
 
 #include "G4LPhysicsFreeVector.icc"
diff --git a/source/global/management/include/G4LPhysicsFreeVector.icc b/source/global/management/include/G4LPhysicsFreeVector.icc
index 7ef13604adc4feaa34d1116f8d9b0bcf405f38e9..6ab9e7e5328567744ba85083d335863755464ef0 100644
--- a/source/global/management/include/G4LPhysicsFreeVector.icc
+++ b/source/global/management/include/G4LPhysicsFreeVector.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LPhysicsFreeVector.icc,v 1.2 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LPhysicsFreeVector.icc,v 1.4 2001/01/09 11:26:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------------
@@ -28,8 +28,8 @@
 inline
 void G4LPhysicsFreeVector::PutValues(size_t binNumber, G4double binValue, G4double dataValue)
 {
-   binVector(binNumber) = binValue;
-   dataVector(binNumber) = dataValue;
+   binVector[binNumber] = binValue;
+   dataVector[binNumber] = dataValue;
 }
 
 // Note that theEnergy could be energy, momentum, or whatever.
@@ -47,33 +47,35 @@ G4double G4LPhysicsFreeVector::GetValue(G4double theEnergy, G4bool& isOutRange)
    if (theEnergy < edgeMin) {
       isOutRange = true;
 
+#ifdef G4VERBOSE
       if (verboseLevel > 1) G4cout << "G4LPhysicsFreeVector::GetValue " <<
-         theEnergy << " " << dataVector(0) << " " << isOutRange << G4endl;
-
-      returnValue = dataVector(0);
+         theEnergy << " " << dataVector[0] << " " << isOutRange << G4endl;
+#endif
+      returnValue = dataVector[0];
    } 
    else if (theEnergy > edgeMax) {
       isOutRange = true;
 
+#ifdef G4VERBOSE
       if (verboseLevel > 1) G4cout << "G4LPhysicsFreeVector::GetValue " <<
-         theEnergy << " " << dataVector(numberOfBin - 1) << " " << 
+         theEnergy << " " << dataVector[numberOfBin - 1] << " " << 
          isOutRange << G4endl;
-
-      returnValue = dataVector(numberOfBin - 1);
+#endif
+      returnValue = dataVector[numberOfBin - 1];
    } 
    else {
      isOutRange = false;
 
      G4int n = FindBinLocation(theEnergy);
 
-     G4double dsde = (dataVector(n + 1) - dataVector(n))/
-                     (binVector(n + 1) - binVector(n));
-
+     G4double dsde = (dataVector[n + 1] - dataVector[n])/
+                     (binVector[n + 1] - binVector[n]);
+#ifdef G4VERBOSE
      if (verboseLevel > 1) G4cout << "G4LPhysicsFreeVector::GetValue " << 
-        theEnergy << " " << dataVector(n) + (theEnergy - binVector(n))*dsde <<
+        theEnergy << " " << dataVector[n] + (theEnergy - binVector[n])*dsde <<
         " " << isOutRange << G4endl;
-
-     returnValue = dataVector(n) + (theEnergy - binVector(n))*dsde;
+#endif
+     returnValue = dataVector[n] + (theEnergy - binVector[n])*dsde;
    }
    return returnValue;
 }                                                                  
@@ -109,13 +111,15 @@ size_t G4LPhysicsFreeVector::FindBinLocation(G4double theEnergy) const
    G4int n2 = numberOfBin/2;
    G4int n3 = numberOfBin - 1;
    while (n1 != n3 - 1) {
-      if (theEnergy > binVector(n2))
+      if (theEnergy > binVector[n2])
          n1 = n2;
       else
          n3 = n2;
       n2 = n1 + (n3 - n1 + 1)/2;
    }
+#ifdef G4VERBOSE
    if (verboseLevel > 1) G4cout << 
       "G4LPhysicsFreeVector::FindBinLocation:  returning " << n1 << G4endl;
+#endif
    return (size_t)n1;
 }
diff --git a/source/global/management/include/G4OrderedTable.hh b/source/global/management/include/G4OrderedTable.hh
index 8e8d7f2ef01f2bf5bdd8c6d4f173e40c79087fa1..155bc252a4dfaceff753a0ffca89c1c838a1e3dd 100644
--- a/source/global/management/include/G4OrderedTable.hh
+++ b/source/global/management/include/G4OrderedTable.hh
@@ -5,43 +5,80 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OrderedTable.hh,v 1.4 1999/11/16 17:40:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OrderedTable.hh,v 1.7 2001/03/06 15:56:47 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
+//      GEANT 4 class header file 
+// ------------------------------------------------------------
+// Sep. 1996  : M.Maire 
+// Jan. 2001  : H.Kurashige
+//              - G4ValVector is replaced with G4DataVector 
+//              - Migrated to G4std::vector<G4DataVector*>.
 //
-//	This class is setting up an ordered collection of 
-//      ordered vectors of <G4double>
-//	30 September 1996, M.Maire
+// Class Description:
 //
+//	Utility class, defining an ordered collection of vectors
+//      of <G4double>.
+
 // ------------------------------------------------------------
 
 #ifndef G4OrderedTable_h
 #define G4OrderedTable_h 1
 
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
+#include "G4DataVector.hh"
 
-class G4ValVector : public G4RWTValOrderedVector<G4double>
+class G4OrderedTable : public G4std::vector<G4DataVector*> 
 {
 
-  public:
+ public: // with description
 
-      G4ValVector(size_t capac=G4RWDEFAULT_CAPACITY)
-        : G4RWTValOrderedVector<G4double>(capac) {;}
+  G4OrderedTable();
+    // Deafult constructor.
 
-      virtual ~G4ValVector() {;}
+  G4OrderedTable(size_t capacity);
+    // Constructor given a 'capacity' defining the initial
+    // number of elements (NULL pointers are filled up)
 
+  virtual ~G4OrderedTable(){;}
+    // Empty Destructor
 
-      G4bool operator==(const G4ValVector &right) const
-      {
-        return (this == (G4ValVector *) &right);
-      }
+  inline void clearAndDestroy();
+    // Removes all elements and deletes all non-NULL pointers
 
 };
 
-typedef G4RWTPtrOrderedVector<G4ValVector> G4OrderedTable;
+inline
+G4OrderedTable::G4OrderedTable()
+  : G4std::vector<G4DataVector*>()
+{
+}
+
+inline
+G4OrderedTable::G4OrderedTable(size_t capacity)
+  : G4std::vector<G4DataVector*>(capacity, (G4DataVector*)(0) )
+{
+}
+
+inline 
+void G4OrderedTable::clearAndDestroy() 
+{
+  G4DataVector* a;
+  while (size()>0) {
+    a = back();
+    pop_back();
+    for (iterator i=begin(); i!=end(); i++){
+      if (*i==a) {
+	erase(i);
+	i--;
+      }
+    } 
+    if ( a )  delete a;    
+  } 
+}
+
 
 #endif
diff --git a/source/global/management/include/G4PhysicsFreeVector.hh b/source/global/management/include/G4PhysicsFreeVector.hh
index 06531a44e1cc0ad0d45d890b7217a137e238178f..337041342ed377b03a41f34578e1b8dd57ec47d1 100644
--- a/source/global/management/include/G4PhysicsFreeVector.hh
+++ b/source/global/management/include/G4PhysicsFreeVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsFreeVector.hh,v 1.3 2000/11/20 17:26:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsFreeVector.hh,v 1.7 2001/03/09 12:08:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -28,8 +28,9 @@
 //    02 Dec. 1995, G.Cosmo : Structure created based on object model
 //    06 Jun. 1996, K.Amako : Implemented the 1st version
 //    01 Jul. 1996, K.Amako : Cache mechanism and hidden bin from the 
-//                            user introduced.
-//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added.
+//                            user introduced
+//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added
+//    11 Nov. 2000, H.Kurashige : Use STL vector for dataVector and binVector
 //
 //--------------------------------------------------------------------
 
@@ -37,29 +38,27 @@
 #define G4PhysicsFreeVector_h 1
 
 #include "globals.hh"
-#include "G4DataVector.hh"
 #include "G4PhysicsVector.hh"
-
+#include "G4DataVector.hh"
 
 class G4PhysicsFreeVector : public G4PhysicsVector  
 {
-  public:
+  public: // with description
 
-    // Constructors
     G4PhysicsFreeVector();
     G4PhysicsFreeVector(size_t theNbin);
     G4PhysicsFreeVector(const G4DataVector& binVector, 
                         const G4DataVector& dataVector);
+         // Constructors:
          // 'binVector' has the low edge value of each scale bin. 
          // 'dataVector' has the cross-section/energy-loss/etc at 
          // the energy/momenturm of the corresponding a bin of 
          // 'binVector'. 'binVector' and 'dataVector' need to have 
          // the same vector length.
   
-    // Destructor
     ~G4PhysicsFreeVector();
+         // Destructor
 
-    // Special PutValue function for PhysicsFreeVector
     void PutValue( size_t binNumber, G4double binValue, 
                                      G4double dataValue );   
          // To use this method to fill a PhysicsFreeVector, you have
@@ -75,7 +74,8 @@ class G4PhysicsFreeVector : public G4PhysicsVector
 };
 
 
-inline size_t G4PhysicsFreeVector::FindBinLocation(G4double theEnergy) const
+inline 
+size_t G4PhysicsFreeVector::FindBinLocation(G4double theEnergy) const
 {
   // For G4PhysicsFreeVector, FindBinLocation is implemented using
   // the binary search algorithm.
@@ -92,11 +92,11 @@ inline size_t G4PhysicsFreeVector::FindBinLocation(G4double theEnergy) const
 
   while (lowerBound <= upperBound) {
     size_t midBin = (lowerBound + upperBound)/2;
-    if( theEnergy < binVector(midBin) )
+    if( theEnergy < binVector[midBin] )
        upperBound = midBin-1;
     else
        lowerBound = midBin+1;
-  } 
+  }
 
   return upperBound;
 }
diff --git a/source/global/management/include/G4PhysicsLinearVector.hh b/source/global/management/include/G4PhysicsLinearVector.hh
index 54dc96fc8fcafc0cd03a0a7d4fb3ba5186c56cf3..6d9b7803be5ef49de64031b870abd64728a1a8bb 100644
--- a/source/global/management/include/G4PhysicsLinearVector.hh
+++ b/source/global/management/include/G4PhysicsLinearVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsLinearVector.hh,v 1.2 1999/11/16 17:40:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsLinearVector.hh,v 1.6 2001/03/09 12:08:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -25,8 +25,9 @@
 //    02 Dec. 1995, G.Cosmo : Structure created based on object model
 //    03 Mar. 1996, K.Amako : Implemented the 1st version
 //    01 Jul. 1996, K.Amako : Cache mechanism and hidden bin from the 
-//                            user introduced.
-//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added.
+//                            user introduced
+//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added
+//    11 Nov. 2000, H.Kurashige : Use STL vector for dataVector and binVector
 //
 //--------------------------------------------------------------------
 
@@ -34,26 +35,30 @@
 #define G4PhysicsLinearVector_h 1
 
 #include "globals.hh"
-#include "G4DataVector.hh"
 #include "G4PhysicsVector.hh"
 
-
 class G4PhysicsLinearVector : public G4PhysicsVector  
 {
   public:
 
-    // Constructors
     G4PhysicsLinearVector();
     G4PhysicsLinearVector(size_t theNbin);
+      // Constructors
+
+  public: // with description
+
     G4PhysicsLinearVector(G4double theEmin, G4double theEmax, size_t theNbin);
+      // Constructor
 
-    // Destructor
     ~G4PhysicsLinearVector();
+      // Destructor
+
+    G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii);
 
   protected:
 
     size_t FindBinLocation(G4double theEnergy) const;
-         // Find bin# in which theEnergy belongs - pure virtual function
+      // Find bin# in which theEnergy belongs - pure virtual function
 
   private:
 
@@ -62,7 +67,8 @@ class G4PhysicsLinearVector : public G4PhysicsVector
 };
 
 
-inline size_t G4PhysicsLinearVector::FindBinLocation(G4double theEnergy) const
+inline 
+ size_t G4PhysicsLinearVector::FindBinLocation(G4double theEnergy) const
 {
   // For G4PhysicsLinearVector, FindBinLocation is implemented using
   // a simple arithmetic calculation.
@@ -78,17 +84,3 @@ inline size_t G4PhysicsLinearVector::FindBinLocation(G4double theEnergy) const
 }
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/global/management/include/G4PhysicsLnVector.hh b/source/global/management/include/G4PhysicsLnVector.hh
index b00140d7c052203c539ac6e2f81a7b28c4abf180..4112cb83c13c32980307e927430ef80244a404b6 100644
--- a/source/global/management/include/G4PhysicsLnVector.hh
+++ b/source/global/management/include/G4PhysicsLnVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsLnVector.hh,v 1.3 2000/03/23 09:20:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsLnVector.hh,v 1.7 2001/03/09 12:08:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -23,6 +23,7 @@
 //
 //  History:
 //    27 Apr. 1999, M.G. Pia: Created, copying from G4PhysicsLogVector 
+//    11 Nov. 2000, H.Kurashige : Use STL vector for dataVector and binVector
 //
 //--------------------------------------------------------------------
 
@@ -30,28 +31,32 @@
 #define G4PhysicsLnVector_h 1
 
 #include "globals.hh"
-#include "G4DataVector.hh"
 #include "G4PhysicsVector.hh"
 
-
 class G4PhysicsLnVector : public G4PhysicsVector  
 {
   public:
 
-    // Constructors
     G4PhysicsLnVector();
     G4PhysicsLnVector(size_t theNbin);
+      // Constructors
+
+  public: // with description
+
     G4PhysicsLnVector(G4double theEmin, G4double theEmax, size_t theNbin);
-         // Because of logarithmic scale, note that 'theEmin' has to be 
-         // greater than zero. No protection exists against this error.
+      // Because of logarithmic scale, note that 'theEmin' has to be 
+      // greater than zero. No protection exists against this error.
 
-    // Destructor
     ~G4PhysicsLnVector();
+      // Destructor.
+
+    G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii);
+      // To retrieve persistent data from file stream.
 
   protected:
 
     size_t FindBinLocation(G4double theEnergy) const;
-         // Find bin# in which theEnergy belongs - pure virtual function
+      // Find bin# in which theEnergy belongs - pure virtual function.
 
   private:
 
@@ -61,8 +66,10 @@ class G4PhysicsLnVector : public G4PhysicsVector
 };
 
 
-inline size_t G4PhysicsLnVector::FindBinLocation(G4double theEnergy) const {
-
+inline 
+ size_t G4PhysicsLnVector::FindBinLocation(G4double theEnergy) const 
+{
+ 
   // For G4PhysicsLnVector, FindBinLocation is implemented using
   // a simple arithmetic calculation.
   //
diff --git a/source/global/management/include/G4PhysicsLogVector.hh b/source/global/management/include/G4PhysicsLogVector.hh
index ed045fa0f3e9d37a11e85fe0677bf0baf71f4ddd..e051321c72d2eb4910744d2639bdb43d3e11751f 100644
--- a/source/global/management/include/G4PhysicsLogVector.hh
+++ b/source/global/management/include/G4PhysicsLogVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsLogVector.hh,v 1.2 1999/11/16 17:40:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsLogVector.hh,v 1.6 2001/03/09 12:08:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -26,7 +26,8 @@
 //    03 Mar. 1996, K.Amako : Implemented the 1st version
 //    27 Apr. 1996, K.Amako : Cache mechanism added
 //    01 Jul. 1996, K.Amako : Hidden bin from the user introduced
-//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added.
+//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added
+//    11 Nov. 2000, H.Kurashige : Use STL vector for dataVector and binVector
 //
 //--------------------------------------------------------------------
 
@@ -34,28 +35,33 @@
 #define G4PhysicsLogVector_h 1
 
 #include "globals.hh"
-#include "G4DataVector.hh"
 #include "G4PhysicsVector.hh"
 
-
 class G4PhysicsLogVector : public G4PhysicsVector  
 {
   public:
 
-    // Constructors
     G4PhysicsLogVector();
     G4PhysicsLogVector(size_t theNbin);
+      // Constructors
+
+
+  public:  // with description
+
     G4PhysicsLogVector(G4double theEmin, G4double theEmax, size_t theNbin);
-         // Because of logarithmic scale, note that 'theEmin' has to be 
-         // greater than zero. No protection exists against this error.
+       // Because of logarithmic scale, note that 'theEmin' has to be 
+       // greater than zero. No protection exists against this error.
 
-    // Destructor
     ~G4PhysicsLogVector();
+      // Destructor
+
+    G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii);
+      // To retrieve persistent data from file stream.
 
   protected:
 
     size_t FindBinLocation(G4double theEnergy) const;
-         // Find bin# in which theEnergy belongs - pure virtual function
+      // Find bin# in which theEnergy belongs - pure virtual function
 
   private:
 
@@ -65,7 +71,8 @@ class G4PhysicsLogVector : public G4PhysicsVector
 };
 
 
-inline size_t G4PhysicsLogVector::FindBinLocation(G4double theEnergy) const
+inline 
+ size_t G4PhysicsLogVector::FindBinLocation(G4double theEnergy) const
 {
   // For G4PhysicsLogVector, FindBinLocation is implemented using
   // a simple arithmetic calculation.
diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.hh b/source/global/management/include/G4PhysicsOrderedFreeVector.hh
index c1c0e3b2ef4b1a6d208946d2b9cf2dbe62bef810..467214a114fa6c9c0009be88a2731c9aff73d6f2 100644
--- a/source/global/management/include/G4PhysicsOrderedFreeVector.hh
+++ b/source/global/management/include/G4PhysicsOrderedFreeVector.hh
@@ -5,19 +5,20 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsOrderedFreeVector.hh,v 1.3 1999/11/16 17:40:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsOrderedFreeVector.hh,v 1.7 2001/03/09 12:08:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Definition
 ////////////////////////////////////////////////////////////////////////
 //
 // File:	G4PhysicsOrderedFreeVector.hh
-// Version:	1.0
 // Created:     1996-08-13
 // Author:      Juliet Armstrong
 // Updated:     1997-03-25 by Peter Gumplinger
 //		> cosmetics (only)
+//              2000-11-11 by H.Kurashige
+//              > use STL vector for dataVector and binVector
 // mail:        gum@triumf.ca
 //
 // Class description:
@@ -39,7 +40,6 @@
 // Includes
 /////////////
 
-#include "g4rw/tpordvec.h"
 #include "G4PhysicsVector.hh"
 
 /////////////////////
@@ -48,7 +48,8 @@
 
 class G4PhysicsOrderedFreeVector : public G4PhysicsVector 
 {
-public:
+
+  public: // with description
 	
         ////////////////////////////////
         // Constructors and Destructor
@@ -81,7 +82,7 @@ public:
 
 	void DumpValues();
 
-private:
+  private:
 
 	size_t FindBinLocation(G4double theEnergy) const;
 
@@ -93,3 +94,9 @@ private:
 #include "G4PhysicsOrderedFreeVector.icc"
 
 #endif /* G4PhysicsOrderedFreeVector_h */
+
+
+
+
+
+
diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.icc b/source/global/management/include/G4PhysicsOrderedFreeVector.icc
index 1aadce6d25ed4dde2f8edef0b4d21e3a11c5ec02..d6f92f29d174cebc40650791d617639c524cb7c9 100644
--- a/source/global/management/include/G4PhysicsOrderedFreeVector.icc
+++ b/source/global/management/include/G4PhysicsOrderedFreeVector.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsOrderedFreeVector.icc,v 1.3 2000/11/20 17:26:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsOrderedFreeVector.icc,v 1.5 2001/01/09 11:26:59 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Inline Functions Definitions
@@ -17,6 +17,9 @@
 // Author:      Juliet Armstrong
 // mail:        gum@triumf.ca
 //
+// Updated:
+//              2000-11-11 by H.Kurashige
+//              > use STL vector for dataVector and binVector
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////
@@ -26,25 +29,25 @@
 inline
 G4double G4PhysicsOrderedFreeVector::GetMaxValue()
 {
-	return dataVector.last();
+	return dataVector.back();
 }
 
 inline
 G4double G4PhysicsOrderedFreeVector::GetMinValue()
 {
-	return dataVector.first();
+	return dataVector.front();
 }
 
 inline
 G4double G4PhysicsOrderedFreeVector::GetMaxLowEdgeEnergy()
 {
-	return binVector.last();
+	return binVector.back();
 }
 
 inline
 G4double G4PhysicsOrderedFreeVector::GetMinLowEdgeEnergy()
 {
-	return binVector.first();
+	return binVector.front();
 }
 
 inline
@@ -62,7 +65,7 @@ size_t G4PhysicsOrderedFreeVector::FindBinLocation(G4double theEnergy) const
    G4int n2 = numberOfBin/2;
    G4int n3 = numberOfBin - 1;
    while (n1 != n3 - 1) {
-      if (theEnergy > binVector(n2))
+      if (theEnergy > binVector[n2])
          n1 = n2;
       else
          n3 = n2;
diff --git a/source/global/management/include/G4PhysicsTable.hh b/source/global/management/include/G4PhysicsTable.hh
index d22f984573c30230cf6fb8de2e1f1cd776f8cc87..d8ff62aead013c03b37a1c3b1e1a389154d66663 100644
--- a/source/global/management/include/G4PhysicsTable.hh
+++ b/source/global/management/include/G4PhysicsTable.hh
@@ -5,28 +5,104 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsTable.hh,v 1.3 1999/11/16 17:40:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsTable.hh,v 1.10 2001/04/03 07:26:38 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//	History: first implementation, based on object model of
-//	2nd December 1995, G.Cosmo
+// Class description:
 //
-//      Modified 01 March 1996, K. Amako
+// G4PhysicsTable is an utility class for storage of pointers
+// to G4PhysicsVector containers. It derives all functionalities
+// of STL vector containers with the addition of few methods for
+// compatibility with previous implementation based on Rogue-Wave
+// pointer collections.
+// The constructor given the 'capacity' of the table, pre-allocates
+// memory for the specified value by invoking the STL's reserve()
+// function, in order to avoid reallocation during insertions.
 // ------------------------------------------------------------
+//
+// History:
+// -------
+// - First implementation, based on object model of
+//   2nd December 1995. G.Cosmo
+// - 1st March 1996, modified. K.Amako
+// - 24th February 2001, migration to STL vectors. H.Kurashige
+// - 9th March 2001, added Store/RetrievePhysicsTable. H.Kurashige
+//-------------------------------------
 
 #ifndef G4PhysicsTable_h
 #define G4PhysicsTable_h 1
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "globals.hh"
-#include "G4PhysicsVector.hh"
+#include "G4ios.hh"
 
-typedef G4RWTPtrOrderedVector<G4PhysicsVector> G4PhysicsTable;
+class G4PhysicsVector;
 
-#endif
+class G4PhysicsTable : public G4std::vector<G4PhysicsVector*> 
+{
+
+  typedef G4std::vector<G4PhysicsVector*> G4PhysCollection;
+
+ public: // with description
+
+  G4PhysicsTable();
+    // Default constructor.
+
+  G4PhysicsTable(size_t capacity);
+    // Constructor with capacity. Reserves memory for the
+    // specified capacity.
+
+  virtual ~G4PhysicsTable();
+    // Destructor.
+    // Does not invoke deletion of contained pointed collections.
+
+  G4PhysicsVector*& operator()(size_t);
+  G4PhysicsVector* const& operator()(size_t) const;
+    // Access operators.
+
+  void clearAndDestroy();
+    // Removes all items and deletes them at the same time.
+
+  void   insert (G4PhysicsVector*);
+    // Pushes new element to collection.
+
+  void   insertAt (size_t, G4PhysicsVector*); 
+    // Inserts element at the specified position in the collection.
 
+  size_t entries() const;
+  size_t length() const;
+    // Return collection's size.
 
+  G4bool isEmpty() const;
+    // Flags if collection is empty or not.
+
+  G4bool StorePhysicsTable(const G4String& filename, G4bool ascii=false);
+    // Stores PhysicsTable in a file (returns false in case of failure).
+  
+  G4bool RetrievePhysicsTable(const G4String& filename, G4bool ascii=false);
+    // Retrieves Physics from a file (returns false in case of failure).
+
+  friend G4std::ostream& operator<<(G4std::ostream& out, G4PhysicsTable& table);
+
+ protected:
+
+  G4PhysicsVector* CreatePhysicsVector(G4int type);  
+
+ private:
+
+  G4PhysicsTable(const G4PhysicsTable&);
+  G4PhysicsTable& operator=(const G4PhysicsTable&);
+    // Private copy constructor and assignment operator.
+
+};
+
+typedef G4PhysicsTable::iterator G4PhysicsTableIterator;
+
+#include "G4PhysicsVector.hh"
+#include "G4PhysicsTable.icc"
+
+#endif
diff --git a/source/global/management/include/G4PhysicsTable.icc b/source/global/management/include/G4PhysicsTable.icc
new file mode 100644
index 0000000000000000000000000000000000000000..cd0fbfaf6ccd01846abca07b04eba13dcd9bfc79
--- /dev/null
+++ b/source/global/management/include/G4PhysicsTable.icc
@@ -0,0 +1,73 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PhysicsTable.icc,v 1.3 2001/04/03 07:26:38 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// ------------------------------------------------------------
+//      GEANT 4 class inline implementation
+//
+//	History: first implementation, based on object model of
+//	2nd December 1995, G.Cosmo
+//
+// ------------------------------------------------------------
+
+inline
+ void G4PhysicsTable::clearAndDestroy() 
+{
+  G4PhysicsVector* a;
+  while (size()>0) {
+    a = back();
+    pop_back();
+    if ( a )  delete a;    
+  } 
+}
+
+inline
+ G4PhysicsVector*& G4PhysicsTable::operator()(size_t i) 
+{
+  return (*this)[i]; 
+}
+
+inline
+ G4PhysicsVector* const& G4PhysicsTable::operator()(size_t i) const
+{ 
+  return (*this)[i]; 
+}
+
+inline
+ void   G4PhysicsTable::insert(G4PhysicsVector* pvec)
+{
+  push_back(pvec);
+}
+
+inline
+ void  G4PhysicsTable::insertAt (size_t idx, G4PhysicsVector* pvec)
+{
+  G4PhysicsTableIterator itr=begin();
+  for (size_t i=0; i<idx; ++i) itr++;
+  G4PhysCollection::insert(itr, pvec);
+}
+
+inline
+ size_t G4PhysicsTable::entries() const 
+{
+  return size();
+}
+
+inline
+ size_t G4PhysicsTable::length() const 
+{
+  return size();
+}
+
+inline
+ G4bool G4PhysicsTable::isEmpty() const
+{
+  return empty();
+}
diff --git a/source/global/management/include/G4PhysicsVector.hh b/source/global/management/include/G4PhysicsVector.hh
index 1cd6e9d6b977c80e6031f697ac7e9838e3d461af..5b6121743fb43aaad1cef7042d5624caf3601ba0 100644
--- a/source/global/management/include/G4PhysicsVector.hh
+++ b/source/global/management/include/G4PhysicsVector.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsVector.hh,v 1.4 2000/11/20 17:26:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsVector.hh,v 1.9 2001/03/09 12:08:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -26,47 +26,59 @@
 //    02 Dec. 1995, G.Cosmo : Structure created based on object model
 //    03 Mar. 1996, K.Amako : Implemented the 1st version
 //    27 Apr. 1996, K.Amako : Cache mechanism added
-//    01 Jul. 1996, K.Amako : Now GetValue not virtual. 
-//    21 Sep. 1996, K.Amako : Added [] and () operators. 
+//    01 Jul. 1996, K.Amako : Now GetValue not virtual
+//    21 Sep. 1996, K.Amako : Added [] and () operators
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
+//    18 Jan. 2001, H.Kurashige : removed ptrNextTable
+//    09 Mar. 2001, H.Kurashige : added G4PhysicsVectorType & Store/Retrieve()
 //
 //---------------------------------------------------------------
 
 #ifndef G4PhysicsVector_h
 #define G4PhysicsVector_h 1
 
+#include "g4std/vector"
 #include "globals.hh"
-#include "G4DataVector.hh"
-#include "g4rw/tpordvec.h"
+#include "G4ios.hh"
+#include "g4std/iostream"
+#include "g4std/fstream"
+
+#include  "G4PhysicsVectorType.hh"
 
 class G4PhysicsVector 
 {
-  public:
+  public:  
 
-    // Constructor and destructor
     G4PhysicsVector();
+    // constructor  
+    // This class is an abstract class with pure virtual method of
+    // virtual size_t FindBinLocation(G4double theEnergy) const
+    // So, default constructor is not supposed to be invoked explicitly
+
+  public:  // with description
+
     virtual ~G4PhysicsVector();
+         // destructor
 
-    // Public functions
-    G4double GetValue(G4double theEnergy, G4bool& isOutRange);
-         // Get the crosssection/energy-loss value corresponding to the
+    inline G4double GetValue(G4double theEnergy, G4bool& isOutRange);
+         // Get the cross-section/energy-loss value corresponding to the
          // given energy. An appropriate interpolation is used to calculate
          // the value. 
          // [Note] isOutRange is not used anymore. This argument is kept
          //        for the compatibility reason.
-    // Public operators
+
     G4int operator==(const G4PhysicsVector &right) const ;
     G4int operator!=(const G4PhysicsVector &right) const ;
-    G4double operator[](const size_t binNumber) const ;
+    inline G4double operator[](const size_t binNumber) const ;
          // Returns simply the value in the bin specified by 'binNumber'
          // of the dataVector. The boundary check will be Done. If you
          // don't want this check, use the operator ().
-    G4double operator()(const size_t binNumber) const ;
+    inline G4double operator()(const size_t binNumber) const ;
          // Returns simply the value in the bin specified by 'binNumber'
          // of the dataVector. The boundary check will not be Done. If 
          // you want this check, use the operator [].
 
-    // Public functions
-    void PutValue(size_t binNumber, G4double theValue);
+    inline void PutValue(size_t binNumber, G4double theValue);
          // Put 'theValue' into the bin specified by 'binNumber'.
          // Take note that the 'binNumber' starts from '0'.
          // To fill the vector, you have beforehand to Construct a vector
@@ -80,28 +92,32 @@ class G4PhysicsVector
          // This value is defined when a physics vector is constructed
          // by a constructor of a derived class. Use this function
          // when you fill physis vector by PutValue().
-    size_t GetVectorLength() const;
+    inline size_t GetVectorLength() const;
          // Get the toal length (bin number) of the vector. 
-    G4bool IsFilledVectorExist() const;
+    inline G4bool IsFilledVectorExist() const;
          // Is non-empty physics vector already exist?
 
-    void LinkPhysicsTable(G4RWTPtrOrderedVector<G4PhysicsVector>& theTable);
-         // Link the given G4PhysicsTable to the current G4PhyiscsVector.
-    G4bool IsLinkedTableExist() const;
-         // Has this physics vector an extended physics table?
-    const G4RWTPtrOrderedVector<G4PhysicsVector>* GetNextTable() const;
-         // Returns the pointer to a physics table created for elements 
-         // or isotopes (when the cross-sesctions or energy-losses 
-         // depend explicitly on them).
-
-    void PutComment(const G4String& theComment);
+    inline void PutComment(const G4String& theComment);
          // Put a comment to the G4PhysicsVector. This may help to check
          // whether your are accessing to the one you want. 
-    G4String GetComment() const;
+    inline const G4String& GetComment() const;
          // Retrieve the comment of the G4PhysicsVector.
 
+    inline G4PhysicsVectorType GetType() const;
+         // Get physics vector type
+
+    virtual G4bool Store(G4std::ofstream& fOut, G4bool ascii=false);
+    virtual G4bool Retrieve(G4std::ifstream& fIn, G4bool ascii=false);
+         // To store/retrieve persistent data to/from file streams.
+
+    friend G4std::ostream& operator<<(G4std::ostream&, const G4PhysicsVector&);
+
   protected:
 
+    typedef G4std::vector<G4double> G4PVDataVector;
+
+    G4PhysicsVectorType type;   // The type of PhysicsVector (enumerator)
+
     G4double edgeMin;           // Lower edge value of the lowest bin
     G4double edgeMax;           // Lower edge value of the highest bin
     size_t numberOfBin;
@@ -110,22 +126,20 @@ class G4PhysicsVector
     G4double lastValue;         // Cache the last output value   
     size_t lastBin;             // Cache the last bin location
 
-    G4DataVector dataVector;    // Vector to keep the crossection/energyloss
-    G4DataVector binVector;     // Vector to keep the low edge value of bin
-
-    G4RWTPtrOrderedVector<G4PhysicsVector>* ptrNextTable;  
-                                // Link to the connected physics table
+    G4PVDataVector dataVector;    // Vector to keep the crossection/energyloss
+    G4PVDataVector binVector;     // Vector to keep the low edge value of bin
 
-    G4double LinearInterpolation(G4double theEnergy, size_t theLocBin);
+    inline G4double LinearInterpolation(G4double theEnergy, size_t theLocBin);
          // Linear interpolation function
+
     virtual size_t FindBinLocation(G4double theEnergy) const=0;
          // Find the bin# in which theEnergy belongs - pure virtual function
 
-  private:
+  protected:
 
     G4PhysicsVector(const G4PhysicsVector&);
     G4PhysicsVector& operator=(const G4PhysicsVector&);
-         // Private copy constructor and assignment operator.
+         // Protected copy constructor and assignment operator.
 
   private:
 
diff --git a/source/global/management/include/G4PhysicsVector.icc b/source/global/management/include/G4PhysicsVector.icc
index 887b3eb962f71c3a177d47f28fa800d49bf9d296..c96fd1c83b3b49ab4d82751adde20d30412af1a5 100644
--- a/source/global/management/include/G4PhysicsVector.icc
+++ b/source/global/management/include/G4PhysicsVector.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsVector.icc,v 1.1 1999/11/16 17:40:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsVector.icc,v 1.6 2001/03/09 12:08:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
@@ -24,27 +24,32 @@
 //---------------------------------------------------------------
 
 
-inline G4double G4PhysicsVector::operator[](const size_t binNumber) const
+inline
+ G4double G4PhysicsVector::operator[](const size_t binNumber) const
 {
   return dataVector[binNumber];
 }
 
 
-inline G4double G4PhysicsVector::operator()(const size_t binNumber) const
+inline
+ G4double G4PhysicsVector::operator()(const size_t binNumber) const
 {
-  return dataVector(binNumber);
+  return dataVector[binNumber];
 }
 
 
-inline const G4RWTPtrOrderedVector<G4PhysicsVector>*
-G4PhysicsVector::GetNextTable() const
+inline 
+ size_t G4PhysicsVector::GetVectorLength() const
 {
-  return ptrNextTable;
+  return numberOfBin;
 }
 
 
-inline G4double G4PhysicsVector::LinearInterpolation(G4double theEnergy, 
-                                                     size_t theLocBin) {
+
+inline
+ G4double G4PhysicsVector::LinearInterpolation(G4double theEnergy, 
+                                               size_t theLocBin)
+{
 
   // Linear interpolation is used to get the value. If the give energy
   // is in the highest bin, no interpolation will be Done. Because 
@@ -52,16 +57,18 @@ inline G4double G4PhysicsVector::LinearInterpolation(G4double theEnergy,
   // the following interpolation is valid even the current locBin=
   // numberOfBin-1. 
 
-  G4double intplFactor = (theEnergy-binVector(theLocBin)) 
-     / (binVector(theLocBin+1)-binVector(theLocBin)); // Interpolation factor
+  G4double intplFactor = (theEnergy-binVector[theLocBin]) 
+     / (binVector[theLocBin+1]-binVector[theLocBin]); // Interpolation factor
 
-  return dataVector(theLocBin) +
-         ( dataVector(theLocBin+1)-dataVector(theLocBin) ) * intplFactor;
+  return dataVector[theLocBin] +
+         ( dataVector[theLocBin+1]-dataVector[theLocBin] ) * intplFactor;
 }
 
 
-inline G4double G4PhysicsVector::GetValue(G4double theEnergy, 
-                                          G4bool& isOutRange) {
+inline
+ G4double G4PhysicsVector::GetValue(G4double theEnergy, 
+                                    G4bool& isOutRange) 
+{
 
   // Use cache for speed up - check if the value 'theEnergy' is same as the 
   // last call. If it is same, then use the last bin location. Also the
@@ -74,28 +81,28 @@ inline G4double G4PhysicsVector::GetValue(G4double theEnergy,
 
   if( theEnergy == lastEnergy ) {
      return lastValue;        
-  } 
-  else if( (theEnergy < lastEnergy) && 
-           (theEnergy >= binVector(lastBin)) ) {
+
+  } else if( (theEnergy < lastEnergy) && 
+           (theEnergy >= binVector[lastBin]) ) {
      locBin = lastBin;
 
      lastEnergy = theEnergy;
      lastValue = LinearInterpolation(theEnergy, locBin);
      return lastValue;
-  } 
-  else if( theEnergy < edgeMin ){
+
+  } else if( theEnergy < edgeMin ){
      lastBin = 0;
      lastEnergy = theEnergy;
-     lastValue = dataVector(0);
+     lastValue = dataVector[0];
      return lastValue;
-  } 
-  else if( theEnergy >= edgeMax ){
+
+  } else if( theEnergy >= edgeMax ){
      lastBin = numberOfBin-1;
      lastEnergy = theEnergy;
-     lastValue = dataVector( numberOfBin-1 );
+     lastValue = dataVector[ numberOfBin-1 ];
      return lastValue;
-  } 
-  else {
+
+  }  else {
      locBin = FindBinLocation(theEnergy); 
 
      lastBin = locBin;
@@ -103,4 +110,45 @@ inline G4double G4PhysicsVector::GetValue(G4double theEnergy,
      lastValue = LinearInterpolation(theEnergy, locBin);
      return lastValue;
   }
+
+}
+
+inline 
+ void G4PhysicsVector::PutValue(size_t binNumber, G4double theValue)
+{
+  dataVector[binNumber] = theValue;
+
+  // Fill the bin which is hidden to user with theValue. This is to 
+  // handle correctly when Energy=theEmax in getValue.
+  if(binNumber==numberOfBin-1) {
+    dataVector[binNumber+1] = theValue;
+  }                                 
+}
+
+inline 
+ G4bool G4PhysicsVector::IsFilledVectorExist() const
+{
+  G4bool status=false;
+
+  if(numberOfBin > 0) status=true;
+  return status;
+}
+
+
+inline 
+ void G4PhysicsVector::PutComment(const G4String& theComment)
+{
+  comment = theComment;
+}
+
+inline 
+ const G4String& G4PhysicsVector::GetComment() const
+{
+  return comment;
+}
+
+inline 
+ G4PhysicsVectorType G4PhysicsVector::GetType() const
+{
+  return type;
 }
diff --git a/source/global/management/include/G4PhysicsVectorType.hh b/source/global/management/include/G4PhysicsVectorType.hh
new file mode 100644
index 0000000000000000000000000000000000000000..d518033d0106ead6ce2f4b8b5ea71f48c4579d05
--- /dev/null
+++ b/source/global/management/include/G4PhysicsVectorType.hh
@@ -0,0 +1,42 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PhysicsVectorType.hh,v 1.2 2001/03/09 12:08:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// --------------------------------------------------------------
+//
+// G4PhysicsVectorType
+//
+// Class Description:
+//
+// Enumerator to define the physics vector type:
+//   G4PhysicsVector - base
+//   G4PhysicsLinearVector
+//   G4PhysicsLogVector
+//   G4PhysicsLnVector
+//   G4PhysicsFreeVector
+//   G4PhysicsOrderedFreeVector
+//   G4LPhysicsFreeVector
+
+// --------------------------------------------------------------
+
+#ifndef G4PhysicsVectorType_h
+#define G4PhysicsVectorType_h
+
+enum G4PhysicsVectorType
+{
+  T_G4PhysicsVector =0,
+  T_G4PhysicsLinearVector,
+  T_G4PhysicsLogVector,
+  T_G4PhysicsLnVector,
+  T_G4PhysicsFreeVector,
+  T_G4PhysicsOrderedFreeVector,
+  T_G4LPhysicsFreeVector
+};
+
+#endif
diff --git a/source/global/management/include/G4RotationMatrix.hh b/source/global/management/include/G4RotationMatrix.hh
index 65459dbb82f4d2d8d6865b546fef607378cc3ec5..f1fb135fd6315e68a3d21bf8610e5a810f33f185 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4UnitsTest.hh b/source/global/management/include/G4SIunits.hh
similarity index 97%
rename from source/global/management/include/G4UnitsTest.hh
rename to source/global/management/include/G4SIunits.hh
index b7329cfe88b2580b047d00ec856394cfffda53b7..aef0514be095d7f71daf9fc720a5cee9a0a0bf36 100644
--- a/source/global/management/include/G4UnitsTest.hh
+++ b/source/global/management/include/G4SIunits.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsTest.hh,v 1.4 1999/11/19 09:19:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SIunits.hh,v 1.1 2001/03/02 11:01:51 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 // ----------------------------------------------------------------------
 //
@@ -42,7 +42,8 @@
 //
 // History:
 //
-// 10.03.99   created    
+// 10.03.99   created
+// 01.03.01   parsec      
 
 #ifndef G4UNITSTEST_HH
 #define G4UNITSTEST_HH
@@ -68,6 +69,8 @@ static const HepDouble kilometer = 1000.*meter;
 static const HepDouble kilometer2 = kilometer*kilometer;
 static const HepDouble kilometer3 = kilometer*kilometer*kilometer;
 
+static const HepDouble parsec = 3.0856775807e+16*meter;
+
 static const HepDouble micrometer = 1.e-6 *meter;             
 static const HepDouble  nanometer = 1.e-9 *meter;
 static const HepDouble  angstrom  = 1.e-10*meter;
@@ -96,6 +99,8 @@ static const HepDouble km  = kilometer;
 static const HepDouble km2 = kilometer2;
 static const HepDouble km3 = kilometer3;
 
+static const HepDouble pc = parsec;
+
 //
 // Angle
 //
diff --git a/source/global/management/include/G4StateManager.hh b/source/global/management/include/G4StateManager.hh
index f2f1dc1c229e6aade7d430713b8484d55c93a009..b1f265b39e111aa2f28916120adfcc946b79b61b 100644
--- a/source/global/management/include/G4StateManager.hh
+++ b/source/global/management/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.2 2000/11/20 17:26:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4StateManager.hh,v 1.3 2001/03/06 15:56:48 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -35,7 +35,7 @@
 #ifndef G4StateManager_h
 #define G4StateManager_h 1
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "globals.hh"
 #include "G4ApplicationState.hh"
 #include "G4VStateDependent.hh"
@@ -60,9 +60,9 @@ public:
 
 public: // with description
 
-  G4ApplicationState GetCurrentState();
+  G4ApplicationState GetCurrentState() const;
     // Returns the current state
-  G4ApplicationState GetPreviousState();
+  G4ApplicationState GetPreviousState() const;
     // Returns the previous state
   G4bool SetNewState(G4ApplicationState requestedState);
     // Set Geant4 to a new state.
@@ -79,7 +79,7 @@ public: // with description
   G4VStateDependent* RemoveDependent(const G4VStateDependent* aDependent);
     // Remove the registration.
     // Removed pointer is returned.
-  G4String GetStateString(G4ApplicationState aState);
+  G4String GetStateString(G4ApplicationState aState) const;
     // Utility method which returns a string of the state name.
 
 public:
@@ -104,7 +104,7 @@ private:
   static G4StateManager* theStateManager;
   G4ApplicationState theCurrentState;
   G4ApplicationState thePreviousState;
-  G4RWTPtrOrderedVector<G4VStateDependent> theDependentsList;
+  G4std::vector<G4VStateDependent*> theDependentsList;
   G4VStateDependent* theBottomDependent;
 
 };
diff --git a/source/global/management/include/G4ThreeVector.hh b/source/global/management/include/G4ThreeVector.hh
index 8945889fd70c033630f596e4063cbc3217a40b73..c6fc850298b069b6942fed6d4dc52016cfc1b749 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4Timer.hh b/source/global/management/include/G4Timer.hh
index 8a294684d10780da72585978ddab5059130f4266..734a61299d25dc61eb04717e710dac6745401ca5 100644
--- a/source/global/management/include/G4Timer.hh
+++ b/source/global/management/include/G4Timer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Timer.hh,v 1.10 2000/01/06 14:27:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4Types.hh b/source/global/management/include/G4Types.hh
index 8c937cb2936bfc44891600d2080688c857344df5..20379390c5ddf5ccb76528bf319127a9d752db45 100644
--- a/source/global/management/include/G4Types.hh
+++ b/source/global/management/include/G4Types.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Types.hh,v 1.4 1999/12/15 18:05:19 gracia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 native types
diff --git a/source/global/management/include/G4UnitsTable.hh b/source/global/management/include/G4UnitsTable.hh
index 7f0de18e6b02633452ebfe21421829dd77cc91ca..367885fd257bf84d9b7de416b6f13d4085297f67 100644
--- a/source/global/management/include/G4UnitsTable.hh
+++ b/source/global/management/include/G4UnitsTable.hh
@@ -5,26 +5,26 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsTable.hh,v 1.9 2000/01/19 11:16:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UnitsTable.hh,v 1.10 2001/03/06 15:56:48 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // -----------------------------------------------------------------
-//	GEANT 4 class header file 
 //
 //      ------------------- class G4UnitsTable -----------------
 //
 // 17-05-98: first version, M.Maire
-// 13-10-98: Units and symbols printed in fixed length
-// 18-01-00: BestUnit for three vector
-
+// 13-10-98: Units and symbols printed in fixed length, M.Maire
+// 18-01-00: BestUnit for three vector, M.Maire
+// 06-03-01: Migrated to STL vectors, G.Cosmo
+//
 // Class description:
 //
 // This class maintains a table of Units.
 // A Unit has a name, a symbol, a value and belong to a category (i.e. its
 // dimensional definition): Length, Time, Energy, etc...
 // The Units are grouped by category. The TableOfUnits is a list of categories.
-// The class BestUnit allow to convert automaticaly a physical quantity
+// The class G4BestUnit allows to convert automaticaly a physical quantity
 // from its internal value into the most appropriate Unit of the same category.
 //
 
@@ -35,11 +35,11 @@
 #define G4UnitsTable_HH
 
 #include "globals.hh"
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "G4ThreeVector.hh"
 
 class G4UnitsCategory;
-typedef G4RWTPtrOrderedVector<G4UnitsCategory> G4UnitsTable;
+typedef G4std::vector<G4UnitsCategory*> G4UnitsTable;
 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -48,8 +48,8 @@ class G4UnitDefinition
 {
 public:  // with description
 
-    G4UnitDefinition(G4String name, G4String symbol,G4String category,
-            G4double value);
+    G4UnitDefinition(G4String name, G4String symbol,
+                     G4String category, G4double value);
 	    
 public:  // without description
 	    
@@ -64,18 +64,17 @@ private:
    
 public:  // with description
 
-    G4String      GetName()       {return Name;};
-    G4String      GetSymbol()     {return SymbolName;};
-    G4double      GetValue()      {return Value;};
+    G4String      GetName()   const {return Name;}
+    G4String      GetSymbol() const {return SymbolName;}
+    G4double      GetValue()  const {return Value;}
     
     void          PrintDefinition();
     
     static void BuildUnitsTable();    
     static void PrintUnitsTable();
     
-    static  
-    G4UnitsTable&   GetUnitsTable() {return theUnitsTable;};
-        
+    static G4UnitsTable& GetUnitsTable() {return theUnitsTable;}
+
     static G4double GetValueOf (G4String);
     static G4String GetCategory(G4String);
 
@@ -94,7 +93,7 @@ private:
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-typedef G4RWTPtrOrderedVector<G4UnitDefinition> G4UnitsContainer;
+typedef G4std::vector<G4UnitDefinition*> G4UnitsContainer;
 
 class G4UnitsCategory
 {
@@ -112,13 +111,13 @@ private:
    
 public:  // without description
 
-    G4String          GetName()      {return Name;};
-    G4UnitsContainer& GetUnitsList() {return UnitsList;};
-    G4int             GetNameMxLen() {return NameMxLen;};
-    G4int             GetSymbMxLen() {return SymbMxLen;};
-    void  UpdateNameMxLen(G4int len) {if (NameMxLen<len) NameMxLen=len;};
-    void  UpdateSymbMxLen(G4int len) {if (SymbMxLen<len) SymbMxLen=len;};
-    void PrintCategory();
+    G4String          GetName()      const {return Name;}
+    G4UnitsContainer& GetUnitsList()       {return UnitsList;}
+    G4int             GetNameMxLen() const {return NameMxLen;}
+    G4int             GetSymbMxLen() const {return SymbMxLen;}
+    void  UpdateNameMxLen(G4int len) {if (NameMxLen<len) NameMxLen=len;}
+    void  UpdateSymbMxLen(G4int len) {if (SymbMxLen<len) SymbMxLen=len;}
+    void  PrintCategory();
 
 private:
 
@@ -134,25 +133,25 @@ class G4BestUnit
 {
 public:  // with description
 
-    G4BestUnit(G4double      internalValue, G4String category);
+    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)
-    
+      // 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)
+
    ~G4BestUnit();
    
 public:  // without description
 
-    G4double*  GetValue()           {return Value;};
-    G4String   GetCategory()        {return Category;};
-    size_t     GetIndexOfCategory() {return IndexOfCategory;};
+    G4double*  GetValue()                 {return Value;}
+    G4String   GetCategory()        const {return Category;}
+    size_t     GetIndexOfCategory() const {return IndexOfCategory;}
     
 public:  // with description 
    
     friend
     G4std::ostream&  operator<<(G4std::ostream&,G4BestUnit VU);
-    // Default format to print the objet VU above.
+      // Default format to print the objet VU above.
 
 private:
 
diff --git a/source/global/management/include/G4UserLimits.hh b/source/global/management/include/G4UserLimits.hh
index 3eb3339853b74a0317c301e0ed7594fbb1916bc1..b41b46bfb9185903357757272aedefedc58e160f 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.6 2000/02/17 16:13:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //
 // class G4UserLimits
diff --git a/source/global/management/include/G4UserLimits.icc b/source/global/management/include/G4UserLimits.icc
index b65f7332975cfac37e48da9be68166b0f8ed8249..f26edb3ff5276f2f0077944131444ec70f37fef1 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.5 2000/02/17 16:13:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
diff --git a/source/global/management/include/G4VStateDependent.hh b/source/global/management/include/G4VStateDependent.hh
index a539e2c9408348185b16e732679a087f04679aaf..13957d0fc348b0e5cdd89c98805c53bc61ca3f81 100644
--- a/source/global/management/include/G4VStateDependent.hh
+++ b/source/global/management/include/G4VStateDependent.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VStateDependent.hh,v 1.2 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4coutDestination.hh b/source/global/management/include/G4coutDestination.hh
index 75405e57637d16ef5a47ba5b49af114319b36ac1..293a19bfd85897df8ca4863bef00192f3ef58dd3 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.3 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/G4ios.hh b/source/global/management/include/G4ios.hh
index 8decbebe63b23d102d3ce92281f24aa538d86162..79dc50ae32ae7eee528d2d1ad67b343a1f4ec5f9 100644
--- a/source/global/management/include/G4ios.hh
+++ b/source/global/management/include/G4ios.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ios.hh,v 1.5 1999/12/15 18:05:18 gracia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/G4strstreambuf.hh b/source/global/management/include/G4strstreambuf.hh
index 5777308b14e064d13e7003e33962866bfb1c044f..e4581dcf42573cbbfd8820f08fb4d150c59e4d9a 100644
--- a/source/global/management/include/G4strstreambuf.hh
+++ b/source/global/management/include/G4strstreambuf.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4strstreambuf.hh,v 1.7 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/G4strstreambuf.icc b/source/global/management/include/G4strstreambuf.icc
index 7186d76bd5f9b762ae5d20c8fecc87cb578ec948..e95ec7970d648bd952a21417c1169511fdd9bafe 100644
--- a/source/global/management/include/G4strstreambuf.icc
+++ b/source/global/management/include/G4strstreambuf.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4strstreambuf.icc,v 1.1 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/PhysicalConstants.h b/source/global/management/include/PhysicalConstants.h
index bfecda2d65948a4aa7efa333e09eeedce745a01f..8c3b8c27f6d6afff59d8898b1ce89922a210537a 100644
--- a/source/global/management/include/PhysicalConstants.h
+++ b/source/global/management/include/PhysicalConstants.h
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: PhysicalConstants.h,v 1.4 1999/11/19 09:19:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: PhysicalConstants.h,v 1.5 2001/03/02 11:28:29 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 // ----------------------------------------------------------------------
 //
@@ -50,7 +50,7 @@
 #define HEP_PHYSICAL_CONSTANTS_H
 
 #include "SystemOfUnits.h"
-///#include "G4UnitsTest.hh"
+////#include "G4SIunits.hh"
 
 //
 //
diff --git a/source/global/management/include/SystemOfUnits.h b/source/global/management/include/SystemOfUnits.h
index 06210e3b8a629b5ff73b84bdb7c6954549c37caa..90e6967bcccf2bf2ac4bdb60212bd09e8bab4268 100644
--- a/source/global/management/include/SystemOfUnits.h
+++ b/source/global/management/include/SystemOfUnits.h
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: SystemOfUnits.h,v 1.4 1999/11/19 09:19:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: SystemOfUnits.h,v 1.6 2001/03/05 13:25:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 // ----------------------------------------------------------------------
 //
@@ -27,7 +27,7 @@
 // 		radian                  (radian)
 //              steradian               (steradian)
 //
-// Below is a non exhaustive List of derived and pratical units
+// Below is a non exhaustive list of derived and pratical units
 // (i.e. mostly the SI units).
 // You can add your own units.
 //
@@ -45,9 +45,10 @@
 // 06.02.96   Created.
 // 28.03.96   Added miscellaneous constants.
 // 05.12.97   E.Tcherniaev: Redefined pascal (to avoid warnings on WinNT)
-// 20.05.98   names: meter, second, gram, radian, degree. (from Blasiuk (STAR))
-//            Added luminous units.
-// 05.08.98   angstrom,picobarn,microsecond,picosecond,petaelectronvolt    
+// 20.05.98   names: meter, second, gram, radian, degree
+//            (from Brian.Lasiuk@yale.edu (STAR)). Added luminous units.
+// 05.08.98   angstrom, picobarn, microsecond, picosecond, petaelectronvolt
+// 01.03.01   parsec    
 
 #ifndef HEP_SYSTEM_OF_UNITS_H
 #define HEP_SYSTEM_OF_UNITS_H
@@ -73,6 +74,8 @@ static const HepDouble kilometer = 1000.*meter;
 static const HepDouble kilometer2 = kilometer*kilometer;
 static const HepDouble kilometer3 = kilometer*kilometer*kilometer;
 
+static const HepDouble parsec = 3.0856775807e+16*meter;
+
 static const HepDouble micrometer = 1.e-6 *meter;             
 static const HepDouble  nanometer = 1.e-9 *meter;
 static const HepDouble  angstrom  = 1.e-10*meter;
@@ -101,6 +104,8 @@ static const HepDouble km  = kilometer;
 static const HepDouble km2 = kilometer2;
 static const HepDouble km3 = kilometer3;
 
+static const HepDouble pc = parsec;
+
 //
 // Angle
 //
diff --git a/source/global/management/include/g4std/algorithm b/source/global/management/include/g4std/algorithm
index 557080056488008adc00ca78070276ba7c251ad6..f6d9f2c0f574086f950e39522b7628d86a4a6c71 100644
--- a/source/global/management/include/g4std/algorithm
+++ b/source/global/management/include/g4std/algorithm
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: algorithm,v 1.3 1999/11/16 17:42:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- algorithm ----------------
 //
diff --git a/source/global/management/include/g4std/complex b/source/global/management/include/g4std/complex
index b4be6f04b07d10d50fcd4b270df0124bb01e29c6..e146d9f58f4565010da617204575871996c09743 100644
--- a/source/global/management/include/g4std/complex
+++ b/source/global/management/include/g4std/complex
@@ -7,7 +7,7 @@
 //
 //
 // $Id: complex,v 1.3 2000/06/15 17:32:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- complex ----------------
 //
diff --git a/source/global/management/include/g4std/fstream b/source/global/management/include/g4std/fstream
index 859645af680015d747f54de63e15b19574cca499..91d39e83f4897757b8e71c9a7dabdfbfee7f0719 100644
--- a/source/global/management/include/g4std/fstream
+++ b/source/global/management/include/g4std/fstream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: fstream,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- fstream ----------------
 //
diff --git a/source/global/management/include/g4std/functional b/source/global/management/include/g4std/functional
index e85886c909211cf669f73154312c1f443ff7e180..acead15fc02ddc82a335be9c933ac80f632b1066 100644
--- a/source/global/management/include/g4std/functional
+++ b/source/global/management/include/g4std/functional
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: functional,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- functional ----------------
 //
diff --git a/source/global/management/include/g4std/iomanip b/source/global/management/include/g4std/iomanip
index 45f93070afb4cc48c8d1d156dbaebe8dabe41d3e..7d2d7fa1678b4bca7811bdcc0f7a1ad1795bb6df 100644
--- a/source/global/management/include/g4std/iomanip
+++ b/source/global/management/include/g4std/iomanip
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iomanip,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- iomanip ----------------
 //
diff --git a/source/global/management/include/g4std/iostream b/source/global/management/include/g4std/iostream
index ae0d9ee03ef37a45786a7e919cc2193610dcb70a..c04e079f8b98904f65c78812387b254b4dcfd045 100644
--- a/source/global/management/include/g4std/iostream
+++ b/source/global/management/include/g4std/iostream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iostream,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- iostream ----------------
 //
diff --git a/source/global/management/include/g4std/list b/source/global/management/include/g4std/list
index 55b10ac56195e0c5e25673ec031b953037f562e4..0031ec46725dec4ac792d19027ae2d995df85896 100644
--- a/source/global/management/include/g4std/list
+++ b/source/global/management/include/g4std/list
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: list,v 1.1 2000/08/22 07:54:26 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- list ----------------
 //
diff --git a/source/global/management/include/g4std/map b/source/global/management/include/g4std/map
index 1fd8802271e969779c431939deeabffbf35eab2b..4c87a5bfa9e983f91f037105d69690330897655a 100644
--- a/source/global/management/include/g4std/map
+++ b/source/global/management/include/g4std/map
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: map,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- map ----------------
 //
diff --git a/source/global/management/include/g4std/queue b/source/global/management/include/g4std/queue
index dec0e9f97fdba9aaf8c06ceb85d44a692fbe203b..0777a6cbf61022e91d3f9a14dbeae9c8440eb83c 100644
--- a/source/global/management/include/g4std/queue
+++ b/source/global/management/include/g4std/queue
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: queue,v 1.1 2000/08/02 09:49:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- queue ----------------
 //
diff --git a/source/global/management/include/g4std/set b/source/global/management/include/g4std/set
index ed2bd7693ab82dc3bb7ecb2c320e6d8f9dbd56ef..76fb2f237eb93630639e853b4e2918665ee14180 100644
--- a/source/global/management/include/g4std/set
+++ b/source/global/management/include/g4std/set
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: set,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- set ----------------
 //
diff --git a/source/global/management/include/g4std/streambuf b/source/global/management/include/g4std/streambuf
index 72effbf10d0ab6eb8d772b51ed4f9c3e0d6b810a..69ea22605c3f472b93f9178730456bb92e96fcfd 100644
--- a/source/global/management/include/g4std/streambuf
+++ b/source/global/management/include/g4std/streambuf
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: streambuf,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- streambuf ----------------
 //
diff --git a/source/global/management/include/g4std/strstream b/source/global/management/include/g4std/strstream
index a53469d3d59eb6e98102d6539c8de9da59948e82..92586fff8c03a2459cbb18f8ee3144957ae61fc8 100644
--- a/source/global/management/include/g4std/strstream
+++ b/source/global/management/include/g4std/strstream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: strstream,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- strstream ----------------
 //
diff --git a/source/global/management/include/g4std/vector b/source/global/management/include/g4std/vector
index c0c222e8e2ac499ada7362c7dbd435abe6da6ca7..0234e5ef504a452549cda64910eb42c6bd571cd7 100644
--- a/source/global/management/include/g4std/vector
+++ b/source/global/management/include/g4std/vector
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: vector,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ---------------- vector ----------------
 //
diff --git a/source/global/management/include/globals.hh b/source/global/management/include/globals.hh
index 2c884db5ab1236eea02c9da0113bcb3512f1c31e..36109c3685dac4aae8d2307feda6844f8fb06d7c 100644
--- a/source/global/management/include/globals.hh
+++ b/source/global/management/include/globals.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: globals.hh,v 1.15 2000/01/19 11:12:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // Global Constants and typedefs
diff --git a/source/global/management/include/templates.hh b/source/global/management/include/templates.hh
index e71475830cbb37afb1a372165dba1274f8b3b439..f1ea2c0f6b7d7a2897dff5a9edf04795c1bc9cc7 100644
--- a/source/global/management/include/templates.hh
+++ b/source/global/management/include/templates.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: templates.hh,v 1.5 2000/01/03 11:39:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // -*- C++ -*-
diff --git a/source/global/management/src/G4Exception.cc b/source/global/management/src/G4Exception.cc
index 098853a70f2d959260a06c7ebf8db33f429a6ff6..39dcb902b4e8fb61a56beb15d906f8f3a364f992 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.9 2000/07/22 10:45:35 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/src/G4LPhysicsFreeVector.cc b/source/global/management/src/G4LPhysicsFreeVector.cc
index e396dc9843b45b75dca7a45cb1e208790ea14bd0..4f2b38cdefe843b0a3d33974ce5ec1e8528f3ce9 100644
--- a/source/global/management/src/G4LPhysicsFreeVector.cc
+++ b/source/global/management/src/G4LPhysicsFreeVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LPhysicsFreeVector.cc,v 1.3 2000/11/20 17:26:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LPhysicsFreeVector.cc,v 1.7 2001/03/09 03:39:30 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------------
@@ -17,6 +17,7 @@
 // F.W. Jones, TRIUMF, 04-JUN-96
 //
 // 27-MAR-97 FWJ: first version for Alpha release
+// 11-NOV-00 H.Kurashige : use STL vector for dataVector and binVector
 //
 
 #include "G4LPhysicsFreeVector.hh"
@@ -25,7 +26,8 @@
 
 G4LPhysicsFreeVector::G4LPhysicsFreeVector()
 {
-   ptrNextTable = 0;
+   type = T_G4LPhysicsFreeVector;
+
    edgeMin = 0.0;
    edgeMax = 0.0;
    numberOfBin = 0;
@@ -35,16 +37,21 @@ G4LPhysicsFreeVector::G4LPhysicsFreeVector()
 G4LPhysicsFreeVector::G4LPhysicsFreeVector(size_t nbin, G4double binmin,
                                            G4double binmax)
 {
+   type = T_G4LPhysicsFreeVector;
+
    edgeMin = binmin;
    edgeMax = binmax;
    numberOfBin = nbin;
    lastEnergy = 0.;
    lastValue = 0.;
    lastBin = 0;
-   binVector.resize(nbin);
-   dataVector.resize(nbin);
-   ptrNextTable = 0;
+   binVector.reserve(nbin);
+   dataVector.reserve(nbin);
    verboseLevel = 0;
+   for (size_t i=0; i<numberOfBin; i++) {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
+   }
 }  
 
 G4LPhysicsFreeVector::~G4LPhysicsFreeVector()
@@ -54,7 +61,7 @@ G4LPhysicsFreeVector::~G4LPhysicsFreeVector()
 void G4LPhysicsFreeVector::DumpValues()
 {
    for (size_t i = 0; i < numberOfBin; i++) {
-     //      printf(" %12.4f   %7.1f\n", binVector(i), dataVector(i)*1.e-27);
-      printf(" %12.4f   %7.1f\n", binVector(i), dataVector(i)/millibarn);
+     //      printf(" %12.4f   %7.1f\n", binVector[i], dataVector[i]*1.e-27);
+      printf(" %12.4f   %7.1f\n", binVector[i], dataVector[i]/millibarn);
    }
 }
diff --git a/source/global/management/src/G4PhysicsFreeVector.cc b/source/global/management/src/G4PhysicsFreeVector.cc
index 90af51f3e2c8fe5a19acf38c0d390ff6316410dc..24d3219b06c2e075f965c94b78023855507f9f5d 100644
--- a/source/global/management/src/G4PhysicsFreeVector.cc
+++ b/source/global/management/src/G4PhysicsFreeVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsFreeVector.cc,v 1.3 2000/11/20 17:26:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsFreeVector.cc,v 1.7 2001/03/09 03:39:30 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -16,10 +16,11 @@
 //
 //  History:
 //    02 Dec. 1995, G.Cosmo : Structure created based on object model
-//    06 June 1996, K.Amako : The 1st version of implemented.
+//    06 June 1996, K.Amako : The 1st version of implemented
 //    01 Jul. 1996, K.Amako : Cache mechanism and hidden bin from the 
-//                            user introduced.
-//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added.
+//                            user introduced
+//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
 //
 //--------------------------------------------------------------------
 
@@ -28,23 +29,27 @@
 
 G4PhysicsFreeVector::G4PhysicsFreeVector()
 {
-  ptrNextTable = 0;
   edgeMin = 0.0;
   edgeMax = 0.0;
   numberOfBin = 0;
+  type = T_G4PhysicsFreeVector;
 }
 
 
 G4PhysicsFreeVector::G4PhysicsFreeVector(size_t theNbin)
 {
+  type = T_G4PhysicsFreeVector;
   numberOfBin = theNbin;
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue.
-  dataVector.resize(numberOfBin+1);
-  binVector.resize(numberOfBin+1);
+  dataVector.reserve(numberOfBin+1);
+  binVector.reserve(numberOfBin+1);
 
-  ptrNextTable = 0;
+  for (size_t i=0; i<=numberOfBin; i++) {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
+  }
 
   edgeMin = 0.;
   edgeMax = 0.;
@@ -59,33 +64,32 @@ G4PhysicsFreeVector::G4PhysicsFreeVector(size_t theNbin)
 G4PhysicsFreeVector::G4PhysicsFreeVector(const G4DataVector& theBinVector, 
                                          const G4DataVector& theDataVector)
 {
-  numberOfBin = theBinVector.entries();
+  type = T_G4PhysicsFreeVector;
+  numberOfBin = theBinVector.size();
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue.
-  dataVector.resize(numberOfBin+1);
-  binVector.resize(numberOfBin+1);
-
-  ptrNextTable = 0;
+  dataVector.reserve(numberOfBin+1);
+  binVector.reserve(numberOfBin+1);
 
   for (size_t i=0; i<numberOfBin; i++) {
-     binVector(i) = theBinVector(i);
-     dataVector(i) = theDataVector(i);
+     binVector.push_back(theBinVector[i]);
+     dataVector.push_back(theDataVector[i]);
   }
 
   // Put values to extra hidden bin. For 'binVector', the 'edgeMin' of the
   // extra hidden bin is assumed to have the following value. For binary
   // search, this value is completely arbitrary if it is greater than
   // the 'edgeMin' at 'numberOfBin-1'. 
-  binVector(numberOfBin) = theBinVector(numberOfBin-1) + 1.0;
+  binVector.push_back ( theBinVector[numberOfBin-1] + 1.0 );
 
 
   // Put values to extra hidden bin. For 'dataVector', the 'value' of the
   // extra hidden bin is assumed to have the same as the one at 'numberBin-1'. 
-  dataVector(numberOfBin) = theDataVector(numberOfBin-1);
+  dataVector.push_back( theDataVector[numberOfBin-1] );
 
-  edgeMin = binVector(0);
-  edgeMax = binVector(numberOfBin-1);
+  edgeMin = binVector[0];
+  edgeMax = binVector[numberOfBin-1];
 
   lastBin = INT_MAX;
   lastEnergy = -DBL_MAX;
@@ -100,26 +104,26 @@ G4PhysicsFreeVector::~G4PhysicsFreeVector(){}
 void G4PhysicsFreeVector::PutValue( size_t theBinNumber, G4double theBinValue, 
 			            G4double theDataValue )
 {
-  binVector(theBinNumber)  = theBinValue;
-  dataVector(theBinNumber) = theDataValue;
+  binVector[theBinNumber]  = theBinValue;
+  dataVector[theBinNumber] = theDataValue;
 
 
   if( theBinNumber == numberOfBin-1 ) {
-     edgeMax = binVector(numberOfBin-1);
+     edgeMax = binVector[numberOfBin-1];
 
      // Put values to extra hidden bin. For 'binVector', the 'edgeMin' 
      // of the extra hidden bin is assumed to have the following value. 
      // For binary search, this value is completely arbitrary if it is 
      // greater than the 'edgeMin' at 'numberOfBin-1'. 
-     binVector(numberOfBin) = theBinValue + 1.0;
+     binVector[numberOfBin] = theBinValue + 1.0;
 
      // Put values to extra hidden bin. For 'dataVector', the 'value' 
      // of the extra hidden bin is assumed to have the same as the one 
      // at 'numberBin-1'. 
-     dataVector(numberOfBin) = theDataValue;
+     dataVector[numberOfBin] = theDataValue;
   }
 
   if( theBinNumber == 0 ) {
-     edgeMin = binVector(0);
+     edgeMin = binVector[0];
   }
 }
diff --git a/source/global/management/src/G4PhysicsLinearVector.cc b/source/global/management/src/G4PhysicsLinearVector.cc
index 3641dfe94227cf8593dc7a926a60034c697d086c..6746571fc66d346574656429b75d0632bbfc0bd1 100644
--- a/source/global/management/src/G4PhysicsLinearVector.cc
+++ b/source/global/management/src/G4PhysicsLinearVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsLinearVector.cc,v 1.3 2000/11/20 17:26:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsLinearVector.cc,v 1.8 2001/04/03 09:15:24 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //--------------------------------------------------------------------
@@ -14,12 +14,14 @@
 //
 //  G4PhysicsLinearVector.cc
 //
-//  History: first implementation, based on object model of
+//  History:
 //    02 Dec. 1995, G.Cosmo : Structure created based on object model
 //    15 Feb. 1996, K.Amako : Implemented the 1st version
 //    01 Jul. 1996, K.Amako : Cache mechanism and hidden bin from the 
 //                            user introduced.
 //    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added.
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
+//    9  Mar. 2001, H.Kurashige : add PhysicsVector type and Retrieve
 //
 //--------------------------------------------------------------------
 
@@ -27,21 +29,21 @@
 
 G4PhysicsLinearVector::G4PhysicsLinearVector()
 {
-  ptrNextTable = 0;
   edgeMin = 0.0;
   edgeMax = 0.0;
   numberOfBin = 0;
+  type = T_G4PhysicsLinearVector;
 }
 
 G4PhysicsLinearVector::G4PhysicsLinearVector(size_t theNbin)
 {
+  type = T_G4PhysicsLinearVector;
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
-  dataVector.resize(theNbin+1);
-  binVector.resize(theNbin+1);      
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1);      
 
-  ptrNextTable = 0;
   numberOfBin = theNbin;
   dBin = 0.;
   baseBin = 0.;
@@ -52,28 +54,34 @@ G4PhysicsLinearVector::G4PhysicsLinearVector(size_t theNbin)
   lastBin = INT_MAX;
   lastEnergy = -DBL_MAX;
   lastValue = DBL_MAX;
+
+  for (size_t i=0; i<=numberOfBin; i++) {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
+  }
 }  
 
 G4PhysicsLinearVector::G4PhysicsLinearVector(G4double theEmin, 
                                              G4double theEmax, size_t theNbin)
 {
+  type = T_G4PhysicsLinearVector;
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
-  dataVector.resize(theNbin+1);
-  binVector.resize(theNbin+1);      
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1);      
 
-  ptrNextTable = 0;
   numberOfBin = theNbin;
   dBin = (theEmax-theEmin) / numberOfBin;
   baseBin = theEmin/dBin;
 
   for (size_t i=0; i<numberOfBin+1; i++) {
-    binVector(i) = theEmin + i*dBin;
+    binVector.push_back( theEmin + i*dBin );
+    dataVector.push_back(0.0);
   }
 
-  edgeMin = binVector(0);
-  edgeMax = binVector(numberOfBin-1);
+  edgeMin = binVector[0];
+  edgeMax = binVector[numberOfBin-1];
 
   lastBin = INT_MAX;
   lastEnergy = -DBL_MAX;
@@ -81,3 +89,16 @@ G4PhysicsLinearVector::G4PhysicsLinearVector(G4double theEmin,
 }  
 
 G4PhysicsLinearVector::~G4PhysicsLinearVector(){}
+
+
+G4bool G4PhysicsLinearVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
+{
+  G4bool success = G4PhysicsVector::Retrieve(fIn, ascii);
+  if (success){
+    G4double theEmin = binVector[0];
+    dBin = binVector[1]-theEmin;
+    baseBin = theEmin/dBin;
+  }
+  return success;
+}
+
diff --git a/source/global/management/src/G4PhysicsLnVector.cc b/source/global/management/src/G4PhysicsLnVector.cc
index f98a738f779fc2749475bb36aa4fd60390503d2a..d69520582b2df1e75a511ed95d68baea9c452f48 100644
--- a/source/global/management/src/G4PhysicsLnVector.cc
+++ b/source/global/management/src/G4PhysicsLnVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsLnVector.cc,v 1.4 2000/11/20 17:26:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsLnVector.cc,v 1.10 2001/04/03 09:15:24 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -16,26 +16,29 @@
 //
 //  History:
 //    27 Apr. 1999, M.G. Pia: Created, copying from G4PhysicsLogVector
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
+//    9  Mar. 2001, H.Kurashige : add PhysicsVector type and Retrieve
 //
 // --------------------------------------------------------------
 
 #include "G4PhysicsLnVector.hh"
 
-
 G4PhysicsLnVector::G4PhysicsLnVector()
   : dBin(0.), baseBin(0.)
-{}
+{
+  type = T_G4PhysicsLnVector;
+}
 
 
 G4PhysicsLnVector::G4PhysicsLnVector(size_t theNbin)
 {
+  type = T_G4PhysicsLnVector;
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
-  dataVector.resize(theNbin+1);
-  binVector.resize(theNbin+1); 
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1); 
 
-  ptrNextTable = 0;
   numberOfBin = theNbin;
   dBin = 0.;
   baseBin = 0.;
@@ -46,29 +49,35 @@ G4PhysicsLnVector::G4PhysicsLnVector(size_t theNbin)
   lastBin = INT_MAX;
   lastEnergy = -DBL_MAX;
   lastValue = DBL_MAX;
-}  
+
+  for (size_t i=0; i<=numberOfBin; i++) {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
+  }
+ }  
 
 
 G4PhysicsLnVector::G4PhysicsLnVector(G4double theEmin, 
                                        G4double theEmax, size_t theNbin)
 {
+  type = T_G4PhysicsLnVector;
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
-  dataVector.resize(theNbin+1);
-  binVector.resize(theNbin+1); 
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1); 
 
-  ptrNextTable = 0;
   numberOfBin = theNbin;
   dBin = log(theEmax/theEmin) / numberOfBin;
   baseBin = log(theEmin)/dBin;
 
   for (size_t i=0; i<numberOfBin+1; i++) {
-    binVector(i) = exp(log(theEmin)+i*dBin);
+    binVector.push_back(exp(log(theEmin)+i*dBin));
+    dataVector.push_back(0.0);
   }
 
-  edgeMin = binVector(0);
-  edgeMax = binVector(numberOfBin-1);
+  edgeMin = binVector[0];
+  edgeMax = binVector[numberOfBin-1];
 
   lastBin = INT_MAX;
   lastEnergy = -DBL_MAX;
@@ -77,3 +86,15 @@ G4PhysicsLnVector::G4PhysicsLnVector(G4double theEmin,
 
 
 G4PhysicsLnVector::~G4PhysicsLnVector(){}
+
+G4bool G4PhysicsLnVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
+{
+  G4bool success = G4PhysicsVector::Retrieve(fIn, ascii);
+  if (success){
+    G4double theEmin = binVector[0];
+    dBin = log(binVector[1]/theEmin);
+    baseBin = log(theEmin)/dBin;
+  }
+  return success;
+}
+
diff --git a/source/global/management/src/G4PhysicsLogVector.cc b/source/global/management/src/G4PhysicsLogVector.cc
index 3e235ba733ac44e71e6dc5ad412451c17df6817f..ac3cfadb24726b81b6c782c0a3863e337b10c58e 100644
--- a/source/global/management/src/G4PhysicsLogVector.cc
+++ b/source/global/management/src/G4PhysicsLogVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsLogVector.cc,v 1.3 2000/11/20 17:26:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsLogVector.cc,v 1.8 2001/04/03 09:15:24 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -14,11 +14,13 @@
 //
 //  G4PhysicsLogVector.cc
 //
-//  History: first implementation, based on object model of
+//  History:
 //    02 Dec. 1995, G.Cosmo : Structure created based on object model
 //    15 Feb. 1996, K.Amako : Implemented the 1st version
 //    01 Jul. 1996, K.Amako : Hidden bin from the user introduced
-//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added.
+//    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
+//    9  Mar. 2001, H.Kurashige : add PhysicsVector type and Retrieve
 //
 // --------------------------------------------------------------
 
@@ -27,18 +29,20 @@
 
 G4PhysicsLogVector::G4PhysicsLogVector()
   : dBin(0.), baseBin(0.)
-{}
+{ 
+  type = T_G4PhysicsLogVector;
+}
 
 
 G4PhysicsLogVector::G4PhysicsLogVector(size_t theNbin)
 {
+  type = T_G4PhysicsLogVector;
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
-  dataVector.resize(theNbin+1);
-  binVector.resize(theNbin+1); 
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1); 
 
-  ptrNextTable = 0;
   numberOfBin = theNbin;
   dBin = 0.;
   baseBin = 0.;
@@ -49,29 +53,35 @@ G4PhysicsLogVector::G4PhysicsLogVector(size_t theNbin)
   lastBin = INT_MAX;
   lastEnergy = -DBL_MAX;
   lastValue = DBL_MAX;
+ 
+  for (size_t i=0; i<=numberOfBin; i++) {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
+  }
 }  
 
 
 G4PhysicsLogVector::G4PhysicsLogVector(G4double theEmin, 
                                        G4double theEmax, size_t theNbin)
 {
+  type = T_G4PhysicsLogVector;
 
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
-  dataVector.resize(theNbin+1);
-  binVector.resize(theNbin+1); 
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1); 
 
-  ptrNextTable = 0;
   numberOfBin = theNbin;
   dBin = log10(theEmax/theEmin) / numberOfBin;
   baseBin = log10(theEmin)/dBin;
 
   for (size_t i=0; i<numberOfBin+1; i++) {
-    binVector(i) = pow(10., log10(theEmin)+i*dBin);
+    binVector.push_back(pow(10., log10(theEmin)+i*dBin));
+    dataVector.push_back(0.0);
   }
 
-  edgeMin = binVector(0);
-  edgeMax = binVector(numberOfBin-1);
+  edgeMin = binVector[0];
+  edgeMax = binVector[numberOfBin-1];
 
   lastBin = INT_MAX;
   lastEnergy = -DBL_MAX;
@@ -80,3 +90,15 @@ G4PhysicsLogVector::G4PhysicsLogVector(G4double theEmin,
 
 
 G4PhysicsLogVector::~G4PhysicsLogVector(){}
+
+G4bool G4PhysicsLogVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
+{
+  G4bool success = G4PhysicsVector::Retrieve(fIn, ascii);
+  if (success){
+    G4double theEmin = binVector[0];
+    dBin = log10(binVector[1]/theEmin);
+    baseBin = log10(theEmin)/dBin;
+  }
+  return success;
+}
+
diff --git a/source/global/management/src/G4PhysicsOrderedFreeVector.cc b/source/global/management/src/G4PhysicsOrderedFreeVector.cc
index ec0a6420e1db5c2f44b72225115a2da2f93950d6..bb0e1721d511867d3658f5d469d9f735f3bdd2b1 100644
--- a/source/global/management/src/G4PhysicsOrderedFreeVector.cc
+++ b/source/global/management/src/G4PhysicsOrderedFreeVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsOrderedFreeVector.cc,v 1.3 2000/11/20 17:26:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsOrderedFreeVector.cc,v 1.7 2001/03/09 03:39:31 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Implementation
@@ -21,6 +21,8 @@
 //              1998-11-11 by Peter Gumplinger
 //              > initialize all data members of the base class in 
 //                derived class constructors
+//              2000-11-11 by H.Kurashige
+//              > use STL vector for dataVector and binVector
 // mail:        gum@triumf.ca
 //
 //
@@ -40,8 +42,7 @@ G4PhysicsOrderedFreeVector::G4PhysicsOrderedFreeVector(G4double *Energies,
 						       G4double *Values,
 						       size_t VectorLength)
 {
-	
-	ptrNextTable = 0;
+        type = T_G4PhysicsOrderedFreeVector;
 
         lastBin = INT_MAX;
 
@@ -52,16 +53,16 @@ G4PhysicsOrderedFreeVector::G4PhysicsOrderedFreeVector(G4double *Energies,
 
 	for (size_t i = 0 ; i < VectorLength ; i++)
 	{
-		binVector.insert(Energies[i]);	
-		dataVector.insert(Values[i]); 
+		binVector.push_back(Energies[i]);	
+		dataVector.push_back(Values[i]); 
 	}
-        edgeMin = binVector.first();
-        edgeMax = binVector.last();
+        edgeMin = binVector.front();
+        edgeMax = binVector.back();
 }
 
 G4PhysicsOrderedFreeVector::G4PhysicsOrderedFreeVector()
 {
-	ptrNextTable = 0;
+        type = T_G4PhysicsOrderedFreeVector;
 
         lastBin = INT_MAX;
         lastEnergy = -DBL_MAX;
@@ -85,11 +86,11 @@ G4PhysicsOrderedFreeVector::~G4PhysicsOrderedFreeVector() {}
 void 
 G4PhysicsOrderedFreeVector::InsertValues(G4double energy, G4double value)
 {
-        binVector.insert(energy);
-        dataVector.insert(value);
+        binVector.push_back(energy);
+        dataVector.push_back(value);
 	numberOfBin++;
-        edgeMin = binVector.first();
-        edgeMax = binVector.last();
+        edgeMin = binVector.front();
+        edgeMax = binVector.back();
 
 }
 
@@ -122,7 +123,7 @@ G4PhysicsOrderedFreeVector::FindValueBinLocation(G4double aValue)
    G4int n2 = numberOfBin/2;
    G4int n3 = numberOfBin - 1;
    while (n1 != n3 - 1) {
-      if (aValue > dataVector(n2))
+      if (aValue > dataVector[n2])
          n1 = n2;
       else
          n3 = n2;
@@ -135,9 +136,9 @@ G4double
 G4PhysicsOrderedFreeVector::LinearInterpolationOfEnergy(G4double aValue,
 						        size_t theLocBin)
 {
-  G4double intplFactor = (aValue-dataVector(theLocBin))
-     / (dataVector(theLocBin+1)-dataVector(theLocBin)); // Interpolation factor
+  G4double intplFactor = (aValue-dataVector[theLocBin])
+     / (dataVector[theLocBin+1]-dataVector[theLocBin]); // Interpolation factor
 
-  return binVector(theLocBin) +
-         ( binVector(theLocBin+1)-binVector(theLocBin) ) * intplFactor;
+  return binVector[theLocBin] +
+         ( binVector[theLocBin+1]-binVector[theLocBin] ) * intplFactor;
 }
diff --git a/source/global/management/src/G4PhysicsTable.cc b/source/global/management/src/G4PhysicsTable.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e57408e1c514f500328cb99d8846129e9c0feccb
--- /dev/null
+++ b/source/global/management/src/G4PhysicsTable.cc
@@ -0,0 +1,237 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PhysicsTable.cc,v 1.5 2001/04/03 07:26:38 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+// 
+// ------------------------------------------------------------
+//      GEANT 4 class implementation
+//
+//	G4PhysicsTable
+//
+// ------------------------------------------------------------
+
+#include "G4PhysicsVector.hh"
+#include "G4PhysicsTable.hh"
+#include "g4std/iostream"
+#include "g4std/fstream"
+#include "g4std/iomanip"
+
+G4PhysicsTable::G4PhysicsTable()
+  : G4PhysCollection()
+{
+}
+
+G4PhysicsTable::G4PhysicsTable(size_t capacity)
+  : G4PhysCollection()
+{
+  reserve(capacity);
+}
+
+G4PhysicsTable::G4PhysicsTable(const G4PhysicsTable& right)
+{
+  *this = right;
+}
+
+G4PhysicsTable& G4PhysicsTable::operator=(const G4PhysicsTable& right)
+{
+  if (this != &right)
+  {
+    G4PhysCollection::const_iterator itr;
+    for (itr=right.begin(); itr!=right.end(); ++itr)
+    {
+      G4PhysCollection::push_back(*itr);
+    }
+  }
+  return *this;
+}
+
+G4PhysicsTable::~G4PhysicsTable()
+{
+  clear();
+}
+ 
+
+G4bool G4PhysicsTable::StorePhysicsTable(const G4String& fileName,
+					 G4bool          ascii)
+{
+  G4std::ofstream fOut;  
+  
+  // open output file //
+#ifdef G4USE_STD_NAMESPACE
+  if (!ascii)
+    fOut.open(fileName, G4std::ios::out|G4std::ios::binary);
+  else
+#endif
+    fOut.open(fileName, G4std::ios::out);
+
+  // check if the file has been opened successfully 
+  if (!fOut) {
+#ifdef G4VERBOSE  
+    G4cerr << "G4PhysicsTable::::StorePhysicsTable  ";
+    G4cerr << " Can not open file " << fileName << G4endl;
+#endif
+    fOut.close();
+    return false;
+  }
+
+  // Number of elements
+  size_t tableSize = size(); 
+  if (!ascii){
+    fOut.write( (char*)(&tableSize), sizeof tableSize); 
+  } else {
+    fOut << tableSize << G4endl;
+  }
+
+  // Physics Vector
+  G4PhysicsTableIterator itr;
+  for (itr=begin(); itr!=end(); ++itr) {
+    G4int vType = (*itr)->GetType();
+    if (!ascii){
+      fOut.write( (char*)(&vType), sizeof vType); 
+    } else {
+      fOut << vType << G4endl;
+    }
+    (*itr)->Store(fOut,ascii);
+  }
+  fOut.close();
+  return true;
+}
+
+
+
+G4bool G4PhysicsTable::RetrievePhysicsTable(const G4String& fileName,
+					    G4bool          ascii)
+{
+  G4std::ifstream fIn;  
+  // open input file //
+#ifdef G4USE_STD_NAMESPACE
+  if (ascii)
+    fIn.open(fileName,G4std::ios::in|G4std::ios::binary);
+  else
+#endif
+    fIn.open(fileName,G4std::ios::in);
+
+  // check if the file has been opened successfully 
+  if (!fIn) {
+#ifdef G4VERBOSE  
+    G4cerr << "G4PhysicsTable::RetrievePhysicsTable  ";
+    G4cerr << " Can not open file " << fileName << G4endl;
+#endif
+    fIn.close();
+    return false;
+  }
+
+  // clear 
+  clearAndDestroy();
+  
+  // Number of elements
+  size_t tableSize; 
+  if (!ascii){
+    fIn.read((char*)(&tableSize), sizeof tableSize); 
+  } else {
+    fIn >> tableSize;
+  }
+  reserve(tableSize); 
+
+  // Physics Vector
+  for (size_t idx=0; idx<tableSize; ++idx) {
+    G4int vType;
+    if (!ascii){
+      fIn.read( (char*)(&vType), sizeof vType); 
+    } else {
+      fIn >>  vType;
+    }
+    G4PhysicsVector* pVec = CreatePhysicsVector(vType);
+    if (pVec==0) {
+#ifdef G4VERBOSE  
+      G4cerr << "G4PhysicsTable::RetrievePhysicsTable  ";
+      G4cerr << " illegal Physics Vector type " << vType << " in  ";
+      G4cerr << fileName << G4endl;
+#endif          
+      fIn.close();
+      return false;
+    }
+
+    if (! (pVec->Retrieve(fIn,ascii)) ){
+#ifdef G4VERBOSE  
+      G4cerr << "G4PhysicsTable::RetrievePhysicsTable  ";
+      G4cerr << " error in retreiving " << idx << "-th Physics Vector from file ";
+      G4cerr << fileName << G4endl;
+#endif          
+      fIn.close();
+      return false;
+    }
+
+    // add a PhysicsVector to this PhysicsTable
+    push_back(pVec);
+  } 
+  fIn.close();
+  return true;
+}
+
+G4std::ostream& operator<<(G4std::ostream& out, 
+			   G4PhysicsTable& right)
+{
+  // Printout Physics Vector
+  G4PhysicsTableIterator itr;
+  size_t i=0;
+  for (itr=right.begin(); itr!=right.end(); ++itr) {
+    out << G4std::setw(8) << i << "-th Vector   ";
+    out << ": Type    " << G4int((*itr)->GetType()) << G4endl;
+    out << *(*itr);
+    i +=1;
+  }
+  out << G4endl;
+  return out; 
+}
+
+#include "G4PhysicsVectorType.hh"
+#include "G4LPhysicsFreeVector.hh"
+#include "G4PhysicsLogVector.hh"
+#include "G4PhysicsFreeVector.hh"
+#include "G4PhysicsOrderedFreeVector.hh"
+#include "G4PhysicsLinearVector.hh"
+#include "G4PhysicsLnVector.hh"
+ 
+G4PhysicsVector* G4PhysicsTable::CreatePhysicsVector(G4int type)
+{
+  G4PhysicsVector* pVector=0;
+  switch (type) {
+
+  case T_G4PhysicsLinearVector: 
+    pVector = new G4PhysicsLinearVector();
+    break;
+
+  case T_G4PhysicsLogVector: 
+    pVector = new G4PhysicsLogVector();
+    break;
+
+  case T_G4PhysicsLnVector: 
+    pVector = new G4PhysicsLnVector();
+    break;
+
+  case T_G4PhysicsFreeVector: 
+    pVector = new G4PhysicsFreeVector();
+    break;
+
+  case T_G4PhysicsOrderedFreeVector: 
+    pVector = new G4PhysicsOrderedFreeVector();
+    break;
+
+  case T_G4LPhysicsFreeVector: 
+    pVector = new G4LPhysicsFreeVector();
+    break;
+  
+  default:
+    break;
+ 
+  }
+  return pVector;
+}
+ 
diff --git a/source/global/management/src/G4PhysicsVector.cc b/source/global/management/src/G4PhysicsVector.cc
index 0f4f7176fe64b3744fa670aab266484a3bb10bd2..4c718221d523335a4fa5b5c46d41df96f2470875 100644
--- a/source/global/management/src/G4PhysicsVector.cc
+++ b/source/global/management/src/G4PhysicsVector.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhysicsVector.cc,v 1.5 2000/11/20 17:26:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicsVector.cc,v 1.11 2001/03/09 13:36:56 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -14,35 +14,45 @@
 //
 //  G4PhysicsVector.cc
 //
-//  History: first implementation, based on object model of
+//  History:
 //    02 Dec. 1995, G.Cosmo : Structure created based on object model
 //    03 Mar. 1996, K.Amako : Implemented the 1st version
 //    01 Jul. 1996, K.Amako : Hidden bin from the user introduced
 //    12 Nov. 1998, K.Amako : A bug in GetVectorLength() fixed
-//
+//    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
+//    18 Jan. 2001, H.Kurashige : removed ptrNextTable
+//    09 Mar. 2001, H.Kurashige : added G4PhysicsVector type 
 // --------------------------------------------------------------
 
 #include "G4PhysicsVector.hh"
+#include "g4std/iomanip"
 
 G4PhysicsVector::G4PhysicsVector()
  : edgeMin(0.), edgeMax(0.), numberOfBin(0),
-   lastEnergy(0.), lastValue(0.), lastBin(0),
-   ptrNextTable(0) {}
+   lastEnergy(0.), lastValue(0.), lastBin(0)
+{
+  type = T_G4PhysicsVector;
+}
 
-G4PhysicsVector::~G4PhysicsVector() {}
+G4PhysicsVector::~G4PhysicsVector() 
+{
+  dataVector.clear();
+  binVector.clear();
+  type = T_G4PhysicsVector;
+}
 
 G4PhysicsVector::G4PhysicsVector(const G4PhysicsVector& right)
- : edgeMin(right.edgeMin), edgeMax(right.edgeMax),
-   numberOfBin(right.numberOfBin), lastEnergy(right.lastEnergy),
-   lastValue(right.lastValue), lastBin(right.lastBin),
-   dataVector(right.dataVector), binVector(right.binVector),
-   ptrNextTable(right.ptrNextTable), comment(right.comment) {}
+{
+  *this=right;
+}
 
 G4PhysicsVector&
-G4PhysicsVector::operator=(const G4PhysicsVector& right)
+ G4PhysicsVector::operator=(const G4PhysicsVector& right)
 {
   if (&right==this) return *this;
+  if (type != right.type) return *this;
 
+  type = right.type;
   edgeMin = right.edgeMin;
   edgeMax = right.edgeMax;
   numberOfBin = right.numberOfBin;
@@ -51,9 +61,7 @@ G4PhysicsVector::operator=(const G4PhysicsVector& right)
   lastBin = right.lastBin;
   dataVector = right.dataVector;
   binVector = right.binVector;
-  ptrNextTable = right.ptrNextTable;
   comment = right.comment;
-
   return *this;
 }
 
@@ -67,66 +75,111 @@ G4int G4PhysicsVector::operator!=(const G4PhysicsVector &right) const
   return (this != &right);
 }
 
-void G4PhysicsVector::PutValue(size_t binNumber, G4double theValue)
-{
-  dataVector(binNumber) = theValue;
-
-  // Fill the bin which is hidden to user with theValue. This is to 
-  // handle correctly when Energy=theEmax in getValue.
-  if(binNumber==numberOfBin-1) {
-    dataVector(binNumber+1) = theValue;
-  }                                 
-}
-
 G4double G4PhysicsVector::GetLowEdgeEnergy(size_t binNumber) const
 {
-  return binVector(binNumber);
+  return binVector[binNumber];
 }
 
-size_t G4PhysicsVector::GetVectorLength() const
+G4bool G4PhysicsVector::Store(G4std::ofstream& fOut, G4bool ascii)
 {
-  return numberOfBin;
+  // Ascii mode
+  if (ascii) {
+    fOut << *this;
+    return true;
+  } 
+  // Binary Mode
+
+  // binning
+  fOut.write((char*)(&edgeMin), sizeof edgeMin);
+  fOut.write((char*)(&edgeMax), sizeof edgeMax);
+  fOut.write((char*)(&numberOfBin), sizeof numberOfBin);
+
+  // contents
+  size_t size = dataVector.size(); 
+  fOut.write((char*)(&size), sizeof size);
+
+  G4double* value = new G4double[2*size];
+  for(size_t i = 0; i < size; i++) {
+    value[2*i]  =  binVector[i];
+    value[2*i+1]=  dataVector[i];
+  }
+  fOut.write((char*)(value), 2*size*(sizeof (G4double)));
+  delete [] value;
+
+  return true;
 }
 
-G4bool G4PhysicsVector::IsFilledVectorExist() const
+G4bool G4PhysicsVector::Retrieve(G4std::ifstream& fIn, G4bool ascii)
 {
-  G4bool status=false;
-
-  if(numberOfBin > 0) status=true;
-  return status;
+  // clear properties;
+  lastEnergy=0.;
+  lastValue =0.;
+  lastBin   =0;
+  dataVector.clear();
+  binVector.clear();
+  comment = "";
+
+  // retrieve in ascii mode
+  if (ascii) {
+    // binning
+    fIn >> edgeMin >> edgeMax >> numberOfBin; 
+    if (fIn.fail()) return false;
+    // contents
+    size_t size;
+    fIn >> size;
+    if (fIn.fail()) return false;
+
+    binVector.reserve(size);
+    dataVector.reserve(size);
+    for(size_t i = 0; i < size ; i++) {
+      G4double vBin, vData;
+      fIn >> vBin >> vData;
+      if (fIn.fail()) return false;
+      binVector.push_back(vBin);
+      dataVector.push_back(vData);
+    }
+    return true ;
+  }
+
+  // retrieve in binary mode
+  // binning
+  fIn.read((char*)(&edgeMin), sizeof edgeMin);
+  fIn.read((char*)(&edgeMax), sizeof edgeMax);
+  fIn.read((char*)(&numberOfBin), sizeof numberOfBin ); 
+ 
+  // contents
+  size_t size;
+  fIn.read((char*)(&size), sizeof size); 
+ 
+  G4double* value = new G4double[2*size];
+  fIn.read((char*)(value),  2*size*(sizeof(G4double)) );
+  if (fIn.gcount() != 2*size*(sizeof(G4double)) ){
+    delete [] value;
+    return false;
+  }
+
+  binVector.reserve(size);
+  dataVector.reserve(size);
+  for(size_t i = 0; i < size; i++) {
+    binVector.push_back(value[2*i]);
+    dataVector.push_back(value[2*i+1]);
+  }
+  delete [] value;
+  return true;
 }
-
-void G4PhysicsVector::LinkPhysicsTable(G4RWTPtrOrderedVector<G4PhysicsVector>& theTable)
+    
+G4std::ostream& operator<<(G4std::ostream& out, const G4PhysicsVector& pv)
 {
-  ptrNextTable = &theTable;
-} 
-
-G4bool G4PhysicsVector::IsLinkedTableExist() const
-{
-  G4bool status=false;
-
-  if(ptrNextTable != 0) status=true;
-  return status;
+  // binning
+  out << G4std::setprecision(12) << pv.edgeMin;
+  out <<" " << pv.edgeMax <<" "  << pv.numberOfBin << G4endl; 
+
+  // contents
+  size_t i;
+  out << pv.dataVector.size() << G4endl; 
+  for(i = 0; i < pv.dataVector.size(); i++) {
+    out << G4std::setprecision(12) << pv.binVector[i] <<"  " << pv.dataVector[i] << G4endl;
+  }
+
+  return out;
 }
-
-void G4PhysicsVector::PutComment(const G4String& theComment)
-{
-  comment = theComment;
-}
-
-G4String G4PhysicsVector::GetComment() const
-{
-  return comment;
-}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/global/management/src/G4StateManager.cc b/source/global/management/src/G4StateManager.cc
index 970c517e40249de4da4045f5e2ae207be83ef50d..b9e9f9db163c8eb581fffedbafc63ce5748b5301 100644
--- a/source/global/management/src/G4StateManager.cc
+++ b/source/global/management/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.2 2000/11/20 17:26:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4StateManager.cc,v 1.3 2001/03/06 15:56:52 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -24,12 +24,31 @@
 G4StateManager* G4StateManager::theStateManager = 0;
 
 G4StateManager::G4StateManager()
-:theCurrentState(PreInit),thePreviousState(PreInit) 
-{ theBottomDependent = 0; }
+ : theCurrentState(PreInit),
+   thePreviousState(PreInit),
+   theBottomDependent(0)
+{
+}
 
 G4StateManager::~G4StateManager()
 {
-   theDependentsList.clearAndDestroy();
+  G4VStateDependent* state=0;
+
+  while (theDependentsList.size()>0)
+  {
+    state = theDependentsList.back();
+    theDependentsList.pop_back();
+    for (G4std::vector<G4VStateDependent*>::iterator
+         i=theDependentsList.begin(); i!=theDependentsList.end(); i++)
+    {
+      if (*i==state)
+      {
+	theDependentsList.erase(i);
+	i--;
+      }
+    } 
+    if ( state ) delete state;    
+  } 
 }
 
 G4StateManager::G4StateManager(const G4StateManager &right)
@@ -40,7 +59,8 @@ G4StateManager::G4StateManager(const G4StateManager &right)
 {
 }
 
-G4StateManager& G4StateManager::operator=(const G4StateManager &right)
+G4StateManager&
+G4StateManager::operator=(const G4StateManager &right)
 {
    if (&right == this) return *this;
 
@@ -52,69 +72,93 @@ G4StateManager& G4StateManager::operator=(const G4StateManager &right)
    return *this;
 }
 
-G4int G4StateManager::operator==(const G4StateManager &right) const
+G4int
+G4StateManager::operator==(const G4StateManager &right) const
 {
    return (this == &right);
 }
 
-G4int G4StateManager::operator!=(const G4StateManager &right) const
+G4int
+G4StateManager::operator!=(const G4StateManager &right) const
 {
    return (this != &right);
 }
 
 
-G4StateManager* G4StateManager::GetStateManager()
+G4StateManager*
+G4StateManager::GetStateManager()
 {
     if (!theStateManager)
-        {
-            theStateManager = new G4StateManager;
-        }
+    {
+      theStateManager = new G4StateManager;
+    }
     return theStateManager;    
 }
 
-G4bool G4StateManager::RegisterDependent(G4VStateDependent* aDependent,G4bool bottom)
+G4bool
+G4StateManager::RegisterDependent(G4VStateDependent* aDependent, G4bool bottom)
 {
-   G4bool ack=true;
-   if(!bottom)
-   { theDependentsList.insert(aDependent); }
-   else
-   { 
-     if(theBottomDependent)
-     { theDependentsList.insert(theBottomDependent); }
-     theBottomDependent = aDependent;
-   }
-   return ack;
+    G4bool ack=true;
+    if(!bottom)
+    {
+      theDependentsList.push_back(aDependent);
+    }
+    else
+    { 
+      if(theBottomDependent)
+      {
+        theDependentsList.push_back(theBottomDependent);
+      }
+      theBottomDependent = aDependent;
+    }
+    return ack;
 }
 
-G4bool G4StateManager::DeregisterDependent(G4VStateDependent* aDependent)
+G4bool
+G4StateManager::DeregisterDependent(G4VStateDependent* aDependent)
 {
-   G4VStateDependent* aD = theDependentsList.remove(aDependent);
-   return (aD != NULL);
+  G4VStateDependent* tmp = 0;
+  G4std::vector<G4VStateDependent*>::iterator i;
+  for (i=theDependentsList.begin(); i!=theDependentsList.end(); i++)
+    {
+      if (**i==*aDependent) 
+	{
+	  tmp = *i;
+	  theDependentsList.erase(i);
+	} 
+    }
+  return (tmp != 0);
 }
 
-G4ApplicationState G4StateManager::GetCurrentState()
+G4ApplicationState
+G4StateManager::GetCurrentState() const
 {
    return theCurrentState;
 }
 
-G4ApplicationState G4StateManager::GetPreviousState()
+G4ApplicationState
+G4StateManager::GetPreviousState() const
 {
    return thePreviousState;
 }
 
-G4bool G4StateManager::SetNewState(G4ApplicationState requestedState)
+G4bool
+G4StateManager::SetNewState(G4ApplicationState requestedState)
 {
    size_t i=0;
    G4bool ack = true;
    G4ApplicationState savedState = thePreviousState;
    thePreviousState = theCurrentState;
    theCurrentState = requestedState;
-   while ((ack) && (i<theDependentsList.entries())) {
-     ack = theDependentsList(i)->Notify(requestedState);
+   while ((ack) && (i<theDependentsList.size()))
+   {
+     ack = theDependentsList[i]->Notify(requestedState);
      i++;
    }
    if(theBottomDependent)
-   { ack = theBottomDependent->Notify(requestedState); }
+   {
+     ack = theBottomDependent->Notify(requestedState);
+   }
 
    if(!ack)
    {
@@ -124,12 +168,24 @@ G4bool G4StateManager::SetNewState(G4ApplicationState requestedState)
    return ack;
 }
 
-G4VStateDependent* G4StateManager::RemoveDependent(const G4VStateDependent* aDependent)
+G4VStateDependent*
+G4StateManager::RemoveDependent(const G4VStateDependent* aDependent)
 {
-   return theDependentsList.remove(aDependent);
+  G4VStateDependent* tmp = 0;
+  G4std::vector<G4VStateDependent*>::iterator i;
+  for (i=theDependentsList.begin(); i!=theDependentsList.end(); i++)
+    {
+      if (**i==*aDependent) 
+	{
+	  tmp = *i;
+	  theDependentsList.erase(i);
+	} 
+    }
+  return tmp;
 }
 
-G4String G4StateManager::GetStateString(G4ApplicationState aState)
+G4String
+G4StateManager::GetStateString(G4ApplicationState aState) const
 {
   G4String stateName;
   switch(aState)
@@ -169,4 +225,3 @@ G4String G4StateManager::GetStateString(G4ApplicationState aState)
 //{
 //  G4UImanager::GetUIpointer()->PauseSession(msg);
 //}
-
diff --git a/source/global/management/src/G4Timer.cc b/source/global/management/src/G4Timer.cc
index 453354afde1009ceec1252fd5d29575e26307516..ca417168caeaf2bdbe058dda4902a727e72cb744 100644
--- a/source/global/management/src/G4Timer.cc
+++ b/source/global/management/src/G4Timer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Timer.cc,v 1.8 2000/06/26 16:27:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/src/G4UnitsTable.cc b/source/global/management/src/G4UnitsTable.cc
index 110336b31bb268e2f65427858cc9a58199cc9bd4..1939dbcb0f1a9ed88ac2eeecfda8f4d82b4de78f 100644
--- a/source/global/management/src/G4UnitsTable.cc
+++ b/source/global/management/src/G4UnitsTable.cc
@@ -5,18 +5,16 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UnitsTable.cc,v 1.11 2000/11/20 17:26:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
+// $Id: G4UnitsTable.cc,v 1.14 2001/04/02 14:29:00 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
-// ------------------------------------------------------------
-//	GEANT 4 class implementation file 
-//
-//      ------------ class G4UnitsTable ------------
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 
 //
 // 17-05-98: first version, M.Maire
-// 05-08-98: angstrom,microbarn,picobarn,petaelectronvolt
-// 13-10-98: Units and symbols printed in fixed length  
+// 05-08-98: angstrom,microbarn,picobarn,petaelectronvolt, M.Maire
+// 13-10-98: units and symbols printed in fixed length, M.Maire
+// 01-03-01: parsec, M.Maire
+// 06-03-01: migration to STL vectors, G.Cosmo
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -32,18 +30,18 @@ G4UnitsTable      G4UnitDefinition::theUnitsTable;
  
 G4UnitDefinition::G4UnitDefinition(G4String name, G4String symbol,
                                    G4String category, G4double value)
-:Name(name),SymbolName(symbol),Value(value)				   
+  : Name(name),SymbolName(symbol),Value(value)				   
 {
     //
     //does the Category objet already exist ?
-    size_t nbCat = theUnitsTable.entries();
+    size_t nbCat = theUnitsTable.size();
     size_t i = 0;
     while ((i<nbCat)&&(theUnitsTable[i]->GetName()!=category)) i++;
-    if (i == nbCat) theUnitsTable.insert( new G4UnitsCategory(category));
+    if (i == nbCat) theUnitsTable.push_back( new G4UnitsCategory(category));
     CategoryIndex = i;
     //
     //insert this Unit in the Unitstable
-    (theUnitsTable[CategoryIndex]->GetUnitsList()).insert(this);
+    (theUnitsTable[CategoryIndex]->GetUnitsList()).push_back(this);
     
     //update string max length for name and symbol
     theUnitsTable[i]->UpdateNameMxLen((G4int)name.length());
@@ -95,11 +93,11 @@ G4int G4UnitDefinition::operator!=(const G4UnitDefinition &right) const
  
 G4double G4UnitDefinition::GetValueOf(G4String string)
 {
-  if(theUnitsTable.entries()==0) BuildUnitsTable();
+  if(theUnitsTable.size()==0) BuildUnitsTable();
   G4String name,symbol;
-  for (size_t i=0;i<theUnitsTable.entries();i++)
+  for (size_t i=0;i<theUnitsTable.size();i++)
      { G4UnitsContainer& units = theUnitsTable[i]->GetUnitsList();
-       for (size_t j=0;j<units.entries();j++)
+       for (size_t j=0;j<units.size();j++)
           { name=units[j]->GetName(); symbol=units[j]->GetSymbol();
             if(string==name||string==symbol) 
                return units[j]->GetValue();
@@ -115,11 +113,11 @@ G4double G4UnitDefinition::GetValueOf(G4String string)
   
 G4String G4UnitDefinition::GetCategory(G4String string)
 {
-  if(theUnitsTable.entries()==0) BuildUnitsTable();
+  if(theUnitsTable.size()==0) BuildUnitsTable();
   G4String name,symbol;
-  for (size_t i=0;i<theUnitsTable.entries();i++)
+  for (size_t i=0;i<theUnitsTable.size();i++)
      { G4UnitsContainer& units = theUnitsTable[i]->GetUnitsList();
-       for (size_t j=0;j<units.entries();j++)
+       for (size_t j=0;j<units.size();j++)
           { name=units[j]->GetName(); symbol=units[j]->GetSymbol();
             if(string==name||string==symbol) 
                return theUnitsTable[i]->GetName();
@@ -147,6 +145,7 @@ void G4UnitDefinition::PrintDefinition()
 void G4UnitDefinition::BuildUnitsTable()
 {
  //Length
+ new G4UnitDefinition(    "parsec","pc"      ,"Length",parsec); 
  new G4UnitDefinition( "kilometer","km"      ,"Length",kilometer);
  new G4UnitDefinition(     "meter","m"       ,"Length",meter);
  new G4UnitDefinition("centimeter","cm"      ,"Length",centimeter); 
@@ -263,7 +262,7 @@ void G4UnitDefinition::BuildUnitsTable()
 void G4UnitDefinition::PrintUnitsTable()
 {
   G4cout << "\n          ----- The Table of Units ----- \n";
-  for(size_t i=0;i<theUnitsTable.entries();i++)
+  for(size_t i=0;i<theUnitsTable.size();i++)
       theUnitsTable[i]->PrintCategory();
 }
 
@@ -320,7 +319,7 @@ G4int G4UnitsCategory::operator!=(const G4UnitsCategory &right) const
 void G4UnitsCategory::PrintCategory()
 {
   G4cout << "\n  category: " << Name << G4endl;
-  for(size_t i=0;i<UnitsList.entries();i++)
+  for(size_t i=0;i<UnitsList.size();i++)
       UnitsList[i]->PrintDefinition();
 }
 
@@ -330,14 +329,14 @@ G4BestUnit::G4BestUnit(G4double value,G4String category)
 {
  // find the category
     G4UnitsTable& theUnitsTable = G4UnitDefinition::GetUnitsTable();
-    size_t nbCat = theUnitsTable.entries();
+    size_t nbCat = theUnitsTable.size();
     size_t i = 0;
     while
      ((i<nbCat)&&(theUnitsTable[i]->GetName()!=category)) i++;
     if (i == nbCat) 
        { G4cout << " G4BestUnit: the category " << category 
-              << " does not exist; --> G4Exception" << G4endl;
-         G4Exception(" ");
+                << " does not exist !!" << G4endl;
+         G4Exception("Missing unit category !");
        }  
   //
     IndexOfCategory = i;
@@ -351,7 +350,7 @@ G4BestUnit::G4BestUnit(const G4ThreeVector& value,G4String category)
 {
  // find the category
     G4UnitsTable& theUnitsTable = G4UnitDefinition::GetUnitsTable();
-    size_t nbCat = theUnitsTable.entries();
+    size_t nbCat = theUnitsTable.size();
     size_t i = 0;
     while
      ((i<nbCat)&&(theUnitsTable[i]->GetName()!=category)) i++;
@@ -389,7 +388,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4BestUnit a)
   G4double value = G4std::max(G4std::max(fabs(a.Value[0]),fabs(a.Value[1])),
                               fabs(a.Value[2]));
 
-  for (size_t k=0; k<List.entries(); k++)
+  for (size_t k=0; k<List.size(); k++)
      {
        G4double unit = List[k]->GetValue();
             if (value==DBL_MAX) {if(unit>umax) {umax=unit; ksup=k;}}
@@ -405,10 +404,17 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4BestUnit a)
   
   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);
+
+  #ifdef G4USE_STD_NAMESPACE
+    std::ios::fmtflags oldform = G4cout.flags();
+  #else
+    G4long oldform = G4cout.flags();
+  #endif
+
+  G4cout.setf(G4std::ios::left,G4std::ios::adjustfield);
   flux << G4std::setw(len) << List[index]->GetSymbol();       
-  G4cout.setf(oldform,G4std::ios::adjustfield);     
-  
+  G4cout.flags(oldform);
+
   return flux;
 }       
 
diff --git a/source/global/management/src/G4VStateDependent.cc b/source/global/management/src/G4VStateDependent.cc
index 0982e414d83e1c9be5c99704717b32277b941cd3..4197cdf3c39110b28811e36c65872712f50acb01 100644
--- a/source/global/management/src/G4VStateDependent.cc
+++ b/source/global/management/src/G4VStateDependent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VStateDependent.cc,v 1.2 2000/11/20 17:26:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/src/G4ios.cc b/source/global/management/src/G4ios.cc
index cd96906144a64df6854e2bb47a5049a9b10f2343..640470d7ab51a2eb4885d2b5b7f623e4440deeee 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/graphics_reps/History b/source/graphics_reps/History
index 577ab859ea213f3e37249d0159d01c6c7965c13b..f382b283402e50e3d2fad841811e34aeffe09681 100644
--- a/source/graphics_reps/History
+++ b/source/graphics_reps/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.25 2000/06/06 10:53:38 johna Exp $
+$Id: History,v 1.27 2001/02/06 22:07:17 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,14 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+6th February 2001  John Allison  (greps-V03-00-01)
+- More tidying for CodeWizard.  Added virtual destructors to
+  HepPolyhedronBox, etc.  Also made all constructors non-inline.
+
+3rd February 2001  John Allison  (greps-V03-00-00)
+- Tidied for CodeWizard.  Note: G4Circle.icc and G4VVisPrim.icc removed, so
+  "gmake clean" all relevant directories before updating.
+
 5th June May 2000  Evgeni Chernaev (greps-V01-01-04)
 - Bug fix in BooleanProcessor.src.
 - Graceful recovery from caseIE() and caseEE() non-implementation
diff --git a/source/graphics_reps/include/G4Circle.hh b/source/graphics_reps/include/G4Circle.hh
index 711567cd294300f3b99874fdc6305f496fc2d413..72dfd9f014e9101174dd17ef2b81c7da53aeab4b 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.4 1999/12/15 14:50:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Circle.hh,v 1.5 2001/02/03 18:29:36 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  17/11/96.
@@ -40,6 +40,4 @@ public: // With description
 
  };
 
-#include "G4Circle.icc"
-
 #endif
diff --git a/source/graphics_reps/include/G4Circle.icc b/source/graphics_reps/include/G4Circle.icc
deleted file mode 100644
index 5cbe4e2824a344bfe2509de64a2a9773f6aa128d..0000000000000000000000000000000000000000
--- a/source/graphics_reps/include/G4Circle.icc
+++ /dev/null
@@ -1,20 +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: G4Circle.icc,v 1.3 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-// 
-// John Allison  17/11/96.
-
-inline G4Circle::G4Circle () {}
-
-inline G4Circle::G4Circle (const G4Point3D& pos):
-G4VMarker (pos) {}
-
-inline G4Circle::G4Circle (const G4VMarker& marker):
-G4VMarker (marker) {}
diff --git a/source/graphics_reps/include/G4Color.hh b/source/graphics_reps/include/G4Color.hh
index 676e2dc24fa344786f0ff9a4b0eb5a60b1b09407..667bf47eb2885bdd1ffc140da9e4b8850ea8b2af 100644
--- a/source/graphics_reps/include/G4Color.hh
+++ b/source/graphics_reps/include/G4Color.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Color.hh,v 1.3 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 20th October 1996
diff --git a/source/graphics_reps/include/G4Colour.hh b/source/graphics_reps/include/G4Colour.hh
index 9e7b80ef6da96fd65f34b15e8a1a13793aa99fea..8d82c2ee98542978172bf5e259f9cd75f471a0f6 100644
--- a/source/graphics_reps/include/G4Colour.hh
+++ b/source/graphics_reps/include/G4Colour.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Colour.hh,v 1.5 1999/12/15 16:46:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 20th October 1996
diff --git a/source/graphics_reps/include/G4NURBS.hh b/source/graphics_reps/include/G4NURBS.hh
index 24ee3a1929772e7e48d761053a2591806029b051..5379910ea9f88ebb350a9453c6aae8f40ec09a1a 100644
--- a/source/graphics_reps/include/G4NURBS.hh
+++ b/source/graphics_reps/include/G4NURBS.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBS.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 // Olivier Crumeyrolle  12 September 1996
 
diff --git a/source/graphics_reps/include/G4NURBSbox.hh b/source/graphics_reps/include/G4NURBSbox.hh
index ed8019deb10447e6321affd3b07cbddef7a59109..e83a67f0ac0ca65b33b42bf65693ceecb19a8cf5 100644
--- a/source/graphics_reps/include/G4NURBSbox.hh
+++ b/source/graphics_reps/include/G4NURBSbox.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBSbox.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBScylinder.hh b/source/graphics_reps/include/G4NURBScylinder.hh
index bb6653f0a8a2df98ae0a575597d8195cef3a7a12..751adba0d6f890b595ab7e7205f2f56397cd690e 100644
--- a/source/graphics_reps/include/G4NURBScylinder.hh
+++ b/source/graphics_reps/include/G4NURBScylinder.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBScylinder.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBShexahedron.hh b/source/graphics_reps/include/G4NURBShexahedron.hh
index e44ed58299450350042bbbf4b8cc3c30bddeb991..40f0950134f60597ecdde154653906bc4b2a4c59 100644
--- a/source/graphics_reps/include/G4NURBShexahedron.hh
+++ b/source/graphics_reps/include/G4NURBShexahedron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBShexahedron.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8ee6fac46636949e3665a3a86ccf157cf9a5db5e..1b6681b9ecbc72890f030dda04e2ae866f540dba 100644
--- a/source/graphics_reps/include/G4NURBStube.hh
+++ b/source/graphics_reps/include/G4NURBStube.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBStube.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBStubesector.hh b/source/graphics_reps/include/G4NURBStubesector.hh
index 1f94f3a7d3f3179b2e67a910158bd03e77821b7f..069df9ec5b9c6b461b83782532e23e4318593c85 100644
--- a/source/graphics_reps/include/G4NURBStubesector.hh
+++ b/source/graphics_reps/include/G4NURBStubesector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBStubesector.hh,v 1.4 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4PlacedPolyhedron.hh b/source/graphics_reps/include/G4PlacedPolyhedron.hh
index bcb6d24e6a33ade95e4cc93e253adc4e59cc5e20..8acaffa3e704ea613eac560bf9b10867dfde0fd6 100644
--- a/source/graphics_reps/include/G4PlacedPolyhedron.hh
+++ b/source/graphics_reps/include/G4PlacedPolyhedron.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlacedPolyhedron.hh,v 1.7 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 
 // Class Description:
diff --git a/source/graphics_reps/include/G4Point3DList.hh b/source/graphics_reps/include/G4Point3DList.hh
index 855135f9781aca80dcaf114c8d8c9373cead18d7..a72d9d12472c7928b39e1a8d5ace6e7efb1d8702 100644
--- a/source/graphics_reps/include/G4Point3DList.hh
+++ b/source/graphics_reps/include/G4Point3DList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Point3DList.hh,v 1.6 1999/12/15 16:46:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  July 1995
diff --git a/source/graphics_reps/include/G4Polyhedron.hh b/source/graphics_reps/include/G4Polyhedron.hh
index 31e6a46648c7ed28877527e1fa23f4fdcb808257..34ad3741bbbe4fd5b2b84d480dbb625057faf96b 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.8 2000/03/30 16:01:41 stesting Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Polyhedron.hh,v 1.9 2001/02/03 18:29:40 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #ifndef G4POLYHEDRON_HH
 #define G4POLYHEDRON_HH
@@ -85,6 +85,7 @@
 class G4Polyhedron : public HepPolyhedron, public G4VVisPrim {
 public:
   G4Polyhedron ();
+  virtual ~G4Polyhedron ();
   G4Polyhedron (const G4Polyhedron& from);
   G4Polyhedron (const HepPolyhedron& from);
   virtual G4Visible& operator = (const G4Visible& from) {
@@ -102,6 +103,7 @@ public:
 class G4PolyhedronBox: public G4Polyhedron {
 public:
   G4PolyhedronBox (G4double dx, G4double dy, G4double dz);
+  virtual ~G4PolyhedronBox ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -117,6 +119,7 @@ class G4PolyhedronCone: public G4Polyhedron {
 public:
   G4PolyhedronCone (G4double Rmn1, G4double Rmx1, 
                     G4double Rmn2, G4double Rmx2, G4double Dz);
+  virtual ~G4PolyhedronCone (); 
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -133,6 +136,7 @@ public:
   G4PolyhedronCons (G4double Rmn1, G4double Rmx1, 
                     G4double Rmn2, G4double Rmx2, G4double Dz,
                     G4double Phi1, G4double Dphi);
+  virtual ~G4PolyhedronCons ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -148,6 +152,7 @@ class G4PolyhedronPara: public G4Polyhedron {
 public:
   G4PolyhedronPara (G4double Dx, G4double Dy, G4double Dz,
                     G4double Alpha, G4double Theta, G4double Phi);
+  virtual ~G4PolyhedronPara ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -165,6 +170,7 @@ public:
                     const G4double *z,
                     const G4double *rmin,
                     const G4double *rmax);
+  virtual ~G4PolyhedronPcon ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -182,6 +188,7 @@ public:
                     const G4double *z,
                     const G4double *rmin,
                     const G4double *rmax);
+  virtual ~G4PolyhedronPgon ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -198,6 +205,7 @@ public:
   G4PolyhedronSphere (G4double rmin, G4double rmax,
                       G4double phi, G4double dphi,
                       G4double the, G4double dthe);
+  virtual ~G4PolyhedronSphere ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -213,6 +221,7 @@ class G4PolyhedronTorus: public G4Polyhedron {
 public:
   G4PolyhedronTorus (G4double rmin, G4double rmax, G4double rtor,
                     G4double phi, G4double dphi);
+  virtual ~G4PolyhedronTorus ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -231,6 +240,7 @@ public:
                     G4double Dx1, G4double Dx2, G4double Alp1,
                     G4double Dy2,
                     G4double Dx3, G4double Dx4, G4double Alp2);
+  virtual ~G4PolyhedronTrap ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -246,6 +256,7 @@ class G4PolyhedronTrd1: public G4Polyhedron {
 public:
   G4PolyhedronTrd1 (G4double Dx1, G4double Dx2,
                     G4double Dy, G4double Dz);
+  virtual ~G4PolyhedronTrd1 ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -261,6 +272,7 @@ class G4PolyhedronTrd2: public G4Polyhedron {
 public:
   G4PolyhedronTrd2 (G4double Dx1, G4double Dx2,
                     G4double Dy1, G4double Dy2, G4double Dz);
+  virtual ~G4PolyhedronTrd2 ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -275,6 +287,7 @@ public:
 class G4PolyhedronTube: public G4Polyhedron {
 public:
   G4PolyhedronTube (G4double Rmin, G4double Rmax, G4double Dz);
+  virtual ~G4PolyhedronTube ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
@@ -290,6 +303,7 @@ class G4PolyhedronTubs: public G4Polyhedron {
 public:
   G4PolyhedronTubs (G4double Rmin, G4double Rmax, G4double Dz, 
                     G4double Phi1, G4double Dphi);
+  virtual ~G4PolyhedronTubs ();
   virtual G4Visible& operator = (const G4Visible& from) {
     return G4Visible::operator = (from);
   }
diff --git a/source/graphics_reps/include/G4Polyline.hh b/source/graphics_reps/include/G4Polyline.hh
index 1aba118c1c11756ea1542c93a1ba2548f2b5ab5b..189db1e7a2158a92a46a4682890c3311f7a5160c 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.5 1999/12/15 14:50:33 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Polyline.hh,v 1.6 2001/02/03 18:29:42 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  July 1995
@@ -31,11 +31,10 @@ public: // With description
 
   G4Polyline ();
   G4Polyline (const G4VVisPrim& prim);
+  virtual ~G4Polyline ();
   virtual G4Visible&  operator = (const G4Visible& right);
   virtual G4VVisPrim& operator = (const G4VVisPrim& right);
   virtual G4Polyline& operator = (const G4Polyline& right);
 };
 
-inline G4Polyline::G4Polyline () {}
-
 #endif
diff --git a/source/graphics_reps/include/G4Polymarker.hh b/source/graphics_reps/include/G4Polymarker.hh
index 0d267d8aba7c5b8b48410438ece9acd90fe25863..6ed2f77df36363fe5e4163671b52e7e8b0bb70e5 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.5 1999/12/15 14:50:33 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Polymarker.hh,v 1.6 2001/02/03 18:29:43 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  November 1996
@@ -29,6 +29,7 @@ public: // With description
   friend G4std::ostream& operator << (G4std::ostream& os, const G4Polymarker& marker);
   enum MarkerType {line, dots, circles, squares};
   G4Polymarker ();
+  virtual ~G4Polymarker ();
   virtual G4Visible&    operator = (const G4Visible& right);
   virtual G4VVisPrim&   operator = (const G4VVisPrim& right);
   virtual G4VMarker&    operator = (const G4VMarker& right);
diff --git a/source/graphics_reps/include/G4Polymarker.icc b/source/graphics_reps/include/G4Polymarker.icc
index 987bda8ff41e117f7a3fdf7ac044f9cfcb5064bf..817f625fd536d429c74f90eb16a0e72e3a2114f1 100644
--- a/source/graphics_reps/include/G4Polymarker.icc
+++ b/source/graphics_reps/include/G4Polymarker.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Polymarker.icc,v 1.2 1999/12/15 14:50:33 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  November 1996
diff --git a/source/graphics_reps/include/G4Square.hh b/source/graphics_reps/include/G4Square.hh
index ade441a6ed8900b35b360f4a1fa217239a8c825c..6dcf53504b883c087fdb252d3f26fadfa2998ce3 100644
--- a/source/graphics_reps/include/G4Square.hh
+++ b/source/graphics_reps/include/G4Square.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Square.hh,v 1.4 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Square.icc b/source/graphics_reps/include/G4Square.icc
index 04472458fe3f6021658fd2c8819984c7ff73bdad..3ea310b2309701975b7d1b58e28cf9b8557bcdc4 100644
--- a/source/graphics_reps/include/G4Square.icc
+++ b/source/graphics_reps/include/G4Square.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Square.icc,v 1.2 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Text.hh b/source/graphics_reps/include/G4Text.hh
index dbc77093d014a9e97f2fd7c37c28a7c03a312376..f33bab2313f0f94cdea70b2a80663ad691237c71 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.5 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Text.hh,v 1.6 2001/02/03 18:29:45 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  17/11/96.
@@ -60,6 +60,7 @@ public: // With description
   G4Text (const G4String& text);
   G4Text (const G4String& text, const G4Point3D& pos);
   G4Text (const G4VMarker& marker);
+  virtual ~G4Text ();
 
   virtual G4Visible&  operator = (const G4Visible& from);
   virtual G4VVisPrim& operator = (const G4VVisPrim& from);
diff --git a/source/graphics_reps/include/G4Text.icc b/source/graphics_reps/include/G4Text.icc
index 513be9c4bd4b1f4ef567b2e691f3b78a1d442d1c..0208203551ecb91f13aa978aae62b816421ed209 100644
--- a/source/graphics_reps/include/G4Text.icc
+++ b/source/graphics_reps/include/G4Text.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Text.icc,v 1.2 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4VMarker.hh b/source/graphics_reps/include/G4VMarker.hh
index c04e149ddbdd1f86e75687cbb35fd88df967bba1..1645adb022d217dfe586620c8dcb309a5c4585f2 100644
--- a/source/graphics_reps/include/G4VMarker.hh
+++ b/source/graphics_reps/include/G4VMarker.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VMarker.hh,v 1.6 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4VMarker - base class for markers - circles, squares, etc.
diff --git a/source/graphics_reps/include/G4VMarker.icc b/source/graphics_reps/include/G4VMarker.icc
index dfbd31ed6fa4389c4d398a2844cc7bf7748529ae..8d920f1c4bb5c130ad17ee6314e74feab20f2c24 100644
--- a/source/graphics_reps/include/G4VMarker.icc
+++ b/source/graphics_reps/include/G4VMarker.icc
@@ -5,36 +5,11 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VMarker.icc,v 1.4 1999/12/16 15:22:05 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VMarker.icc,v 1.5 2001/02/03 18:29:46 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
-inline G4VMarker::G4VMarker ():
-  fPosition   (G4Point3D ()),
-  fWorldSize  (0.),
-  fScreenSize (0.),
-  fFillStyle  (noFill),
-  fInfo()
-{}
-
-inline G4VMarker::G4VMarker (const G4VMarker& marker):
-  G4VVisPrim  (marker),
-  fPosition   (marker.fPosition),
-  fWorldSize  (marker.fWorldSize),
-  fScreenSize (marker.fScreenSize),
-  fFillStyle  (marker.fFillStyle),
-  fInfo       (marker.fInfo)
-{}  
-
-inline G4VMarker::G4VMarker (const G4Point3D& pos):
-  fPosition   (pos),
-  fWorldSize  (0.),
-  fScreenSize (0.),
-  fFillStyle  (noFill),
-  fInfo       ()
-{}
-
 inline G4Point3D G4VMarker::GetPosition () const {
   return fPosition;
 }
diff --git a/source/graphics_reps/include/G4VVisPrim.hh b/source/graphics_reps/include/G4VVisPrim.hh
index 65128ad4406a3e6ce276f8ed2883299405fe710b..452ce56a876dc03bb2abbaaa46b5c72f04b15e91 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.6 1999/12/15 16:46:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VVisPrim.hh,v 1.7 2001/02/03 18:29:47 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  August 1995
@@ -43,6 +43,4 @@ public: // With description
 
 };
 
-#include "G4VVisPrim.icc"
-
 #endif
diff --git a/source/graphics_reps/include/G4VVisPrim.icc b/source/graphics_reps/include/G4VVisPrim.icc
deleted file mode 100644
index bb33b3743982773b2ba7e9c86f2b381976e431f6..0000000000000000000000000000000000000000
--- a/source/graphics_reps/include/G4VVisPrim.icc
+++ /dev/null
@@ -1,23 +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: G4VVisPrim.icc,v 1.3 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-// 
-// John Allison  August 1995
-
-inline G4VVisPrim::G4VVisPrim () {}
-
-inline G4VVisPrim::G4VVisPrim (const G4VVisPrim& prim):
-G4Visible (prim)
-{}
-
-inline G4VVisPrim::G4VVisPrim (const G4VisAttributes* pVA):
-G4Visible (pVA)
-{}
-
diff --git a/source/graphics_reps/include/G4VisAttributes.hh b/source/graphics_reps/include/G4VisAttributes.hh
index 24b6489ac6ab5223958bca725de656ef1709aab8..fc5e3fd96ba80d2063c91ccde48b52330f6dc4d7 100644
--- a/source/graphics_reps/include/G4VisAttributes.hh
+++ b/source/graphics_reps/include/G4VisAttributes.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisAttributes.hh,v 1.6 2000/05/13 09:33:37 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  23rd October 1996
diff --git a/source/graphics_reps/include/G4VisAttributes.icc b/source/graphics_reps/include/G4VisAttributes.icc
index fe1be5b503b4a8791a89b25b79931108423e22d6..dd9b11f53efa0268903dcf5e59cac04caaa85bf2 100644
--- a/source/graphics_reps/include/G4VisAttributes.icc
+++ b/source/graphics_reps/include/G4VisAttributes.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisAttributes.icc,v 1.3 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  18th November 1996
diff --git a/source/graphics_reps/include/G4VisExtent.hh b/source/graphics_reps/include/G4VisExtent.hh
index 4d3bebead17b3897699d88d59f8b52113f43a8c4..7cae918fd64848bbd42352785c81fe491f38a1b6 100644
--- a/source/graphics_reps/include/G4VisExtent.hh
+++ b/source/graphics_reps/include/G4VisExtent.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisExtent.hh,v 1.4 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // A.Walkden 28/11/95
diff --git a/source/graphics_reps/include/G4Visible.hh b/source/graphics_reps/include/G4Visible.hh
index c1bab86f583c7fc88784db75d27af98e0daba97c..404b8d707522503f800a96343b1fdbcc05e6868f 100644
--- a/source/graphics_reps/include/G4Visible.hh
+++ b/source/graphics_reps/include/G4Visible.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Visible.hh,v 1.6 1999/12/15 16:46:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  30th October 1996
diff --git a/source/graphics_reps/include/G4Visible.icc b/source/graphics_reps/include/G4Visible.icc
index 2c9bb529dde276fea754ff934126c689cdc05683..23086d6c873ea96f3f7b1390762e1502ef09e168 100644
--- a/source/graphics_reps/include/G4Visible.icc
+++ b/source/graphics_reps/include/G4Visible.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Visible.icc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  30th October 1996
diff --git a/source/graphics_reps/include/HepPolyhedron.h b/source/graphics_reps/include/HepPolyhedron.h
index 0c804708b2b07243cd86ae6e68a27a5e15624a00..0c15c4f385b7660cbe225bb6fe88216fbd90d66b 100644
--- a/source/graphics_reps/include/HepPolyhedron.h
+++ b/source/graphics_reps/include/HepPolyhedron.h
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: HepPolyhedron.h,v 1.4 2000/04/18 10:03:06 evc Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: HepPolyhedron.h,v 1.5 2001/02/06 22:07:49 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // Class Description:
@@ -309,6 +309,7 @@ class HepPolyhedronTrd2 : public HepPolyhedron {
  public:
   HepPolyhedronTrd2(HepDouble Dx1, HepDouble Dx2,
 		    HepDouble Dy1, HepDouble Dy2, HepDouble Dz);
+  virtual ~HepPolyhedronTrd2();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -317,8 +318,8 @@ class HepPolyhedronTrd2 : public HepPolyhedron {
 class HepPolyhedronTrd1 : public HepPolyhedronTrd2 {
  public:
   HepPolyhedronTrd1(HepDouble Dx1, HepDouble Dx2,
-		    HepDouble Dy, HepDouble Dz) :
-    HepPolyhedronTrd2(Dx1, Dx2, Dy, Dy, Dz) {}
+		    HepDouble Dy, HepDouble Dz);
+  virtual ~HepPolyhedronTrd1();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -326,8 +327,8 @@ class HepPolyhedronTrd1 : public HepPolyhedronTrd2 {
 
 class HepPolyhedronBox : public HepPolyhedronTrd2 {
  public:
-  HepPolyhedronBox(HepDouble Dx, HepDouble Dy, HepDouble Dz) :
-    HepPolyhedronTrd2(Dx, Dx, Dy, Dy, Dz) {}
+  HepPolyhedronBox(HepDouble Dx, HepDouble Dy, HepDouble Dz);
+  virtual ~HepPolyhedronBox();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -340,6 +341,7 @@ public:
 		    HepDouble Dx1, HepDouble Dx2, HepDouble Alp1,
 		    HepDouble Dy2,
 		    HepDouble Dx3, HepDouble Dx4, HepDouble Alp2);
+  virtual ~HepPolyhedronTrap();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -348,8 +350,8 @@ public:
 class HepPolyhedronPara : public HepPolyhedronTrap {
 public:
   HepPolyhedronPara(HepDouble Dx, HepDouble Dy, HepDouble Dz,
-		    HepDouble Alpha, HepDouble Theta, HepDouble Phi) :
-    HepPolyhedronTrap(Dz, Theta, Phi, Dy, Dx, Dx, Alpha, Dy, Dx, Dx, Alpha) {}
+		    HepDouble Alpha, HepDouble Theta, HepDouble Phi);
+  virtual ~HepPolyhedronPara();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -360,6 +362,7 @@ public:
   HepPolyhedronCons(HepDouble Rmn1, HepDouble Rmx1, 
 		    HepDouble Rmn2, HepDouble Rmx2, HepDouble Dz,
 		    HepDouble Phi1, HepDouble Dphi); 
+  virtual ~HepPolyhedronCons();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -368,8 +371,8 @@ public:
 class HepPolyhedronCone : public HepPolyhedronCons {
 public:
   HepPolyhedronCone(HepDouble Rmn1, HepDouble Rmx1, 
-		    HepDouble Rmn2, HepDouble Rmx2, HepDouble Dz)
-    : HepPolyhedronCons(Rmn1, Rmx1, Rmn2, Rmx2, Dz, 0*deg, 360*deg) {}
+		    HepDouble Rmn2, HepDouble Rmx2, HepDouble Dz);
+  virtual ~HepPolyhedronCone();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -378,8 +381,8 @@ public:
 class HepPolyhedronTubs : public HepPolyhedronCons {
 public:
   HepPolyhedronTubs(HepDouble Rmin, HepDouble Rmax, HepDouble Dz, 
-		    HepDouble Phi1, HepDouble Dphi)
-    : HepPolyhedronCons(Rmin, Rmax, Rmin, Rmax, Dz, Phi1, Dphi) {}
+		    HepDouble Phi1, HepDouble Dphi);
+  virtual ~HepPolyhedronTubs();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -387,8 +390,8 @@ public:
 
 class HepPolyhedronTube : public HepPolyhedronCons {
 public:
-  HepPolyhedronTube (HepDouble Rmin, HepDouble Rmax, HepDouble Dz)
-    : HepPolyhedronCons(Rmin, Rmax, Rmin, Rmax, Dz, 0*deg, 360*deg) {}
+  HepPolyhedronTube (HepDouble Rmin, HepDouble Rmax, HepDouble Dz);
+  virtual ~HepPolyhedronTube();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -400,6 +403,7 @@ public:
 		    const HepDouble *z,
 		    const HepDouble *rmin,
 		    const HepDouble *rmax);
+  virtual ~HepPolyhedronPgon();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -410,8 +414,8 @@ public:
   HepPolyhedronPcon(HepDouble phi, HepDouble dphi, int nz,
 		    const HepDouble *z,
 		    const HepDouble *rmin,
-		    const HepDouble *rmax)
-    : HepPolyhedronPgon(phi, dphi, 0, nz, z, rmin, rmax) {}	
+		    const HepDouble *rmax);
+  virtual ~HepPolyhedronPcon();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -422,6 +426,7 @@ public:
   HepPolyhedronSphere(HepDouble rmin, HepDouble rmax,
 		      HepDouble phi, HepDouble dphi,
 		      HepDouble the, HepDouble dthe);
+  virtual ~HepPolyhedronSphere();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
@@ -431,6 +436,7 @@ class HepPolyhedronTorus : public HepPolyhedron {
 public:
   HepPolyhedronTorus(HepDouble rmin, HepDouble rmax, HepDouble rtor,
                     HepDouble phi, HepDouble dphi);
+  virtual ~HepPolyhedronTorus();
   virtual HepPolyhedron& operator = (const HepPolyhedron& from) {
     return HepPolyhedron::operator = (from);
   }
diff --git a/source/graphics_reps/src/G4Circle.cc b/source/graphics_reps/src/G4Circle.cc
index db4cd2c4730b8d3318eb71e600615af825032bbb..ea069dfb33993aaa5ee8c20ce46acc773bc63b8c 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.2 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Circle.cc,v 1.3 2001/02/03 18:29:52 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -14,6 +14,14 @@
 
 #include "G4VisAttributes.hh"
 
+G4Circle::G4Circle () {}
+
+G4Circle::G4Circle (const G4Point3D& pos):
+G4VMarker (pos) {}
+
+G4Circle::G4Circle (const G4VMarker& marker):
+G4VMarker (marker) {}
+
 G4Circle::~G4Circle () {}
 
 G4Visible & G4Circle::operator = (const G4Visible &right) {
diff --git a/source/graphics_reps/src/G4Colour.cc b/source/graphics_reps/src/G4Colour.cc
index 285b87ebc85793bd6763f48a8a6ba5ce9759dde9..2ddbd56b99c45e9c090da4bee3d532efb665a4b7 100644
--- a/source/graphics_reps/src/G4Colour.cc
+++ b/source/graphics_reps/src/G4Colour.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Colour.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 20th October 1996
diff --git a/source/graphics_reps/src/G4NURBS.cc b/source/graphics_reps/src/G4NURBS.cc
index c9dd2540457ec61a5f5f19bd63f4e973ed0d7392..c26a324109b12e6eecd7e400a34dd85b4640fca7 100644
--- a/source/graphics_reps/src/G4NURBS.cc
+++ b/source/graphics_reps/src/G4NURBS.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBS.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBSbox.cc b/source/graphics_reps/src/G4NURBSbox.cc
index 837f5a4b4996e3995f5b6dd9df337bbe5bb7155d..43dcc0d28db504e073419d8c10b89da5fe127106 100644
--- a/source/graphics_reps/src/G4NURBSbox.cc
+++ b/source/graphics_reps/src/G4NURBSbox.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBSbox.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBScylinder.cc b/source/graphics_reps/src/G4NURBScylinder.cc
index 016186377f5cace265b8f776da689162aa953c18..ada70bd0252a9f34cf831c401ca6d7b7ac9f7bae 100644
--- a/source/graphics_reps/src/G4NURBScylinder.cc
+++ b/source/graphics_reps/src/G4NURBScylinder.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBScylinder.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBShexahedron.cc b/source/graphics_reps/src/G4NURBShexahedron.cc
index d3d8c606e387114da5a5b0372fa3d7008347bce3..6fca9ab29fe2e9c9fea8a90659c5949f48a1b9d4 100644
--- a/source/graphics_reps/src/G4NURBShexahedron.cc
+++ b/source/graphics_reps/src/G4NURBShexahedron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBShexahedron.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // hexahedron implementation
 //  OC 17 9 96
diff --git a/source/graphics_reps/src/G4NURBStube.cc b/source/graphics_reps/src/G4NURBStube.cc
index 6fa489e8cfaca0ad5bde77ed3e6dfac0a1da4ea6..ec2d71df4028dcd8d8982f263c9e8a2ac44c0606 100644
--- a/source/graphics_reps/src/G4NURBStube.cc
+++ b/source/graphics_reps/src/G4NURBStube.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBStube.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBStubesector.cc b/source/graphics_reps/src/G4NURBStubesector.cc
index 7e5253327f133059a7284fc143bda2d11fc0ce8b..d6402a81b242ed90ab3fb0ee1dffd6b571f21ebb 100644
--- a/source/graphics_reps/src/G4NURBStubesector.cc
+++ b/source/graphics_reps/src/G4NURBStubesector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NURBStubesector.cc,v 1.4 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4PlacedPolyhedron.cc b/source/graphics_reps/src/G4PlacedPolyhedron.cc
index a1e02fb9979d42d14bfef21ab9f37fbfb9750554..5718f94d769d045a17a9c8f4941716330abfcea9 100644
--- a/source/graphics_reps/src/G4PlacedPolyhedron.cc
+++ b/source/graphics_reps/src/G4PlacedPolyhedron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlacedPolyhedron.cc,v 1.2 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G4PlacedPolyhedron.hh"
 
diff --git a/source/graphics_reps/src/G4Point3DList.cc b/source/graphics_reps/src/G4Point3DList.cc
index 0987b6687d7399976852b1dd3a70b8b6371b5502..eaf82898c5a184a31824ab30eb478428e97267cb 100644
--- a/source/graphics_reps/src/G4Point3DList.cc
+++ b/source/graphics_reps/src/G4Point3DList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Point3DList.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  July 1995
diff --git a/source/graphics_reps/src/G4Polyhedron.cc b/source/graphics_reps/src/G4Polyhedron.cc
index eb6afa8338b74ea85dfe434a87d14d77ad5a08a5..91b11fb6e10ddd409dc91f854ff9d58e769c5c14 100644
--- a/source/graphics_reps/src/G4Polyhedron.cc
+++ b/source/graphics_reps/src/G4Polyhedron.cc
@@ -5,13 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polyhedron.cc,v 1.9 2000/02/23 16:57:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Polyhedron.cc,v 1.10 2001/02/03 18:29:53 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G4Polyhedron.hh"
 
 G4Polyhedron::G4Polyhedron () {}
 
+G4Polyhedron::~G4Polyhedron () {}
+
 G4Polyhedron::G4Polyhedron (const G4Polyhedron& from) {
   *this = from;
 }
@@ -30,26 +32,36 @@ G4Polyhedron& G4Polyhedron::operator = (const G4Polyhedron& from) {
 G4PolyhedronBox::G4PolyhedronBox (G4double dx, G4double dy, G4double dz):
   G4Polyhedron (HepPolyhedronBox (dx, dy, dz)) {}
 
+G4PolyhedronBox::~G4PolyhedronBox () {}
+
 G4PolyhedronCone::G4PolyhedronCone (G4double Rmn1, G4double Rmx1, 
 				    G4double Rmn2, G4double Rmx2, G4double Dz):
   G4Polyhedron (HepPolyhedronCone (Rmn1, Rmx1, Rmn2, Rmx2, Dz)) {}
 
+G4PolyhedronCone::~G4PolyhedronCone () {}
+
 G4PolyhedronCons::G4PolyhedronCons (G4double Rmn1, G4double Rmx1, 
 				    G4double Rmn2, G4double Rmx2, G4double Dz,
 				    G4double Phi1, G4double Dphi):
   G4Polyhedron (HepPolyhedronCons (Rmn1, Rmx1, Rmn2, Rmx2, Dz, Phi1, Dphi)) {}
 
+G4PolyhedronCons::~G4PolyhedronCons () {}
+
 G4PolyhedronPara::G4PolyhedronPara (G4double Dx, G4double Dy, G4double Dz,
 				    G4double Alpha, G4double Theta,
 				    G4double Phi):
   G4Polyhedron (HepPolyhedronPara (Dx, Dy, Dz, Alpha, Theta, Phi)) {}
 
+G4PolyhedronPara::~G4PolyhedronPara () {}
+
 G4PolyhedronPcon::G4PolyhedronPcon (G4double phi, G4double dphi, G4int nz,
 				    const G4double *z,
 				    const G4double *rmin,
 				    const G4double *rmax):
   G4Polyhedron (HepPolyhedronPcon (phi, dphi, nz, z, rmin, rmax)) {}
 
+G4PolyhedronPcon::~G4PolyhedronPcon () {}
+
 G4PolyhedronPgon::G4PolyhedronPgon (G4double phi, G4double dphi, G4int npdv,
 				    G4int nz,
 				    const G4double *z,
@@ -57,16 +69,22 @@ G4PolyhedronPgon::G4PolyhedronPgon (G4double phi, G4double dphi, G4int npdv,
 				    const G4double *rmax):
   G4Polyhedron (HepPolyhedronPgon (phi, dphi, npdv, nz, z, rmin, rmax)) {}
 
+G4PolyhedronPgon::~G4PolyhedronPgon () {}
+
 G4PolyhedronSphere::G4PolyhedronSphere (G4double rmin, G4double rmax,
 					G4double phi, G4double dphi,
 					G4double the, G4double dthe):
   G4Polyhedron (HepPolyhedronSphere (rmin, rmax, phi, dphi, the, dthe)) {}
 
+G4PolyhedronSphere::~G4PolyhedronSphere () {}
+
 G4PolyhedronTorus::G4PolyhedronTorus (G4double rmin, G4double rmax,
 				      G4double rtor,
 				      G4double phi, G4double dphi):
   G4Polyhedron (HepPolyhedronTorus (rmin, rmax, rtor, phi, dphi)) {}
 
+G4PolyhedronTorus::~G4PolyhedronTorus () {}
+
 G4PolyhedronTrap::G4PolyhedronTrap (G4double Dz, G4double Theta, G4double Phi,
 				    G4double Dy1,
 				    G4double Dx1, G4double Dx2, G4double Alp1,
@@ -75,17 +93,27 @@ G4PolyhedronTrap::G4PolyhedronTrap (G4double Dz, G4double Theta, G4double Phi,
   G4Polyhedron (HepPolyhedronTrap (Dz, Theta, Phi, Dy1, Dx1, Dx2, Alp1,
 				   Dy2, Dx3, Dx4, Alp2)) {}
 
+G4PolyhedronTrap::~G4PolyhedronTrap () {}
+
 G4PolyhedronTrd1::G4PolyhedronTrd1 (G4double Dx1, G4double Dx2,
 				    G4double Dy, G4double Dz):
   G4Polyhedron (HepPolyhedronTrd1 (Dx1, Dx2, Dy, Dz)) {}
 
+G4PolyhedronTrd1::~G4PolyhedronTrd1 () {}
+
 G4PolyhedronTrd2::G4PolyhedronTrd2 (G4double Dx1, G4double Dx2,
 				    G4double Dy1, G4double Dy2, G4double Dz):
   G4Polyhedron (HepPolyhedronTrd2 (Dx1, Dx2, Dy1, Dy2, Dz)) {}
 
+G4PolyhedronTrd2::~G4PolyhedronTrd2 () {}
+
 G4PolyhedronTube::G4PolyhedronTube (G4double Rmin, G4double Rmax, G4double Dz):
   G4Polyhedron (HepPolyhedronTube (Rmin, Rmax, Dz)) {}
 
+G4PolyhedronTube::~G4PolyhedronTube () {}
+
 G4PolyhedronTubs::G4PolyhedronTubs (G4double Rmin, G4double Rmax, G4double Dz, 
 				    G4double Phi1, G4double Dphi):
   G4Polyhedron (HepPolyhedronTubs (Rmin, Rmax, Dz, Phi1, Dphi)) {}
+
+G4PolyhedronTubs::~G4PolyhedronTubs () {}
diff --git a/source/graphics_reps/src/G4Polyline.cc b/source/graphics_reps/src/G4Polyline.cc
index 873ef026a12f5230e8cdee2a9b633ce8a9d5636d..03ce92ed1fcd69fc1317995ff592cac833e8bfc1 100644
--- a/source/graphics_reps/src/G4Polyline.cc
+++ b/source/graphics_reps/src/G4Polyline.cc
@@ -5,18 +5,22 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Polyline.cc,v 1.4 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Polyline.cc,v 1.5 2001/02/03 18:29:55 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  July 1995
 
 #include "G4Polyline.hh"
 
+G4Polyline::G4Polyline () {}
+
 G4Polyline::G4Polyline (const G4VVisPrim& prim):
   G4VVisPrim (prim)
 {}
 
+G4Polyline::~G4Polyline () {}
+
 G4Visible & G4Polyline::operator = (const G4Visible &right) {
   return G4Visible::operator = (right);
 }
diff --git a/source/graphics_reps/src/G4Polymarker.cc b/source/graphics_reps/src/G4Polymarker.cc
index ad2211b8e1f4c1811b67a28c71b5c3b41b9b7247..17fed8a30654f538d283a00435328b1fb9e27300 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.5 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Polymarker.cc,v 1.6 2001/02/03 18:29:56 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  November 1996
@@ -17,6 +17,8 @@ G4Polymarker::G4Polymarker ():
 fMarkerType (line)
 {}
 
+G4Polymarker::~G4Polymarker () {}
+
 G4Visible & G4Polymarker::operator = (const G4Visible &right) {
   return G4Visible::operator = (right);
 }
diff --git a/source/graphics_reps/src/G4Square.cc b/source/graphics_reps/src/G4Square.cc
index 29bda405ad5cfda2dacb32301dbf1ad680dba22a..a67db5a9a680bff92f5927095d28a2aeb4a93d98 100644
--- a/source/graphics_reps/src/G4Square.cc
+++ b/source/graphics_reps/src/G4Square.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Square.cc,v 1.2 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/graphics_reps/src/G4Text.cc b/source/graphics_reps/src/G4Text.cc
index 632d88d2af2efe0fd6cc3f1905338b5a899f5341..964385a89ac6c200fcec5ecc2fd6a021b5036c59 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.4 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Text.cc,v 1.5 2001/02/03 18:29:58 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  17/11/96.
@@ -33,6 +33,8 @@ fLayout   (left)  ,
 fXOffset(0.) , fYOffset(0.)
 {}
 
+G4Text::~G4Text () {}
+
 G4Visible & G4Text::operator = (const G4Visible &from) {
   return G4Visible::operator = (from);
 }
diff --git a/source/graphics_reps/src/G4VMarker.cc b/source/graphics_reps/src/G4VMarker.cc
index b4480c3954e2c5605baa264bd614a4628462d3ab..44a26ab8143b80e7ea49f3c6e02ba5aca4c49bfb 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.5 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VMarker.cc,v 1.6 2001/02/03 18:29:59 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -14,6 +14,31 @@
 
 #include "G4VisAttributes.hh"
 
+G4VMarker::G4VMarker ():
+  fPosition   (G4Point3D ()),
+  fWorldSize  (0.),
+  fScreenSize (0.),
+  fFillStyle  (noFill),
+  fInfo       (G4String())
+{}
+
+G4VMarker::G4VMarker (const G4VMarker& marker):
+  G4VVisPrim  (marker),
+  fPosition   (marker.fPosition),
+  fWorldSize  (marker.fWorldSize),
+  fScreenSize (marker.fScreenSize),
+  fFillStyle  (marker.fFillStyle),
+  fInfo       (marker.fInfo)
+{}  
+
+G4VMarker::G4VMarker (const G4Point3D& pos):
+  fPosition   (pos),
+  fWorldSize  (0.),
+  fScreenSize (0.),
+  fFillStyle  (noFill),
+  fInfo       (G4String())
+{}
+
 G4VMarker::~G4VMarker () {}
 
 G4Visible & G4VMarker::operator = (const G4Visible &right) {
diff --git a/source/graphics_reps/src/G4VVisPrim.cc b/source/graphics_reps/src/G4VVisPrim.cc
index 61840d7e41cff89ebbe7dd8c7d18854c2dcb97d4..d70e247f1398d9d762b40400de18af6ee216ba39 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.5 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VVisPrim.cc,v 1.6 2001/02/03 18:30:00 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  August 1995
@@ -15,6 +15,16 @@
 #include "G4VisAttributes.hh"
 #include "G4ios.hh"
 
+G4VVisPrim::G4VVisPrim () {}
+
+G4VVisPrim::G4VVisPrim (const G4VVisPrim& prim):
+G4Visible (prim)
+{}
+
+G4VVisPrim::G4VVisPrim (const G4VisAttributes* pVA):
+G4Visible (pVA)
+{}
+
 G4VVisPrim::~G4VVisPrim () {}
 
 G4Visible& G4VVisPrim::operator = (const G4Visible& right) {
diff --git a/source/graphics_reps/src/G4VisAttributes.cc b/source/graphics_reps/src/G4VisAttributes.cc
index 08c006b0aabf607b4480cec1ec538de87e297b9b..5990cdb443b94290f6497194561d00d3724f4b00 100644
--- a/source/graphics_reps/src/G4VisAttributes.cc
+++ b/source/graphics_reps/src/G4VisAttributes.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisAttributes.cc,v 1.5 1999/12/15 14:50:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  23rd October 1996
diff --git a/source/graphics_reps/src/G4VisExtent.cc b/source/graphics_reps/src/G4VisExtent.cc
index 896c50155aa6d6f7e7d55e64ad3a59e05f643f7f..25fdfa4c29a7b7bef872e3ae2d0952b32da81cc5 100644
--- a/source/graphics_reps/src/G4VisExtent.cc
+++ b/source/graphics_reps/src/G4VisExtent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisExtent.cc,v 1.4 1999/12/15 14:50:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // A.Walkden 28/11/95
diff --git a/source/graphics_reps/src/G4Visible.cc b/source/graphics_reps/src/G4Visible.cc
index c50880e17c2d673b632652de90b751f5ed545c83..85bc85a2eed05093767f18d42886cf3d809c8fce 100644
--- a/source/graphics_reps/src/G4Visible.cc
+++ b/source/graphics_reps/src/G4Visible.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Visible.cc,v 1.3 1999/12/15 14:50:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  30th October 1996
diff --git a/source/graphics_reps/src/HepPolyhedron.cc b/source/graphics_reps/src/HepPolyhedron.cc
index d067e703079d3d18c871210d1b63b8f3141534d3..cc39feb41e7a7897da0e3cab93094ab1696a7f65 100644
--- a/source/graphics_reps/src/HepPolyhedron.cc
+++ b/source/graphics_reps/src/HepPolyhedron.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: HepPolyhedron.cc,v 1.4 2000/04/18 10:03:29 evc Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: HepPolyhedron.cc,v 1.5 2001/02/06 22:07:51 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
@@ -1206,6 +1206,19 @@ HepPolyhedronTrd2::HepPolyhedronTrd2(HepDouble Dx1, HepDouble Dx2,
   CreatePrism();
 }
 
+HepPolyhedronTrd2::~HepPolyhedronTrd2() {}
+
+HepPolyhedronTrd1::HepPolyhedronTrd1(HepDouble Dx1, HepDouble Dx2,
+				     HepDouble Dy, HepDouble Dz)
+  : HepPolyhedronTrd2(Dx1, Dx2, Dy, Dy, Dz) {}
+
+HepPolyhedronTrd1::~HepPolyhedronTrd1() {}
+
+HepPolyhedronBox::HepPolyhedronBox(HepDouble Dx, HepDouble Dy, HepDouble Dz)
+  : HepPolyhedronTrd2(Dx, Dx, Dy, Dy, Dz) {}
+
+HepPolyhedronBox::~HepPolyhedronBox() {}
+
 HepPolyhedronTrap::HepPolyhedronTrap(HepDouble Dz,
 				     HepDouble Theta,
 				     HepDouble Phi,
@@ -1259,6 +1272,15 @@ HepPolyhedronTrap::HepPolyhedronTrap(HepDouble Dz,
   CreatePrism();
 }
 
+HepPolyhedronTrap::~HepPolyhedronTrap() {}
+
+HepPolyhedronPara::HepPolyhedronPara(HepDouble Dx, HepDouble Dy, HepDouble Dz,
+				     HepDouble Alpha, HepDouble Theta,
+				     HepDouble Phi)
+  : HepPolyhedronTrap(Dz, Theta, Phi, Dy, Dx, Dx, Alpha, Dy, Dx, Dx, Alpha) {}
+
+HepPolyhedronPara::~HepPolyhedronPara() {}
+
 HepPolyhedronCons::HepPolyhedronCons(HepDouble Rmn1,
 				     HepDouble Rmx1,
 				     HepDouble Rmn2,
@@ -1335,6 +1357,28 @@ HepPolyhedronCons::HepPolyhedronCons(HepDouble Rmn1,
   SetReferences();
 }
 
+HepPolyhedronCons::~HepPolyhedronCons() {}
+
+HepPolyhedronCone::HepPolyhedronCone(HepDouble Rmn1, HepDouble Rmx1, 
+				     HepDouble Rmn2, HepDouble Rmx2,
+				     HepDouble Dz) :
+  HepPolyhedronCons(Rmn1, Rmx1, Rmn2, Rmx2, Dz, 0*deg, 360*deg) {}
+
+HepPolyhedronCone::~HepPolyhedronCone() {}
+
+HepPolyhedronTubs::HepPolyhedronTubs(HepDouble Rmin, HepDouble Rmax,
+				     HepDouble Dz, 
+				     HepDouble Phi1, HepDouble Dphi)
+  :   HepPolyhedronCons(Rmin, Rmax, Rmin, Rmax, Dz, Phi1, Dphi) {}
+
+HepPolyhedronTubs::~HepPolyhedronTubs() {}
+
+HepPolyhedronTube::HepPolyhedronTube (HepDouble Rmin, HepDouble Rmax,
+				      HepDouble Dz)
+  : HepPolyhedronCons(Rmin, Rmax, Rmin, Rmax, Dz, 0*deg, 360*deg) {}
+
+HepPolyhedronTube::~HepPolyhedronTube () {}
+
 HepPolyhedronPgon::HepPolyhedronPgon(HepDouble phi,
 				     HepDouble dphi,
 				     int    npdv,
@@ -1424,6 +1468,16 @@ HepPolyhedronPgon::HepPolyhedronPgon(HepDouble phi,
   delete [] rr;
 }
 
+HepPolyhedronPgon::~HepPolyhedronPgon() {}
+
+HepPolyhedronPcon::HepPolyhedronPcon(HepDouble phi, HepDouble dphi, int nz,
+				     const HepDouble *z,
+				     const HepDouble *rmin,
+				     const HepDouble *rmax)
+  : HepPolyhedronPgon(phi, dphi, 0, nz, z, rmin, rmax) {}
+
+HepPolyhedronPcon::~HepPolyhedronPcon() {}
+
 HepPolyhedronSphere::HepPolyhedronSphere(HepDouble rmin, HepDouble rmax,
 				       HepDouble phi, HepDouble dphi,
 				       HepDouble the, HepDouble dthe)
@@ -1519,6 +1573,8 @@ HepPolyhedronSphere::HepPolyhedronSphere(HepDouble rmin, HepDouble rmax,
   delete [] rr;
 }
 
+HepPolyhedronSphere::~HepPolyhedronSphere() {}
+
 HepPolyhedronTorus::HepPolyhedronTorus(HepDouble rmin,
 				       HepDouble rmax,
 				       HepDouble rtor,
@@ -1592,6 +1648,8 @@ HepPolyhedronTorus::HepPolyhedronTorus(HepDouble rmin,
   delete [] rr;
 }
 
+HepPolyhedronTorus::~HepPolyhedronTorus() {}
+
 int HepPolyhedron::fNumberOfRotationSteps = DEFAULT_NUMBER_OF_STEPS;
 /***********************************************************************
  *                                                                     *
diff --git a/source/intercoms/History b/source/intercoms/History
index 1ac1cc850a8efafe76a070ef79af2323edd0f79b..593b43254665c9e73bfc482fd0d33fe758a9ff85 100644
--- a/source/intercoms/History
+++ b/source/intercoms/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.15 2000/07/26 09:26:24 asaim Exp $
+$Id: History,v 1.17 2001/03/08 17:00:46 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,21 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Mar 8, 2001, G.Cosmo (intercoms-V03-00-02)
+- G4UIcommand.cc: replaced calls to entries() with size(), according
+  to migration to STL vectors for G4UnitsTable and related in tag
+  "global-V03-00-07".
+
+Feb 8, 2001, M.Asai (intercoms-V03-00-01)
+- Migration to STL vector classes
+  affected classes :
+./intercoms/include/G4UIcommand.hh
+./intercoms/include/G4UIcommandTree.hh
+./intercoms/include/G4UImanager.hh
+./intercoms/src/G4UIcommand.cc
+./intercoms/src/G4UIcommandTree.cc
+./intercoms/src/G4UImanager.cc
+
 Jul 26, 00, M.Asai (tag intercoms-V02-00-01)
 - Retagging with removing G4StateManager, G4VStateDependent and G4ApplicationState
   classes.
diff --git a/source/intercoms/include/G4UIbatch.hh b/source/intercoms/include/G4UIbatch.hh
index 6411b18b682725cfc0635b298f21fab4575c3798..311a2cd8e87087d2adb2a7bd7839c9037d1d5576 100644
--- a/source/intercoms/include/G4UIbatch.hh
+++ b/source/intercoms/include/G4UIbatch.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIbatch.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $id$
 
diff --git a/source/intercoms/include/G4UIcmdWith3Vector.hh b/source/intercoms/include/G4UIcmdWith3Vector.hh
index c3ba580680354315eebb63c6680a2ee31f2fbfe4..0c7e067ffa7d5fcd75754c6ce93d8cceb3caf1c4 100644
--- a/source/intercoms/include/G4UIcmdWith3Vector.hh
+++ b/source/intercoms/include/G4UIcmdWith3Vector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWith3Vector.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
index edf6006547a9844ec1858ed15365f63fc881023e..70094bca98799901f7677e6723f8e600bd9c7af2 100644
--- a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
+++ b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithABool.hh b/source/intercoms/include/G4UIcmdWithABool.hh
index 8244dd8c56997b14b4e169ff8809c2850b7f7813..a32f840c4bad438f8e7e1546536d67db6efecc1d 100644
--- a/source/intercoms/include/G4UIcmdWithABool.hh
+++ b/source/intercoms/include/G4UIcmdWithABool.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithABool.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithADouble.hh b/source/intercoms/include/G4UIcmdWithADouble.hh
index 258f84c704e90290874cc8e997eaaf73ce0f0e88..337b6d9d1a6a70d7cee9679524e6199924c3f790 100644
--- a/source/intercoms/include/G4UIcmdWithADouble.hh
+++ b/source/intercoms/include/G4UIcmdWithADouble.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithADouble.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
index f0849c2845f3e2dabd5ca7c8177722e042209344..3071b90005f9047e06781edc0146fead7c9c9f5a 100644
--- a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
+++ b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithAString.hh b/source/intercoms/include/G4UIcmdWithAString.hh
index aef500bb34c542fea05155036e8bae410740c37f..9ca515aed6cd3e917e8d1e376bb15bcb9f8aa3b7 100644
--- a/source/intercoms/include/G4UIcmdWithAString.hh
+++ b/source/intercoms/include/G4UIcmdWithAString.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithAString.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithAnInteger.hh b/source/intercoms/include/G4UIcmdWithAnInteger.hh
index 67fc3c9fd582e6c63cd3ef1d31bf7ad7fbe32c6a..db88cd40ddece12ba9c0828c7cf57f4e052f3c13 100644
--- a/source/intercoms/include/G4UIcmdWithAnInteger.hh
+++ b/source/intercoms/include/G4UIcmdWithAnInteger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithAnInteger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithoutParameter.hh b/source/intercoms/include/G4UIcmdWithoutParameter.hh
index 22d2bb3f9ce9048f285bfcf5cb2e10f8bddbd671..6f1af1eeeba26a44b27a2b25edc40324fcc40941 100644
--- a/source/intercoms/include/G4UIcmdWithoutParameter.hh
+++ b/source/intercoms/include/G4UIcmdWithoutParameter.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithoutParameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcommand.hh b/source/intercoms/include/G4UIcommand.hh
index d4f3e3ba37ed12ccf9678fc7d5879c6aa2096c10..25f956f1b3252c587692eb1b3a5003d4cb60517f 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.5 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UIcommand.hh,v 1.6 2001/02/08 06:07:18 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -17,8 +17,9 @@
 class G4UImessenger;
 #include "globals.hh"
 #include "G4ApplicationState.hh"
-#include "g4rw/tpordvec.h"
-#include "g4rw/tvordvec.h"
+//#include "g4rw/tpordvec.h"
+//#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 #include "G4UItokenNum.hh"
 
 // class description:
@@ -74,9 +75,9 @@ class G4UIcommand
       G4String commandPath;
       G4String commandName;
       G4String rangeString;
-      G4RWTPtrOrderedVector<G4UIparameter> parameter;
-      G4RWTValOrderedVector<G4String> commandGuidance;
-      G4RWTValOrderedVector<G4ApplicationState> availabelStateList;
+      G4std::vector<G4UIparameter*> parameter;
+      G4std::vector<G4String> commandGuidance;
+      G4std::vector<G4ApplicationState> availabelStateList;
 
   public: // with description
       inline void SetRange(const char* rs)
@@ -90,7 +91,7 @@ class G4UIcommand
       inline const G4String GetRange() const
       { return rangeString; };
       inline G4int GetGuidanceEntries() const
-      { return commandGuidance.entries(); }
+      { return commandGuidance.size(); }
       inline const G4String GetGuidanceLine(int i) const
       { return commandGuidance[i]; }
       inline const G4String GetCommandPath() const
@@ -98,14 +99,14 @@ class G4UIcommand
       inline const G4String GetCommandName() const
       { return commandName; }
       inline G4int GetParameterEntries() const
-      { return parameter.entries(); }
+      { return parameter.size(); }
       inline G4UIparameter * GetParameter(int i) const
       { return parameter[i]; }
   public: // with description
       inline void SetParameter(G4UIparameter *const newParameter)
       {
-	parameter.insert( newParameter );
-	newVal.resize( parameter.entries() );
+	parameter.push_back( newParameter );
+	newVal.resize( parameter.size() );
       }
       //  Defines a parameter. This method is used by the derived command classes
       // but the user can directly use this command when he/she defines a command
@@ -114,7 +115,7 @@ class G4UIcommand
       inline void SetGuidance(const char * aGuidance)
       { 
         G4String * theGuidance = new G4String( aGuidance );
-        commandGuidance.insert( *theGuidance ); 
+        commandGuidance.push_back( *theGuidance ); 
       }
       //  Adds a guidance line. Unlimitted number of invokation of this method is
       // allowed. The given lines of guidance will appear for the help. The first
@@ -123,10 +124,10 @@ class G4UIcommand
   public:
       inline const G4String GetTitle() const
       {
-	    if(commandGuidance.entries() == 0)
+	    if(commandGuidance.size() == 0)
 	    { return G4String("...Title not available..."); }
  	    else
-	    { return commandGuidance(0); }
+	    { return commandGuidance[0]; }
       }
 
   protected:
@@ -168,7 +169,7 @@ class G4UIcommand
     int bp;                      // buffer pointer for rangeBuf
     tokenNum token;
     yystype yylval;
-    G4RWTValOrderedVector<yystype>  newVal;
+    G4std::vector<yystype>  newVal;
     int paramERR;
 };
 
diff --git a/source/intercoms/include/G4UIcommandStatus.hh b/source/intercoms/include/G4UIcommandStatus.hh
index e7d9d962e83d414b0d3eace8eb694af1fc0473d6..8ea2cf09fc3fb0b0c50db4c5a1c10a8688d7d515 100644
--- a/source/intercoms/include/G4UIcommandStatus.hh
+++ b/source/intercoms/include/G4UIcommandStatus.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcommandStatus.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UIcommandStatus_h
diff --git a/source/intercoms/include/G4UIcommandTree.hh b/source/intercoms/include/G4UIcommandTree.hh
index cde2ba9be839e3cf46c9a43964bef8bdfca719f4..35528520d261b55b2007bd08dd7959192777ad26 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.5 2000/02/14 12:24:41 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UIcommandTree.hh,v 1.6 2001/02/08 06:07:18 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UIcommandTree_h
@@ -15,7 +15,8 @@
 
 #include "G4UIcommand.hh"
 #include "globals.hh"
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -42,8 +43,8 @@ class G4UIcommandTree
       void ListCurrentWithNum();
 
   private:
-      G4RWTPtrOrderedVector<G4UIcommand> command;
-      G4RWTPtrOrderedVector<G4UIcommandTree> tree;
+      G4std::vector<G4UIcommand*> command;
+      G4std::vector<G4UIcommandTree*> tree;
       G4UIcommand *guidance;
       G4String pathName;
 
@@ -53,14 +54,14 @@ class G4UIcommandTree
       inline const G4String GetPathName() const
       { return pathName; };
       inline G4int GetTreeEntry() const
-      { return tree.entries(); };
+      { return tree.size(); };
       inline G4int GetCommandEntry() const
-      { return command.entries(); };
+      { return command.size(); };
       inline G4UIcommandTree * GetTree(int i)
       { return tree[i-1]; };
       inline G4UIcommandTree * GetTree(G4String comName)
       { 
-        for( int i=0; i < tree.entries(); i++)
+        for( int i=0; i < tree.size(); i++)
         {
           if( comName == tree[i]->GetPathName() )
           { return tree[i]; }
diff --git a/source/intercoms/include/G4UIcontrolMessenger.hh b/source/intercoms/include/G4UIcontrolMessenger.hh
index 54cdb29f502377db8f7bb144387163b1dd78bb78..07bd95a824cc8b2d9f05ac6f7242ba5ae11847a0 100644
--- a/source/intercoms/include/G4UIcontrolMessenger.hh
+++ b/source/intercoms/include/G4UIcontrolMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcontrolMessenger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UIcontrolMessenger_h
diff --git a/source/intercoms/include/G4UIdirectory.hh b/source/intercoms/include/G4UIdirectory.hh
index 092f9ae8e57210a9d4f8f2c7f6f58474072378fa..afca83e5345bb3fc39cc2f75ed6cf8a2c072c6b3 100644
--- a/source/intercoms/include/G4UIdirectory.hh
+++ b/source/intercoms/include/G4UIdirectory.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIdirectory.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/include/G4UImanager.hh b/source/intercoms/include/G4UImanager.hh
index 0b825ec91d1f4342b071bc43d0a7b1f359d8939c..cf708f03c34cd306de4c2444a4615c57c324846d 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.6 2000/07/22 10:49:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UImanager.hh,v 1.7 2001/02/08 06:07:18 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UImanager_h
@@ -14,7 +14,8 @@
 
 #include "globals.hh"
 #include "g4rw/ctoken.h"
-#include "g4rw/tvordvec.h"
+//#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 #include "g4std/fstream"
 #include "G4VStateDependent.hh"
 class G4UIcommandTree;
@@ -105,7 +106,7 @@ class G4UImanager : public G4VStateDependent
       G4int verboseLevel;
       G4std::ofstream historyFile;
       G4bool saveHistory;
-      G4RWTValOrderedVector<G4String> histVec;
+      G4std::vector<G4String> histVec;
       
       G4bool pauseAtBeginOfEvent;
       G4bool pauseAtEndOfEvent;
@@ -167,11 +168,11 @@ class G4UImanager : public G4VStateDependent
       inline G4int GetVerboseLevel() const
       { return verboseLevel; };
       inline G4int GetNumberOfHistory() const
-      { return histVec.entries(); };
+      { return histVec.size(); };
       inline G4String GetPreviousCommand(G4int i) const
       { 
         G4String st;
-        if(i>=0 && i<histVec.entries())
+        if(i>=0 && i<histVec.size())
         { st = histVec[i]; }
         return st;
       }
diff --git a/source/intercoms/include/G4UImessenger.hh b/source/intercoms/include/G4UImessenger.hh
index bb2160eb584719ca2f2f51dda8c7d3c09785a5f0..68cf253807cff2d327c4f3d6fa271f975c2d2ef0 100644
--- a/source/intercoms/include/G4UImessenger.hh
+++ b/source/intercoms/include/G4UImessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UImessenger.hh,v 1.4 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UImessenger_h
diff --git a/source/intercoms/include/G4UIparameter.hh b/source/intercoms/include/G4UIparameter.hh
index dc63117941d27f86a8b474a50de439d269789660..f84351afb2f5f362ea1ebf8fdf34f4334f8d97c0 100644
--- a/source/intercoms/include/G4UIparameter.hh
+++ b/source/intercoms/include/G4UIparameter.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIparameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------------
diff --git a/source/intercoms/include/G4UIsession.hh b/source/intercoms/include/G4UIsession.hh
index 83cd882b2fc53cc511d941366f8abb3175eb52ec..232157cd37984f1b55b5898e387b60bc64caee92 100644
--- a/source/intercoms/include/G4UIsession.hh
+++ b/source/intercoms/include/G4UIsession.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIsession.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $id$
 
diff --git a/source/intercoms/include/G4UItokenNum.hh b/source/intercoms/include/G4UItokenNum.hh
index a3cca10f3203df58601777333609eecc7b2edcc8..9ad24b26693f00baeb26d7c9e898fb94440cd631 100644
--- a/source/intercoms/include/G4UItokenNum.hh
+++ b/source/intercoms/include/G4UItokenNum.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UItokenNum.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4UItokenNum.hh
 
diff --git a/source/intercoms/include/G4UnitsMessenger.hh b/source/intercoms/include/G4UnitsMessenger.hh
index a566b4bc98f943fba06bf3bb5da119c86c28a010..0dcd5a492ee30c176d7cadadf1fc789f4bd97c90 100644
--- a/source/intercoms/include/G4UnitsMessenger.hh
+++ b/source/intercoms/include/G4UnitsMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UnitsMessenger.hh,v 1.3 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class description
 //
diff --git a/source/intercoms/include/G4VFlavoredParallelWorld.hh b/source/intercoms/include/G4VFlavoredParallelWorld.hh
index 89a8dcd844fff4ff0616698d5e8b21820fe99d5a..d4d439446d36c8856d071e36e5c0168e0249be43 100644
--- a/source/intercoms/include/G4VFlavoredParallelWorld.hh
+++ b/source/intercoms/include/G4VFlavoredParallelWorld.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VFlavoredParallelWorld.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Abstract interface for GEANT4 Flavored Parallel World.
diff --git a/source/intercoms/include/G4VGlobalFastSimulationManager.hh b/source/intercoms/include/G4VGlobalFastSimulationManager.hh
index 57984aeed39f301415b9898a8f549f54e08ad6e2..0689615345e4c4d0ab3048049ec3ec982c6b1f17 100644
--- a/source/intercoms/include/G4VGlobalFastSimulationManager.hh
+++ b/source/intercoms/include/G4VGlobalFastSimulationManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VGlobalFastSimulationManager.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Abstract interface for GEANT4 Global Fast Simulation Manager.
diff --git a/source/intercoms/include/G4VGraphicsScene.hh b/source/intercoms/include/G4VGraphicsScene.hh
index dafc4a846455681c223dd6a2aaf8138926f899c8..f996b54c155e4086257d5bff07775a3b32c61bbd 100644
--- a/source/intercoms/include/G4VGraphicsScene.hh
+++ b/source/intercoms/include/G4VGraphicsScene.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VGraphicsScene.hh,v 1.5 2000/05/19 06:29:48 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // John Allison  19th July 1996
 //
 // Class Description:
diff --git a/source/intercoms/include/G4VVisManager.hh b/source/intercoms/include/G4VVisManager.hh
index 86337df59e7f44ac4ecc042dd755e34c6425d3b0..3097c762e7ee212fbcbc1cb3818295ad2968ab50 100644
--- a/source/intercoms/include/G4VVisManager.hh
+++ b/source/intercoms/include/G4VVisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VVisManager.hh,v 1.4 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // John Allison 19/Oct/1996.
 // 
 // Class Description:
diff --git a/source/intercoms/src/G4UIbatch.cc b/source/intercoms/src/G4UIbatch.cc
index 05ac6689cd55560a05aea23cd50d69a1cb736134..80d3e92250169f4efa7da243da9e12724ebbae77 100644
--- a/source/intercoms/src/G4UIbatch.cc
+++ b/source/intercoms/src/G4UIbatch.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIbatch.cc,v 1.2 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UIbatch.hh"
diff --git a/source/intercoms/src/G4UIcmdWith3Vector.cc b/source/intercoms/src/G4UIcmdWith3Vector.cc
index f8515a40d7e5881af028d2ee68029acf563890ec..7d42f20dcc6944dc35ec3b83f3892b4c9dccab17 100644
--- a/source/intercoms/src/G4UIcmdWith3Vector.cc
+++ b/source/intercoms/src/G4UIcmdWith3Vector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWith3Vector.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
index 46d325b0b7a5785c00bad166e09666df9a3fe682..153d99bbdecba87ba46a7aab806f03d7a69e9d11 100644
--- a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
+++ b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithABool.cc b/source/intercoms/src/G4UIcmdWithABool.cc
index cbbcbcb4d095bb9d33343f04c7c52b41ad262269..c5e03cadda55ecc48647b4ebf1ce567c28a72247 100644
--- a/source/intercoms/src/G4UIcmdWithABool.cc
+++ b/source/intercoms/src/G4UIcmdWithABool.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithABool.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithADouble.cc b/source/intercoms/src/G4UIcmdWithADouble.cc
index 52e460f8b8610d540aeb6c4bcbb64dfd1772f6f0..fce0c1a2588b56e41375d36a92b7a4483780b137 100644
--- a/source/intercoms/src/G4UIcmdWithADouble.cc
+++ b/source/intercoms/src/G4UIcmdWithADouble.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithADouble.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
index 331c900d613b421b15405b74e486fd797684f3e0..96f44e8707cda06452d479c92db7eb45ea15de90 100644
--- a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
+++ b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithAString.cc b/source/intercoms/src/G4UIcmdWithAString.cc
index 7bfa443d432c83402a8028d7f4fddde62f6c72d2..6c9507a567dab43d33afe940c052371d0a94dc25 100644
--- a/source/intercoms/src/G4UIcmdWithAString.cc
+++ b/source/intercoms/src/G4UIcmdWithAString.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithAString.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithAnInteger.cc b/source/intercoms/src/G4UIcmdWithAnInteger.cc
index 42be4a556106ce1ab11d8faac7e64fcdbbf1a91d..0181feed30f4793bb4be6146433cfc93c275fefc 100644
--- a/source/intercoms/src/G4UIcmdWithAnInteger.cc
+++ b/source/intercoms/src/G4UIcmdWithAnInteger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithAnInteger.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithoutParameter.cc b/source/intercoms/src/G4UIcmdWithoutParameter.cc
index 20d60f1a16d196e2321ec53495a776608365f9ea..b3fc1063dc936fa7817862dabc80f9442182ce77 100644
--- a/source/intercoms/src/G4UIcmdWithoutParameter.cc
+++ b/source/intercoms/src/G4UIcmdWithoutParameter.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcmdWithoutParameter.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcommand.cc b/source/intercoms/src/G4UIcommand.cc
index 54f0e98d84e1540bc222e2050bc49753eab28c65..2f5ed026f60e6a8f01e0693879ec5987fcb70835 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.5 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UIcommand.cc,v 1.7 2001/03/08 17:00:32 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -39,11 +39,11 @@ G4UIcommand::G4UIcommand(const char * theCommandPath,
   G4UIcommandCommonConstructorCode (comStr);
   G4String nullString;
   availabelStateList.clear();
-  availabelStateList.insert(PreInit);
-  availabelStateList.insert(Init);
-  availabelStateList.insert(Idle);
-  availabelStateList.insert(GeomClosed);
-  availabelStateList.insert(EventProc);
+  availabelStateList.push_back(PreInit);
+  availabelStateList.push_back(Init);
+  availabelStateList.push_back(Idle);
+  availabelStateList.push_back(GeomClosed);
+  availabelStateList.push_back(EventProc);
 }
 
 void G4UIcommand::G4UIcommandCommonConstructorCode
@@ -62,9 +62,10 @@ G4UIcommand::~G4UIcommand()
   G4UImanager* fUImanager = G4UImanager::GetUIpointer();
   if(fUImanager) fUImanager->RemoveCommand(this);
   
-  int n_parameterEntry = parameter.entries();
+  int n_parameterEntry = parameter.size();
   for( int i_thParameter=0; i_thParameter < n_parameterEntry; i_thParameter++ )
   { delete parameter[i_thParameter]; }
+  parameter.clear();
 }
 
 int G4UIcommand::operator==(const G4UIcommand &right) const
@@ -80,7 +81,7 @@ int G4UIcommand::operator!=(const G4UIcommand &right) const
 G4int G4UIcommand::DoIt(G4String parameterList)
 {
   G4String correctParameters;
-  int n_parameterEntry = parameter.entries();
+  int n_parameterEntry = parameter.size();
   if( n_parameterEntry != 0 )
   {
     G4String aToken;
@@ -160,15 +161,15 @@ G4String G4UIcommand::GetCurrentValue()
 void G4UIcommand::AvailableForStates(G4ApplicationState s1)
 {
   availabelStateList.clear();
-  availabelStateList.insert(s1);
+  availabelStateList.push_back(s1);
 }
 
 void G4UIcommand::AvailableForStates(G4ApplicationState s1,
                                      G4ApplicationState s2)
 {
   availabelStateList.clear();
-  availabelStateList.insert(s1);
-  availabelStateList.insert(s2);
+  availabelStateList.push_back(s1);
+  availabelStateList.push_back(s2);
 }
 
 void G4UIcommand::AvailableForStates(G4ApplicationState s1,
@@ -176,9 +177,9 @@ void G4UIcommand::AvailableForStates(G4ApplicationState s1,
                                      G4ApplicationState s3)
 {
   availabelStateList.clear();
-  availabelStateList.insert(s1);
-  availabelStateList.insert(s2);
-  availabelStateList.insert(s3);
+  availabelStateList.push_back(s1);
+  availabelStateList.push_back(s2);
+  availabelStateList.push_back(s3);
 }
 
 void G4UIcommand::AvailableForStates(G4ApplicationState s1,
@@ -187,10 +188,10 @@ void G4UIcommand::AvailableForStates(G4ApplicationState s1,
                                      G4ApplicationState s4)
 {
   availabelStateList.clear();
-  availabelStateList.insert(s1);
-  availabelStateList.insert(s2);
-  availabelStateList.insert(s3);
-  availabelStateList.insert(s4);
+  availabelStateList.push_back(s1);
+  availabelStateList.push_back(s2);
+  availabelStateList.push_back(s3);
+  availabelStateList.push_back(s4);
 }
 
 void G4UIcommand::AvailableForStates(G4ApplicationState s1,
@@ -200,11 +201,11 @@ void G4UIcommand::AvailableForStates(G4ApplicationState s1,
                                      G4ApplicationState s5)
 {
   availabelStateList.clear();
-  availabelStateList.insert(s1);
-  availabelStateList.insert(s2);
-  availabelStateList.insert(s3);
-  availabelStateList.insert(s4);
-  availabelStateList.insert(s5);
+  availabelStateList.push_back(s1);
+  availabelStateList.push_back(s2);
+  availabelStateList.push_back(s3);
+  availabelStateList.push_back(s4);
+  availabelStateList.push_back(s5);
 }
 
 G4bool G4UIcommand::IsAvailable()
@@ -213,7 +214,7 @@ G4bool G4UIcommand::IsAvailable()
   G4ApplicationState currentState 
    = G4StateManager::GetStateManager()->GetCurrentState();
    
-  int nState = availabelStateList.entries();
+  int nState = availabelStateList.size();
   for(int i=0;i<nState;i++)
   {
   	if(availabelStateList[i]==currentState)
@@ -243,16 +244,16 @@ G4String G4UIcommand::UnitsList(G4String unitCategory)
   G4String retStr;
   G4UnitsTable& UTbl = G4UnitDefinition::GetUnitsTable();
   G4int i;
-  for(i=0;i<UTbl.entries();i++)
+  for(i=0;i<UTbl.size();i++)
   { if(UTbl[i]->GetName()==unitCategory) break; }
-  if(i==UTbl.entries())
+  if(i==UTbl.size())
   { 
     G4cerr << "Unit category <" << unitCategory << "> is not defined." << G4endl;
     return retStr;
   }
   G4UnitsContainer& UCnt = UTbl[i]->GetUnitsList();
   retStr = UCnt[0]->GetSymbol();
-  G4int je = UCnt.entries();
+  G4int je = UCnt.size();
   for(int j=1;j<je;j++)
   {
     retStr += " ";
@@ -273,12 +274,12 @@ void G4UIcommand::List()
   if(commandPath(commandPath.length()-1)!='/')
   { G4cout << "Command " << commandPath << G4endl; }
   G4cout << "Guidance :" << G4endl;
-  int n_guidanceEntry = commandGuidance.entries();
+  int n_guidanceEntry = commandGuidance.size();
   for( int i_thGuidance=0; i_thGuidance < n_guidanceEntry; i_thGuidance++ )
   { G4cout << commandGuidance[i_thGuidance] << G4endl; }
   if( ! rangeString.isNull() )
   { G4cout << " Range of parameters : " << rangeString << G4endl; }
-  int n_parameterEntry = parameter.entries();
+  int n_parameterEntry = parameter.size();
   if( n_parameterEntry > 0 )
   {
     for( int i_thParameter=0; i_thParameter<n_parameterEntry; i_thParameter++ )
@@ -315,9 +316,9 @@ TypeCheck(G4String newValues)
     char type;
     const char* t = newValues;
     G4std::istrstream is((char*)t);
-    for (unsigned i=0; i< parameter.entries(); i++) {
+    for (unsigned i=0; i< parameter.size(); i++) {
         is >> aNewValue;
-        type = toupper(parameter(i)->GetParameterType());
+        type = toupper(parameter[i]->GetParameterType());
         switch ( type ) {
             case 'D':
                 if( IsDouble(aNewValue)==0 ){
@@ -450,11 +451,11 @@ RangeCheck(G4String newValue) {
     bp = 0;                 // reset buffer pointer for G4UIpGetc()
     const char* t = newValue;
     G4std::istrstream is((char*)t);
-    for (unsigned i=0; i< parameter.entries(); i++) {
-        type= toupper(parameter(i)->GetParameterType());
+    for (unsigned i=0; i< parameter.size(); i++) {
+        type= toupper(parameter[i]->GetParameterType());
         switch ( type ) {
-            case 'D':  is >> newVal(i).D;  break;
-            case 'I':  is >> newVal(i).I;  break;
+            case 'D':  is >> newVal[i].D;  break;
+            case 'I':  is >> newVal[i].I;  break;
             case 'S':
             case 'B':
             default:  ;
@@ -728,11 +729,11 @@ Eval2(yystype arg1, int op, yystype arg2)
 
     if( arg1.type == IDENTIFIER) {
         unsigned i = IndexOf( arg1.S );
-        newValtype = toupper(parameter(i)->GetParameterType());
+        newValtype = toupper(parameter[i]->GetParameterType());
         switch ( newValtype ) {
             case 'I': 
                 if( arg2.type == CONSTINT ) {
-                    return CompareInt( newVal(i).I, op, arg2.I );
+                    return CompareInt( newVal[i].I, op, arg2.I );
                 } else {
                     G4cerr << "integer operand expected for "
                          <<  rangeString 
@@ -740,21 +741,21 @@ Eval2(yystype arg1, int op, yystype arg2)
                 } break;
             case 'D':
                 if( arg2.type == CONSTDOUBLE ) {
-                    return CompareDouble( newVal(i).D, op, arg2.D );
+                    return CompareDouble( newVal[i].D, op, arg2.D );
                 } else
                 if ( arg2.type == CONSTINT ) {  // integral promotion
-                    return CompareDouble( newVal(i).D, op, arg2.I );
+                    return CompareDouble( newVal[i].D, op, arg2.I );
                 } break;
             default: ;
         }
     }
     if( arg2.type == IDENTIFIER) {
         unsigned i = IndexOf( arg2.S );
-        newValtype = toupper(parameter(i)->GetParameterType());
+        newValtype = toupper(parameter[i]->GetParameterType());
         switch ( newValtype ) {
             case 'I': 
                 if( arg1.type == CONSTINT ) {
-                    return CompareInt( arg1.I, op, newVal(i).I );
+                    return CompareInt( arg1.I, op, newVal[i].I );
                 } else {
                     G4cerr << "integer operand expected for "
                          <<  rangeString
@@ -762,10 +763,10 @@ Eval2(yystype arg1, int op, yystype arg2)
                 } break;
             case 'D':
                 if( arg1.type == CONSTDOUBLE ) {
-                    return CompareDouble( arg1.D, op, newVal(i).D );
+                    return CompareDouble( arg1.D, op, newVal[i].D );
                 } else
                 if ( arg1.type == CONSTINT ) {  // integral promotion
-                    return CompareDouble( arg1.I, op, newVal(i).D );
+                    return CompareDouble( arg1.I, op, newVal[i].D );
                 } break;
             default: ;
         }
@@ -829,9 +830,9 @@ IndexOf( G4String nam)
 {
     unsigned i;
     G4String pname;
-    for( i=0;  i<parameter.entries(); i++)
+    for( i=0;  i<parameter.size(); i++)
     {
-        pname = parameter(i)-> GetParameterName();
+        pname = parameter[i]-> GetParameterName();
         if( pname == nam ) {
             return i;
         }
@@ -846,9 +847,9 @@ unsigned G4UIcommand::
 IsParameter(G4String nam)
 {
     G4String pname;
-    for(unsigned i=0;  i<parameter.entries(); i++)  
+    for(unsigned i=0;  i<parameter.size(); i++)  
     {
-        pname = parameter(i)-> GetParameterName();
+        pname = parameter[i]-> GetParameterName();
         if( pname == nam ) return 1;
     }
     return 0;
diff --git a/source/intercoms/src/G4UIcommandTree.cc b/source/intercoms/src/G4UIcommandTree.cc
index fe283cf15ae9bf01c422b4ea977b284a58b46913..acc1bf7551cdc1bac863ff96a2c391ae8d3449bd 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.4 2000/02/14 12:24:42 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UIcommandTree.cc,v 1.5 2001/02/08 06:07:20 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UIcommandTree.hh"
@@ -31,7 +31,7 @@ G4UIcommandTree::G4UIcommandTree(const char * thePathName)
 G4UIcommandTree::~G4UIcommandTree()
 {
   int i;
-  int n_treeEntry = tree.entries();
+  int n_treeEntry = tree.size();
   for( i=0; i < n_treeEntry; i++ )
   { delete tree[i]; }
 }
@@ -60,13 +60,13 @@ void G4UIcommandTree::AddNewCommand(G4UIcommand *newCommand)
   if( i == G4std::string::npos )
   {
     // Find command
-    int n_commandEntry = command.entries();
+    int n_commandEntry = command.size();
     for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
     {
       if( remainingPath == command[i_thCommand]->GetCommandName() )
       { return; }
     }
-    command.insert( newCommand );
+    command.push_back( newCommand );
     return;
   }
   else
@@ -74,7 +74,7 @@ void G4UIcommandTree::AddNewCommand(G4UIcommand *newCommand)
     // Find path
     G4String nextPath = pathName;
     nextPath.append(remainingPath(0,i+1));
-    int n_treeEntry = tree.entries();
+    int n_treeEntry = tree.size();
     for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
     {
       if( nextPath == tree[i_thTree]->GetPathName() )
@@ -84,7 +84,7 @@ void G4UIcommandTree::AddNewCommand(G4UIcommand *newCommand)
       }
     }
     G4UIcommandTree * newTree = new G4UIcommandTree( nextPath );
-    tree.insert( newTree );
+    tree.push_back( newTree );
     newTree->AddNewCommand( newCommand );
     return;
   }
@@ -105,12 +105,12 @@ void G4UIcommandTree::RemoveCommand(G4UIcommand *aCommand)
     if( i == G4std::string::npos )
     {
       // Find command
-      int n_commandEntry = command.entries();
+      int n_commandEntry = command.size();
       for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
       {
         if( remainingPath == command[i_thCommand]->GetCommandName() )
         { 
-          command.remove(command[i_thCommand]); 
+          command.erase(command.begin()+i_thCommand);
           break;
         }
       }
@@ -120,7 +120,7 @@ void G4UIcommandTree::RemoveCommand(G4UIcommand *aCommand)
       // Find path
       G4String nextPath = pathName;
       nextPath.append(remainingPath(0,i+1));
-      int n_treeEntry = tree.entries();
+      int n_treeEntry = tree.size();
       for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
       {
         if( nextPath == tree[i_thTree]->GetPathName() )
@@ -130,7 +130,7 @@ void G4UIcommandTree::RemoveCommand(G4UIcommand *aCommand)
     	  if(n_commandRemain==0)
     	  {
     	    G4UIcommandTree * emptyTree = tree[i_thTree];
-    	    tree.remove(tree[i_thTree]);
+    	    tree.erase(tree.begin()+i_thTree);
     	    delete emptyTree;
     	  }
     	  break;
@@ -150,7 +150,7 @@ G4UIcommand * G4UIcommandTree::FindPath(G4String commandPath)
   if( i == G4std::string::npos )
   {
     // Find command
-    int n_commandEntry = command.entries();
+    int n_commandEntry = command.size();
     for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
     {
       if( remainingPath == command[i_thCommand]->GetCommandName() )
@@ -162,7 +162,7 @@ G4UIcommand * G4UIcommandTree::FindPath(G4String commandPath)
     // Find path
     G4String nextPath = pathName;
     nextPath.append(remainingPath(0,i+1));
-    int n_treeEntry = tree.entries();
+    int n_treeEntry = tree.size();
     for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
     {
       if( nextPath == tree[i_thTree]->GetPathName() )
@@ -178,14 +178,14 @@ void G4UIcommandTree::ListCurrent()
   if( guidance != NULL ) guidance->List();
   int i = 0;
   G4cout << " Sub-directories : " << G4endl;
-  int n_treeEntry = tree.entries();
+  int n_treeEntry = tree.size();
   for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
   {
     G4cout << "   " << tree[i_thTree]->GetPathName() 
 	 << "   " << tree[i_thTree]->GetTitle() << G4endl;
   }
   G4cout << " Commands : " << G4endl;
-  int n_commandEntry = command.entries();
+  int n_commandEntry = command.size();
   for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
   {
     G4cout << "   " << command[i_thCommand]->GetCommandName() 
@@ -199,7 +199,7 @@ void G4UIcommandTree::ListCurrentWithNum()
   if( guidance != NULL ) guidance->List();
   int i = 0;
   G4cout << " Sub-directories : " << G4endl;
-  int n_treeEntry = tree.entries();
+  int n_treeEntry = tree.size();
   for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
   {
     i++;
@@ -207,7 +207,7 @@ void G4UIcommandTree::ListCurrentWithNum()
 	 << "   " << tree[i_thTree]->GetTitle() << G4endl;
   }
   G4cout << " Commands : " << G4endl;
-  int n_commandEntry = command.entries();
+  int n_commandEntry = command.size();
   for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
   {
     i++;
@@ -219,12 +219,12 @@ void G4UIcommandTree::ListCurrentWithNum()
 void G4UIcommandTree::List()
 {
   ListCurrent();
-  int n_commandEntry = command.entries();
+  int n_commandEntry = command.size();
   for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
   {
     command[i_thCommand]->List();
   }
-  int n_treeEntry = tree.entries();
+  int n_treeEntry = tree.size();
   for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
   {
     tree[i_thTree]->List();
diff --git a/source/intercoms/src/G4UIcontrolMessenger.cc b/source/intercoms/src/G4UIcontrolMessenger.cc
index e58beec2e121d0d9c10c42b6974671fe5009c7e1..b629860ff01a29be2e2b852ebd88a79a6c6d6902 100644
--- a/source/intercoms/src/G4UIcontrolMessenger.cc
+++ b/source/intercoms/src/G4UIcontrolMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcontrolMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UIcontrolMessenger.hh"
diff --git a/source/intercoms/src/G4UIdirectory.cc b/source/intercoms/src/G4UIdirectory.cc
index b6e930f2cc5989b5402a7027b4e2ec22b44b4820..ed454e87622e88ec62f1381d5533604f9d08d6fa 100644
--- a/source/intercoms/src/G4UIdirectory.cc
+++ b/source/intercoms/src/G4UIdirectory.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIdirectory.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/intercoms/src/G4UImanager.cc b/source/intercoms/src/G4UImanager.cc
index 4c6c2b78296b5f703e5043da6b36a275a33c025f..47b993c0c450cf8c7c843bb62bb8f42eb7ef98a5 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.6 2000/07/22 10:49:38 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UImanager.cc,v 1.7 2001/02/08 06:07:20 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------------
@@ -233,7 +233,7 @@ int G4UImanager::ApplyCommand(G4String aCommand)
   { return fIllegalApplicationState; }
  
   if(saveHistory) historyFile << aCommand << G4endl; 
-  histVec.insert(aCommand);
+  histVec.push_back(aCommand);
   return targetCommand->DoIt( commandParameter );
 }
 
diff --git a/source/intercoms/src/G4UImessenger.cc b/source/intercoms/src/G4UImessenger.cc
index 189c73ac83b56513518157521b4feb11a879ba5c..0a785c476a02b0322555fc4b417e9eca83759e58 100644
--- a/source/intercoms/src/G4UImessenger.cc
+++ b/source/intercoms/src/G4UImessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UImessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UImessenger.hh"
diff --git a/source/intercoms/src/G4UIparameter.cc b/source/intercoms/src/G4UIparameter.cc
index d909a628bff56400f56d0f64d9d2a317a358ddc2..e199dfdca93d15d8d4e120a64dadaf71ff4dfd78 100644
--- a/source/intercoms/src/G4UIparameter.cc
+++ b/source/intercoms/src/G4UIparameter.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIparameter.cc,v 1.4 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UIparameter.hh"
diff --git a/source/intercoms/src/G4UIsession.cc b/source/intercoms/src/G4UIsession.cc
index aad13f4bcd390e3ef33f40ed9c979168fb5b218c..ce7baebf028ec0d7ad9c0fb12c9ee3c053c6f78d 100644
--- a/source/intercoms/src/G4UIsession.cc
+++ b/source/intercoms/src/G4UIsession.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIsession.cc,v 1.3 1999/12/15 17:52:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------------
diff --git a/source/intercoms/src/G4UnitsMessenger.cc b/source/intercoms/src/G4UnitsMessenger.cc
index 60638b86ca8f4bc6d363512adb3d3980abe1518a..625b92f0c8f19def53a5ba4795505bd0d4683ba3 100644
--- a/source/intercoms/src/G4UnitsMessenger.cc
+++ b/source/intercoms/src/G4UnitsMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UnitsMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/intercoms/src/G4VGlobalFastSimulationManager.cc b/source/intercoms/src/G4VGlobalFastSimulationManager.cc
index 8b1fbcf86421dfe31d65e8fa2120830b840608b8..9a2980a3c951267c9b5335664a500703b0f47195 100644
--- a/source/intercoms/src/G4VGlobalFastSimulationManager.cc
+++ b/source/intercoms/src/G4VGlobalFastSimulationManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VGlobalFastSimulationManager.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Abstract interface for GEANT4 Global Fast Simulation Manager.
diff --git a/source/intercoms/src/G4VVisManager.cc b/source/intercoms/src/G4VVisManager.cc
index 533a0fdf92699d4a5df15b65c5d5668f1dd1efef..08aba6cf8cf05dc69f2ecfab044464631dbee32b 100644
--- a/source/intercoms/src/G4VVisManager.cc
+++ b/source/intercoms/src/G4VVisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VVisManager.cc,v 1.3 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Abstract interface for GEANT4 Visualization Manager.
diff --git a/source/interfaces/GAG/include/G4UIGAG.hh b/source/interfaces/GAG/include/G4UIGAG.hh
index 1d6573ef7792a5092827c5adf016e227d3817ae5..38f01eef92a3702cccf754be5c3d70df2e43668f 100644
--- a/source/interfaces/GAG/include/G4UIGAG.hh
+++ b/source/interfaces/GAG/include/G4UIGAG.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIGAG.hh,v 1.4 1999/12/15 14:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4UIGAG.hh
 // GAG(Geant4 adaptive GUI) interface class
diff --git a/source/interfaces/GAG/src/G4UIGAG.cc b/source/interfaces/GAG/src/G4UIGAG.cc
index cd5cf53f3a1ac2012bd8ec5cdd2146a529c4c436..c4c9937fa029fa025517427bc6209a75b870839d 100644
--- a/source/interfaces/GAG/src/G4UIGAG.cc
+++ b/source/interfaces/GAG/src/G4UIGAG.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIGAG.cc,v 1.9 1999/12/17 12:09:50 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4UIGAG.cc
 // 18.Feb.98 M.Nagamatu and T.Kodama created G4UIGAG from G4UIterminal
diff --git a/source/interfaces/OPACS/include/G4UIWo.hh b/source/interfaces/OPACS/include/G4UIWo.hh
index 491ab9e750e9b61c5f038cbd7eab0ae4e0822b0f..e92fc7fb9bb477c30bd49fc847a6599e50339dce 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.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4UIWo_h
 #define G4UIWo_h 
diff --git a/source/interfaces/OPACS/include/G4WoMessenger.hh b/source/interfaces/OPACS/include/G4WoMessenger.hh
index 1205946bf69ba2bd98ff26cd9f91b75b911991a2..7ac8154cec3b372d35f531b8da3b3e0303a4072f 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.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2851266f6dc785b234c42eea81d21b5b008c84f7..822cc80ad983374e3497c2430b044138bc6c3ecd 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.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
    Included by G4o.h.
diff --git a/source/interfaces/OPACS/include/G4oCommon.icc b/source/interfaces/OPACS/include/G4oCommon.icc
index c7e1282111dd36939cc51e560b2a90f1c1dd46c1..f7a9a06010145be987334e1d96235e920cbbf023 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.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
    Included by G4o.cc.
diff --git a/source/interfaces/OPACS/src/G4UIWo.cc b/source/interfaces/OPACS/src/G4UIWo.cc
index 63d6c6c89ca2bec00ab5d134e984cfca50e11844..6c74eda79c02f731553c9abaeb73519b3c08f29a 100644
--- a/source/interfaces/OPACS/src/G4UIWo.cc
+++ b/source/interfaces/OPACS/src/G4UIWo.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIWo.cc,v 1.4 2000/08/11 09:56:50 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //G4UIWo.cc   -- copied from G4UIterminal.cc
 
diff --git a/source/interfaces/OPACS/src/G4WoMessenger.cc b/source/interfaces/OPACS/src/G4WoMessenger.cc
index a41b9a0e9f60989aec539382cdedf6a2909a571a..7a205abb69bf7c6a1f33c690c031576574485918 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.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifdef G4UI_BUILD_WO_SESSION
 
diff --git a/source/interfaces/XVT/include/G4UIxvt.hh b/source/interfaces/XVT/include/G4UIxvt.hh
index 889782370001cb7f9cd613990de144075c478dd3..fff0663518a2eb4c1ffe10a9133508ce4453cd8c 100644
--- a/source/interfaces/XVT/include/G4UIxvt.hh
+++ b/source/interfaces/XVT/include/G4UIxvt.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIxvt.hh,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 //                     XVT driver class header                        //
diff --git a/source/interfaces/XVT/include/G4UIxvtMessenger.hh b/source/interfaces/XVT/include/G4UIxvtMessenger.hh
index 584638cf36659bdcb6adfda3be76e955d83d76b9..e11ee5c7e9753975c16bc74b38b9ed7525eb055d 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.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //
diff --git a/source/interfaces/XVT/src/G4UIxvt.cc b/source/interfaces/XVT/src/G4UIxvt.cc
index 20999cd6d285b58850b39280113d74674ca39855..360063a1be98c8982344599dec82b73d7fc3f52e 100644
--- a/source/interfaces/XVT/src/G4UIxvt.cc
+++ b/source/interfaces/XVT/src/G4UIxvt.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIxvt.cc,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
diff --git a/source/interfaces/XVT/src/G4UIxvtMessenger.cc b/source/interfaces/XVT/src/G4UIxvtMessenger.cc
index a6c0e58e7c5770549fd9abc1b58e2a5d4bf81feb..b29cf5715eadcdf0a9abf4e1c2430f2728f3efee 100644
--- a/source/interfaces/XVT/src/G4UIxvtMessenger.cc
+++ b/source/interfaces/XVT/src/G4UIxvtMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIxvtMessenger.cc,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
diff --git a/source/interfaces/basic/include/G4UIArrayString.hh b/source/interfaces/basic/include/G4UIArrayString.hh
index 9dda93f2273977a7cb91d08d81b9bbf37f3f7855..e2e608e4af3e3a4d7e5f350b2edb03316086c929 100644
--- a/source/interfaces/basic/include/G4UIArrayString.hh
+++ b/source/interfaces/basic/include/G4UIArrayString.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIArrayString.hh,v 1.1 2000/03/26 23:02:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UIArrayString_h
diff --git a/source/interfaces/basic/include/G4UIWin32.hh b/source/interfaces/basic/include/G4UIWin32.hh
index f9b837ce414df21567072282e682cbaf0c2d2807..6f61922e7536daac8bba997e83e2f7da8f40f6f3 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.9 2000/05/26 14:58:29 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4UIWin32_h
 #define G4UIWin32_h 
diff --git a/source/interfaces/basic/include/G4UIXaw.hh b/source/interfaces/basic/include/G4UIXaw.hh
index 1cad7f5c8eccad0c497b20fededea2c70ca4d0bb..3b053bbfe9cc035b28a3c5ad674d463152ec79a5 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.4 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4UIXaw_h
 #define G4UIXaw_h 
diff --git a/source/interfaces/basic/include/G4UIXm.hh b/source/interfaces/basic/include/G4UIXm.hh
index d6d0228fab5516ba7f4901ca167a2ed2a22bd061..1a19fc78cc0b76e8166b7f4fbc6c60d7aa258d1c 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.10 2000/05/26 14:58:30 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4UIXm_h
 #define G4UIXm_h 
diff --git a/source/interfaces/basic/include/G4UIcsh.hh b/source/interfaces/basic/include/G4UIcsh.hh
index 066f4d7f471299d00cae3a55321bd8ea804b4ed2..62aeedfdb3b9c20291adaaf49af9ac8850a63f0e 100644
--- a/source/interfaces/basic/include/G4UIcsh.hh
+++ b/source/interfaces/basic/include/G4UIcsh.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcsh.hh,v 1.2 2000/07/22 10:52:28 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UIcsh_h
diff --git a/source/interfaces/basic/include/G4UItcsh.hh b/source/interfaces/basic/include/G4UItcsh.hh
index 4c02ab617c04eb4cdd72e67ab9e6ca2e92cc1c5f..abc6a82a1e0254b185d103d0f726baa365728a6c 100644
--- a/source/interfaces/basic/include/G4UItcsh.hh
+++ b/source/interfaces/basic/include/G4UItcsh.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UItcsh.hh,v 1.2 2000/07/22 10:52:28 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UItcsh_h
diff --git a/source/interfaces/basic/include/G4UIterminal.hh b/source/interfaces/basic/include/G4UIterminal.hh
index 879f7a0a79757a0c36ee3d0c9cefd22692b69f24..a6b19fe787020520c387d3120afadc2dbca0a01c 100644
--- a/source/interfaces/basic/include/G4UIterminal.hh
+++ b/source/interfaces/basic/include/G4UIterminal.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIterminal.hh,v 1.6 2000/07/22 10:52:28 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UIterminal_h
diff --git a/source/interfaces/basic/include/G4VUIshell.hh b/source/interfaces/basic/include/G4VUIshell.hh
index 18024fc0cba83891fb2945a6c60768d495c88d64..3279b81f97223591a73832595fa39dc35c3a38e4 100644
--- a/source/interfaces/basic/include/G4VUIshell.hh
+++ b/source/interfaces/basic/include/G4VUIshell.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUIshell.hh,v 1.3 2000/11/27 11:01:51 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VUIshell_h
diff --git a/source/interfaces/basic/src/G4UIArrayString.cc b/source/interfaces/basic/src/G4UIArrayString.cc
index 3777a534581c7bd245d69c3b63edbb891fa6c50c..7325a63580d34b9c89d33af850f81c94178aa6e2 100644
--- a/source/interfaces/basic/src/G4UIArrayString.cc
+++ b/source/interfaces/basic/src/G4UIArrayString.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIArrayString.cc,v 1.3 2000/07/31 08:00:01 gracia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/iomanip"
diff --git a/source/interfaces/basic/src/G4UIWin32.cc b/source/interfaces/basic/src/G4UIWin32.cc
index 458c2c1dc3df955bc6f13e47de67029581886d47..adaaa22bd0448656d8a2121078919e4432428101 100644
--- a/source/interfaces/basic/src/G4UIWin32.cc
+++ b/source/interfaces/basic/src/G4UIWin32.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIWin32.cc,v 1.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/basic/src/G4UIXaw.cc b/source/interfaces/basic/src/G4UIXaw.cc
index e3f498d7e308f1e114f4568cd17225de3d345707..c3c117147635e6db257f80f110e3e94bfe4df790 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.3 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/basic/src/G4UIXm.cc b/source/interfaces/basic/src/G4UIXm.cc
index 93f2a1e9a2c312efb7283595be079f0d5ae24b00..93128b7890a6523d798578dce0b8a83f6a2d85fd 100644
--- a/source/interfaces/basic/src/G4UIXm.cc
+++ b/source/interfaces/basic/src/G4UIXm.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIXm.cc,v 1.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/basic/src/G4UIcsh.cc b/source/interfaces/basic/src/G4UIcsh.cc
index 042aff13d3134363d5110c7e372337d072dab635..072814f74ab75a9fb6e0213162030ab57c6cd3e5 100644
--- a/source/interfaces/basic/src/G4UIcsh.cc
+++ b/source/interfaces/basic/src/G4UIcsh.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIcsh.cc,v 1.4 2000/07/22 10:52:29 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UIcsh.hh"
diff --git a/source/interfaces/basic/src/G4UItcsh.cc b/source/interfaces/basic/src/G4UItcsh.cc
index 3dac651b0ea599a6626ccc87808b6e4b6c8a979c..203dbadd2b8563d1115df1f651f053a16b8522b9 100644
--- a/source/interfaces/basic/src/G4UItcsh.cc
+++ b/source/interfaces/basic/src/G4UItcsh.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UItcsh.cc,v 1.5 2000/08/01 08:02:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef WIN32
diff --git a/source/interfaces/basic/src/G4UIterminal.cc b/source/interfaces/basic/src/G4UIterminal.cc
index 2ee47a0998f346d28e9f713efdee4f42d243f51c..31ab3fe8412c7c339e2c44df717d32639f19409a 100644
--- a/source/interfaces/basic/src/G4UIterminal.cc
+++ b/source/interfaces/basic/src/G4UIterminal.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIterminal.cc,v 1.14 2000/07/22 10:52:29 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/strstream"
diff --git a/source/interfaces/basic/src/G4VUIshell.cc b/source/interfaces/basic/src/G4VUIshell.cc
index e716a5b9ef175dba6887b1c2b81e3bdfa4bd3924..75f494ab9db71d01903bf274b499f08288fb862d 100644
--- a/source/interfaces/basic/src/G4VUIshell.cc
+++ b/source/interfaces/basic/src/G4VUIshell.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUIshell.cc,v 1.4 2000/07/31 08:00:01 gracia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UImanager.hh"
diff --git a/source/interfaces/common/include/G4VBasicShell.hh b/source/interfaces/common/include/G4VBasicShell.hh
index 46ed812cc9f8d81a4eaef3f74ff6700973844c7a..4f6b999b653d2db7670d252ed84a865fb74e69a9 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.5 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VBasicShell_H
diff --git a/source/interfaces/common/include/G4VInteractorManager.hh b/source/interfaces/common/include/G4VInteractorManager.hh
index 6c115dda81788db8562fbe1c7b8adbced38ecbe8..5690e0f4f08953dc95a26fd4c3ef78733843c93e 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.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/common/include/G4Win32.hh b/source/interfaces/common/include/G4Win32.hh
index c22b15c01e84f916935ad596a7d2055fa8932c31..60951ec00db158db519bbab630c0c79e16f3aeb4 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.5 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 221f383811a362d5149e765505bae8f465ac78b0..e38400a73047c4376baa5a30066fb189ed28e5b5 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.4 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 86ca9658a7a29c63ef51a8c45e5d9b0aa71e0692..b33eae697136b8451107d8d903a7854742f8ffd3 100644
--- a/source/interfaces/common/src/G4VBasicShell.cc
+++ b/source/interfaces/common/src/G4VBasicShell.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VBasicShell.cc,v 1.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/vector"
diff --git a/source/interfaces/common/src/G4VInteractorManager.cc b/source/interfaces/common/src/G4VInteractorManager.cc
index b34101739b06077d77a1b0e2db1911d028f32a3f..55d5cdfb24163c6ec669cd10642e3345627f7560 100644
--- a/source/interfaces/common/src/G4VInteractorManager.cc
+++ b/source/interfaces/common/src/G4VInteractorManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VInteractorManager.cc,v 1.8 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/common/src/G4Win32.cc b/source/interfaces/common/src/G4Win32.cc
index e9795021c0f5c174af81ae13d81fb881b504b178..39e445b61721093f18703db21b559c68a605ca3b 100644
--- a/source/interfaces/common/src/G4Win32.cc
+++ b/source/interfaces/common/src/G4Win32.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Win32.cc,v 1.5 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G.Barrand
 
diff --git a/source/interfaces/common/src/G4Xt.cc b/source/interfaces/common/src/G4Xt.cc
index edda9c9d14d73887fe3b522e8cf5ca3a0a2f3dbf..7a02bec7c7c16bc77ee21d173c4a2fee571b2bd3 100644
--- a/source/interfaces/common/src/G4Xt.cc
+++ b/source/interfaces/common/src/G4Xt.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Xt.cc,v 1.6 2000/11/28 08:13:54 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G.Barrand
 
diff --git a/source/materials/History b/source/materials/History
index de2014f128287f4690172e3c210df4ed3f98b712..0795a5e1fe498c65bb42ee847978f53e43768319 100644
--- a/source/materials/History
+++ b/source/materials/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.7 2000/11/09 09:38:45 grichine Exp $
+$Id: History,v 1.18 2001/04/03 14:37:36 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,8 +16,44 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+     
+03.04.01 M.Maire - materials-V03-00-07
+         removed warning to cerr in GetIsotope(name), GetElement(name),
+	 and GetMaterial(name).
+         fnulcof added as data member in G4SandiaTable.
+     
+22.03.01 M.Maire - materials-V03-00-06
+         revision of destructor, copy constructor, assignement operator in
+	 G4IonisParamElm, G4IonisParamMat, G4Isotope, G4Element, G4Material
+	      
+22.02.01 M.Maire - materials-V03-00-05
+         G4SandiaTable : protection added in GetSandiaCofForMaterial(energy)
+	            
+Feb     16, 01 M.Maire - materials-V03-00-04
+               G4SandiaTable : major bug in GetSandiaCofPerAtom (units!).
+	       redesign of ComputeMatSandiaMatrix.
+	       Include materials-V03-00-02 
+	       
+Feb     05, 01 G.Cosmo - materials-V03-00-03
+               STL migration for G4OrderedTable and G4DataVector.
+               Modified files: G4SandiaTable.cc.
+               NOTE: this tag does not include changes in materials-V03-00-02.
 
-November 09, 00 V.Grichine - materials-V02-00-01
+Jan     28, 01 M.Maire - materials-V03-00-02
+               new method G4Material::GetNuclearInterLength()
+	  
+Jan     16, 01 V.Ivanchenko - materials-V03-00-01
+               IonisParamElm.cc : excitation potential is tabulated
+               according ICRU Report #37.
+	       
+Jan     16, 01 L.Urban  - materials-V03-00-00
+               bug fixed in IonisParamMat.cc : E100eV instead of E100keV
+               This bug affected the values of the density correction
+               parameters in the energy loss (dE/dx) computation,
+               its effect was quite big (~ 3-5 % error in dE/dx
+               in the energy range 1 MeV - 50 MeV !!!)
+	       
+Nov     09, 00 V.Grichine - materials-V02-00-01
                included test/ directory which was not tagged.
 
 August  04, 00 V.Grichine - materials-V02-00-00
diff --git a/source/materials/include/G4AtomicShells.hh b/source/materials/include/G4AtomicShells.hh
index 4f763c965deb56ca0063383563a3b19faaa3a2ea..51af432e11bf0e621457e6f7da5145d3746308be 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.3 1999/12/16 18:11:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // class description
 //
diff --git a/source/materials/include/G4Element.hh b/source/materials/include/G4Element.hh
index 5ffddeb69c0690a1ece6a1a215c0d4013674d811..5ff2a846c59ffb3aeebafb4d86aad41f1a3f7310 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.5 1999/12/16 18:11:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Element.hh,v 1.7 2001/03/30 14:43:15 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description
@@ -44,6 +44,7 @@
 // 09-07-98, Ionisation parameters removed from the class, M.Maire
 // 04-08-98, new method GetElement(elementName), M.Maire
 // 16-11-98, Subshell -> Shell, mma
+// 30-03-01, suppression of the warning message in GetElement
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -92,7 +93,7 @@ public:  // with description
                     G4double   RelativeAbundance);	//fraction of nb of 
                     					//atomes per volume
                     					
-   ~G4Element();
+   virtual ~G4Element();
    
     //
     // retrieval methods
@@ -145,15 +146,15 @@ public:  // with description
     friend G4std::ostream& operator<<(G4std::ostream&, G4ElementTable);
 
 public:  // without description
-    
+
     G4int operator==(const G4Element&) const;
     G4int operator!=(const G4Element&) const;
-     
-private:
 
-    G4Element(G4Element &right);
-    const G4Element & operator=(const G4Element &right);
+private:
 
+    G4Element(G4Element&);
+    const G4Element & operator=(const G4Element&);
+       
 private:
 
     void InitializePointers();
@@ -205,8 +206,7 @@ G4Element* G4Element::GetElement(G4String elementName)
       return theElementTable[J];
    }
    
-  G4cerr << "  Warning from GetElement(name). The element: " << elementName
-         << "  does not exist in the ElementTable.  Return NULL pointer \n";
+  // the element does not exist in the table 
   return NULL;   
 }
 
diff --git a/source/materials/include/G4ElementTable.hh b/source/materials/include/G4ElementTable.hh
index 20b265490524f7348a16c03cd42badc89ea40c3b..b2c4e279bf6d29b36c1f51a462af904267698961 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.2 1999/12/15 14:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4ElementVector.hh b/source/materials/include/G4ElementVector.hh
index 96c357cd0ea7acec5ab02c581b86c90758626bc9..5a8e4b7e252d4639ba0982b922c476e6c746d923 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.2 1999/12/15 14:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4IonisParamElm.hh b/source/materials/include/G4IonisParamElm.hh
index 41b08247fa06c0cf7ae502b0dcc3f4266009461b..1bb9063aef311b4d80c6c76e9e00cddda85f5d8b 100644
--- a/source/materials/include/G4IonisParamElm.hh
+++ b/source/materials/include/G4IonisParamElm.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonisParamElm.hh,v 1.4 1999/12/16 18:11:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IonisParamElm.hh,v 1.5 2001/03/12 17:48:47 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description
@@ -17,7 +17,8 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-// 09-07-98, data moved from G4Element. M.Maire
+// 09.03.01: copy constructor and assignement operator in public (mma)
+// 09.07.98: data moved from G4Element (mma) 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -34,7 +35,7 @@ class G4IonisParamElm
 public:  // with description
 
     G4IonisParamElm(G4double Z);
-   ~G4IonisParamElm();
+    virtual ~G4IonisParamElm();
 
     // retrieval methods
     
@@ -60,15 +61,12 @@ public:  // with description
                                        // shell correction coefficients
    
 public:  // without description
-   
+
+    G4IonisParamElm(G4IonisParamElm&);
+    const G4IonisParamElm& operator=(const G4IonisParamElm&);   
     G4int operator==(const G4IonisParamElm&) const;
     G4int operator!=(const G4IonisParamElm&) const;
      
-private:
-
-    G4IonisParamElm(G4IonisParamElm&);
-    const G4IonisParamElm& operator=(const G4IonisParamElm&);
-
 
 private:
 
@@ -86,7 +84,7 @@ private:
     G4double  fTaul ;                 // 2*MeV/proton mass
     G4double  fBetheBlochLow;         // Bethe-Bloch at fTaul*particle mass   
     G4double  fAlow,fBlow,fClow;      // parameters for the low energy ion.loss
-    G4double  fMeanExcitationEnergy;  // 16*pow(Z,0.9)*eV    
+    G4double  fMeanExcitationEnergy;  //     
     G4double* fShellCorrectionVector; // shell correction coefficients
 };
 
diff --git a/source/materials/include/G4IonisParamMat.hh b/source/materials/include/G4IonisParamMat.hh
index 43b3867c9727e22d657d73e656504a79a5c83950..51de958487944f112c59830da61d1a38f0dff644 100644
--- a/source/materials/include/G4IonisParamMat.hh
+++ b/source/materials/include/G4IonisParamMat.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonisParamMat.hh,v 1.4 1999/12/16 18:11:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IonisParamMat.hh,v 1.5 2001/03/12 17:48:47 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description
@@ -17,7 +17,8 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-// 09-07-98, data moved from G4Material, M.Maire
+// 09.03.01: copy constructor and assignement operator in public (mma)
+// 09-07-98: data moved from G4Material (mma)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -36,7 +37,7 @@ class G4IonisParamMat  // with description
 public:
 
     G4IonisParamMat(G4Material*); 
-   ~G4IonisParamMat();
+    virtual ~G4IonisParamMat();
 
     //
     // retrieval methods
@@ -66,15 +67,14 @@ public:
     G4double  GetRateionexcfluct()        const {return fRateionexcfluct;};
 
 public:  // without description
-          
+
+    G4IonisParamMat(const G4IonisParamMat&);
+    const G4IonisParamMat& operator=(const G4IonisParamMat&);          
     G4int operator==(const G4IonisParamMat&) const;
     G4int operator!=(const G4IonisParamMat&) const;
 
 private:
-
-    G4IonisParamMat(const G4IonisParamMat&);
-    const G4IonisParamMat& operator=(const G4IonisParamMat&);
-     
+    
     // Compute mean parameters : ExcitationEnergy,Shell corretion vector ...
     void ComputeMeanParameters();
 
diff --git a/source/materials/include/G4Isotope.hh b/source/materials/include/G4Isotope.hh
index 488198f50c9b19c9a4fb83425b522d506ad7c730..fd1ceaacbef28e2335e4310450a81d7400f7e912 100644
--- a/source/materials/include/G4Isotope.hh
+++ b/source/materials/include/G4Isotope.hh
@@ -5,10 +5,10 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Isotope.hh,v 1.4 1999/12/16 18:11:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Isotope.hh,v 1.6 2001/03/30 14:43:16 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
-// ------------------------------------------------------------
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 // class description
 //
@@ -25,8 +25,9 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-// 17-01-97, aesthetic rearrangement, M.Maire
-// 04-08-98, new method GetIsotope(isotopeName), M.Maire
+// 30.03.01: suppression of the warnig message in GetIsotope
+// 04.08.98: new method GetIsotope(isotopeName) (mma)
+// 17.01.97: aesthetic rearrangement (mma)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -53,7 +54,7 @@ class G4Isotope
                     G4int     n,		//number of nucleons
                     G4double  a);		//mass of mole
                     
-   ~G4Isotope();
+   virtual ~G4Isotope();
 
     // Retrieval methods
     G4String GetName()  const {return fName;};    
@@ -79,14 +80,14 @@ class G4Isotope
      
  public:  // without description
  
-    G4int operator==(const G4Isotope &right) const;
-    G4int operator!=(const G4Isotope &right) const;
-         
+    G4int operator==(const G4Isotope&) const;
+    G4int operator!=(const G4Isotope&) const;
+    
  private:
-
-    G4Isotope(G4Isotope &right);
-    G4Isotope & operator=(const G4Isotope &right);
-
+     
+    G4Isotope(G4Isotope&);
+    G4Isotope& operator=(const G4Isotope&);
+     
  private:
 
     G4String fName;              // name of the Isotope
@@ -111,8 +112,7 @@ G4Isotope* G4Isotope::GetIsotope(G4String isotopeName)
       return theIsotopeTable[J];
    }
    
-  G4cerr << "  Warning from GetIsotope(name). The isotope: " << isotopeName
-         << "  does not exist in the IsotopeTable.  Return NULL pointer \n";
+  // the isotope does not exist in the table
   return NULL;          
 }
 
diff --git a/source/materials/include/G4IsotopeVector.hh b/source/materials/include/G4IsotopeVector.hh
index 61d409fc73390879a02c90b67ed5496878f03ac3..27fc8d561c9988fdd57e25200a7fcdaba7f5e52d 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.2 1999/12/15 14:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4MPVEntry.hh b/source/materials/include/G4MPVEntry.hh
index 7b137b0d37d734b4802e95a4db27fceee6ee7147..3ae41b6f8fd70478f00ab3851c8ac323e1dd8267 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.4 1999/11/11 15:36:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4Material.hh b/source/materials/include/G4Material.hh
index 02cb07cfd68c0b5296994b077cfcab577dae255a..7368555caf1ac64296327862113d2b83cdf0cb0c 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.7 1999/12/16 18:11:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Material.hh,v 1.10 2001/03/30 14:43:16 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description
@@ -14,7 +14,7 @@
 // Materials defined via the G4Material class are used to define the
 // composition of Geant volumes.
 // a Material is always made of Elements. It can be defined directly
-// from scratch (defined by a single element), specifying :
+// from scratch (defined by an implicit, single element), specifying :
 //                                             its name,
 //                                             density,
 //                                             state informations,
@@ -53,6 +53,8 @@
 // 05-10-98, change name: NumDensity -> NbOfAtomsPerVolume
 // 18-11-98, SandiaTable interface modified.
 // 19-07-99, new data member (chemicalFormula) added by V.Ivanchenko
+// 12-03-01, G4bool fImplicitElement (mma)
+// 30-03-01, suppression of the warning message in GetMaterial
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -144,7 +146,7 @@ public:  // with description
                      G4double   fraction);			//fraction of mass
                      
                      
-   ~G4Material();
+   virtual ~G4Material();
                         
     //
     // retrieval methods
@@ -190,6 +192,9 @@ public:  // with description
     // Radiation length:     
     G4double         GetRadlen()          const {return fRadlen;};
     
+    // Nuclear interaction length:     
+    G4double GetNuclearInterLength()      const {return fNuclInterLen;};
+        
     // ionisation parameters:
     G4IonisParamMat* GetIonisation()      const {return fIonisation;};
     
@@ -242,7 +247,10 @@ private:
 
     // Compute Radiation length
     void ComputeRadiationLength();
-
+    
+    // Compute Nuclear interaction length
+    void ComputeNuclearInterLength();
+    
 private:
 
 //
@@ -263,6 +271,7 @@ private:
 
     size_t           fNumberOfElements;     // Number of Elements in the material
     G4ElementVector* theElementVector;      // vector of constituent Elements
+    G4bool           fImplicitElement;      // implicit Element created by this?
     G4double*        fMassFractionVector;   // composition by fractional mass
     G4int*           fAtomsVector;          // composition by atom count
 
@@ -280,7 +289,8 @@ private:
     G4double* VecNbOfAtomsPerVolume;      // vector of nb of atoms per volume
     G4double  TotNbOfAtomsPerVolume;      // total nb of atoms per volume 
     G4double  TotNbOfElectPerVolume;      // total nb of electrons per volume 
-    G4double  fRadlen;                    // Radiation length  
+    G4double  fRadlen;                    // Radiation length
+    G4double  fNuclInterLen;              // Nuclear interaction length  
     
     G4IonisParamMat* fIonisation;          // ionisation parameters
     G4SandiaTable*   fSandiaTable;         // Sandia table         
@@ -298,8 +308,7 @@ G4Material* G4Material::GetMaterial(G4String materialName)
       return theMaterialTable[J];
    }
    
-  G4cerr << "  Warning from GetMaterial(name). The material: " << materialName
-         << "  does not exist in the MaterialTable.  Return NULL pointer \n";
+  // the material does not exist in the table
   return NULL;          
 }
 
diff --git a/source/materials/include/G4MaterialPropertiesTable.hh b/source/materials/include/G4MaterialPropertiesTable.hh
index 82ee7070169a1623fceac51888dbec19be42c6cb..2ef921d2941bca01e64600e49b40f5e0d23d163d 100644
--- a/source/materials/include/G4MaterialPropertiesTable.hh
+++ b/source/materials/include/G4MaterialPropertiesTable.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MaterialPropertiesTable.hh,v 1.9 2000/03/03 10:21:00 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4MaterialPropertyVector.hh b/source/materials/include/G4MaterialPropertyVector.hh
index db99e21f6470161093747d00a731946f3c42e7a5..cd6d0a8d28b8d607f3ef798cd0363df3c9e7da11 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.4 1999/11/11 15:36:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4MaterialTable.hh b/source/materials/include/G4MaterialTable.hh
index a11b6f4ebd15bdc6fe16fd3d77c3b0a926f6c601..56bf3aeea30ed6f5ff458ab6563095c439b45474 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.2 1999/12/15 14:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/materials/include/G4OpticalSurface.hh b/source/materials/include/G4OpticalSurface.hh
index 4494ad382d924b410c8b6e18183e16d986fa7754..bb93a15bd93eb097994eae32d6fa2612676f78f5 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4SandiaTable.hh b/source/materials/include/G4SandiaTable.hh
index e61f31ac51f3c8dc9778b34e030d14bfd2ea3f53..f5c12bd400893340849353c063cc38826d8441da 100644
--- a/source/materials/include/G4SandiaTable.hh
+++ b/source/materials/include/G4SandiaTable.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SandiaTable.hh,v 1.6 2000/06/15 17:35:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SandiaTable.hh,v 1.8 2001/04/03 12:32:54 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // class description
 //
@@ -17,6 +17,9 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
+// 03.04.01 fnulcof[4] added; returned if energy < emin
+// 30.01.01 major bug in the computation of AoverAvo and in the units (/g!)
+//          in GetSandiaCofPerAtom(). mma
 // 18.11.98 simplified public interface; new methods for materials.  mma
 // 10.06.97 created. V. Grichine
 //
@@ -54,12 +57,34 @@ public:  // with description
            G4double  GetSandiaCofForMaterial(G4int,G4int);
            G4double* GetSandiaCofForMaterial(G4double energy);
 	   
-public:  // without description
+
+private:
+       
+    void ComputeMatSandiaMatrix();
+    
+private:
+
+    static const G4double        fSandiaTable[981][5];
+    static const G4int           fNbOfIntervals[101];
+    static       G4int           fCumulInterval[101];
+    static const G4double        fZtoAratio[101];
+    static const G4double        fIonizationPotentials[101];
+               
+    static       G4double        fSandiaCofPerAtom[4];
+    
+                 G4Material*     fMaterial;
+                 G4int           fMatNbOfIntervals;
+                 G4OrderedTable* fMatSandiaMatrix;
+		 
+		 G4double        fnulcof[4];
+		   
 
 /////////////////////////////////////////////////////////////////////
 //
 // Methods for PAI model
 
+public:  // without description
+
          inline void SandiaSwap( G4double** da,
                                  G4int i,
                                  G4int j );
@@ -81,28 +106,11 @@ public:  // without description
 
 
 
-private:
-       
-    void ComputeMatSandiaMatrix();
-    
-private:
-
-    static const G4double        fSandiaTable[981][5];
-    static const G4int           fNbOfIntervals[101];
-    static       G4int           fCumulInterval[101];
-    static const G4double        fZtoAratio[101];
-    static const G4double        fIonizationPotentials[101];
-               
-    static       G4double        fSandiaCofPerAtom[4];
-    
-                 G4Material*     fMaterial;
-                 G4int           fMatNbOfIntervals;
-                 G4OrderedTable* fMatSandiaMatrix;  
-
 //////////////////////////////////////////////////////////////////////////
 //
 // data members for PAI model
 
+private:
          static const G4int    fNumberOfElements  ;
          static const G4int    fIntervalLimit ;
          static const G4int    fNumberOfIntervals  ;
@@ -114,6 +122,9 @@ private:
          // G4OrderedTable*
 	 G4int fMaxInterval ;
 
+//
+//
+//////////////////////////////////////////////////////////////////////////
   
 };
     
@@ -138,8 +149,8 @@ G4double  G4SandiaTable::GetSandiaCofPerAtom(G4int Z, G4int interval, G4int j)
 
    G4int row = fCumulInterval[Z-1] + interval;
    if (j==0) return fSandiaTable[row][0]*keV;
-   G4double AoverAvo = Z/(fZtoAratio[Z]*Avogadro*mole);         
-   return fSandiaTable[row][j]*AoverAvo*cm2*pow(keV,G4double(j));     
+   G4double AoverAvo = Z*amu/fZtoAratio[Z];         
+   return AoverAvo*(fSandiaTable[row][j]*cm2*pow(keV,G4double(j))/g);     
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -148,19 +159,24 @@ inline
 G4double* G4SandiaTable::GetSandiaCofPerAtom(G4int Z, G4double energy)
 {
    assert (Z > 0);
+   
+   G4double Emin  = fSandiaTable[fCumulInterval[Z-1]][0]*keV;
+   G4double Iopot = fIonizationPotentials[Z]*eV;
+   if (Iopot > Emin) Emin = Iopot;
+   
    G4int interval = fNbOfIntervals[Z] - 1;
    G4int row = fCumulInterval[Z-1] + interval;
    while ((interval>0) && (energy<fSandiaTable[row][0]*keV))
          row = fCumulInterval[Z-1] + --interval;
 
-   if (energy >= fIonizationPotentials[Z]*eV)
+   if (energy >= Emin)
      {        
-      G4double AoverAvo = Z/(fZtoAratio[Z]*Avogadro*mole);
+      G4double AoverAvo = Z*amu/fZtoAratio[Z];
          
-      fSandiaCofPerAtom[0]=fSandiaTable[row][1]*AoverAvo*cm2*keV;     
-      fSandiaCofPerAtom[1]=fSandiaTable[row][2]*AoverAvo*cm2*keV*keV;     
-      fSandiaCofPerAtom[2]=fSandiaTable[row][3]*AoverAvo*cm2*keV*keV*keV;     
-      fSandiaCofPerAtom[3]=fSandiaTable[row][4]*AoverAvo*cm2*keV*keV*keV*keV;
+      fSandiaCofPerAtom[0]=AoverAvo*(fSandiaTable[row][1]*cm2*keV/g);     
+      fSandiaCofPerAtom[1]=AoverAvo*(fSandiaTable[row][2]*cm2*keV*keV/g);     
+      fSandiaCofPerAtom[2]=AoverAvo*(fSandiaTable[row][3]*cm2*keV*keV*keV/g);     
+      fSandiaCofPerAtom[3]=AoverAvo*(fSandiaTable[row][4]*cm2*keV*keV*keV*keV/g);
      }
    else
       fSandiaCofPerAtom[0] = fSandiaCofPerAtom[1] = fSandiaCofPerAtom[2] =
diff --git a/source/materials/include/G4StaticSandiaData.hh b/source/materials/include/G4StaticSandiaData.hh
index 47f20bbd97a4dc13086ad6bca2f05c9676f2047f..79fd3f5be4d4841c04a1c81489610867f0254427 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.4 1999/12/16 18:11:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/materials/src/G4AtomicShells.cc b/source/materials/src/G4AtomicShells.cc
index 1c8bba96129b37a4573460fa9b6a89c3d1fafa94..32c5b207e66ddcdb9fd4d4073b88d3d18f51866f 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.2 1999/12/15 14:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
diff --git a/source/materials/src/G4Element.cc b/source/materials/src/G4Element.cc
index be89e07eb2a5db1ab29497d861d51f9a4a93baca..e6d1d9f086516b8cb73d608e783ce4058c420ca8 100644
--- a/source/materials/src/G4Element.cc
+++ b/source/materials/src/G4Element.cc
@@ -5,27 +5,24 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Element.cc,v 1.3 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Element.cc,v 1.4 2001/03/12 17:48:48 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-//
-//      ------------ class G4Element ------------
-//
-//             Torre Wenaus, November 1995
-//
-//
-// 26-06-96, Code uses operators (+=, *=, ++, -> etc.) correctly, P. Urban
-// 09-07-96, new data members added by L.Urban
-// 17-01-97, aesthetic rearrangement, M.Maire
-// 20-01-97, Compute Tsai's formula for the rad length, M.Maire
-// 21-01-97, remove mixture flag, M.Maire
-// 24-01-97, ComputeIonisationParameters(). 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
+// 26-06-96: Code uses operators (+=, *=, ++, -> etc.) correctly, P. Urban
+// 09-07-96: new data members added by L.Urban
+// 17-01-97: aesthetic rearrangement, M.Maire
+// 20-01-97: Compute Tsai's formula for the rad length, M.Maire
+// 21-01-97: remove mixture flag, M.Maire
+// 24-01-97: ComputeIonisationParameters(). 
 //           new data member: fTaul, M.Maire
-// 29-01-97, Forbidden to create Element with Z<1 or N<Z, M.Maire
-// 20-03-97, corrected initialization of pointers, M.Maire
-// 28-04-98, atomic subshell binding energies stuff, V. Grichine  
-// 09-07-98, Ionisation parameters removed from the class, M.Maire
-// 16-11-98, name Subshell -> Shell; GetBindingEnergy(), mma
+// 29-01-97: Forbidden to create Element with Z<1 or N<Z, M.Maire
+// 20-03-97: corrected initialization of pointers, M.Maire
+// 28-04-98: atomic subshell binding energies stuff, V. Grichine  
+// 09-07-98: Ionisation parameters removed from the class, M.Maire
+// 16-11-98: name Subshell -> Shell; GetBindingEnergy() (mma)
+// 09-03-01: assignement operator revised (mma)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -162,51 +159,6 @@ G4Element::~G4Element()
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4Element::G4Element(G4Element &right)
-{
-    *this = right;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
-
-const G4Element& G4Element::operator=(const G4Element& right)
-{
-  if (this != &right)
-    {
-      fName                    = right.fName;
-      fSymbol                  = right.fSymbol;
-      fZeff                    = right.fZeff;
-      fNeff                    = right.fNeff;
-      fAeff                    = right.fAeff;
-      fNbOfAtomicShells        = right.fNbOfAtomicShells;
-      fAtomicShells            = right.fAtomicShells;
-      fNumberOfIsotopes        = right.fNumberOfIsotopes;
-      theIsotopeVector         = right.theIsotopeVector;
-      fRelativeAbundanceVector = right.fRelativeAbundanceVector;
-      fIndexInTable            = right.fIndexInTable;
-      fCoulomb                 = right.fCoulomb;
-      fRadTsai                 = right.fRadTsai;
-      fIonisation              = right.fIonisation;
-     } 
-  return *this;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
-
-G4int G4Element::operator==(const G4Element &right) const
-{
-  return (this == (G4Element *) &right);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
-
-G4int G4Element::operator!=(const G4Element &right) const
-{
-  return (this != (G4Element *) &right);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
-
 void G4Element::ComputeDerivedQuantities()
 {
   // some basic functions of the atomic number
@@ -215,7 +167,8 @@ void G4Element::ComputeDerivedQuantities()
      ComputeCoulombFactor();
      ComputeLradTsaiFactor(); 
 
-  // parameters for energy loss by ionisation   
+  // parameters for energy loss by ionisation 
+     if (fIonisation) delete fIonisation;  
      fIonisation = new G4IonisParamElm(fZeff);
 }
 
@@ -266,6 +219,70 @@ G4double G4Element::GetAtomicShell(G4int i) const
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
+G4Element::G4Element(G4Element& right)
+{
+      InitializePointers();
+      *this = right;
+
+      // Store this new element in table and set the index
+      theElementTable.insert(this);
+      fIndexInTable = theElementTable.index(this);	   
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
+const G4Element& G4Element::operator=(const G4Element& right)
+{
+  if (this != &right)
+    {
+      fName                    = right.fName;
+      fSymbol                  = right.fSymbol;
+      fZeff                    = right.fZeff;
+      fNeff                    = right.fNeff;
+      fAeff                    = right.fAeff;
+      
+      if (fAtomicShells) delete [] fAtomicShells;      
+      fNbOfAtomicShells        = right.fNbOfAtomicShells;
+      fAtomicShells     = new G4double[fNbOfAtomicShells];
+      for (G4int i=0;i<fNbOfAtomicShells;i++)      
+         fAtomicShells[i]      = right.fAtomicShells[i];
+	 
+      if (theIsotopeVector) delete theIsotopeVector;
+      if (fRelativeAbundanceVector) delete [] fRelativeAbundanceVector;
+	      	 
+      fNumberOfIsotopes        = right.fNumberOfIsotopes;
+      if (fNumberOfIsotopes > 0)
+        {
+	 theIsotopeVector         = new G4IsotopeVector(fNumberOfIsotopes);
+	 fRelativeAbundanceVector = new G4double[fNumberOfIsotopes];
+	 for (G4int i=0;i<fNumberOfIsotopes;i++)
+	    {
+             (*theIsotopeVector)[i]      = (*right.theIsotopeVector)[i];
+             fRelativeAbundanceVector[i] = right.fRelativeAbundanceVector[i];
+	    }
+	}   
+      ComputeDerivedQuantities();
+      fIndexInTable = right.fIndexInTable;
+     } 
+  return *this;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
+G4int G4Element::operator==(const G4Element& right) const
+{
+  return (this == (G4Element*) &right);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
+G4int G4Element::operator!=(const G4Element& right) const
+{
+  return (this != (G4Element*) &right);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
 G4std::ostream& operator<<(G4std::ostream& flux, G4Element* element)
 { 
   long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
@@ -307,5 +324,6 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4ElementTable ElementTable)
                                                       << G4endl << G4endl;
 
    return flux;
-}      
-          
+}
+      
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....          
diff --git a/source/materials/src/G4IonisParamElm.cc b/source/materials/src/G4IonisParamElm.cc
index b60487afd76f4935154df7d0fda71e75ea41def5..aeff771e8afe9712bdbe50e16fb6403ac329f6f8 100644
--- a/source/materials/src/G4IonisParamElm.cc
+++ b/source/materials/src/G4IonisParamElm.cc
@@ -5,14 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonisParamElm.cc,v 1.3 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IonisParamElm.cc,v 1.6 2001/03/12 17:48:48 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
-//      ------------ class G4IonisParamElm ------------
-//
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
+// 08-03-01, correct handling of fShellCorrectionVector. M.Maire
+// 22-11-00, tabulation of ionisation potential from 
+//           the ICRU Report N#37. V.Ivanchenko
 // 09-07-98, data moved from G4Element. M.Maire
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -32,8 +33,29 @@ G4IonisParamElm::G4IonisParamElm(G4double Z)
     fZZ3 = pow(fZ*(fZ+1.), 1./3.);
     flogZ3 = log(fZ)/3.;
    
-     // parameters for energy loss by ionisation   
-    fMeanExcitationEnergy = 16.*pow(fZ,0.9)*eV;
+     // Parameters for energy loss by ionisation   
+
+     // Mean excitation energy
+     // from "Stopping Powers for Electrons and Positrons"
+     // ICRU Report N#37, 1984  (energy in eV)
+    static double exc[100] = { 
+    21.8, 20.9,	13.3, 15.9, 15.2, 13.0,	11.7, 11.9, 11.5, 13.7,
+    13.6, 13.0,	12.8, 12.4, 11.5, 11.3,	10.2, 10.4, 10.0,  9.6,
+    10.3, 10.6,	10.7, 10.7, 10.9, 11.0,	11.0, 11.1, 11.1, 11.0,
+    10.8, 10.4,	10.5, 10.2,  9.8,  9.8,  9.8,  9.6,  9.7,  9.8,
+    10.2, 10.1, 10.0, 10.0, 10.0, 10.2, 10.0,  9.8, 10.0,  9.8,
+     9.5,  9.3,  9.3,  8.9,  8.9,  8.8,  8.8,  8.8,  9.1,  9.1,
+     9.2,  9.3,  9.2,  9.2,  9.4,  9.5,  9.7,  9.7,  9.8,  9.8,
+     9.8,  9.8,  9.8,  9.8,  9.8,  9.8,  9.8, 10.1, 10.0, 10.0,
+    10.0, 10.0,  9.9,  9.9,  9.7,  9.2,  9.5,  9.4,  9.4,  9.4,
+     9.6,  9.7,  9.7,  9.8,  9.8,  9.8,  9.8,  9.9,  9.9,  9.9 };
+
+     G4int iz = (G4int)Z - 1 ;
+     if(0  > iz) iz = 0;
+     if(98 < iz) iz = 98 ;
+     fMeanExcitationEnergy = 
+       fZ * (exc[iz] + (fZ - (G4double)(iz))*(exc[iz+1] - exc[iz])) * eV ;
+
 
     fTau0 = 0.1*fZ3*MeV/proton_mass_c2;
     fTaul = 2.*MeV/proton_mass_c2;
@@ -61,13 +83,15 @@ G4IonisParamElm::G4IonisParamElm(G4double Z)
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 G4IonisParamElm::~G4IonisParamElm()
-{ }
+{
+  if (fShellCorrectionVector) delete [] fShellCorrectionVector; 
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 G4IonisParamElm::G4IonisParamElm(G4IonisParamElm& right)
 {
-    *this = right;
+  *this = right;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -87,21 +111,27 @@ const G4IonisParamElm& G4IonisParamElm::operator=(const G4IonisParamElm& right)
       fBlow                  = right.fBlow;
       fClow                  = right.fClow;
       fMeanExcitationEnergy  = right.fMeanExcitationEnergy;
-      fShellCorrectionVector = right.fShellCorrectionVector;
+      if (fShellCorrectionVector) delete [] fShellCorrectionVector;             
+      fShellCorrectionVector = new G4double[3];            
+      fShellCorrectionVector[0] = right.fShellCorrectionVector[0];
+      fShellCorrectionVector[1] = right.fShellCorrectionVector[1];
+      fShellCorrectionVector[2] = right.fShellCorrectionVector[2];      
      } 
   return *this;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4int G4IonisParamElm::operator==(const G4IonisParamElm &right) const
+G4int G4IonisParamElm::operator==(const G4IonisParamElm& right) const
 {
   return (this == (G4IonisParamElm *) &right);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4int G4IonisParamElm::operator!=(const G4IonisParamElm &right) const
+G4int G4IonisParamElm::operator!=(const G4IonisParamElm& right) const
 {
   return (this != (G4IonisParamElm *) &right);
 }
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/materials/src/G4IonisParamMat.cc b/source/materials/src/G4IonisParamMat.cc
index 74751311133e29b2ddd30ccb0eb93be28752be7e..55665da910a7a445b5afa3fbd8790ff47e86b40e 100644
--- a/source/materials/src/G4IonisParamMat.cc
+++ b/source/materials/src/G4IonisParamMat.cc
@@ -5,12 +5,14 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IonisParamMat.cc,v 1.3 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IonisParamMat.cc,v 1.6 2001/03/12 17:48:48 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
+// 08-02-01, fShellCorrectionVector correctly handled (mma)
+// 16-01-01, bug corrected in ComputeDensityEffect() E100eV (L.Urban)
 // 18-07-98, bug corrected in ComputeDensityEffect() for gas
 // 09-07-98, data moved from G4Material, M.Maire
 
@@ -46,7 +48,6 @@ void G4IonisParamMat::ComputeMeanParameters()
 
   fLogMeanExcEnergy /= fMaterial->GetTotNbOfElectPerVolume();
   fMeanExcitationEnergy = exp(fLogMeanExcEnergy);
-
   fShellCorrectionVector = new G4double[3];
 
   for (G4int j=0; j<=2; j++)
@@ -84,12 +85,12 @@ void G4IonisParamMat::ComputeDensityEffect()
   
   if ((State == kStateSolid)||(State == kStateLiquid)) {
 
-      const G4double E100keV  = 100.*keV; 
+      const G4double E100eV  = 100.*eV; 
       const G4double ClimiS[] = {3.681 , 5.215 };
       const G4double X0valS[] = {1.0   , 1.5   };
       const G4double X1valS[] = {2.0   , 3.0   };
                                 
-      if(fMeanExcitationEnergy < E100keV) icase = 0 ;
+      if(fMeanExcitationEnergy < E100eV) icase = 0 ;
          else                             icase = 1 ;
 
       if(fCdensity < ClimiS[icase]) fX0density = 0.2;
@@ -176,13 +177,15 @@ void G4IonisParamMat::ComputeFluctModel()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 G4IonisParamMat::~G4IonisParamMat()
-{ }
+{
+  if (fShellCorrectionVector) delete [] fShellCorrectionVector;
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4IonisParamMat::G4IonisParamMat(const G4IonisParamMat &right)
+G4IonisParamMat::G4IonisParamMat(const G4IonisParamMat& right)
 {
-    *this = right;
+  *this = right;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -191,40 +194,44 @@ const G4IonisParamMat& G4IonisParamMat::operator=(const G4IonisParamMat& right)
 {
   if (this != &right)
     {
-      fMaterial              = right.fMaterial;
-      fMeanExcitationEnergy  = right.fMeanExcitationEnergy;
-      fLogMeanExcEnergy      = right.fLogMeanExcEnergy;
-      fShellCorrectionVector = right.fShellCorrectionVector;
-      fTaul                  = right.fTaul;
-      fCdensity              = right.fCdensity;
-      fMdensity              = right.fMdensity;
-      fAdensity              = right.fAdensity;
-      fX0density             = right.fX0density;
-      fX1density             = right.fX1density;
-      fF1fluct               = right.fF1fluct;
-      fF2fluct               = right.fF2fluct;
-      fEnergy1fluct          = right.fEnergy1fluct;
-      fLogEnergy1fluct       = right.fLogEnergy1fluct;      
-      fEnergy2fluct          = right.fEnergy2fluct;
-      fLogEnergy2fluct       = right.fLogEnergy2fluct;      
-      fEnergy0fluct          = right.fEnergy0fluct;
-      fRateionexcfluct       = right.fRateionexcfluct;
+      fMaterial                 = right.fMaterial;
+      fMeanExcitationEnergy     = right.fMeanExcitationEnergy;
+      fLogMeanExcEnergy         = right.fLogMeanExcEnergy;
+      if (fShellCorrectionVector) delete [] fShellCorrectionVector;      
+      fShellCorrectionVector    = new G4double[3];             
+      fShellCorrectionVector[0] = right.fShellCorrectionVector[0];
+      fShellCorrectionVector[1] = right.fShellCorrectionVector[1];
+      fShellCorrectionVector[2] = right.fShellCorrectionVector[2];
+      fTaul                     = right.fTaul;
+      fCdensity                 = right.fCdensity;
+      fMdensity                 = right.fMdensity;
+      fAdensity                 = right.fAdensity;
+      fX0density                = right.fX0density;
+      fX1density                = right.fX1density;
+      fF1fluct                  = right.fF1fluct;
+      fF2fluct                  = right.fF2fluct;
+      fEnergy1fluct             = right.fEnergy1fluct;
+      fLogEnergy1fluct          = right.fLogEnergy1fluct;      
+      fEnergy2fluct             = right.fEnergy2fluct;
+      fLogEnergy2fluct          = right.fLogEnergy2fluct;      
+      fEnergy0fluct             = right.fEnergy0fluct;
+      fRateionexcfluct          = right.fRateionexcfluct;
      } 
   return *this;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4int G4IonisParamMat::operator==(const G4IonisParamMat &right) const
+G4int G4IonisParamMat::operator==(const G4IonisParamMat& right) const
 {
-  return (this == (G4IonisParamMat *) &right);
+  return (this == (G4IonisParamMat*) &right);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4int G4IonisParamMat::operator!=(const G4IonisParamMat &right) const
+G4int G4IonisParamMat::operator!=(const G4IonisParamMat& right) const
 {
-  return (this != (G4IonisParamMat *) &right);
+  return (this != (G4IonisParamMat*) &right);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/materials/src/G4Isotope.cc b/source/materials/src/G4Isotope.cc
index 9ba13b58bcf55792c9ddfcf5e32c2037de3cf2ec..4be402bb1eb31d29d4e50326814d426538f1a254 100644
--- a/source/materials/src/G4Isotope.cc
+++ b/source/materials/src/G4Isotope.cc
@@ -5,24 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Isotope.cc,v 1.2 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-// 
-// --------------------------------------------------------------
-//	GEANT 4 class implementation file
-//
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
-//
-//      ---------- class G4Isotope ---------
-//
-//           Torre Wenaus, November 1995
+// $Id: G4Isotope.cc,v 1.3 2001/03/12 17:48:49 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-// 26-06-96, Code uses operators (+=, *=, ++, -> etc.) correctly, P. Urban
-// 29-01-97, Forbidden to create Isotope with Z<1 or N<Z, M.Maire
+// 29-01-97: Forbidden to create Isotope with Z<1 or N<Z, M.Maire
+// 26-06-96: Code uses operators (+=, *=, ++, -> etc.) correctly, P. Urban
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -53,14 +42,18 @@ G4Isotope::~G4Isotope() {}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4Isotope::G4Isotope(G4Isotope &right)
+G4Isotope::G4Isotope(G4Isotope& right)
 {
-    *this = right;
+  *this = right;
+  
+  //insert this new isotope in table
+  theIsotopeTable.insert(this);
+  fIndexInTable = theIsotopeTable.index(this);  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
-G4Isotope & G4Isotope::operator=(const G4Isotope &right)
+G4Isotope & G4Isotope::operator=(const G4Isotope& right)
 {
   if (this != &right)
   {
@@ -68,8 +61,7 @@ G4Isotope & G4Isotope::operator=(const G4Isotope &right)
     fZ = right.fZ;
     fN = right.fZ;
     fA = right.fA;
-    theIsotopeTable = right.theIsotopeTable;
-    fIndexInTable = right.fIndexInTable;
+    fIndexInTable = theIsotopeTable.index(this);     
   }
   return *this;
 }
@@ -125,4 +117,6 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4IsotopeTable IsotopeTable)
    for (G4int i=0; i<IsotopeTable.length(); i++) flux << IsotopeTable[i] << G4endl;
 
    return flux;
-}      
+}
+      
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/materials/src/G4MPVEntry.cc b/source/materials/src/G4MPVEntry.cc
index e49881bf3039ad3f98872f927c236e57e0366303..78a9b15b3fdc54b8ac853fa1362514e3b18ce88c 100644
--- a/source/materials/src/G4MPVEntry.cc
+++ b/source/materials/src/G4MPVEntry.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MPVEntry.cc,v 1.5 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/src/G4Material.cc b/source/materials/src/G4Material.cc
index c6af090a18912d0be064b5092224b94213fdad11..c721a93f0e6552c7b332a96825c9dce8a2f2653f 100644
--- a/source/materials/src/G4Material.cc
+++ b/source/materials/src/G4Material.cc
@@ -5,13 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Material.cc,v 1.6 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-//
-//      ---------- class G4Material ----------
-//
-//            Torre Wenaus, November 1995
+// $Id: G4Material.cc,v 1.8 2001/03/12 17:48:49 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
@@ -35,6 +30,9 @@
 // 18-11-98, new interface to SandiaTable
 // 19-01-99  enlarge tolerance on test of coherence of gas conditions
 // 19-07-99, Constructors with chemicalFormula added by V.Ivanchenko
+// 16-01-01, Nuclear interaction length, M.Maire
+// 12-03-01, G4bool fImplicitElement;
+//           copy constructor and assignement operator revised (mma)
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -73,7 +71,8 @@ G4Material::G4Material(const G4String& name, G4double z,
 
     // Initialize theElementVector allocating one
     // element corresponding to this material
-    maxNbComponents = fNumberOfComponents = fNumberOfElements = 1;
+    maxNbComponents  = fNumberOfComponents = fNumberOfElements = 1;
+    fImplicitElement = true;
     theElementVector    = new G4ElementVector(1);
     theElementVector[0] = new G4Element(name, " ", z, a);
     fMassFractionVector = new G4double[1];
@@ -121,6 +120,7 @@ G4Material::G4Material(const G4String& name, G4double density, G4int nComponents
     
     maxNbComponents     = nComponents;
     fNumberOfComponents = fNumberOfElements = 0;
+    fImplicitElement    = false;
     theElementVector    = new G4ElementVector(maxNbComponents);
     
     if (fState == kStateUndefined) 
@@ -157,7 +157,8 @@ G4Material::G4Material(const G4String& name, const G4String& chFormula,
 
     // Initialize theElementVector allocating one
     // element corresponding to this material
-    maxNbComponents = fNumberOfComponents = fNumberOfElements = 1;
+    maxNbComponents  = fNumberOfComponents = fNumberOfElements = 1;
+    fImplicitElement = true;
     theElementVector    = new G4ElementVector(1);
     theElementVector[0] = new G4Element(name, " ", z, a);
     fMassFractionVector = new G4double[1];
@@ -206,6 +207,7 @@ G4Material::G4Material(const G4String& name, const G4String& chFormula,
     
     maxNbComponents     = nComponents;
     fNumberOfComponents = fNumberOfElements = 0;
+    fImplicitElement    = false;
     theElementVector    = new G4ElementVector(maxNbComponents);
     
     if (fState == kStateUndefined) 
@@ -381,6 +383,7 @@ void G4Material::ComputeDerivedQuantities()
   // Atoms density vector, Electrons density
   G4double Zi, Ai;
   TotNbOfAtomsPerVolume = 0.;
+  if (VecNbOfAtomsPerVolume) delete [] VecNbOfAtomsPerVolume;
   VecNbOfAtomsPerVolume = new G4double[fNumberOfElements];
   TotNbOfElectPerVolume = 0.;
   for (G4int i=0;i<fNumberOfElements;i++) {
@@ -407,8 +410,11 @@ void G4Material::ComputeDerivedQuantities()
      }
          
    ComputeRadiationLength();
+   ComputeNuclearInterLength();
 
+   if (fIonisation) delete fIonisation;
    fIonisation  = new G4IonisParamMat(this);
+   if (fSandiaTable) delete fSandiaTable;
    fSandiaTable = new G4SandiaTable(this);
 }
 
@@ -425,6 +431,20 @@ void G4Material::ComputeRadiationLength()
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
+void G4Material::ComputeNuclearInterLength()
+{
+  const G4double lambda0 = 35*g/cm2;
+  G4double NILinv = 0.0;
+  for (G4int i=0;i<fNumberOfElements;i++) {
+     NILinv +=
+     VecNbOfAtomsPerVolume[i]*pow(((*theElementVector)[i]->GetN()),2./3.); 
+   }
+  NILinv *= amu/lambda0; 
+  fNuclInterLen = (NILinv <= 0.0 ? DBL_MAX : 1./NILinv);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
 void G4Material::InitializePointers()
 {
     theElementVector         = NULL;
@@ -441,6 +461,7 @@ void G4Material::InitializePointers()
 
 G4Material::~G4Material()
 {
+  if (fImplicitElement)       delete    ((*theElementVector)[0]);
   if (theElementVector)       delete    theElementVector;
   if (fMassFractionVector)    delete [] fMassFractionVector;
   if (fAtomsVector)           delete [] fAtomsVector;
@@ -453,7 +474,12 @@ G4Material::~G4Material()
 
 G4Material::G4Material(const G4Material& right)
 {
+    InitializePointers();
     *this = right;
+        
+    // Store this new material in the table of Materials
+    theMaterialTable.insert(this);
+    fIndexInTable = theMaterialTable.index(this);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -468,20 +494,43 @@ const G4Material& G4Material::operator=(const G4Material& right)
       fState                   = right.fState;
       fTemp                    = right.fTemp;
       fPressure                = right.fPressure;
+           
+      if (fImplicitElement)    delete    ((*theElementVector)[0]);      
+      if (theElementVector)    delete    theElementVector;
+      if (fMassFractionVector) delete [] fMassFractionVector;
+      if (fAtomsVector)        delete [] fAtomsVector;
+      
       maxNbComponents          = right.maxNbComponents;
       fNumberOfComponents      = right.fNumberOfComponents;
-      fNumberOfElements        = right.fNumberOfElements;
-      theElementVector         = right.theElementVector;
-      fMassFractionVector      = right.fMassFractionVector;
-      fAtomsVector             = right.fAtomsVector;
+      fNumberOfElements        = right.fNumberOfElements;     
+      fImplicitElement         = right.fImplicitElement;
+      
+      if (fImplicitElement) {
+        G4double z = (*right.theElementVector)[0]->GetZ();
+	G4double a = (*right.theElementVector)[0]->GetA();
+        theElementVector       = new G4ElementVector(1);
+	theElementVector[0]    = new G4Element(fName," ",z,a);
+	fMassFractionVector    = new G4double[1];
+	fMassFractionVector[0] = 1.;
+      } else {		
+        theElementVector       = new G4ElementVector(fNumberOfElements);
+        fMassFractionVector    = new G4double[fNumberOfElements];     
+        for (G4int i=0; i<fNumberOfElements; i++) {
+           (*theElementVector)[i]= (*right.theElementVector)[i];
+           fMassFractionVector[i]= right.fMassFractionVector[i];
+        }
+      }
+      
+      if (right.fAtomsVector) { 
+        fAtomsVector       = new G4int[fNumberOfElements];
+        for (G4int i=0; i<fNumberOfElements; i++)              
+           fAtomsVector[i] = right.fAtomsVector[i];
+      }
+      	   
       fMaterialPropertiesTable = right.fMaterialPropertiesTable;
-      fIndexInTable            = right.fIndexInTable;
-      VecNbOfAtomsPerVolume    = right.VecNbOfAtomsPerVolume;
-      TotNbOfAtomsPerVolume    = right.TotNbOfAtomsPerVolume;
-      TotNbOfElectPerVolume    = right.TotNbOfElectPerVolume;
-      fRadlen                  = right.fRadlen;
-      fIonisation              = right.fIonisation;
-      fSandiaTable             = right.fSandiaTable;
+      
+      ComputeDerivedQuantities();      
+      fIndexInTable = right.fIndexInTable;
      } 
   return *this;
 }
@@ -518,7 +567,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4Material* material)
                           << (material->fPressure)/atmosphere << " atm"
     << "  RadLength: "   << G4std::setw(7)  << G4std::setprecision(3)  
                           << G4BestUnit(material->fRadlen,"Length");
-    
+
   for (G4int i=0; i<material->fNumberOfElements; i++)
   flux 
     << "\n   ---> " << (*(material->theElementVector))[i] 
diff --git a/source/materials/src/G4MaterialPropertiesTable.cc b/source/materials/src/G4MaterialPropertiesTable.cc
index e94512ba4b53838c788f14e1a2dec6faabd0be34..9c283dff10e46611f3f1f28c98636523556bd698 100644
--- a/source/materials/src/G4MaterialPropertiesTable.cc
+++ b/source/materials/src/G4MaterialPropertiesTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MaterialPropertiesTable.cc,v 1.9 2000/03/03 10:21:02 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/src/G4MaterialPropertyVector.cc b/source/materials/src/G4MaterialPropertyVector.cc
index b52a577469036e3814d29dce4e899d71b083fe0d..dfd805240139ecdc82045fac4ed15a773fa92ebc 100644
--- a/source/materials/src/G4MaterialPropertyVector.cc
+++ b/source/materials/src/G4MaterialPropertyVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MaterialPropertyVector.cc,v 1.5 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/src/G4OpticalSurface.cc b/source/materials/src/G4OpticalSurface.cc
index 6507b0623aa19eaadc7c94cbd9c266fe230d19ec..67ebf59f2f46a3a35ce0c6aef488604c99e92ffc 100644
--- a/source/materials/src/G4OpticalSurface.cc
+++ b/source/materials/src/G4OpticalSurface.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpticalSurface.cc,v 1.4 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/src/G4SandiaTable.cc b/source/materials/src/G4SandiaTable.cc
index 485e41ca1f64d288fbe1eee3250d66fd8966aa24..3c1ce640b188df627f763330572c9daf0f377d6c 100644
--- a/source/materials/src/G4SandiaTable.cc
+++ b/source/materials/src/G4SandiaTable.cc
@@ -5,11 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SandiaTable.cc,v 1.6 2000/08/03 14:28:31 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SandiaTable.cc,v 1.10 2001/04/03 12:32:54 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
+// 03.04.01 fnulcof returned if energy < emin
+// 22.02.01 GetsandiaCofForMaterial(energy) return 0 below lowest interval  mma  
+// 16.02.01 adapted for STL.  mma
+// 31.01.01 redesign of ComputeMatSandiaMatrix().  mma
 // 18.11.98 simplified public interface; new methods for materials.  mma
 // 10.06.97 created. V. Grichine
 //
@@ -31,6 +35,8 @@ G4SandiaTable::G4SandiaTable(G4int matIndex)
   fPhotoAbsorptionCof = 0 ;
 }
 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
 G4SandiaTable::G4SandiaTable(G4Material* material)
 :fMaterial(material)
 {
@@ -41,17 +47,21 @@ G4SandiaTable::G4SandiaTable(G4Material* material)
       fCumulInterval[Z] = fCumulInterval[Z-1] + fNbOfIntervals[Z];
   
   //compute macroscopic Sandia coefs for a material   
-  ComputeMatSandiaMatrix();    
+  ComputeMatSandiaMatrix();
+  
+  //initialisation of fnulcof
+  fnulcof[0] = fnulcof[1] = fnulcof[2] = fnulcof[3] = 0.;   
 }
 							
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 G4SandiaTable::~G4SandiaTable()
 { 
-  if(fMatSandiaMatrix) delete fMatSandiaMatrix ;
+  if(fMatSandiaMatrix) delete fMatSandiaMatrix;
+  
   if(fPhotoAbsorptionCof)
   {
-    for(G4int i = 0 ; i < fMaxInterval ; i++)  delete[] fPhotoAbsorptionCof[i] ;
+    for(G4int i = 0 ; i < fMaxInterval ; i++)  delete[] fPhotoAbsorptionCof[i];
     delete fPhotoAbsorptionCof ;
   }
 }
@@ -65,58 +75,85 @@ void G4SandiaTable::ComputeMatSandiaMatrix()
   const G4ElementVector* ElementVector = fMaterial->GetElementVector();
   
   G4int* Z = new G4int[NbElm];               //Atomic number
-     
-  //determine the total number of energy-intervals for this material
-  fMatNbOfIntervals = 0;
+
+  //   
+  //determine the maximum number of energy-intervals for this material
+  //
+  G4int MaxIntervals = 0;
   G4int elm;    
   for (elm=0; elm<NbElm; elm++)
      { Z[elm] = (int)(*ElementVector)(elm)->GetZ();
-       fMatNbOfIntervals += fNbOfIntervals[Z[elm]];
+       MaxIntervals += fNbOfIntervals[Z[elm]];
      }  
      
-  //create the sandia matrix for this material  
-  fMatSandiaMatrix = new G4OrderedTable(fMatNbOfIntervals);
-  G4int interval;
-  for (interval=0; interval<fMatNbOfIntervals; interval++)
-     (*fMatSandiaMatrix)(interval) = new G4ValVector(5);
-  
-  //copy the Energy bins (take care of the Ionization Potential)
-  G4double Ebin;
-  interval=0;
+  //
+  //copy the Energy bins in a tmp1 array
+  //(take care of the Ionization Potential of each element)
+  //
+  G4double* tmp1 = new G4double[MaxIntervals]; 
+  G4double IonizationPot;
+  G4int interval1=0;
   for (elm=0; elm<NbElm; elm++)
-     for (G4int row=fCumulInterval[Z[elm]-1];row<fCumulInterval[Z[elm]];row++)
-        { Ebin = fSandiaTable[row][0]*keV;
-          if ((row==fCumulInterval[Z[elm]-1])&&(GetIonizationPot(Z[elm])<Ebin))
-              Ebin = GetIonizationPot(Z[elm]);
-          (*(*fMatSandiaMatrix)(interval++))(0) = Ebin;
-        }  
-         
-  //sort the energies in increasing values
-  G4double tmp;
-  for (G4int i1=0; i1<fMatNbOfIntervals; i1++)
-     for (G4int i2=i1+1; i2<fMatNbOfIntervals; i2++)
-        {if ((*(*fMatSandiaMatrix)(i1))(0) > (*(*fMatSandiaMatrix)(i2))(0))        
-           {
-            tmp = (*(*fMatSandiaMatrix)(i1))(0);
-            (*(*fMatSandiaMatrix)(i1))(0) = (*(*fMatSandiaMatrix)(i2))(0);
-            (*(*fMatSandiaMatrix)(i2))(0) = tmp;
-           }
-        }
+     { IonizationPot = GetIonizationPot(Z[elm]);
+       for (G4int row=fCumulInterval[Z[elm]-1];row<fCumulInterval[Z[elm]];row++)
+          tmp1[interval1++] = G4std::max(fSandiaTable[row][0]*keV,IonizationPot);  
+     }	  
         
+  //       
+  //sort the energies in strickly increasing values in a tmp2 array
+  //(eliminate redondances)
+  //
+  G4double* tmp2 = new G4double[MaxIntervals];
+  G4double Emin;
+  G4int interval2 = 0;
+  
+  do {
+       Emin = DBL_MAX;
+       for (G4int i1=0; i1<MaxIntervals; i1++)
+          if (tmp1[i1] < Emin) Emin = tmp1[i1];          //find the minimum
+       if (Emin < DBL_MAX) tmp2[interval2++] = Emin;     //copy Emin in tmp2
+       for (G4int j1=0; j1<MaxIntervals; j1++)
+             if (tmp1[j1] <= Emin) tmp1[j1] = DBL_MAX;   //eliminate from tmp1	    
+     } while (Emin < DBL_MAX);
+        	         	   
+  //	
+  //create the sandia matrix for this material
+  //  
+  fMatSandiaMatrix = new G4OrderedTable();
+  G4int interval;
+  for (interval=0; interval<interval2; interval++)
+     fMatSandiaMatrix->push_back(new G4DataVector(5));
+        	         	
+  //
   //ready to compute the Sandia coefs for the material
+  //
   const G4double* NbOfAtomsPerVolume = fMaterial->GetVecNbOfAtomsPerVolume();
-  for (interval=0; interval<fMatNbOfIntervals; interval++)
+  
+  const G4double prec = 1.e-03*eV;
+  G4double coef, oldsum(0.), newsum(0.);
+  fMatNbOfIntervals = 0;
+         
+  for (interval=0; interval<interval2; interval++)
      {
-      Ebin = (*(*fMatSandiaMatrix)(interval))(0);        
+      Emin = (*(*fMatSandiaMatrix)[fMatNbOfIntervals])[0] = tmp2[interval];
+      for (G4int k=1; k<5; k++)(*(*fMatSandiaMatrix)[fMatNbOfIntervals])[k]=0.;      
+      newsum = 0.;
+      
       for (elm=0; elm<NbElm; elm++)
          {
-           GetSandiaCofPerAtom(Z[elm], Ebin);
+           GetSandiaCofPerAtom(Z[elm], Emin+prec);
            for (G4int j=1; j<5; j++)
-              (*(*fMatSandiaMatrix)(interval))(j) += NbOfAtomsPerVolume[elm]*
-                                                     fSandiaCofPerAtom[j-1];
-         }
+	      {
+	       coef = NbOfAtomsPerVolume[elm]*fSandiaCofPerAtom[j-1];
+               (*(*fMatSandiaMatrix)[fMatNbOfIntervals])[j] += coef;
+	       newsum += abs(coef);
+	      }						       
+         }	      
+			      			      	 
+      //check for null or redondant intervals	 
+      if (newsum != oldsum) { oldsum = newsum; fMatNbOfIntervals++;}
      }
-  delete [] Z;              
+  delete Z; delete tmp1; delete tmp2;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -124,16 +161,18 @@ void G4SandiaTable::ComputeMatSandiaMatrix()
 G4double  G4SandiaTable::GetSandiaCofForMaterial(G4int interval, G4int j)                                                 
 {
    assert (interval>=0 && interval<fMatNbOfIntervals && j>=0 && j<5);                      
-   return ((*(*fMatSandiaMatrix)(interval))(j)); 
+   return ((*(*fMatSandiaMatrix)[interval])[j]); 
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 G4double* G4SandiaTable::GetSandiaCofForMaterial(G4double energy)
 {
+   if (energy < (*(*fMatSandiaMatrix)[0])[0]) return fnulcof;
+   
    G4int interval = fMatNbOfIntervals - 1;
-   while ((interval>0)&&(energy<(*(*fMatSandiaMatrix)(interval))(0))) interval--; 
-   return &((*(*fMatSandiaMatrix)(interval))(1));
+   while ((interval>0)&&(energy<(*(*fMatSandiaMatrix)[interval])[0])) interval--; 
+   return &((*(*fMatSandiaMatrix)[interval])[1]);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/parameterisations/include/G4FoamXrayTRmodel.hh b/source/parameterisations/include/G4FoamXrayTRmodel.hh
index 1fcfb0e57b7246e8e384689e10648af0085090b9..7259c29f281c627cf76de80ab318c3d6355d2197 100644
--- a/source/parameterisations/include/G4FoamXrayTRmodel.hh
+++ b/source/parameterisations/include/G4FoamXrayTRmodel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FoamXrayTRmodel.hh,v 1.1 2000/11/14 16:05:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4GamDistrXrayTRmodel.hh b/source/parameterisations/include/G4GamDistrXrayTRmodel.hh
index c69742998f2bb1e709b5964318cac0d5953cee8d..3078f5f69bd0c2905d5910e6e1b019605ea418f7 100644
--- a/source/parameterisations/include/G4GamDistrXrayTRmodel.hh
+++ b/source/parameterisations/include/G4GamDistrXrayTRmodel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GamDistrXrayTRmodel.hh,v 1.1 2000/11/14 16:05:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4IrregularXrayTRmodel.hh b/source/parameterisations/include/G4IrregularXrayTRmodel.hh
index af2d222bff6a542073ed6f7b52f6498444ae0fff..a69785668419cb7cd5281e7099dc1dec26425ac2 100644
--- a/source/parameterisations/include/G4IrregularXrayTRmodel.hh
+++ b/source/parameterisations/include/G4IrregularXrayTRmodel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IrregularXrayTRmodel.hh,v 1.1 2000/11/14 16:05:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4PAIclusterModel.hh b/source/parameterisations/include/G4PAIclusterModel.hh
index 0d8c761f2b801f7697e7c199d29782ae24c497bd..208feca69830db8e09793692d2b0c68ff665f90e 100644
--- a/source/parameterisations/include/G4PAIclusterModel.hh
+++ b/source/parameterisations/include/G4PAIclusterModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAIclusterModel.hh,v 1.1 2000/11/14 16:06:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4PhotoClusterModel.hh b/source/parameterisations/include/G4PhotoClusterModel.hh
index 7a5c1f96b467572dc56ff31db96327fd7239a9d2..2e202047d4064ee69f81ea8bd5f280e2d86eb43e 100644
--- a/source/parameterisations/include/G4PhotoClusterModel.hh
+++ b/source/parameterisations/include/G4PhotoClusterModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhotoClusterModel.hh,v 1.1 2000/11/14 16:06:17 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh b/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh
index e6778b0717027df271c5a5790f87edeccb77a597..fd2fc7ded18eeec6ac5bc7bfc76a3e71b8b70d4a 100644
--- a/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh
+++ b/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlateIrrGasXrayTRmodel.hh,v 1.1 2000/11/14 16:06:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4RegularXrayTRmodel.hh b/source/parameterisations/include/G4RegularXrayTRmodel.hh
index e580545db6982ff7eb099f95783c584637c2970d..699350aabb52547ec136da8bd79412e6585ead2c 100644
--- a/source/parameterisations/include/G4RegularXrayTRmodel.hh
+++ b/source/parameterisations/include/G4RegularXrayTRmodel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RegularXrayTRmodel.hh,v 1.1 2000/11/14 16:06:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4VClusterModel.hh b/source/parameterisations/include/G4VClusterModel.hh
index d85864a8fd11b515bd342c7580a9d1d6d151ea7a..135b5b992af04167ae7f09f61675abec00f32c84 100644
--- a/source/parameterisations/include/G4VClusterModel.hh
+++ b/source/parameterisations/include/G4VClusterModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VClusterModel.hh,v 1.1 2000/11/14 16:07:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4VXrayTRmodel.hh b/source/parameterisations/include/G4VXrayTRmodel.hh
index bde9f17eeff51fd092af823853195a69470601b0..9e3610d4b0978923c89460fb50e791b7706ffdf0 100644
--- a/source/parameterisations/include/G4VXrayTRmodel.hh
+++ b/source/parameterisations/include/G4VXrayTRmodel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VXrayTRmodel.hh,v 1.1 2000/11/14 16:07:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/src/G4FoamXrayTRmodel.cc b/source/parameterisations/src/G4FoamXrayTRmodel.cc
index 1b583aff2b1bced7150216c65085ab141d278fa6..bfd9f50d186456b0d13117c56fd9cdddf2c6cc0f 100644
--- a/source/parameterisations/src/G4FoamXrayTRmodel.cc
+++ b/source/parameterisations/src/G4FoamXrayTRmodel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FoamXrayTRmodel.cc,v 1.1 2000/11/14 16:07:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4GamDistrXrayTRmodel.cc b/source/parameterisations/src/G4GamDistrXrayTRmodel.cc
index e4efa9ed6f2022bd7d4474266742560dfd5afc87..6e19dad3b3af743d1031215d1943fc7719331d2f 100644
--- a/source/parameterisations/src/G4GamDistrXrayTRmodel.cc
+++ b/source/parameterisations/src/G4GamDistrXrayTRmodel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GamDistrXrayTRmodel.cc,v 1.1 2000/11/14 16:07:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4IrregularXrayTRmodel.cc b/source/parameterisations/src/G4IrregularXrayTRmodel.cc
index a2042a0d7f23c5be7425d8a19395759a5d342288..f987b584097c8e80d96231feb7a9b9100710cc3d 100644
--- a/source/parameterisations/src/G4IrregularXrayTRmodel.cc
+++ b/source/parameterisations/src/G4IrregularXrayTRmodel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IrregularXrayTRmodel.cc,v 1.1 2000/11/14 16:08:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 
diff --git a/source/parameterisations/src/G4PAIclusterModel.cc b/source/parameterisations/src/G4PAIclusterModel.cc
index e94341769242ec62fc48f0df74fd0a01ee02db7a..4bb4acd26647e1093688f1ae2e11de057cf5d1bc 100644
--- a/source/parameterisations/src/G4PAIclusterModel.cc
+++ b/source/parameterisations/src/G4PAIclusterModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAIclusterModel.cc,v 1.1 2000/11/14 16:08:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4Timer.hh"
diff --git a/source/parameterisations/src/G4PhotoClusterModel.cc b/source/parameterisations/src/G4PhotoClusterModel.cc
index d0ce5e1d44ffa99292cfc73be2ce769607039315..b17641aa524a5d434a2b4a4b9e11b3494bd21e72 100644
--- a/source/parameterisations/src/G4PhotoClusterModel.cc
+++ b/source/parameterisations/src/G4PhotoClusterModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhotoClusterModel.cc,v 1.1 2000/11/14 16:08:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4Timer.hh"
diff --git a/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc b/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc
index ebb8eb629a1a85f55c4a5de371bbc717684f16bd..faaece911d83b02af379dcb19d958b6b0ced5888 100644
--- a/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc
+++ b/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PlateIrrGasXrayTRmodel.cc,v 1.1 2000/11/14 16:08:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4RegularXrayTRmodel.cc b/source/parameterisations/src/G4RegularXrayTRmodel.cc
index e3d0b66670bb41a258b863213912ae4709711c09..24283f8ba36983129dcb83cd74517757d33dfe56 100644
--- a/source/parameterisations/src/G4RegularXrayTRmodel.cc
+++ b/source/parameterisations/src/G4RegularXrayTRmodel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RegularXrayTRmodel.cc,v 1.1 2000/11/14 16:09:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4VClusterModel.cc b/source/parameterisations/src/G4VClusterModel.cc
index 1055693882097c37b9666e7fefd0d148b34c6f57..0cd612d4a9b9a4603854561d2ca434eacdb6b545 100644
--- a/source/parameterisations/src/G4VClusterModel.cc
+++ b/source/parameterisations/src/G4VClusterModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VClusterModel.cc,v 1.1 2000/11/14 16:09:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4Timer.hh"
diff --git a/source/parameterisations/src/G4VXrayTRmodel.cc b/source/parameterisations/src/G4VXrayTRmodel.cc
index c0c464999b331966a3c2fc2b1abe503dfc103142..30c96400e4d9686ad7a2aacdc0209d182416e34f 100644
--- a/source/parameterisations/src/G4VXrayTRmodel.cc
+++ b/source/parameterisations/src/G4VXrayTRmodel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VXrayTRmodel.cc,v 1.1 2000/11/14 16:09:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4Timer.hh"
diff --git a/source/particles/History b/source/particles/History
index 9ef24b2d782a2f2bd49f79e3693a39fec739be6c..4d9b21cee9025c5ffc32e0def701980dd121a246 100644
--- a/source/particles/History
+++ b/source/particles/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.44 2000/10/20 11:41:33 kurasige Exp $
+$Id: History,v 1.49 2001/03/12 06:10:49 kurasige Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,26 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+-  Mar. 09, 01 H.Kurashige   (particles-V03-00-03)
+------- partman-V03-00-03
+- Added RestoreCuts methods to G4ParticleWithCuts 
+  and G4ParticleDefinition 
+------ hadrons-V03-00-01, leptons-V03-00-01, -bosons-V03-00-01
+- Added RestoreCuts methods 
+
+-  Mar. 05, 01 H.Kurashige   (particles-V03-00-02)
+------- partman-V03-00-02
+- Fixed a bug in G4DynamicParticle::SetDefinition() 
+- STL migration for G4ParticleWithCuts::BuildLossTable()
+
+-  Feb. 28, 01 H.Kurashige  (particles-V03-00-01)
+------- partman-V03-00-01
+- Fixed a bug in calculation of electron energy in G4MuonDecayChannel. 
+
+-  Jan 18, 01 H.Kurashige 
+------- partman-V03-00-00 (particles-V03-00-00)
+-  Add thePreAssignedDecayTime to G4DynamicParticle 
+
 -  Oct 19 , 00 HKurashige (particles-V02-00-01)
 ------- partman-V02-00-02
 -  Some bug fixes according to CodeWizard's suggestion (HK)
diff --git a/source/particles/bosons/include/G4BosonConstructor.hh b/source/particles/bosons/include/G4BosonConstructor.hh
index c49b9ded5bbdaa6da2021bf714d3e21bf8ab870c..eb94f0f0615176eaadf325ce9bc9fb5c1ffaf9de 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.2 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4ChargedGeantino.hh b/source/particles/bosons/include/G4ChargedGeantino.hh
index 555255d915f1be18a5742a7f8e6e691f215e4858..b77ba005bee9e2d368dda038a153909facb80bee 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.3 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4Gamma.hh b/source/particles/bosons/include/G4Gamma.hh
index 12994b652c94d80f3750ccb7fe5fd0c025c5eb2e..1f1e760f6a9f4625a607e8d9a0c3a69f9c7cbf50 100644
--- a/source/particles/bosons/include/G4Gamma.hh
+++ b/source/particles/bosons/include/G4Gamma.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Gamma.hh,v 1.3 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Gamma.hh,v 1.4 2001/03/12 05:49:03 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -106,6 +106,8 @@ class G4Gamma : public G4VBoson
    static G4double* GetCutsInEnergy() {return theGammaKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4Gamma::SetCuts(G4double aCut)
@@ -113,9 +115,17 @@ inline void G4Gamma::SetCuts(G4double aCut)
   CalcEnergyCuts(aCut);
   theGammaLengthCut = theCutInMaxInteractionLength;  
   theGammaKineticEnergyCuts = theKineticEnergyCuts;
-  
 }
 
+inline void G4Gamma::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theGammaLengthCut = theCutInMaxInteractionLength;  
+  theGammaKineticEnergyCuts = theKineticEnergyCuts;
+}
+
+
 inline G4Gamma* G4Gamma::Gamma()
 { return &theGamma; }
 
diff --git a/source/particles/bosons/include/G4Geantino.hh b/source/particles/bosons/include/G4Geantino.hh
index d5d8bc5be944d942c357ecd5ba2b8573fc295f26..724948752d0223c67132486706393b74b0cef4f2 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.3 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4OpticalPhoton.hh b/source/particles/bosons/include/G4OpticalPhoton.hh
index 34e8010aee6bea31c7ccfb89569d30f352250495..eb3a05c5da4393f0fa18a70d5c5003c833565bf1 100644
--- a/source/particles/bosons/include/G4OpticalPhoton.hh
+++ b/source/particles/bosons/include/G4OpticalPhoton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4OpticalPhoton.hh,v 1.3 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpticalPhoton.hh,v 1.4 2001/03/12 05:49:03 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,9 +66,21 @@ class G4OpticalPhoton: public G4VBoson
    static G4double* GetCutsInEnergy() {return theOpticalPhotonKineticEnergyCuts;}
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
+inline void G4OpticalPhoton::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theOpticalPhotonLengthCut = theCutInMaxInteractionLength;  
+  theOpticalPhotonKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 inline G4OpticalPhoton* G4OpticalPhoton::OpticalPhoton()
 { return &theOpticalPhoton; }
+
+
 #endif
 
diff --git a/source/particles/bosons/include/G4VBoson.hh b/source/particles/bosons/include/G4VBoson.hh
index 295cbc7e2e95e10434a14c0d5c2137c411a44585..c9839b1a49af3fccd970a654c66ff3eace80fd89 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.2 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4BosonConstructor.cc b/source/particles/bosons/src/G4BosonConstructor.cc
index 4e668f1bd2d4fd8c1dbab09b275cd030c06f0658..2e81d6f88d2bc752588a26f6aa3cb72b6944b0fc 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.2 1999/12/15 14:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4ChargedGeantino.cc b/source/particles/bosons/src/G4ChargedGeantino.cc
index db3fb7f426177c7ad10bd634e35c65b94f50cf70..722b83e74af1c7b83406b875fa5c814861a15e4b 100644
--- a/source/particles/bosons/src/G4ChargedGeantino.cc
+++ b/source/particles/bosons/src/G4ChargedGeantino.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ChargedGeantino.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4Gamma.cc b/source/particles/bosons/src/G4Gamma.cc
index 1c875990fe8b6fef3d566c4a336ab82dfbdb38cc..8ce8407e6bc4fca52605dd2a96cc92f2ee311ac4 100644
--- a/source/particles/bosons/src/G4Gamma.cc
+++ b/source/particles/bosons/src/G4Gamma.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Gamma.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4Geantino.cc b/source/particles/bosons/src/G4Geantino.cc
index d721b81e4d96dc312d02ae02b847e3335f3b7099..12f88cf75185775cb89920a5734a3141f8438a64 100644
--- a/source/particles/bosons/src/G4Geantino.cc
+++ b/source/particles/bosons/src/G4Geantino.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Geantino.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4OpticalPhoton.cc b/source/particles/bosons/src/G4OpticalPhoton.cc
index 5211cc972ac9f3647f587cba4ae7009a21314795..c28b5476d37d78f90b648da4a063109bcefde1a7 100644
--- a/source/particles/bosons/src/G4OpticalPhoton.cc
+++ b/source/particles/bosons/src/G4OpticalPhoton.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpticalPhoton.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4VBoson.cc b/source/particles/bosons/src/G4VBoson.cc
index 258b988ea09eb6d5aa6d81ebc30125ef26faa9b3..02c9e1e5869cd83c7dd6794c9bca8d70db810f90 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.2 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiLambda.hh b/source/particles/hadrons/barions/include/G4AntiLambda.hh
index fb0a69490fa8d03edd94d45d6be41b0f3ddb64f6..9490dc9d75f5227db617a9878a3a2bcb03b3a112 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh b/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh
index 5eebe3d61b9b05fd35911e21d2f4226f0556818e..33fe6d76911777ce9f1f3bb205121e0af31d8741 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiNeutron.hh b/source/particles/hadrons/barions/include/G4AntiNeutron.hh
index 404281d363e4769896e70dfa9c24d9fb74aa0a22..56e67be90d97b96c36dad2062cfadbf7acd99ce4 100644
--- a/source/particles/hadrons/barions/include/G4AntiNeutron.hh
+++ b/source/particles/hadrons/barions/include/G4AntiNeutron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiNeutron.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4AntiNeutron.hh,v 1.5 2001/03/12 05:45:40 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,6 +66,16 @@ class G4AntiNeutron : public G4VBaryon
    static G4double* GetCutsInEnergy() {return theAntiNeutronKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
+inline
+ void G4AntiNeutron::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theAntiNeutronLengthCut = theCutInMaxInteractionLength;  
+  theAntiNeutronKineticEnergyCuts = theKineticEnergyCuts;
+}
 #endif
diff --git a/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh b/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh
index 11e0595f5dad65b0fdacbc38e5b261fae0960d3e..9108bd918f2c16a23f1388a008607910a1ef51f3 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh b/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh
index 00dfd680e91e1cfe6a7e2285a66060a88894d4c2..ef0978382a3833dff8961871a531bed263fadce0 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiProton.hh b/source/particles/hadrons/barions/include/G4AntiProton.hh
index c9c3f855f6be41757ff135791e067e212d402d8b..72f17d857ff2f506396ac6bfb5341900dc6d4a33 100644
--- a/source/particles/hadrons/barions/include/G4AntiProton.hh
+++ b/source/particles/hadrons/barions/include/G4AntiProton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiProton.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4AntiProton.hh,v 1.5 2001/03/12 05:45:40 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -67,6 +67,8 @@ class G4AntiProton : public G4VBaryon
    static G4double* GetCutsInEnergy() {return theAntiProtonKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4AntiProton::SetCuts(G4double aCut)
@@ -74,7 +76,14 @@ inline void G4AntiProton::SetCuts(G4double aCut)
   CalcEnergyCuts(aCut);
   theAntiProtonLengthCut = theCutInMaxInteractionLength;  
   theAntiProtonKineticEnergyCuts = theKineticEnergyCuts;
-  
+}
+
+inline void G4AntiProton::RestoreCuts(G4double cutInLength,
+				      const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theAntiProtonLengthCut = theCutInMaxInteractionLength;  
+  theAntiProtonKineticEnergyCuts = theKineticEnergyCuts;
 }
 
 inline G4AntiProton* G4AntiProton::AntiProton()
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh
index e903d56833e47ed27c7d8109165b264d99363542..afc1d8832288febbda9c5cfb01b2b860ed04eee3 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh
index 4be9285d15a9870d08ab04d2e8e6e693c27cfbc5..6c8f0b754f8a0d393d17e52f1c9546fbec8c354b 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh
index 670d7cb333c90fa83c1e3690cb47f5745b194ea9..84911ad3269b7524766139e0dfd84a5874ca0c50 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh
index 1d748df24248dfca917e07b0c12cee67deb5c9c9..47c8426efe4cdab31688e6ccb8ddb7efa5d498cd 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh
index d172c22d34ecc0aadfb8a57d64a093fc26ca29fc..07d1b21ed8f036bb83b5913b2c065fb399fd15bc 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh
index 892001953cb94a6236e128d5785fb97b41f2368b..f70cc04b320aecb90e0c82dd8f7ebcd5bb329715 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXiMinus.hh b/source/particles/hadrons/barions/include/G4AntiXiMinus.hh
index a7e3bb8d990d802a44928573e4104cfb8406ea2d..d6548a37a666d54f9415195d915c11ee82547944 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXiZero.hh b/source/particles/hadrons/barions/include/G4AntiXiZero.hh
index e7051861b241e0bafe6886cc94c9f057c2812d63..371f67b9a386a057e6387d91d567ec5cb3467b9b 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.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXicPlus.hh b/source/particles/hadrons/barions/include/G4AntiXicPlus.hh
index 6c3a585c15a60669f1f8f40f08a8109144f66d8e..9167e7e15251c7920b6529c70fd2c2420197db0e 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiXicZero.hh b/source/particles/hadrons/barions/include/G4AntiXicZero.hh
index 12e103aaa9980822fa135fdf7d6bf31246ee79e8..39e90017d5debe52568a63d91656ee3dcf1f0890 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4BaryonConstructor.hh b/source/particles/hadrons/barions/include/G4BaryonConstructor.hh
index b5ceabd8466d88d15757a36ffd6c6c9e55bb8a78..5e12a691cde0b0f13f5ec6568f8881508b39fb67 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.2 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4Lambda.hh b/source/particles/hadrons/barions/include/G4Lambda.hh
index 33d87e8331ea067f4f032fb05121b327de96d4ed..71c0ab865aa628748b57e2a54e5623399829493c 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4LambdacPlus.hh b/source/particles/hadrons/barions/include/G4LambdacPlus.hh
index 569a32c7c2ecd94c449aacd2be75ea78d403ade8..956751aec2d16ce6d7c8fdb28f4d649468e35910 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4Neutron.hh b/source/particles/hadrons/barions/include/G4Neutron.hh
index c50ea40111d37a1fbabf9b59071088e38570fd7d..849453b7cfa859883d7c24e1788a393350fdf085 100644
--- a/source/particles/hadrons/barions/include/G4Neutron.hh
+++ b/source/particles/hadrons/barions/include/G4Neutron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Neutron.hh,v 1.5 2000/02/25 07:37:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Neutron.hh,v 1.6 2001/03/12 05:45:41 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,6 +66,8 @@ class G4Neutron : public G4VBaryon
    static G4double* GetCutsInEnergy() {return theNeutronKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 
  public:  //With Description
    G4int    GetAtomicNumber() const;
@@ -88,4 +90,14 @@ inline
 {
   return 1;
 }
+
+inline
+ void G4Neutron::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theNeutronLengthCut = theCutInMaxInteractionLength;  
+  theNeutronKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 #endif
diff --git a/source/particles/hadrons/barions/include/G4OmegaMinus.hh b/source/particles/hadrons/barions/include/G4OmegaMinus.hh
index 88140999b429bfea57964f68c99a70183e7ac7a6..756c63bf5fdbe80372b31a7ea9ed478076f492f1 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4OmegacZero.hh b/source/particles/hadrons/barions/include/G4OmegacZero.hh
index 1d55d64d047e3755d97a421890798e2fdd174cb1..ecf7243f60ff204820c2013e02d683b8b4447c5e 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4Proton.hh b/source/particles/hadrons/barions/include/G4Proton.hh
index b79cf674d921eb62a673d7792d9fcfc4d263a9bc..1a089f517784b861db60a1903d7967d29ce2a374 100644
--- a/source/particles/hadrons/barions/include/G4Proton.hh
+++ b/source/particles/hadrons/barions/include/G4Proton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Proton.hh,v 1.5 2000/02/25 07:37:11 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Proton.hh,v 1.6 2001/03/12 05:45:41 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,7 +66,9 @@ class G4Proton : public G4VBaryon
    static G4double* GetCutsInEnergy() {return theProtonKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
-
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
+      
  public:  //With Description
    G4int    GetAtomicNumber() const;
    G4int    GetAtomicMass() const;
@@ -82,8 +84,15 @@ inline void G4Proton::SetCuts(G4double aCut)
 {
   CalcEnergyCuts(aCut);
   theProtonLengthCut = theCutInMaxInteractionLength;  
-  theProtonKineticEnergyCuts = theKineticEnergyCuts;
-  
+  theProtonKineticEnergyCuts = theKineticEnergyCuts;  
+}
+
+inline void G4Proton::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theProtonLengthCut = theCutInMaxInteractionLength;  
+  theProtonKineticEnergyCuts = theKineticEnergyCuts;  
 }
 
 inline G4Proton* G4Proton::Proton()
diff --git a/source/particles/hadrons/barions/include/G4SigmaMinus.hh b/source/particles/hadrons/barions/include/G4SigmaMinus.hh
index 8ad68894cc68ef8a5c82a00297d069e6351c62a0..bcbd842c5a03b14edf1aca0d59a58f653d826c5f 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmaPlus.hh b/source/particles/hadrons/barions/include/G4SigmaPlus.hh
index e1d13c8ce91ea2d5b405b57ede17a92f3ba5b3bb..769e662356a376be506e0de3ae4438170646b3cb 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmaZero.hh b/source/particles/hadrons/barions/include/G4SigmaZero.hh
index 8d3ce44a3c24a915917252dd7b73eca6803aca66..70c5fdf0e85b640f600483273cf7c37616831fe0 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmacPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlus.hh
index f47a8c28e4fcec35e19d6cf2731366836ccd2c71..6aabd28fcdaabc31178af48796bca18fa3c9c0be 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh
index bbd3c881e8c0c7b3d6cec244796a79ced0115b3c..e8677615415596f8ecf8f4558da086ca75c53f43 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4SigmacZero.hh b/source/particles/hadrons/barions/include/G4SigmacZero.hh
index 5ced01b45f8195e2b8037bf7525f70d474acae5f..16405e7dbb9c5fe01f91112f4ea3f506527fb112 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.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4VBaryon.hh b/source/particles/hadrons/barions/include/G4VBaryon.hh
index 50504fe14e58da342804380cf2ee5197921e0cff..d84699c15d841e548d4deb88d4d542c2ece930cd 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.2 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XiMinus.hh b/source/particles/hadrons/barions/include/G4XiMinus.hh
index 1929e149dc5b698a607c4e4923af2932a5f59dea..4cbdb172e2c253e2a6ee35bbb9fd98d8fc367c11 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.4 1999/12/15 14:50:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XiZero.hh b/source/particles/hadrons/barions/include/G4XiZero.hh
index 80c8395e30035045652e00ee42e00aea4487ce78..cf863f483105e9191d66658bcb948ee8c02dc3f7 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.4 1999/12/15 14:50:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XicPlus.hh b/source/particles/hadrons/barions/include/G4XicPlus.hh
index 4df822921408268dedd4548a72e76945ea552a4d..e93387a201070cc24636948fa006c621613458bf 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.4 1999/12/15 14:50:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XicZero.hh b/source/particles/hadrons/barions/include/G4XicZero.hh
index 8cb94856fb9e79ccaaa140629667b9e837690082..2fefd395cf837509b0c12200b6073d05772af6dc 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.4 1999/12/15 14:50:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiLambda.cc b/source/particles/hadrons/barions/src/G4AntiLambda.cc
index 299c6c5a89071e1295f9a6df7d917941e978b171..b748ed7326486f505fcf9b90db630e12cc6c3fe1 100644
--- a/source/particles/hadrons/barions/src/G4AntiLambda.cc
+++ b/source/particles/hadrons/barions/src/G4AntiLambda.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiLambda.cc,v 1.5 2000/02/27 06:17:02 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
index fb5a9d94304339517296214da8c32f5a5c1efaf9..6922068e6f07674f4266bde97c984fa4cf1b080d 100644
--- a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiLambdacPlus.cc,v 1.5 2000/02/27 06:17:02 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiNeutron.cc b/source/particles/hadrons/barions/src/G4AntiNeutron.cc
index db667c959ae1c5b6a4505a8db1316bec1907a6bd..9c3028b9a10bc903c0336f15b65740e1e467b27b 100644
--- a/source/particles/hadrons/barions/src/G4AntiNeutron.cc
+++ b/source/particles/hadrons/barions/src/G4AntiNeutron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutron.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
index cb80d418d0f627b29dae8ef704e87118f4ef2317..129fb5142c39f2f96fa0adbd425d0165d878361c 100644
--- a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiOmegaMinus.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
index 86636e80a06894778f6f28d537cc0ca14054b6a5..58c26be1f0d9aa2276edeac01783bcee1afb7bf9 100644
--- a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiOmegacZero.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiProton.cc b/source/particles/hadrons/barions/src/G4AntiProton.cc
index 6b4d1104c74a658bd280fe36f9e1e06afdcca06a..072a20459c9fe263288916fd10e42a045e3c977d 100644
--- a/source/particles/hadrons/barions/src/G4AntiProton.cc
+++ b/source/particles/hadrons/barions/src/G4AntiProton.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiProton.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
index d3b0474fe3963ad7f1a3c0d1780c92962c286747..dc06bc2f00006e8fd5cb5d87991f423b88ceb29f 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaMinus.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
index d675c3998d8ff8e3cf424695554ad2a609551b13..eaed076ea12f62f17ce72c9de49635f19a5bcd42 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaPlus.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
index 5321383b7a0d2ff0a6466185eafd13b4d71509bd..a9e7652cbc12a0611e6aa816c267a67066001013 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmaZero.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
index 29d5c002a23cda70b257a3269c5e822b8d9a7202..c6a322adfb33fbdfb08f53283798d64cb7d76ffa 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmacPlus.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
index 91cdb18fd4082805c6eb3bd12314ba3499c3285e..10b41f91268f76c10172504924bce2e9cc4c496d 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmacPlusPlus.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
index 95e8bd8ff5102cf651976c972ce0f7ebb9fd8f48..261eb77358d6fcf456cc26040073a11b15dd66fc 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiSigmacZero.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
index 7b4c803bf1073580aca744468972740b2645779c..061f2b9b2b85f9a80300b2a9956812c31e5970c4 100644
--- a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXiMinus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiXiZero.cc b/source/particles/hadrons/barions/src/G4AntiXiZero.cc
index c6e001ad861d9b9c8f365edc0fdcc67becf8e0b5..d92d8318068d4f0a1c45737ab4d65b48258391e0 100644
--- a/source/particles/hadrons/barions/src/G4AntiXiZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXiZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXiZero.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
index 60f138b1bbdf0d1e7fe6334581b58e22c6d4dbce..53baefe43436b380a8fe5290663c8cd5668c7c2d 100644
--- a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXicPlus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4AntiXicZero.cc b/source/particles/hadrons/barions/src/G4AntiXicZero.cc
index d661ddc62eecae11c1328d072e83b9dcf948f7df..ea0ce77cfae600806926024b7d1e92cd8e440744 100644
--- a/source/particles/hadrons/barions/src/G4AntiXicZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXicZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiXicZero.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4BaryonConstructor.cc b/source/particles/hadrons/barions/src/G4BaryonConstructor.cc
index cdd854a811017e1ea6ac455bbf2310f3467b8bae..9c47483a73126eab14021f5e2ff82f5dcf48adaa 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.2 1999/12/15 14:51:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4Lambda.cc b/source/particles/hadrons/barions/src/G4Lambda.cc
index 00c43c38dd86fee6dc1afdb64aeb5d5c72e6790a..13c57cf7ca69f30cf40a594a5fd1705d92d967f9 100644
--- a/source/particles/hadrons/barions/src/G4Lambda.cc
+++ b/source/particles/hadrons/barions/src/G4Lambda.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Lambda.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4LambdacPlus.cc b/source/particles/hadrons/barions/src/G4LambdacPlus.cc
index fd61290294b3144b7c56ae04c34ec1cae4ac97d0..04e262cca757ccf8281035116276463373f3e3b5 100644
--- a/source/particles/hadrons/barions/src/G4LambdacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4LambdacPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LambdacPlus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4Neutron.cc b/source/particles/hadrons/barions/src/G4Neutron.cc
index 17460c57385eea04cf2fcfcace77475fa7f106c3..2d999dbad19ee06a7b37dbf747c62e09157efa67 100644
--- a/source/particles/hadrons/barions/src/G4Neutron.cc
+++ b/source/particles/hadrons/barions/src/G4Neutron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Neutron.cc,v 1.5 2000/10/17 12:24:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4OmegaMinus.cc b/source/particles/hadrons/barions/src/G4OmegaMinus.cc
index 47744c8549a0c3101a0050757c6dbe46d5486efd..a82b4066c7d940340d9960a7efeae2a4d4868f86 100644
--- a/source/particles/hadrons/barions/src/G4OmegaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4OmegaMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OmegaMinus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4OmegacZero.cc b/source/particles/hadrons/barions/src/G4OmegacZero.cc
index 7bd02b33813913df4d224628a48efbfa36eafa87..2af6da99c2b06bb79c580b7338eeebe7fb80bfec 100644
--- a/source/particles/hadrons/barions/src/G4OmegacZero.cc
+++ b/source/particles/hadrons/barions/src/G4OmegacZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OmegacZero.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4Proton.cc b/source/particles/hadrons/barions/src/G4Proton.cc
index 59cc16770aaf5136d43e4cfc70ae855f010cef8c..d66613f8bfd60ef08e98e2b2b5a4c47d8ad7f83a 100644
--- a/source/particles/hadrons/barions/src/G4Proton.cc
+++ b/source/particles/hadrons/barions/src/G4Proton.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Proton.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4SigmaMinus.cc b/source/particles/hadrons/barions/src/G4SigmaMinus.cc
index d6f68f228b69b6af94237710a92c53fdc931f45e..ae5d9600fd4d1061a29a40429875cba87fd9beb8 100644
--- a/source/particles/hadrons/barions/src/G4SigmaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaMinus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4SigmaPlus.cc b/source/particles/hadrons/barions/src/G4SigmaPlus.cc
index 9f38327e5b4987b9ec72342eda3a461b61e83bf1..f552e0dc74ef02f4532f73490f090cdced3b940f 100644
--- a/source/particles/hadrons/barions/src/G4SigmaPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaPlus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4SigmaZero.cc b/source/particles/hadrons/barions/src/G4SigmaZero.cc
index bd8eb3962016871225ad4c49d79bb19493fd48d2..f72cf9b78a303de36d7196456bbd606c10b78812 100644
--- a/source/particles/hadrons/barions/src/G4SigmaZero.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmaZero.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4SigmacPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlus.cc
index 4696d1f21eea8c8780f8faa269df9b8185ab9136..3394a1b2d9f4297a3f6986bdeaecba86868152ab 100644
--- a/source/particles/hadrons/barions/src/G4SigmacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmacPlus.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
index c3e3e1a0ddb6047146b6e543e516e5eb3425fde6..e869a44945bcd31e6ccc59babf7abfbf4c594eb8 100644
--- a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmacPlusPlus.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4SigmacZero.cc b/source/particles/hadrons/barions/src/G4SigmacZero.cc
index 6273dadc7b783e7c284a68077b72d9a76b9abbfc..5164b2e4c1ad9ada199add02910891a954b72dca 100644
--- a/source/particles/hadrons/barions/src/G4SigmacZero.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4SigmacZero.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4VBaryon.cc b/source/particles/hadrons/barions/src/G4VBaryon.cc
index 9f36956829df3aade1c8720f085984db0546f224..875d58650dc782be305251eb0377f164c103b6d8 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.2 1999/12/15 14:51:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4XiMinus.cc b/source/particles/hadrons/barions/src/G4XiMinus.cc
index 17d8321695842ca43495f156cdf6786896dd836f..e0154d8eeccca4f779dff4e507ee993bf0f91b39 100644
--- a/source/particles/hadrons/barions/src/G4XiMinus.cc
+++ b/source/particles/hadrons/barions/src/G4XiMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XiMinus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4XiZero.cc b/source/particles/hadrons/barions/src/G4XiZero.cc
index 2cf21bfae7b6e2ccbc1a96605f5c3b5ee3c28d57..026e3a273d338dff9b2f6ed9df277d2955b39e6c 100644
--- a/source/particles/hadrons/barions/src/G4XiZero.cc
+++ b/source/particles/hadrons/barions/src/G4XiZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XiZero.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4XicPlus.cc b/source/particles/hadrons/barions/src/G4XicPlus.cc
index d866953f5d7b09a435dadd910884e441a827f7ea..986c332d99dff70dea3a1a892a10ce20f9ed6d0b 100644
--- a/source/particles/hadrons/barions/src/G4XicPlus.cc
+++ b/source/particles/hadrons/barions/src/G4XicPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XicPlus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4XicZero.cc b/source/particles/hadrons/barions/src/G4XicZero.cc
index 34521c9b265ba3eba72686473c0b451ff83819d7..74f0cd9cc280678854a0a2e5850b6171b34eb34f 100644
--- a/source/particles/hadrons/barions/src/G4XicZero.cc
+++ b/source/particles/hadrons/barions/src/G4XicZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XicZero.cc,v 1.5 2000/02/27 06:17:06 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4Alpha.hh b/source/particles/hadrons/ions/include/G4Alpha.hh
index 0d1bdbf831df0f5b1a7e35e756665e4e72c1f47a..a3c1ac69140baa8df1833ae1431ba25c83e519cf 100644
--- a/source/particles/hadrons/ions/include/G4Alpha.hh
+++ b/source/particles/hadrons/ions/include/G4Alpha.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Alpha.hh,v 1.3 1999/12/15 14:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Alpha.hh,v 1.4 2001/03/12 05:45:42 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -64,6 +64,8 @@ class G4Alpha : public G4VIon
    static G4double* GetCutsInEnergy() {return theAlphaKineticEnergyCuts;};
 
    void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4Alpha::SetCuts(G4double aCut)
@@ -74,4 +76,12 @@ inline void G4Alpha::SetCuts(G4double aCut)
   
 }
 
+inline void G4Alpha::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theAlphaLengthCut = theCutInMaxInteractionLength;  
+  theAlphaKineticEnergyCuts = theKineticEnergyCuts;
+  
+}
 #endif
diff --git a/source/particles/hadrons/ions/include/G4Deuteron.hh b/source/particles/hadrons/ions/include/G4Deuteron.hh
index fe54cb7f2841705a8b464cd5bf329a239e58d021..a605f4baa0863db80365aa07c300ad807d2f433d 100644
--- a/source/particles/hadrons/ions/include/G4Deuteron.hh
+++ b/source/particles/hadrons/ions/include/G4Deuteron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Deuteron.hh,v 1.3 1999/12/15 14:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Deuteron.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -64,6 +64,8 @@ class G4Deuteron : public G4VIon
    static G4double* GetCutsInEnergy() {return theDeuteronKineticEnergyCuts;};
 
    void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4Deuteron::SetCuts(G4double aCut)
@@ -74,6 +76,14 @@ inline void G4Deuteron::SetCuts(G4double aCut)
   
 }
 
+inline void G4Deuteron::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theDeuteronLengthCut = theCutInMaxInteractionLength;  
+  theDeuteronKineticEnergyCuts = theKineticEnergyCuts;
+  
+}
 #endif
 
 
diff --git a/source/particles/hadrons/ions/include/G4GenericIon.hh b/source/particles/hadrons/ions/include/G4GenericIon.hh
index 2895a575ce1da2cc77dc6bab90afb6e8b276fc5c..81cf8ec7bb669d0d09625bdef20169932748ecde 100644
--- a/source/particles/hadrons/ions/include/G4GenericIon.hh
+++ b/source/particles/hadrons/ions/include/G4GenericIon.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4GenericIon.hh,v 1.3 1999/12/15 14:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4GenericIon.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -61,6 +61,8 @@ class G4GenericIon : public G4VIon
    static G4double* GetCutsInEnergy() {return theGenericIonKineticEnergyCuts;};
 
    void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4GenericIon::SetCuts(G4double aCut)
@@ -71,4 +73,12 @@ inline void G4GenericIon::SetCuts(G4double aCut)
   
 }
 
+inline void G4GenericIon::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theGenericIonLengthCut = theCutInMaxInteractionLength;  
+  theGenericIonKineticEnergyCuts = theKineticEnergyCuts;
+  
+}
 #endif
diff --git a/source/particles/hadrons/ions/include/G4He3.hh b/source/particles/hadrons/ions/include/G4He3.hh
index a3c4fcf77e9dea60fb2df4826a34afb4923fd49d..e89fb4abc824f92ac95ac30c7e54d57061cccb23 100644
--- a/source/particles/hadrons/ions/include/G4He3.hh
+++ b/source/particles/hadrons/ions/include/G4He3.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4He3.hh,v 1.3 1999/12/15 14:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4He3.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -60,6 +60,8 @@ class G4He3 : public G4VIon
    static G4double* GetCutsInEnergy() {return theHe3KineticEnergyCuts;};
 
    void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4He3::SetCuts(G4double aCut)
@@ -69,6 +71,12 @@ inline void G4He3::SetCuts(G4double aCut)
   theHe3KineticEnergyCuts = theKineticEnergyCuts;
   
 }
-
+inline void G4He3::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theHe3LengthCut = theCutInMaxInteractionLength;  
+  theHe3KineticEnergyCuts = theKineticEnergyCuts;
+}
 #endif
 
diff --git a/source/particles/hadrons/ions/include/G4IonConstructor.hh b/source/particles/hadrons/ions/include/G4IonConstructor.hh
index d9b51557b926f4242aaf1d06ecd125146ba4578a..6fd475c73e0214d434af93ee1d8d5f9b6b11a918 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.2 1999/12/15 14:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4Triton.hh b/source/particles/hadrons/ions/include/G4Triton.hh
index a6b18bea2d667b203c0e7cdaf5b323b3d9db8d96..f4e13c26d89528f2943f9cdbd3bed51ef82b2b74 100644
--- a/source/particles/hadrons/ions/include/G4Triton.hh
+++ b/source/particles/hadrons/ions/include/G4Triton.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Triton.hh,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Triton.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -65,6 +65,8 @@ class G4Triton : public G4VIon
    static G4double* GetCutsInEnergy() {return theTritonKineticEnergyCuts;};
 
    void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4Triton::SetCuts(G4double aCut)
@@ -75,4 +77,14 @@ inline void G4Triton::SetCuts(G4double aCut)
   
 }
 
+inline void G4Triton::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theTritonLengthCut = theCutInMaxInteractionLength;  
+  theTritonKineticEnergyCuts = theKineticEnergyCuts;
+  
+}
+
+
 #endif
diff --git a/source/particles/hadrons/ions/include/G4VIon.hh b/source/particles/hadrons/ions/include/G4VIon.hh
index 653afae1a531248f315f30b8adfdcdc53e7eed86..eb11ffe247bec758d9dbaea076d68627cac677bf 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.3 2000/02/25 07:37:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4Alpha.cc b/source/particles/hadrons/ions/src/G4Alpha.cc
index 3c81048f097e03675fda2d85981dd7b1d32dc183..568735ed7f9353fc6ba9b785796a8559b1bbdf3d 100644
--- a/source/particles/hadrons/ions/src/G4Alpha.cc
+++ b/source/particles/hadrons/ions/src/G4Alpha.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Alpha.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4Deuteron.cc b/source/particles/hadrons/ions/src/G4Deuteron.cc
index 3d5081c87b0f811b9cd35f662864e2afcecc17a0..7c066bc4e9f162047e795c7a536d0400abfc362d 100644
--- a/source/particles/hadrons/ions/src/G4Deuteron.cc
+++ b/source/particles/hadrons/ions/src/G4Deuteron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Deuteron.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4GenericIon.cc b/source/particles/hadrons/ions/src/G4GenericIon.cc
index 68a3bcb602b1873ea965a036ca72d14921fd27e3..4bbd8ac9dfefb85251eba6b8e9187eced5f202bb 100644
--- a/source/particles/hadrons/ions/src/G4GenericIon.cc
+++ b/source/particles/hadrons/ions/src/G4GenericIon.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GenericIon.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4He3.cc b/source/particles/hadrons/ions/src/G4He3.cc
index b36631ebb3d9122d32cb91fa698d1e2e186bf748..03fbee06b84751f15c9234154d0c2e8d1a239a34 100644
--- a/source/particles/hadrons/ions/src/G4He3.cc
+++ b/source/particles/hadrons/ions/src/G4He3.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4He3.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4IonConstructor.cc b/source/particles/hadrons/ions/src/G4IonConstructor.cc
index 35c848af73e2f594796cc7ea3f4a9d974e905960..b137cae597308ec0c12b559ac650374e322a707d 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.2 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4Triton.cc b/source/particles/hadrons/ions/src/G4Triton.cc
index 6f9590f028c61f6bbbac3a05f5606f91596834dc..6de83a855285cb6ea9f43c8b9bb94e1fc8143b04 100644
--- a/source/particles/hadrons/ions/src/G4Triton.cc
+++ b/source/particles/hadrons/ions/src/G4Triton.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Triton.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4VIon.cc b/source/particles/hadrons/ions/src/G4VIon.cc
index e8961116b7b6e9aed7b7dec36d01b0f6b5f71833..74fbb88b0f4818f6e76ac2b5d0c68ac8598948f1 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.2 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh
index 93c83532ed60b943c8645f87242696bcb96134ab..a9f7c4c7312cb6206c95654771dfd956db5befde 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.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh
index 1bbef516510d2f9a9e97a56d14452db0963489f9..e6fad2961e052d4a9d0041940942a97e42dded46 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh
index aa977a9337bc8f811abdefbb36c6f0f29457bdf7..d617d3b2fc018d49a65121e5e1e4b3f9ea727a46 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
index d24264bfe105f2f97fda286383797e74e71b32d4..1c0b2b9af7467b9a38119739ff30755542f6cc8d 100644
--- a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4AntiKaonZero.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4AntiKaonZero.hh,v 1.4 2001/03/12 05:45:44 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -69,6 +69,15 @@ class G4AntiKaonZero : public G4VMeson
    static G4double* GetCutsInEnergy() {return theAntiKaonZeroKineticEnergyCuts;};
 
    virtual void   SetCuts(G4double aCut);
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
+inline void G4AntiKaonZero::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theAntiKaonZeroLengthCut = theCutInMaxInteractionLength;  
+  theAntiKaonZeroKineticEnergyCuts = theKineticEnergyCuts;
+}
 #endif
diff --git a/source/particles/hadrons/mesons/include/G4BMesonMinus.hh b/source/particles/hadrons/mesons/include/G4BMesonMinus.hh
index a9d6314c02085487b82283a5f22cc8a3fab2faf8..9dd147a9179827accecdec6f48d05d73461f4340 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4BMesonPlus.hh b/source/particles/hadrons/mesons/include/G4BMesonPlus.hh
index 731153cb6e56379505bfe0351c454902296258d2..5f3db5833b06653e46a242fc7a0678b88cf647d4 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4BMesonZero.hh b/source/particles/hadrons/mesons/include/G4BMesonZero.hh
index e49003d20e84adfe920d89af6922445754619639..f035b5efb25c7b839ce20faa45ad6985728c5e8a 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4BsMesonZero.hh b/source/particles/hadrons/mesons/include/G4BsMesonZero.hh
index 9c1105285bc1e344c0577a60a0cf67ce0c4523c3..a0bbe64839780c9771e716842ad6d049218fd8a4 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DMesonMinus.hh
index 984f29178101d5dbc61de12560b21db4ba04e76e..4026aa29837b92cd767c73a868b6d34d759a2c10 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DMesonPlus.hh
index a9be8da66546b5e5220917baf29d8f09bd8230ee..d957f6c99554c97619aa05a2850e81e655473800 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.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DMesonZero.hh b/source/particles/hadrons/mesons/include/G4DMesonZero.hh
index ab4242b7b4f5da0b425996ba8763599e7237ac98..f19aa5f388eac9c833e70dfdb9462ea2652f00fd 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh
index 3d0577443b4ce60090fe5ffe6dde7fe5bbed8171..ab913e4944434ee3a7b76d50d64c1d6b7db3d7bf 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh
index 36ad0eaaf8d3a199287a75c48e644520447f30bc..ee33c6ecda0dac0416954ac3493f5815b69d742f 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4Eta.hh b/source/particles/hadrons/mesons/include/G4Eta.hh
index e786d6b107008be8bcb9a2d9bb4c9e584e21068f..773bd9b36237fac91d9ed65000d6c313337a8578 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4EtaPrime.hh b/source/particles/hadrons/mesons/include/G4EtaPrime.hh
index 0b69b7252cd13eefe6ef3d6105de481f22899d43..23abc10dc99e25b41a9d1dc08983e3489fecca1f 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4JPsi.hh b/source/particles/hadrons/mesons/include/G4JPsi.hh
index ce7578225eeace246e6e782d7cdf35d7076f379b..a6ae7babe361f4fba08d7f368fc3e2c2c71b514f 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4KaonMinus.hh b/source/particles/hadrons/mesons/include/G4KaonMinus.hh
index 8989d500177729e889657d85e47e260236357925..a356bd6fc5bf825cb460266dff99ba02330760cb 100644
--- a/source/particles/hadrons/mesons/include/G4KaonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonMinus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonMinus.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4KaonMinus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,6 +66,8 @@ class G4KaonMinus : public G4VMeson
    static G4double* GetCutsInEnergy() {return theKaonMinusKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4KaonMinus::SetCuts(G4double aCut)
@@ -75,4 +77,12 @@ inline void G4KaonMinus::SetCuts(G4double aCut)
   theKaonMinusKineticEnergyCuts = theKineticEnergyCuts;
 }
 
+inline void G4KaonMinus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theKaonMinusLengthCut = theCutInMaxInteractionLength;  
+  theKaonMinusKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 #endif
diff --git a/source/particles/hadrons/mesons/include/G4KaonPlus.hh b/source/particles/hadrons/mesons/include/G4KaonPlus.hh
index 088c47d85b4574a7362eb923dd70c7dd2345b4c7..f6240e04dc675193fa8d7d7f67f7991c895448b5 100644
--- a/source/particles/hadrons/mesons/include/G4KaonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonPlus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonPlus.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4KaonPlus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -65,6 +65,8 @@ public:
    static G4double* GetCutsInEnergy() {return theKaonPlusKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4KaonPlus::SetCuts(G4double aCut)
@@ -74,4 +76,13 @@ inline void G4KaonPlus::SetCuts(G4double aCut)
   theKaonPlusKineticEnergyCuts = theKineticEnergyCuts;
 }
 
+inline void G4KaonPlus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theKaonPlusLengthCut = theCutInMaxInteractionLength;  
+  theKaonPlusKineticEnergyCuts = theKineticEnergyCuts;
+}
+
+
 #endif
diff --git a/source/particles/hadrons/mesons/include/G4KaonZero.hh b/source/particles/hadrons/mesons/include/G4KaonZero.hh
index 06cd9a3033fea3fc16261d56f5d088f7b0acb323..1c5a830e7028c88fb58de2d6f4c9df114e3bfec7 100644
--- a/source/particles/hadrons/mesons/include/G4KaonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonZero.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4KaonZero.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4KaonZero.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,6 +66,16 @@ class G4KaonZero : public G4VMeson
    static G4double* GetCutsInEnergy() {return theKaonZeroKineticEnergyCuts;};
 
    virtual void        SetCuts(G4double aCut);
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
+inline void G4KaonZero::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theKaonZeroLengthCut = theCutInMaxInteractionLength;  
+  theKaonZeroKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 #endif
diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh b/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh
index 8ccaeff70c71d806e1bd88129d9b6923f66fcab0..3824fec56292b5542aa52ded528a9aa18d491cde 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh b/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh
index 56e609d4edb9bcf20db4be3cd51debac905a7015..eda7ba9c34769fb64640e5ec22e08e4a05cc61c3 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.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4MesonConstructor.hh b/source/particles/hadrons/mesons/include/G4MesonConstructor.hh
index 0d9e1c772283733044cf448cec0ad3cc91d573d1..d4247a61f4d7d37b762411a6db343116500e9b59 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.2 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4PionMinus.hh b/source/particles/hadrons/mesons/include/G4PionMinus.hh
index d8cf748e861577c01dac2bad805e6a630e514d4b..7ad48dcba78e80ee8d1f8d445bf1177e76f1cd5d 100644
--- a/source/particles/hadrons/mesons/include/G4PionMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4PionMinus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PionMinus.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PionMinus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -65,6 +65,8 @@ class G4PionMinus : public G4VMeson
    static G4double* GetCutsInEnergy() {return thePionMinusKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4PionMinus::SetCuts(G4double aCut)
@@ -74,4 +76,12 @@ inline void G4PionMinus::SetCuts(G4double aCut)
   thePionMinusKineticEnergyCuts = theKineticEnergyCuts;
 }
 
+inline void G4PionMinus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  thePionMinusLengthCut = theCutInMaxInteractionLength;  
+  thePionMinusKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 #endif
diff --git a/source/particles/hadrons/mesons/include/G4PionPlus.hh b/source/particles/hadrons/mesons/include/G4PionPlus.hh
index 279a297451cf96cb28cd773394c07cb7cdd07f71..4ff338c7edfac0bbb1b159d213e3f5334b7f8748 100644
--- a/source/particles/hadrons/mesons/include/G4PionPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4PionPlus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PionPlus.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PionPlus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,6 +66,8 @@ class G4PionPlus : public G4VMeson
    static G4double* GetCutsInEnergy() {return thePionPlusKineticEnergyCuts;};
 
    void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4PionPlus::SetCuts(G4double aCut)
@@ -75,5 +77,13 @@ inline void G4PionPlus::SetCuts(G4double aCut)
   thePionPlusKineticEnergyCuts = theKineticEnergyCuts;
 }
 
+inline void G4PionPlus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  thePionPlusLengthCut = theCutInMaxInteractionLength;  
+  thePionPlusKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 
 #endif
diff --git a/source/particles/hadrons/mesons/include/G4PionZero.hh b/source/particles/hadrons/mesons/include/G4PionZero.hh
index e236a8d4fda60b2594ae9a4f9690efe618595509..7f4e6451bc9a83dec982ac499c72cc57e4c1f4f4 100644
--- a/source/particles/hadrons/mesons/include/G4PionZero.hh
+++ b/source/particles/hadrons/mesons/include/G4PionZero.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PionZero.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PionZero.hh,v 1.4 2001/03/12 05:45:46 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,6 +66,15 @@ class G4PionZero : public G4VMeson
    static G4double* GetCutsInEnergy() {return thePionZeroKineticEnergyCuts;};
 
    virtual void        SetCuts(G4double aCut);
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
+inline void G4PionZero::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  thePionZeroLengthCut = theCutInMaxInteractionLength;  
+  thePionZeroKineticEnergyCuts = theKineticEnergyCuts;
+}
 #endif
diff --git a/source/particles/hadrons/mesons/include/G4VMeson.hh b/source/particles/hadrons/mesons/include/G4VMeson.hh
index e3f7c3df8b21601990786e24a8387c9cbd67a0e2..44df1b85aef88ebf375f1606ddd2de8dc54199e9 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.2 1999/12/15 14:51:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
index bf6b125a284c755452125d2388ce4597ff7bc949..46e1fa6a36f7b83c669fa28944646db0841d923f 100644
--- a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiBMesonZero.cc,v 1.4 2000/02/27 05:56:30 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
index 0985e7b98f61f9e6b4ca1f3a39c5f5eaaecc12a3..c2e8067f6eaa63a0ee3323a81cbf2ece43e4eedd 100644
--- a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiBsMesonZero.cc,v 1.4 2000/02/27 05:57:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
index bac5a9ed4502d492ca31e6ac25bae43dd3dba985..e459f5f4bcfe23ddc7ac8805804fbfa6f24d24a7 100644
--- a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiDMesonZero.cc,v 1.4 2000/02/27 05:57:40 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
index d4059f5a7f814807f060ccacc316ee40811104f0..00430abffb1427d40dfd60d69efa61c6d5007fd7 100644
--- a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiKaonZero.cc,v 1.3 2000/02/27 05:57:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
index def711f8f7cd9345ff3049f0f41a4362790aa8f4..5e65db94835ad2daebe93dc44616c11819969743 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BMesonMinus.cc,v 1.4 2000/02/27 05:57:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
index 8f03c7526e49eca0d00fb85b277f559fb17b52aa..b50f3a9e511cd83e69c32248e107d2c8225c0a44 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BMesonPlus.cc,v 1.4 2000/02/27 05:57:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4BMesonZero.cc b/source/particles/hadrons/mesons/src/G4BMesonZero.cc
index 1eb5542afbc16bd40253d5b4f4f3d35ab3dc9c9a..c5a2d5c0d47378deaab197e7691af924846a8c69 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BMesonZero.cc,v 1.4 2000/02/27 05:57:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
index d3bb4b0ca916658338aacc8f9765530e8ab29420..868da1919d2501970369fc33d671fbd24cd5eb5d 100644
--- a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BsMesonZero.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
index 502bac140ebd47c03189d7ce3bdfce1192f99701..ee701bb48c44ac988dd6496efa2f56acdca0c26d 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMesonMinus.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
index 9ac59997d2adb3ad674fbc65e4dd13dffca54154..e1ce7634839940f9c94be04e1e85d53ee069a23a 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMesonPlus.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4DMesonZero.cc b/source/particles/hadrons/mesons/src/G4DMesonZero.cc
index c9abe7df3485572d85bc5a5e0c80d64d1fdedc3b..dddfb9f93b935729f0dcb61e7d6ebaf84e7c2d24 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DMesonZero.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
index 3aa7da50e6b5134d7f1fc4678c7c50b968bc0d4f..6c5754f87c651ebd2bd7f7309fb4de382655586c 100644
--- a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DsMesonMinus.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
index f6b0c66fe1646c80b6c29539bebea03168ccfe83..918cb7248dc2bf41490ea1772061770487da05cd 100644
--- a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DsMesonPlus.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4Eta.cc b/source/particles/hadrons/mesons/src/G4Eta.cc
index 4465fa1c995e019bc960326accf1640f027589c0..4edee6d6abee3893bb19e26fe3f562ec57ffab92 100644
--- a/source/particles/hadrons/mesons/src/G4Eta.cc
+++ b/source/particles/hadrons/mesons/src/G4Eta.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Eta.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4EtaPrime.cc b/source/particles/hadrons/mesons/src/G4EtaPrime.cc
index c7804cc3ceab5c25fce5f3fce068e42cad4ee0b7..e140a9eadbcfe2a12e5c429dbdbf3b8878b85d02 100644
--- a/source/particles/hadrons/mesons/src/G4EtaPrime.cc
+++ b/source/particles/hadrons/mesons/src/G4EtaPrime.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EtaPrime.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4JPsi.cc b/source/particles/hadrons/mesons/src/G4JPsi.cc
index 2671010a75e7304ea52f46d928ca1daa392e5870..cc5b6ab522c7613c57f342ea328020d4f99c318a 100644
--- a/source/particles/hadrons/mesons/src/G4JPsi.cc
+++ b/source/particles/hadrons/mesons/src/G4JPsi.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4JPsi.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4KaonMinus.cc b/source/particles/hadrons/mesons/src/G4KaonMinus.cc
index 0bce07e1f740a62fc264fcd7d9a24f2fa6387fac..bd1914f933d19086f6c62b9a188e70ddd565236a 100644
--- a/source/particles/hadrons/mesons/src/G4KaonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonMinus.cc,v 1.4 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4KaonPlus.cc b/source/particles/hadrons/mesons/src/G4KaonPlus.cc
index 92e9d31a473d1f9a7ccb62650c13e6d1a9c64a53..e2eeabc7a1049be76336001ff90f53cee0f2b285 100644
--- a/source/particles/hadrons/mesons/src/G4KaonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonPlus.cc,v 1.4 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4KaonZero.cc b/source/particles/hadrons/mesons/src/G4KaonZero.cc
index e156443eec3d02c252183b0f5a406e75d875d5d5..7bed68d2f6892f40f42b9790fcda7d57bfc5f1a0 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZero.cc,v 1.3 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
index f33a9165e5da0366b9cc803623279f900329dcb7..942847de879fef4b4840c0ef88681ffb5407fba5 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZeroLong.cc,v 1.4 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
index 46244cbf8ef8942c23a8d641b179e8be01cc0c0d..09625c5af824d161f857472a510fe703c3942292 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonZeroShort.cc,v 1.4 2000/02/27 05:57:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4MesonConstructor.cc b/source/particles/hadrons/mesons/src/G4MesonConstructor.cc
index bf255716a3cfaef705e6fd1d5c6a74fbe8506ea9..fb7744b43635073f8bd221d1232277aa552215ef 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.3 2000/02/25 11:38:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4PionMinus.cc b/source/particles/hadrons/mesons/src/G4PionMinus.cc
index 586ef0eba6575620943c1258cf3cff3eba1baeea..924df58e3188595151137274ad5a6df71fd43540 100644
--- a/source/particles/hadrons/mesons/src/G4PionMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4PionMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionMinus.cc,v 1.4 2000/02/27 05:57:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4PionPlus.cc b/source/particles/hadrons/mesons/src/G4PionPlus.cc
index 6b5358b418acb2739cab9ecaecc296ec24a7bf1b..57256cf92af61b014f24c9416c3e5423ead5e05d 100644
--- a/source/particles/hadrons/mesons/src/G4PionPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4PionPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionPlus.cc,v 1.5 2000/06/28 06:54:01 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4PionZero.cc b/source/particles/hadrons/mesons/src/G4PionZero.cc
index 52158a2637c721aadc8a119f920fa49c6151ed21..7ac0532567cfcb75f6b441020d1304fa0b57bb45 100644
--- a/source/particles/hadrons/mesons/src/G4PionZero.cc
+++ b/source/particles/hadrons/mesons/src/G4PionZero.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionZero.cc,v 1.4 2000/02/27 05:57:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4VMeson.cc b/source/particles/hadrons/mesons/src/G4VMeson.cc
index e6ba42e93b61999ddc4e4feb5549fc8b785f91c0..c09ab3ee81e36687877fd7c2f27006cb414b4054 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.2 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4AntiNeutrinoE.hh b/source/particles/leptons/include/G4AntiNeutrinoE.hh
index abd85149745109ac42c9369b72cd1b53f4f6ad8b..a7845754bf7fa5760355a181b7471c98d9215d2b 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.3 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4AntiNeutrinoMu.hh b/source/particles/leptons/include/G4AntiNeutrinoMu.hh
index c62a2e53bd75e3b86f36fb21039b92bec6ab4705..144c2a5851e008dc7140eb2880ead82269ba4b8a 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.3 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4AntiNeutrinoTau.hh b/source/particles/leptons/include/G4AntiNeutrinoTau.hh
index 8c9b596e6f3dbf113c198eca42ee010ed2c6e7b5..dd24ad3ba3cd9909540070f2868391057fe2a955 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.3 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4Electron.hh b/source/particles/leptons/include/G4Electron.hh
index 1bd8f8eed0877fa71c00604c637c944f5f0561b6..cac4e480229c8460c0194707d7a180175afbc567 100644
--- a/source/particles/leptons/include/G4Electron.hh
+++ b/source/particles/leptons/include/G4Electron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Electron.hh,v 1.3 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Electron.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -77,6 +77,9 @@ class G4Electron : public G4VLepton
    static G4double* GetCutsInEnergy() {return theElectronKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
+      
 };
 
 inline void G4Electron::SetCuts(G4double aCut)
@@ -87,6 +90,14 @@ inline void G4Electron::SetCuts(G4double aCut)
   
 }
 
+inline void G4Electron::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theElectronLengthCut = theCutInMaxInteractionLength;  
+  theElectronKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 inline G4Electron* G4Electron::Electron()
 {  return &theElectron; }
  
diff --git a/source/particles/leptons/include/G4LeptonConstructor.hh b/source/particles/leptons/include/G4LeptonConstructor.hh
index aacd635d09651123e4cde50e09656ce52f0c6039..682123b389c071b277bc7f02d01ca1f0757f9890 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.2 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4MuonMinus.hh b/source/particles/leptons/include/G4MuonMinus.hh
index 7fee86cc61acb36fcbd9d9f4b837e298036375a1..ae421ec61ef4f99b44af528edd5d67f9c1d3ea41 100644
--- a/source/particles/leptons/include/G4MuonMinus.hh
+++ b/source/particles/leptons/include/G4MuonMinus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuonMinus.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MuonMinus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -65,16 +65,27 @@ class G4MuonMinus : public G4VLepton
    static G4double* GetCutsInEnergy() {return theMuonMinusKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
+      
 };
 
 inline void G4MuonMinus::SetCuts(G4double aCut)
 {
    CalcEnergyCuts(aCut);
+   theMuonMinusLengthCut = theCutInMaxInteractionLength;  
+   theMuonMinusKineticEnergyCuts = theKineticEnergyCuts;  
+}
+
+inline void G4MuonMinus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
    theMuonMinusLengthCut = theCutInMaxInteractionLength;  
    theMuonMinusKineticEnergyCuts = theKineticEnergyCuts;
-   
 }
 
+
 inline  G4MuonMinus*  G4MuonMinus::MuonMinus()
 { return &theMuonMinus; }
 
diff --git a/source/particles/leptons/include/G4MuonPlus.hh b/source/particles/leptons/include/G4MuonPlus.hh
index 157bcf3a5c99ca492c8c135a4f193d58214f8f79..1b5b1bb5f02e1d5a372fab3a744779501a5ded4d 100644
--- a/source/particles/leptons/include/G4MuonPlus.hh
+++ b/source/particles/leptons/include/G4MuonPlus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4MuonPlus.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MuonPlus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,14 +66,24 @@ class G4MuonPlus : public G4VLepton
    static G4double* GetCutsInEnergy() {return theMuonPlusKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
+      
 };
 
 inline void G4MuonPlus::SetCuts(G4double aCut)
 {
   CalcEnergyCuts(aCut);
   theMuonPlusLengthCut = theCutInMaxInteractionLength;  
-  theMuonPlusKineticEnergyCuts = theKineticEnergyCuts;
-  
+  theMuonPlusKineticEnergyCuts = theKineticEnergyCuts; 
+}
+
+inline void G4MuonPlus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theMuonPlusLengthCut = theCutInMaxInteractionLength;  
+  theMuonPlusKineticEnergyCuts = theKineticEnergyCuts; 
 }
 
 inline G4MuonPlus* G4MuonPlus::MuonPlus()
diff --git a/source/particles/leptons/include/G4NeutrinoE.hh b/source/particles/leptons/include/G4NeutrinoE.hh
index d8d78d8faaa18ffd4b0a2aa63955d950176e7cab..dcafe55780e077a02a4d3bb1fe4282fe60e4f373 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.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4NeutrinoMu.hh b/source/particles/leptons/include/G4NeutrinoMu.hh
index b025face1f2c565e637117dff72b2b95dc7f5cdf..69e234250ad8a76a3e5d8e6ea07d4cc7ec374763 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.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4NeutrinoTau.hh b/source/particles/leptons/include/G4NeutrinoTau.hh
index ea1d77ce259748b4e20ebfef17ffd224eb61d409..fee175a47b43686fae74817757e5b611f7d64209 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.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4Positron.hh b/source/particles/leptons/include/G4Positron.hh
index 1d54da32ecdc0142ce8dc5bc18c5a9dc8036e682..1e5f6ad5aad57d68d2dd08ce6ca6ebb0c0f41951 100644
--- a/source/particles/leptons/include/G4Positron.hh
+++ b/source/particles/leptons/include/G4Positron.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Positron.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Positron.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -89,6 +89,8 @@ class G4Positron : public G4VLepton
    static G4double* GetCutsInEnergy() {return thePositronKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4Positron::SetCuts(G4double aCut)
@@ -97,8 +99,18 @@ inline void G4Positron::SetCuts(G4double aCut)
   thePositronLengthCut = theCutInMaxInteractionLength;  
   thePositronKineticEnergyCuts = theKineticEnergyCuts;
 }
+
+inline void G4Positron::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  thePositronLengthCut = theCutInMaxInteractionLength;  
+  thePositronKineticEnergyCuts = theKineticEnergyCuts;
+}
+
 inline G4Positron*  G4Positron::Positron()
 {  return &thePositron; }
+
 #endif
 
 
diff --git a/source/particles/leptons/include/G4TauMinus.hh b/source/particles/leptons/include/G4TauMinus.hh
index f428c198263fc10cecff6992f24cdfc6dae2ed4f..162d07a3bb039b846cbd05e2e882efa450550716 100644
--- a/source/particles/leptons/include/G4TauMinus.hh
+++ b/source/particles/leptons/include/G4TauMinus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TauMinus.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TauMinus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -66,16 +66,26 @@ class G4TauMinus : public G4VLepton
    static G4double* GetCutsInEnergy() {return theTauMinusKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4TauMinus::SetCuts(G4double aCut)
 {
    CalcEnergyCuts(aCut);
    theTauMinusLengthCut = theCutInMaxInteractionLength;  
-   theTauMinusKineticEnergyCuts = theKineticEnergyCuts;
-   
+   theTauMinusKineticEnergyCuts = theKineticEnergyCuts;   
 }
 
+inline void G4TauMinus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+   theTauMinusLengthCut = theCutInMaxInteractionLength;  
+   theTauMinusKineticEnergyCuts = theKineticEnergyCuts;   
+}
+
+
 inline  G4TauMinus*  G4TauMinus::TauMinus()
 { return &theTauMinus; }
 #endif
diff --git a/source/particles/leptons/include/G4TauPlus.hh b/source/particles/leptons/include/G4TauPlus.hh
index a5fe05aef33910334e5ce07e915ace45f905956f..d47dec90afe2d09c8129cbd9473f900c9679b289 100644
--- a/source/particles/leptons/include/G4TauPlus.hh
+++ b/source/particles/leptons/include/G4TauPlus.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TauPlus.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TauPlus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -67,6 +67,8 @@ class G4TauPlus : public G4VLepton
    static G4double* GetCutsInEnergy() {return theTauPlusKineticEnergyCuts;};
 
    virtual void SetCuts(G4double aCut); 
+   virtual void RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy );
 };
 
 inline void G4TauPlus::SetCuts(G4double aCut)
@@ -76,6 +78,15 @@ inline void G4TauPlus::SetCuts(G4double aCut)
   theTauPlusKineticEnergyCuts = theKineticEnergyCuts;
 }
 
+inline void G4TauPlus::RestoreCuts(G4double cutInLength,
+			    const G4double* cutInEnergy )
+{
+  G4ParticleWithCuts::RestoreCuts(cutInLength, cutInEnergy);
+  theTauPlusLengthCut = theCutInMaxInteractionLength;  
+  theTauPlusKineticEnergyCuts = theKineticEnergyCuts;
+}
+
+
 inline G4TauPlus*  G4TauPlus::TauPlus()
 {  return &theTauPlus; }
 
diff --git a/source/particles/leptons/include/G4VLepton.hh b/source/particles/leptons/include/G4VLepton.hh
index 44cb06cfa764d8ef4bcf9b65d3df26fc9255c482..bd9fa7eee1fb2df3df94f6e3b099cffe57601aa2 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.2 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4AntiNeutrinoE.cc b/source/particles/leptons/src/G4AntiNeutrinoE.cc
index d6516dd7d46858726c99c8fe4574807d7d9a627c..0519ee5ac3ba882ba28d346e4b6c1f59a9cade60 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoE.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoE.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutrinoE.cc,v 1.3 2000/02/27 06:23:40 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4AntiNeutrinoMu.cc b/source/particles/leptons/src/G4AntiNeutrinoMu.cc
index f11c49ead1b69dceb9245a1b1faf90ba27faa8ee..8ee740112eef3dc33ca3a606ecc6c818b91650d8 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoMu.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoMu.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutrinoMu.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4AntiNeutrinoTau.cc b/source/particles/leptons/src/G4AntiNeutrinoTau.cc
index 986ca63ee6cdf3e599ef6ad643b3185c5d394799..9f7fbde9c68b541c89d4f9279c84684312f0087c 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoTau.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoTau.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutrinoTau.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4Electron.cc b/source/particles/leptons/src/G4Electron.cc
index 908d03429085cb7088354ea54d0a8a8c65ada545..8d8059f160c7e3b3a221139d658a7cdc8cd58a82 100644
--- a/source/particles/leptons/src/G4Electron.cc
+++ b/source/particles/leptons/src/G4Electron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Electron.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4LeptonConstructor.cc b/source/particles/leptons/src/G4LeptonConstructor.cc
index f23862b4082359b1ff52e6dd991c2555b628f7e3..447cd350efccd4ad065f5121bf6cbede01d04f50 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.2 1999/12/15 14:51:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4MuonMinus.cc b/source/particles/leptons/src/G4MuonMinus.cc
index ccda73bad779daf8f9e5a59dff45f26e298007b3..0140a6afda415832f19fffc41d6d4779f5bc655e 100644
--- a/source/particles/leptons/src/G4MuonMinus.cc
+++ b/source/particles/leptons/src/G4MuonMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonMinus.cc,v 1.4 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4MuonPlus.cc b/source/particles/leptons/src/G4MuonPlus.cc
index 0340f004975a93ec236858789d0ad6c8323bd3fa..7d9245c9983475c5c24ec44cc357a97d95b249b0 100644
--- a/source/particles/leptons/src/G4MuonPlus.cc
+++ b/source/particles/leptons/src/G4MuonPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonPlus.cc,v 1.4 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4NeutrinoE.cc b/source/particles/leptons/src/G4NeutrinoE.cc
index 615b41a0073b6a4be2c9bd3ff7fd9751298d8ad8..dc1ecafc8ae732d95a95e4ea8e0707cb5f97bf3e 100644
--- a/source/particles/leptons/src/G4NeutrinoE.cc
+++ b/source/particles/leptons/src/G4NeutrinoE.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutrinoE.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4NeutrinoMu.cc b/source/particles/leptons/src/G4NeutrinoMu.cc
index 66cdb49aed8f6463cf1402ecacc2d1ea8670ea66..796e86e1f132573dd787384f2d7892be783f7317 100644
--- a/source/particles/leptons/src/G4NeutrinoMu.cc
+++ b/source/particles/leptons/src/G4NeutrinoMu.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutrinoMu.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4NeutrinoTau.cc b/source/particles/leptons/src/G4NeutrinoTau.cc
index c63d4c098e603efac0bd047ffaec412973632c62..563c28821666ce84d6b5a4dcb4bae594a8b866a0 100644
--- a/source/particles/leptons/src/G4NeutrinoTau.cc
+++ b/source/particles/leptons/src/G4NeutrinoTau.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutrinoTau.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4Positron.cc b/source/particles/leptons/src/G4Positron.cc
index 8f2ee0990922ec224307a4f6b567a82998ba6b34..8d2a3a3f3ddcb7f7b8974f01d0d05a5b294752ce 100644
--- a/source/particles/leptons/src/G4Positron.cc
+++ b/source/particles/leptons/src/G4Positron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Positron.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4TauMinus.cc b/source/particles/leptons/src/G4TauMinus.cc
index 8d63bc749a40655250e0e6312cb954312df26faf..7dcb0ff9f5b4a22c69beedefc74588a5022b9cfc 100644
--- a/source/particles/leptons/src/G4TauMinus.cc
+++ b/source/particles/leptons/src/G4TauMinus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TauMinus.cc,v 1.4 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4TauPlus.cc b/source/particles/leptons/src/G4TauPlus.cc
index 11a5e485da8826c6f70c8a0c0d24918687787f5b..04502e24811f85d05ceeaec96778b3c22076e21e 100644
--- a/source/particles/leptons/src/G4TauPlus.cc
+++ b/source/particles/leptons/src/G4TauPlus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TauPlus.cc,v 1.4 2000/02/27 06:23:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4VLepton.cc b/source/particles/leptons/src/G4VLepton.cc
index 4f7232ad3709b962e991a8ab5d2472847d3b4bda..352d4351dcec2cc09be5a7815538c70e7a43dd8a 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.2 1999/12/15 14:51:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/management/GNUmakefile b/source/particles/management/GNUmakefile
index b1ba7010cfc893d01569884ec0fa00bfdd0815b0..dc7b468ba66e8e8d2829535a39bcf23002ab5a43 100644
--- a/source/particles/management/GNUmakefile
+++ b/source/particles/management/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.3 1999/10/30 04:33:33 kurasige Exp $
+# $Id: GNUmakefile,v 1.4 2000/10/24 13:36:51 gcosmo Exp $
 # ----------------------------------------------------------------
 # GNUmakefile for particle management library.  G.Cosmo, 4/4/97.
 # ----------------------------------------------------------------
@@ -16,11 +16,6 @@ CPPFLAGS += \
             -I$(G4BASE)/global/HEPRandom/include \
             -I$(G4BASE)/global/HEPGeometry/include \
             -I$(G4BASE)/intercoms/include \
-            -I$(G4BASE)/particles/management/include \
-            -I$(G4BASE)/processes/management/include \
-            -I$(G4BASE)/processes/decay/include \
-            -I$(G4BASE)/processes/electromagnetic/utils/include \
-            -I$(G4BASE)/track/include \
             -I$(G4BASE)/materials/include
 
 
diff --git a/source/particles/management/include/G4DalitzDecayChannel.hh b/source/particles/management/include/G4DalitzDecayChannel.hh
index e3f009c0f5233b569419451170c8b28f3f60ea58..fbfa4a90a088462a860bd9e05812c215f077f5dc 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.3 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DecayProducts.hh b/source/particles/management/include/G4DecayProducts.hh
index 11ecf12a9dfc3e7d8a77ad20dfba297428236fa0..465975be6134320cdf87d3f5fe4ae6a548c76373 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.6 2000/10/20 11:34:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DecayTable.hh b/source/particles/management/include/G4DecayTable.hh
index 9e6668b6835479954211ce12ac9b8fceabafd271..036ec8dbbcae38abc4bf57bd92874943ff79a62d 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.5 2000/02/25 07:36:14 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DecayTableMessenger.hh b/source/particles/management/include/G4DecayTableMessenger.hh
index 96fb0d06949dfd6e426ee9b85209f8bb8de57e71..e1b039cf020e0ce0bec385b7cf7727d1c057f8c2 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.5 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4DynamicParticle.hh b/source/particles/management/include/G4DynamicParticle.hh
index 0b2872de9b94a76dc47d411ef09ba3bf4b1553bf..0f2cc9c096144c01d32d36b1f34872ad71880404 100644
--- a/source/particles/management/include/G4DynamicParticle.hh
+++ b/source/particles/management/include/G4DynamicParticle.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DynamicParticle.hh,v 1.8 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4DynamicParticle.hh,v 1.9 2001/01/18 12:46:05 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -25,6 +25,7 @@
 //                ------------------------
 //      Add theDynamicCharge and theElectronOccupancy
 //                             17 AUg. 1999   H.Kurashige  
+//      Add thePreAssignedDecayTime   18 Jan. 2001 H.Kurashige
 // ------------------------------------------------------------
 
 #ifndef G4DynamicParticle_h
@@ -157,6 +158,10 @@ class G4DynamicParticle
      const G4DecayProducts *GetPreAssignedDecayProducts() const;
      void SetPreAssignedDecayProducts(G4DecayProducts *aDecayProducts);
       //   Set/Get pre-assigned decay channel
+
+     G4double GetPreAssignedDecayProperTime() const;
+     void SetPreAssignedDecayProperTime(G4double);
+      //   Set/Get pre-assigned proper time when the particle will decay
  
    
   //- print out information
@@ -189,6 +194,8 @@ class G4DynamicParticle
   
      G4DecayProducts *thePreAssignedDecayProducts;
 
+     G4double thePreAssignedDecayTime;
+
  private:
    G4int verboseLevel;
  
diff --git a/source/particles/management/include/G4DynamicParticle.icc b/source/particles/management/include/G4DynamicParticle.icc
index e27dc09d008fee9250caccb30611c98e301041b9..347bb7d85f3531237089d7a3ff2cfbb2c4d66c2d 100644
--- a/source/particles/management/include/G4DynamicParticle.icc
+++ b/source/particles/management/include/G4DynamicParticle.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DynamicParticle.icc,v 1.5 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4DynamicParticle.icc,v 1.7 2001/03/05 08:32:16 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -179,11 +179,6 @@ inline void G4DynamicParticle::SetMomentumDirection(G4double px, G4double py, G4
   theMomentumDirection.setZ(pz);
 }
 
-inline void G4DynamicParticle::SetDefinition(G4ParticleDefinition * aParticleDefinition)
-{
-  theParticleDefinition = aParticleDefinition;
-  theDynamicalMass = theParticleDefinition->GetPDGMass();
-}
 
 inline void G4DynamicParticle::SetPolarization(G4double polX, G4double polY, G4double polZ)
 {
@@ -212,6 +207,16 @@ inline void G4DynamicParticle::SetPreAssignedDecayProducts(G4DecayProducts* aDec
  thePreAssignedDecayProducts = aDecayProducts;
 }
 
+inline G4double G4DynamicParticle::GetPreAssignedDecayProperTime() const
+{
+  return thePreAssignedDecayTime;
+}
+ 
+inline void G4DynamicParticle::SetPreAssignedDecayProperTime(G4double aTime)
+{
+  thePreAssignedDecayTime = aTime;
+}
+
 inline 
 void G4DynamicParticle::SetVerboseLevel(G4int value)
 {
diff --git a/source/particles/management/include/G4DynamicParticleFastVector.hh b/source/particles/management/include/G4DynamicParticleFastVector.hh
index 2e84f5424bc433c922bd8eab8d29c1cd1b9b4e97..9f1f57755a5cec1c141c8afa7d115ca328eaab6b 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.2 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ElectronOccupancy.hh b/source/particles/management/include/G4ElectronOccupancy.hh
index bf08f5c5e5961a3cd6a566bed69f26dd32523385..9284b9ef7d41dfb131e945d38981dbffdf8f3a27 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.4 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4IonTable.hh b/source/particles/management/include/G4IonTable.hh
index 2287df637b8185cc92a8bcadeb40816ca7b76670..6e50666969114081eb7aaa4250d7ebc1db73a691 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.17 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4Ions.hh b/source/particles/management/include/G4Ions.hh
index faa3ee2cff01319345176650180b15139edc11b7..093db79acd69338eefb22b201bf135c5a0af39ea 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.6 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4IsotopeProperty.hh b/source/particles/management/include/G4IsotopeProperty.hh
index 51da5acf0af9362a93d25561e54f1b9579871615..523cf462bb8172ea7ecf1ad9e9cebf4f1e31bcea 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4KL3DecayChannel.hh b/source/particles/management/include/G4KL3DecayChannel.hh
index 810216f0e6c90c60e58d71749232b77c802f12ca..49e7b3ee466c920caa752d6e92d0d6ddefc16589 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.3 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4MuonDecayChannel.hh b/source/particles/management/include/G4MuonDecayChannel.hh
index 7d36338de3a15c902e02e56bb878ff38390efa69..e618c2c3fb0bde1666066f91bce93bbf12ccf93f 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.4 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4NucleiProperties.hh b/source/particles/management/include/G4NucleiProperties.hh
index 1ac87c6232eaf6ef9efefe10ab79e201ddcddb64..152f8a5a73fd72b82e4b6f0da8ebafddd81c74ea 100644
--- a/source/particles/management/include/G4NucleiProperties.hh
+++ b/source/particles/management/include/G4NucleiProperties.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NucleiProperties.hh,v 1.10 2000/02/04 03:05:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4NucleiPropertiesTable.hh b/source/particles/management/include/G4NucleiPropertiesTable.hh
index 413a90e6bd41af0a8db9cebaf27ff80de40879a0..332daeb7a90428b3bbe7ca5225452cfccc13cef6 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.8 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 eb3c22955a41c550383a707ab4fb3610d045f204..e2d6dd8b0644d6b674cfeeafdd99c3914b43bfdc 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.5 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleDefinition.hh b/source/particles/management/include/G4ParticleDefinition.hh
index 869d865f93867cef338ee03336f5fda77e3e06d2..053933cdea5d393a5eaf014e602eeb6d40bdb480 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.7 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ParticleDefinition.hh,v 1.8 2001/03/12 05:58:21 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -29,6 +29,7 @@
 // added  ShortLived flag and ApplyCuts flag  H.Kurashige 27  June 1998
 // fixed  some improper codings   H.Kurashige 08 Apr. 1999
 // added  sub-type  H.Kurashige 15 Feb. 2000
+// added  RestoreCuts  H.Kurashige 09 Mar. 2001
 // ------------------------------------------------------------
 
 #ifndef G4ParticleDefinition_h
@@ -96,7 +97,15 @@ class G4ParticleDefinition
       // applyCuts flag
       G4bool                GetApplyCutsFlag() const;
       void                  SetApplyCutsFlag(G4bool flag);
+
+  public: 
+      // This method concerning cut values is supposed to be used by
+      // G4VUserPhysicsList to restore cutvalues witout calculation
+      // Actual implementation can be seen in the class G4ParticleWithCuts  
+      virtual void          RestoreCuts(G4double cutInLength,
+					const G4double* cutInEnergy ){}
       
+    
   public: // With Description
   // By these following Getxxxx methods, you can get values 
   // for members which can not be changed
diff --git a/source/particles/management/include/G4ParticleMessenger.hh b/source/particles/management/include/G4ParticleMessenger.hh
index 35fdfaf2a563e43a7c294e35f7fd3af00fd47aa7..98d77327b02a716c63feac68d0008619350b8388 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.4 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleMomentum.hh b/source/particles/management/include/G4ParticleMomentum.hh
index f078a48b4b5ac9be81f9b10b0b17fbb99075308d..732f45f9d8747fc9f5a5636746ad72a7aabba34c 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.4 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticlePropertyMessenger.hh b/source/particles/management/include/G4ParticlePropertyMessenger.hh
index 1926ca3173d2f3d1a95c5d798f72c7ce638df2b2..ab7e8162a48f1f3fb08ae54d4778f82c365a3eb8 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.4 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTable.hh b/source/particles/management/include/G4ParticleTable.hh
index fcea1fc245679455e569bc709044bb31c5839a73..86520b0f0b97f5afd8173e3c7e65fe1fbdd8fa7c 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.14 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTable.icc b/source/particles/management/include/G4ParticleTable.icc
index 97a480965a70fdab9ed2ffab954a7106fc2f19c2..31fdbc63309cce84d50927ff78211fe9300cc3d5 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.7 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTableIterator.hh b/source/particles/management/include/G4ParticleTableIterator.hh
index 50f03a4173a10d007f7720068630edcd0c1c817e..4e9928f0954cdb163576ad51d737a9e09f3003fc 100644
--- a/source/particles/management/include/G4ParticleTableIterator.hh
+++ b/source/particles/management/include/G4ParticleTableIterator.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleTableIterator.hh,v 1.4 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleWithCuts.hh b/source/particles/management/include/G4ParticleWithCuts.hh
index fd22668d40f860b2e1f67d445eb33cd0410737b7..77c2e0690268947239ac7d88b8d46597fb786e49 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.5 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ParticleWithCuts.hh,v 1.6 2001/03/12 05:58:21 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -25,6 +25,7 @@
 //      BuildPhysicsTable() becomes dummy H.Kurashige 06 June 1998
 //      added  GetEnergyThreshold  H.Kurashige 08 June 1998
 //      change Lowest/HighestEnergy as static H.Kurashige 18 June 1998 
+//      added  RestoreCuts  H.Kurashige 09 Mar. 2001
 // ----------------------------------------------------------------
 // Class Description
 // "theCutInMaxInteractionLength", for charged particles, is
@@ -110,6 +111,13 @@ class G4ParticleWithCuts : public G4ParticleDefinition
    virtual G4double      	GetEnergyThreshold(const G4Material* aMaterial) const;
    static  void          	SetEnergyRange(G4double, G4double);
 
+  public:  // With Description
+   // This method concerning cut values is supposed to be used by
+   // G4VUserPhysicsList to restore cutvalues witout calculation
+
+   virtual void                  RestoreCuts(G4double cutInLength,
+					     const G4double* cutInEnergy );
+      
  protected:
     virtual   void  CalcEnergyCuts(G4double aCut);
 
diff --git a/source/particles/management/include/G4PhaseSpaceDecayChannel.hh b/source/particles/management/include/G4PhaseSpaceDecayChannel.hh
index e8b3c791d0ffd754a4ec6c128eec690924551c5b..e10fa394df3c967354c7c24343a0da3ede3d0e4d 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.3 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ShortLivedTable.hh b/source/particles/management/include/G4ShortLivedTable.hh
index b644884df12fcf96c3ddc577e647b1a50b7f21f5..d050271b4bc37e4853079b0b56a521cf3e1dcbb6 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.9 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4VDecayChannel.hh b/source/particles/management/include/G4VDecayChannel.hh
index b16d787030c66164f2d909eb40de348229c46b34..2a67e56bb18ded4a85a878c8f0d7fba936ef3bcb 100644
--- a/source/particles/management/include/G4VDecayChannel.hh
+++ b/source/particles/management/include/G4VDecayChannel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDecayChannel.hh,v 1.7 2000/03/23 16:43:41 hweber Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4VIsotopeTable.hh b/source/particles/management/include/G4VIsotopeTable.hh
index 0027552b694b7bbec99267ac54a5d7e6e6a9e9cb..69a48f58c03c1c37ecc513490525aa3d4ab9e48c 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.3 2000/01/26 10:52:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4DalitzDecayChannel.cc b/source/particles/management/src/G4DalitzDecayChannel.cc
index 4f1b9c38a1150846fde982c21ed2b0b99b9a4ced..da220b7661552d6b92d37fdb59b26e118cafc565 100644
--- a/source/particles/management/src/G4DalitzDecayChannel.cc
+++ b/source/particles/management/src/G4DalitzDecayChannel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DalitzDecayChannel.cc,v 1.4 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4DecayProducts.cc b/source/particles/management/src/G4DecayProducts.cc
index 8e137fb6effd54846706a5f55b5e7eb56594b1db..d87d86ed660ec451975402bdbede7fba46a9fff1 100644
--- a/source/particles/management/src/G4DecayProducts.cc
+++ b/source/particles/management/src/G4DecayProducts.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DecayProducts.cc,v 1.6 2000/10/20 11:35:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4DecayTable.cc b/source/particles/management/src/G4DecayTable.cc
index e09f100bc1a8e35f43f45af598f44dfce60e6840..bf424793ee8319fc01410225c502767fce839c14 100644
--- a/source/particles/management/src/G4DecayTable.cc
+++ b/source/particles/management/src/G4DecayTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DecayTable.cc,v 1.6 2000/02/25 07:36:23 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4DecayTableMessenger.cc b/source/particles/management/src/G4DecayTableMessenger.cc
index 8c29a9534c8909fd1b455983f78e4e020c3e9569..ced1739f183bfabcdc20dffb0607987624ec4178 100644
--- a/source/particles/management/src/G4DecayTableMessenger.cc
+++ b/source/particles/management/src/G4DecayTableMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DecayTableMessenger.cc,v 1.3 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/src/G4DynamicParticle.cc b/source/particles/management/src/G4DynamicParticle.cc
index 5c1d2e65d79dd75af2da48d156a52e7470cc69d8..6159dd33781c1039a8ec8729fc703fc9aa095997 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.7 2000/10/20 11:35:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4DynamicParticle.cc,v 1.9 2001/03/05 08:32:38 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -35,6 +35,8 @@
 //         modify DumpInfo()
 //      revised by Hisaya Kurashige, 5  June 1998
 //         remove    theKillProcess
+//      revised by Hisaya Kurashige, 5  Mar 2001
+//         fixed  SetDefinition()
 //--------------------------------------------------------------
 #include "G4DynamicParticle.hh"
 #include "G4DecayProducts.hh"
@@ -54,6 +56,7 @@ G4DynamicParticle::G4DynamicParticle():
 		   theKineticEnergy(0.0),
  		   theProperTime(0.0),
                    thePreAssignedDecayProducts(0),
+                   thePreAssignedDecayTime(-1.0),
 		   verboseLevel(1)
 {  
    theDynamicalMass = 0.0; 
@@ -72,6 +75,7 @@ G4DynamicParticle::G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
 		   theKineticEnergy(aKineticEnergy),
  		   theProperTime(0.0),
                    thePreAssignedDecayProducts(0),
+                   thePreAssignedDecayTime(-1.0),
 		   verboseLevel(1)
 {  
   // set dynamic charge/mass
@@ -86,6 +90,7 @@ G4DynamicParticle::G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
 		   theParticleDefinition(aParticleDefinition),
        		   theProperTime(0.0),
                    thePreAssignedDecayProducts(0),
+                   thePreAssignedDecayTime(-1.0),
 		   verboseLevel(1)
 {
   // set dynamic charge/mass
@@ -113,6 +118,7 @@ G4DynamicParticle::G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
 				     const G4LorentzVector   &aParticleMomentum):
 		   theParticleDefinition(aParticleDefinition),
  		   theProperTime(0.0),
+                   thePreAssignedDecayTime(-1.0),
                    thePreAssignedDecayProducts(0),
 		   verboseLevel(1)
 {
@@ -151,6 +157,7 @@ G4DynamicParticle::G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
                    theParticleDefinition(aParticleDefinition),
                    thePreAssignedDecayProducts(0),
                    theProperTime(0.0),
+                   thePreAssignedDecayTime(-1.0),
 		   verboseLevel(1)
 {
    // set dynamic charge/mass
@@ -200,8 +207,9 @@ G4DynamicParticle::G4DynamicParticle(const G4DynamicParticle &right)
   // proper time is set to zero
   theProperTime = 0.0;
 
-  // thePreAssignedDecayProducts must not be copied.
+  // thePreAssignedDecayProducts/Time must not be copied.
   thePreAssignedDecayProducts = 0;
+  thePreAssignedDecayTime = -1.0;
 
 }
 
@@ -243,10 +251,38 @@ G4DynamicParticle & G4DynamicParticle::operator=(const G4DynamicParticle &right)
     
     // thePreAssignedDecayProducts must not be copied.
     thePreAssignedDecayProducts = 0;
+    thePreAssignedDecayTime = -1.0;
+
   }
   return *this;
 }
 
+////////////////////
+void G4DynamicParticle::SetDefinition(G4ParticleDefinition * aParticleDefinition)
+{
+  // remove preassigned decay
+  if (thePreAssignedDecayProducts != 0) {
+    G4cout << " G4DynamicParticle::SetDefinition()::";
+    G4cout << "!!! Pre-assigned decay products is attached !!!! " << G4endl; 
+    DumpInfo(0); 
+    G4cout << "!!! New Definition is " << aParticleDefinition->GetParticleName() << " !!! " << G4endl; 
+    G4cout << "!!! Pre-assigned decay products will be deleted !!!! " << G4endl; 
+    delete thePreAssignedDecayProducts;
+  }
+  thePreAssignedDecayProducts = 0;
+
+  theParticleDefinition = aParticleDefinition;
+  // set Dynamic mass/chrge
+  theDynamicalMass = theParticleDefinition->GetPDGMass();
+  theDynamicalCharge = theParticleDefinition->GetPDGCharge();
+
+  // Set electron orbits
+  if (theElectronOccupancy != 0) delete theElectronOccupancy;
+  theElectronOccupancy =0;
+  AllocateElectronOccupancy();
+
+}
+
 ////////////////////
 G4int G4DynamicParticle::operator==(const G4DynamicParticle &right) const
 {
@@ -350,11 +386,6 @@ void G4DynamicParticle::DumpInfo(G4int mode) const
 	theElectronOccupancy->DumpInfo();
       }
     }
-    if (mode>1) {
-      if( theElectronOccupancy != 0) {
-	theElectronOccupancy->DumpInfo();
-      }
-    }
   }
 }
 
diff --git a/source/particles/management/src/G4ElectronOccupancy.cc b/source/particles/management/src/G4ElectronOccupancy.cc
index 553fcf95d8f500980e074ab427169ccf4f194a44..0d4f3992eeddb35b1cfde046d86d4ec59e5aea6e 100644
--- a/source/particles/management/src/G4ElectronOccupancy.cc
+++ b/source/particles/management/src/G4ElectronOccupancy.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ElectronOccupancy.cc,v 1.5 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/management/src/G4IonTable.cc b/source/particles/management/src/G4IonTable.cc
index bdedb4ff609c0afc55de55bbb91f2aa57d118630..04dc74a2ec8d1ed057f7d097d6980ccdf472e895 100644
--- a/source/particles/management/src/G4IonTable.cc
+++ b/source/particles/management/src/G4IonTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IonTable.cc,v 1.26 2000/09/14 10:00:22 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/management/src/G4Ions.cc b/source/particles/management/src/G4Ions.cc
index 4477cdca0bb5d06408e7311fad86a5ac3b400c7d..9ff7b304777d24aef81dd2f25cdccff7aaf2587a 100644
--- a/source/particles/management/src/G4Ions.cc
+++ b/source/particles/management/src/G4Ions.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Ions.cc,v 1.4 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/management/src/G4IsotopeProperty.cc b/source/particles/management/src/G4IsotopeProperty.cc
index 36e96dc60b91bf476e0a9acf6508b855d5ecf7d0..fdaac25ae233351e3810aa2b12d289731e925045 100644
--- a/source/particles/management/src/G4IsotopeProperty.cc
+++ b/source/particles/management/src/G4IsotopeProperty.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IsotopeProperty.cc,v 1.2 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/management/src/G4KL3DecayChannel.cc b/source/particles/management/src/G4KL3DecayChannel.cc
index 3d0830999458245770e18ab12de9039f941836ba..74fe74f0407ef4ec1f53d282838b0b14083c0983 100644
--- a/source/particles/management/src/G4KL3DecayChannel.cc
+++ b/source/particles/management/src/G4KL3DecayChannel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KL3DecayChannel.cc,v 1.4 1999/12/15 14:51:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4MuonDecayChannel.cc b/source/particles/management/src/G4MuonDecayChannel.cc
index 97d971d7c6c0395bf7f1a808cbed23bc9a59bd08..bcabad142d79ef18b2eb4c76cfd9c8877ae66bd9 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.6 2000/02/25 07:36:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MuonDecayChannel.cc,v 1.7 2001/02/28 07:29:28 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -16,7 +16,8 @@
 //      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      30 May  1997 H.Kurashige
-//      10 June 1997 H.Kurashige
+//
+//      Fix bug in calcuration of electron energy in DecayIt 28 Feb. 01 H.Kurashige 
 // ------------------------------------------------------------
 
 #include "G4ParticleDefinition.hh"
@@ -104,7 +105,7 @@ G4DecayProducts *G4MuonDecayChannel::DecayIt(G4double)
     do {
       r = G4UniformRand();
       x = xmax*G4UniformRand();
-    } while (r < (3.0 - 2.0*x)*x*x);    
+    } while (r > (3.0 - 2.0*x)*x*x);    
     energy = x*parentmass/2.0 - daughtermass[0];
    } while (energy <0.0);
   //create daughter G4DynamicParticle 
diff --git a/source/particles/management/src/G4NucleiProperties.cc b/source/particles/management/src/G4NucleiProperties.cc
index 5624cc97d1e0b9ab235aa53bf2db4b081c30a8b2..d627144f477853396938872dadd5640949775198 100644
--- a/source/particles/management/src/G4NucleiProperties.cc
+++ b/source/particles/management/src/G4NucleiProperties.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NucleiProperties.cc,v 1.6 1999/12/15 14:51:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4NucleiPropertiesTableA.cc b/source/particles/management/src/G4NucleiPropertiesTableA.cc
index ce8c2f8ce6ee6bb5e67faa32dd97715bce451ba7..3b4db27d26f6d0956068bd87bff24ea0561fe4db 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.5 1999/12/15 14:51:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2046c69ed5c950f7ecf99e5386f8a7016f2f697e..d7306ae881ed59d170500f1cc1818cc47fe1306a 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.4 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c3bf82f9b463d3fd8a13fb1c3bae3a8a4ed45e47..8574152833055f4d7954dedbd29f156e3e28cee3 100644
--- a/source/particles/management/src/G4PDGCodeChecker.cc
+++ b/source/particles/management/src/G4PDGCodeChecker.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PDGCodeChecker.cc,v 1.3 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/management/src/G4ParticleDefinition.cc b/source/particles/management/src/G4ParticleDefinition.cc
index 9b2d8d7c5c59fa44e487f3da1780c7c3b25bbcb9..2cf23e629ac46e9904e965df13cee06a82772123 100644
--- a/source/particles/management/src/G4ParticleDefinition.cc
+++ b/source/particles/management/src/G4ParticleDefinition.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleDefinition.cc,v 1.10 2000/10/20 11:35:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/management/src/G4ParticleMessenger.cc b/source/particles/management/src/G4ParticleMessenger.cc
index 78cfdfbafb186a27fa8db9b9b9ec446fba704d29..c7b5fbec011a3ac970d145d0ea706248c309dbf1 100644
--- a/source/particles/management/src/G4ParticleMessenger.cc
+++ b/source/particles/management/src/G4ParticleMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleMessenger.cc,v 1.4 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/src/G4ParticlePropertyMessenger.cc b/source/particles/management/src/G4ParticlePropertyMessenger.cc
index d07f630c02d3e03c7287cf357c760ba916f2e013..78b35dab9feee5a219b45ef37c239c4f1e6bdcf9 100644
--- a/source/particles/management/src/G4ParticlePropertyMessenger.cc
+++ b/source/particles/management/src/G4ParticlePropertyMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticlePropertyMessenger.cc,v 1.3 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/src/G4ParticleTable.cc b/source/particles/management/src/G4ParticleTable.cc
index d2873589f466d9c80284507d00d24926f327b249..4cabb52c03ff89dbe8fcd385ba60fe6ed09d06d4 100644
--- a/source/particles/management/src/G4ParticleTable.cc
+++ b/source/particles/management/src/G4ParticleTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleTable.cc,v 1.17 2000/10/20 11:35:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4ParticleTable
 //
diff --git a/source/particles/management/src/G4ParticleWithCuts.cc b/source/particles/management/src/G4ParticleWithCuts.cc
index 0ab83fe83bc9d916d662492a4efdb99bdba1350f..b628162291f7cc5ed0f43a6f84636db28c5f25fa 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.6 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ParticleWithCuts.cc,v 1.8 2001/03/12 05:58:22 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -24,6 +24,7 @@
 //   remove BuildPhysicTabel()   06 June 1998 H.Kurashige
 //   bug in CalcEnergyCuts is corrected , 22 June 1998 L.Urban
 //   modify CalcEnergyCuts 09 Nov. 1998, L.Urban
+//   added  RestoreCuts  H.Kurashige 09 Mar. 2001
 // ------------------------------------------------------------
 #include "globals.hh"
 #include "G4ParticleWithCuts.hh"
@@ -174,8 +175,9 @@ void G4ParticleWithCuts::BuildLossTable()
   if (NumberOfElements ==0) 
   {
     NumberOfElements = G4Element::GetNumberOfElements();
-    theLossTable = new
-               G4LossTable(G4Element::GetNumberOfElements());
+    theLossTable = new G4LossTable();
+    theLossTable->reserve(G4Element::GetNumberOfElements());
+
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>2) {
       G4cout << "G4ParticleWithCuts::BuildLossTable() ";
@@ -274,6 +276,27 @@ G4double G4ParticleWithCuts::ConvertCutToKineticEnergy(G4RangeVector* rangeVecto
   }
 }
 
+// **********************************************************************
+// **************************** RestoreCuts *********************************
+// **********************************************************************
+
+void  G4ParticleWithCuts::RestoreCuts(G4double cutInLength,
+				      const G4double* cutInEnergy )
+{
+  // Set cut in stopping range
+  theCutInMaxInteractionLength = cutInLength;
+
+  const G4MaterialTable* materialTable = G4Material::GetMaterialTable();
+
+  // Restore the vector of cuts in energy corresponding to the range cut
+  if(theKineticEnergyCuts) delete [] theKineticEnergyCuts;
+  theKineticEnergyCuts = new G4double [materialTable->length()];
+  for (G4int j=0; j<materialTable->length(); j +=1) {
+    theKineticEnergyCuts[j] = cutInEnergy[j];
+  } 
+}
+      
+
 // **********************************************************************
 // **************************** SetCuts *********************************
 // **********************************************************************
diff --git a/source/particles/management/src/G4PhaseSpaceDecayChannel.cc b/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
index eef56480385813645d0069573388e971cb30f0a9..dc0b76fd14b17af83d2e5ba6000d1ebaba7a1259 100644
--- a/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
+++ b/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhaseSpaceDecayChannel.cc,v 1.4 1999/12/15 14:51:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4ShortLivedTable.cc b/source/particles/management/src/G4ShortLivedTable.cc
index 7f394968d4e1a0849f53617daacbd71cea69100c..fd542fa132c26a0f679ad529030cd3e3d71bdb9f 100644
--- a/source/particles/management/src/G4ShortLivedTable.cc
+++ b/source/particles/management/src/G4ShortLivedTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ShortLivedTable.cc,v 1.9 2000/02/25 07:36:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/management/src/G4VDecayChannel.cc b/source/particles/management/src/G4VDecayChannel.cc
index 2658e39b9f49d37eada2b77e3be1fce0be1180b8..99ac1fb735dbe80496b08245f366c39f0826b76f 100644
--- a/source/particles/management/src/G4VDecayChannel.cc
+++ b/source/particles/management/src/G4VDecayChannel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VDecayChannel.cc,v 1.8 2000/05/29 01:30:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4DiQuarks.hh b/source/particles/shortlived/include/G4DiQuarks.hh
index f2a7b8a695a57792ee3a8c9979f4b1a2503281b7..b8ef2ddc95f03938da238180c165c2ba851f53f5 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.3 1999/12/15 14:51:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh b/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh
index 45b52ec56e2bab15b5d19da94ac1a750c7d55856..30581be07c4730424dd682b8ed5d5805bf060f01 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedBaryons.hh b/source/particles/shortlived/include/G4ExcitedBaryons.hh
index 9ac6a4346972d3f44e264c51d744722673539d7c..26458cfd3739a86215d7c4b81bc87157882de282 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh b/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh
index b1811cdd2fd0af1dfa062e1e28fa91410adc96a0..abf3f387c7707b8f75e27cf40a282dccc2121873 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh b/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh
index 94d51b621191dca1d10e2900f3ff0141e4445550..68107c0288887e02a5c9b56e3d70e2f4d65bc83a 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh b/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh
index 2af45075015611cf5dd3e6d8a823bf9cdead24e7..73122880a5920ef1b48abfd2e8015545c4fab2e4 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.5 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedMesons.hh b/source/particles/shortlived/include/G4ExcitedMesons.hh
index 1cb171c38007faef67dc4622aeda58cdefc31445..5853dcc45539a90ffd71c7933326f58003be4636 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh b/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh
index 6f0b44c19e9886f799ffce1ff279f937bfe8f623..824b3248355d9a682171c9a087fc848a4ffdcce6 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh b/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh
index 3a2f3d1d41becb48cb37f61bec3f9089ba16e93e..3dd0823305e0995816bad38ab48337e75d90746f 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedXiConstructor.hh b/source/particles/shortlived/include/G4ExcitedXiConstructor.hh
index f2dff2a22526c4bc7c636e23f87449851dd8e78f..a9f28019ab33d1af10094ce9773aae8e869d7029 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.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4Gluons.hh b/source/particles/shortlived/include/G4Gluons.hh
index f0fa112db522c1010d78c4918b3bb3ea0af8e56c..aa7048ffe33c1e5d7e1d6dbe07ffaced949edcd1 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.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4Quarks.hh b/source/particles/shortlived/include/G4Quarks.hh
index cfc7898cd218e84cc67594849aedcef13dcdde01..29f9e9de80769e2f73d570547bd90799c382e1a0 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.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ShortLivedConstructor.hh b/source/particles/shortlived/include/G4ShortLivedConstructor.hh
index 6af4ad4f0665ae0e7fb2e4b9b6241e2c7137b711..de651729f3e6ab30b0bd1b8b919260971c6b488a 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.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4VShortLivedParticle.hh b/source/particles/shortlived/include/G4VShortLivedParticle.hh
index 97eda1e1e2d3b2764cdf13f58ce62789b278a523..728c4fa2b965145055e8982f5012dac9c4fa4a3a 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.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4DiQuarks.cc b/source/particles/shortlived/src/G4DiQuarks.cc
index 67cbf4dca205db77ec02b2e57206f4b38d230927..900f8676903cbc2b375de0c36f41b9e5747c7f7e 100644
--- a/source/particles/shortlived/src/G4DiQuarks.cc
+++ b/source/particles/shortlived/src/G4DiQuarks.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DiQuarks.cc,v 1.3 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
index ce82732baa4875cb7134bf4974c65a89f7094a61..26c3fa882e84300355382750447fbf13c09d6d92 100644
--- a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedBaryonConstructor.cc,v 1.4 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedBaryons.cc b/source/particles/shortlived/src/G4ExcitedBaryons.cc
index bf360654bcf17dcf9dabbf581d759208dc271564..50b9ac0134e853e724c3cc5af945247fb57a2165 100644
--- a/source/particles/shortlived/src/G4ExcitedBaryons.cc
+++ b/source/particles/shortlived/src/G4ExcitedBaryons.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedBaryons.cc,v 1.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc b/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc
index 3ebb4976b12bb5b868735862316c5ceb8511f4f6..ced03667e37830cbdc18863b72666ef62a4547c6 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.4 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc b/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc
index e95f28205f2bd114981d94c0d6fb33a889e3f146..25e83ebedba6001334cba623741b50903f0fc601 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.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
index d6466ee36ef78e0ca8cb0aefe681b044a2a2ce29..2382bbc5c5a101fd463d7cb74dd63ff6a0b3d86f 100644
--- a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedMesonConstructor.cc,v 1.8 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedMesons.cc b/source/particles/shortlived/src/G4ExcitedMesons.cc
index 9601d22ac2434038427d2c2e5ea17ec607848af0..49648c71c8bc69e6bd3905dd64fb40c13abab5a0 100644
--- a/source/particles/shortlived/src/G4ExcitedMesons.cc
+++ b/source/particles/shortlived/src/G4ExcitedMesons.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ExcitedMesons.cc,v 1.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc b/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc
index 46bf90ceb4b4794fcb3626b427a9f69c6e067b27..b85513aa7219f49d11b6ba32e6d0422306326bf4 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.4 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc b/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc
index 026f58e5e43fc90e33811f383fa217adcb1fe402..8539f7014e2d76e27d8985fb93b4cd53f4686630 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.4 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedXiConstructor.cc b/source/particles/shortlived/src/G4ExcitedXiConstructor.cc
index 231934ca882cc34c495ed96350fe5e5fbff04c0b..4d2a84870afe8653c071e7147321f5b3292b4a75 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.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4Gluons.cc b/source/particles/shortlived/src/G4Gluons.cc
index 3ccb0531b08daf69ebad10ba7e0152f28849689d..26a70da03daee74f109b3f53c4d1e489a8788e22 100644
--- a/source/particles/shortlived/src/G4Gluons.cc
+++ b/source/particles/shortlived/src/G4Gluons.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Gluons.cc,v 1.3 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4Quarks.cc b/source/particles/shortlived/src/G4Quarks.cc
index 62f451307ff16fb90458d8b0ba9ea2c2148cfe27..4bda3ae21d444b76ebb563d27179824905e99ad7 100644
--- a/source/particles/shortlived/src/G4Quarks.cc
+++ b/source/particles/shortlived/src/G4Quarks.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Quarks.cc,v 1.3 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ShortLivedConstructor.cc b/source/particles/shortlived/src/G4ShortLivedConstructor.cc
index 3826cac8ba754ab924d7f3f18513d97d310f3312..264806a53b551093e6e1f990e010900df5f76f25 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.7 2000/03/02 00:52:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4VShortLivedParticle.cc b/source/particles/shortlived/src/G4VShortLivedParticle.cc
index fc940819d7b498a46786713fbef97dd4e75d4364..fb40143cb41142bc2b1dafa2c280052ff51a6d0a 100644
--- a/source/particles/shortlived/src/G4VShortLivedParticle.cc
+++ b/source/particles/shortlived/src/G4VShortLivedParticle.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VShortLivedParticle.cc,v 1.3 1999/12/15 14:51:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/persistency/History b/source/persistency/History
index 72b7740321d1bc2742421d18ab56b2f5d9e62860..f2fd5d48fb8ee60d52e2f80e967c727541d98159 100644
--- a/source/persistency/History
+++ b/source/persistency/History
@@ -15,6 +15,13 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+14 March, 01   Y.Morita (persistency-V03-00-01)
+- G4PDCofThisEvent.ddl: fixed a bug in GetNumberOfCollections()
+
+08 March, 01   G.Cosmo (persistency-V03-00-00)
+- G4Pglobals.hh: substituted inclusion of G4UnitsTest.hh with G4SIUnits.hh
+  according to tag "global-V03-00-06".
+
 15 December, 00   Y.Morita (persistency-V02-00-03)
 - added more SRM comments
 
diff --git a/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl b/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
index 624ccb1c894bae64082a917d216fb8ed4c43146c..faf26a06c6da580cdb92e6248e67a1980dd53e4d 100644
--- a/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
+++ b/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PDCofThisEvent.ddl,v 1.4 2000/12/15 08:04:13 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PDCofThisEvent.ddl,v 1.5 2001/03/14 17:15:46 morita Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
@@ -60,7 +60,7 @@ class G4PDCofThisEvent
         G4int n = 0;
         for(int i=0;i<DC.size();i++)
         {
-          if(! DC[i] ) n++;
+          if( DC[i] != NULL ) n++;
         }
         return n;
       }
diff --git a/source/persistency/digits+hits/digits/include/G4PVDigit.ddl b/source/persistency/digits+hits/digits/include/G4PVDigit.ddl
index 101e66b8258fdfa7d08ebbae613ffddf725767e8..a630c772d3bd3a40d05eb081279240a1e66b1e8f 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.3 2000/12/15 08:04:13 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl b/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
index 9fe9c3bb89d1d65dfd26df96d88840dedfb87e89..6441334805f4df455ef7b1569dbe7e8baf9f2326 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.6 2000/12/15 08:04:13 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh b/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
index 43b24bf75d0865f97c992c36d0abe76cf0ddf54a..ca48e1dca6af7b61b87fc202e3f543e1f3e5304b 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.7 2000/12/15 08:04:13 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc b/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
index e226a5f7e9fe02201ddddb49659047a66f199695..5b8ccca71450b89958613b00082d7f87b218db55 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c282399d8758dffe3b4c00d95fd83a487e192ac1..345d988ecd99a7e9ddc6cee072bf2a40c6fd59f1 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c04763d139ba2d2a604d6879dd206b00ff943cca..a75ec7c03ca91b57f2b33473119a8a6343e16838 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4PVDigitsCollection
diff --git a/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc b/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
index 56d00d34dec51110de792f86eb34d2e3c094f8b7..1da72e909c2d0f1ba33b47a6077fb59b74df2bff 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PersistentDigitMan 
 //
diff --git a/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl b/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
index 1228439da43e6a5de82e934a9e201f52c46d8c1d..1e8f2c1bbfd07e325cd4e8106f7cda88d32c9fff 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.9 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/hits/include/G4PVHit.ddl b/source/persistency/digits+hits/hits/include/G4PVHit.ddl
index 7dfcc28417d088e3382077b649398abbb3147475..b015552440d0aa326dd48282b20d62021291fc6e 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.7 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl b/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
index 2a0f1d9494f3e4d3047b0429700a78ab771f4b83..42ade118b9e4fc8fed333cead077c43c268c2d7b 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.14 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh b/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
index f709b887835596404a32acdcb66ee4cd36faba2b..151b341ea959021427c5cf475f15d332e6a279b3 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.6 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc b/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
index b5941e25f69de697ea933fcdf4335afb65553d98..743ff700512fac4725694c10484f0da05acbe289 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2806f61136b88ed15c9e7267560f9a991ebab901..fb5c415192d7fc67682ffa80df284e19f4912053 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f649e26f3b4f543e5510acdcb81be12c217bb381..6d350043e3f890aa3dc82384e2b7fdb78e7c5e0f 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4PVHitsCollection
diff --git a/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc b/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
index 8a0847a15c3162b65de5908a75e9c178ce232e59..61cbe29bb940b8322a2e1a36529060dcbdbb364e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PersistentHitMan 
 //
diff --git a/source/persistency/events/include/G4PEvent.ddl b/source/persistency/events/include/G4PEvent.ddl
index 9f27ebb347cd6f2760e555dde105f2cb12fb584d..ab507261f224ec15f8de0de3b4cba19d3e210c21 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.10 2000/12/05 14:40:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/events/include/G4PPrimaryParticle.ddl b/source/persistency/events/include/G4PPrimaryParticle.ddl
index a201709c334d021fc25425007ab229b8a9fe45fc..2d259e0a3f29de741a953715cd069a75acc2b436 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.2 2000/11/02 12:41:59 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4PPrimaryParticle_h
diff --git a/source/persistency/events/include/G4PPrimaryVertex.ddl b/source/persistency/events/include/G4PPrimaryVertex.ddl
index ba448e9fc0614afbb1fe098301fddadd3c9832ec..0870f73d5d82f51d7e645ab2aeb39c121a85c9fc 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.9 2000/12/05 14:40:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/events/include/G4PersistentEventMan.hh b/source/persistency/events/include/G4PersistentEventMan.hh
index 4ad46ebaf0d0bbc257816ab6913fa5b5cf63e7e2..9dfd90cf13989adecbf457da56d16432dba9da93 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.11 2000/12/15 07:54:49 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/events/src/G4PEvent.cc b/source/persistency/events/src/G4PEvent.cc
index 8ee6f480839d82e3cb48d0fa5d7fb645d582f8dd..e1902ec157035c2e9d1d95be204121b52c6a99b5 100644
--- a/source/persistency/events/src/G4PEvent.cc
+++ b/source/persistency/events/src/G4PEvent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PEvent.cc,v 1.11 1999/12/15 14:51:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // G4PEvent
diff --git a/source/persistency/events/src/G4PPrimaryParticle.cc b/source/persistency/events/src/G4PPrimaryParticle.cc
index ac67e05e08d225c8f2a0cf340842ae5d9fd82f7b..1738c677a725e0d4bb65d4ff399d744b687cc0eb 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4PPrimaryParticle.hh"
diff --git a/source/persistency/events/src/G4PPrimaryVertex.cc b/source/persistency/events/src/G4PPrimaryVertex.cc
index 24e4e55b34b3d6ac2c3a8e2a0f9ec315d84dce9b..3ac0b98fbdbbd35bbbaf96622f4b07553227c761 100644
--- a/source/persistency/events/src/G4PPrimaryVertex.cc
+++ b/source/persistency/events/src/G4PPrimaryVertex.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPrimaryVertex.cc,v 1.7 1999/12/15 14:51:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4PPrimaryVertex.hh"
diff --git a/source/persistency/events/src/G4PersistentEventMan.cc b/source/persistency/events/src/G4PersistentEventMan.cc
index eb041e89bae8d9cfbe37b54a3b7466f16e4424bd..d3327b96a4da414fe242bd679bbabc750789ce64 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PersistentEventMan 
 //
diff --git a/source/persistency/geometry/global/include/G4PAffineTransform.ddl b/source/persistency/geometry/global/include/G4PAffineTransform.ddl
index 1071a614098694c111f964f68b02b4761561b2da..7d42443874048dbe7231fa6f529f3a2be087ff5a 100644
--- a/source/persistency/geometry/global/include/G4PAffineTransform.ddl
+++ b/source/persistency/geometry/global/include/G4PAffineTransform.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAffineTransform.ddl,v 1.4 1999/12/15 14:51:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // persistenet class of G4AffineTransform
 //
diff --git a/source/persistency/geometry/global/include/G4PVSolid.ddl b/source/persistency/geometry/global/include/G4PVSolid.ddl
index a72dbc6056f8c782257c597d2d1a2ec0b58625f8..0d979e58b853c403d020e07606c15032d4f81268 100644
--- a/source/persistency/geometry/global/include/G4PVSolid.ddl
+++ b/source/persistency/geometry/global/include/G4PVSolid.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVSolid.ddl,v 1.4 2000/11/02 12:42:06 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVSolid
diff --git a/source/persistency/geometry/global/src/G4PAffineTransform.cc b/source/persistency/geometry/global/src/G4PAffineTransform.cc
index 18abedb478c4b1c81fdcdad80be397c327bceabd..f84366c6e1385529a14f94d4db06477fda973daa 100644
--- a/source/persistency/geometry/global/src/G4PAffineTransform.cc
+++ b/source/persistency/geometry/global/src/G4PAffineTransform.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAffineTransform.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PAffineTransform
 //
diff --git a/source/persistency/geometry/global/src/G4PVSolid.cc b/source/persistency/geometry/global/src/G4PVSolid.cc
index 4f8960bbdb34a6c868aa0059c448fe38d0cac022..25b207a784666effcf293035e809e1b1669b44f0 100644
--- a/source/persistency/geometry/global/src/G4PVSolid.cc
+++ b/source/persistency/geometry/global/src/G4PVSolid.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVSolid.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PVSolid
 //
diff --git a/source/persistency/geometry/management/include/G4LogVolRefArray.hh b/source/persistency/geometry/management/include/G4LogVolRefArray.hh
index 60e6ae778ee436f11041591dba7ca26e28e65165..f023933080c4f1207cfcadaec49e2ce6766c9274 100644
--- a/source/persistency/geometry/management/include/G4LogVolRefArray.hh
+++ b/source/persistency/geometry/management/include/G4LogVolRefArray.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogVolRefArray.hh,v 1.1 2000/11/17 05:10:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl b/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
index 8544e0ed21aba85fef03d2a44de7ba01410e77ae..14a6ed1cca4f2867e941b59551c14c8169f0d212 100644
--- a/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
+++ b/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PGeometryObjectMap.ddl,v 1.7 2000/11/22 15:29:39 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/include/G4PLogicalVolume.ddl b/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
index f4aab571cfa0204bc943633db172e9ab428645bd..f6e0d265b7fa81bea6be00b21a13f322d0c52cdf 100644
--- a/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
+++ b/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PLogicalVolume.ddl,v 1.9 2000/11/02 12:42:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PLogicalVolume
diff --git a/source/persistency/geometry/management/include/G4PPVParameterised.ddl b/source/persistency/geometry/management/include/G4PPVParameterised.ddl
index 0ed5a6a002a2f6db6fbb9f33f71615ddbd8d50ac..e6d3060a18660dae4e13b9fe0f30a9ad449091f2 100644
--- a/source/persistency/geometry/management/include/G4PPVParameterised.ddl
+++ b/source/persistency/geometry/management/include/G4PPVParameterised.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPVParameterised.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PPVParameterised
 //
diff --git a/source/persistency/geometry/management/include/G4PPVPlacement.ddl b/source/persistency/geometry/management/include/G4PPVPlacement.ddl
index 11652bfa4f644e3917eae5f24541057b0bc79c92..ffb9a9bd12f942210a685a48902d53576059cb30 100644
--- a/source/persistency/geometry/management/include/G4PPVPlacement.ddl
+++ b/source/persistency/geometry/management/include/G4PPVPlacement.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPVPlacement.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f474c4e6b1e14e3c96986a2eade191dc5d057a45..bc1df195ece9e310d0ee44d66892d315807f1077 100644
--- a/source/persistency/geometry/management/include/G4PPVReplica.ddl
+++ b/source/persistency/geometry/management/include/G4PPVReplica.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPVReplica.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PPVReplica
diff --git a/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl b/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
index f463963a3d93794803b4c3b48e1795f1a67a6c0d..081213c2c336426306a3877cdeb709c7d1cb9c18 100644
--- a/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
+++ b/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVPhysicalVolume.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PVPhysicalVolume
diff --git a/source/persistency/geometry/management/include/G4PersistentGeomMan.hh b/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
index 30d948a71e3e99d982bc84b63e848d434d885a6e..2d28c09a4984fcb6bb45ee4c401528c43ed62f04 100644
--- a/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
+++ b/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentGeomMan.hh,v 1.10 2000/12/15 07:56:35 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh b/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
index f7ab9428a6e9de7d4b0800828ea5aa548639b738..a1bab9f6c21326cbd2d897d650a6d0eb30b63812 100644
--- a/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
+++ b/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPhysVolRefArray.hh,v 1.1 2000/11/17 05:10:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/include/G4VSolidRefArray.hh b/source/persistency/geometry/management/include/G4VSolidRefArray.hh
index f2d4c246f73ceff29ea3a4528c80702beca30d01..2017850c3b2c178d1a840adce4e2017e2b81eb7d 100644
--- a/source/persistency/geometry/management/include/G4VSolidRefArray.hh
+++ b/source/persistency/geometry/management/include/G4VSolidRefArray.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VSolidRefArray.hh,v 1.1 2000/11/17 05:10:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc b/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
index fc3e2996f185ae95d8a5c6bb5c4fae55263b6538..bf120c6b0c875f11ba23288349c5dc2c62ae1b1b 100644
--- a/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
+++ b/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PGeometryObjectMap.cc,v 1.6 2000/11/17 05:10:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PGeometryObjectMap 
 //
diff --git a/source/persistency/geometry/management/src/G4PLogicalVolume.cc b/source/persistency/geometry/management/src/G4PLogicalVolume.cc
index bfae23b84eef89ac68b8197773e6fcf81f85f109..08cafe5331a5f660159afb699a429cf568c6d70f 100644
--- a/source/persistency/geometry/management/src/G4PLogicalVolume.cc
+++ b/source/persistency/geometry/management/src/G4PLogicalVolume.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PLogicalVolume.cc,v 1.5 2000/06/09 12:56:44 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //                                      Takashi.Sasaki@kek.jp
diff --git a/source/persistency/geometry/management/src/G4PPVParameterised.cc b/source/persistency/geometry/management/src/G4PPVParameterised.cc
index 458114695b72fbbd2fce06bb180cd3f7faa9a5c1..c32d90b2248d2a66dd9c4c1526b18bcbfbb65fa9 100644
--- a/source/persistency/geometry/management/src/G4PPVParameterised.cc
+++ b/source/persistency/geometry/management/src/G4PPVParameterised.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPVParameterised.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PPVPlacement.cc b/source/persistency/geometry/management/src/G4PPVPlacement.cc
index 16736f60a7b38e30a8e8ddf65b2ec8bd5454fcf7..f27bb68bc305e7324fb78aeb66b19894856d265c 100644
--- a/source/persistency/geometry/management/src/G4PPVPlacement.cc
+++ b/source/persistency/geometry/management/src/G4PPVPlacement.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPVPlacement.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PPVReplica.cc b/source/persistency/geometry/management/src/G4PPVReplica.cc
index 45a987342c7d57cc8b7fb16586590284619989b4..118a9c135b83516c4cdade21662752dddaf3ca5c 100644
--- a/source/persistency/geometry/management/src/G4PPVReplica.cc
+++ b/source/persistency/geometry/management/src/G4PPVReplica.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPVReplica.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc b/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
index 5a81ad8fd60c85a9e11bb45ce2412c70ebd96d22..01181e8e5578908eb1a95857bbba746540069285 100644
--- a/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
+++ b/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PVPhysicalVolume.cc,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //                         Takashi.Sasaki@kek.jp
diff --git a/source/persistency/geometry/management/src/G4PersistentGeomMan.cc b/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
index b7c5ecebd4b6e8d01160ff289b38fe1e80277df0..4d0a825542574237ca64e737eaf6f62ce8b46a76 100644
--- a/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
+++ b/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentGeomMan.cc,v 1.14 2000/06/09 12:56:44 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PersistentGeomMan 
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PBox.ddl b/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
index c0744a35af6a786465ce160ee16360f8e5a802d1..930fd67105637f387e8c518b1e5ba6a1f89a72df 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PBox.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PBox
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl b/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
index df70a43a1426686d629c17f3474ba63f0db67f74..17847306b5bd439c027bd6a70a411e492d778e11 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PCSGSolid.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 // class G4CSGSolid
diff --git a/source/persistency/geometry/solids/CSG/include/G4PCons.ddl b/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
index cb3773d666a5eb1b40fb731aff53ae9ac8316647..368d07fab52b4c6bef818525baa76ffaf48ef53e 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PCons.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4Cons
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PPara.ddl b/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
index b183108d43fd1125cecee80f2b09cc646d52a577..66735737b98e2623385ed0791cd31c42eee9325c 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PPara.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PPara
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl b/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
index 74142e93d458d33d97dc1bec94b4a778e7aee336..0e88be4eaf689d994d79c56c8ccbe7321fd3e05d 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PSphere.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PSphere
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl b/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
index c8099a703c735c2e60ff5bfbc3aa5b8c0025abfe..1eb887ff317120e37d6b8dfd1f1bb36e48e61a56 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTorus.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PTorus
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl b/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
index 9710e7ffebc96288004cc01dd1c06be3433a3140..726c12f4ffc1a9f479d97fdefb13df162e3a3473 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTrap.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PTrap
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl b/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
index b2a14ca708bcea393d6783f68f37604c75b0bc9a..2d3b92f7e750096745017da01752ee57cb5ec701 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTrd.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PTrd
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl b/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
index 661adb085ed18192a78474d205565efe83d61b70..7b2584dfe9d1a2ce955186d3ecd66ec62ae80727 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTubs.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PTubs
diff --git a/source/persistency/geometry/solids/CSG/src/G4PBox.cc b/source/persistency/geometry/solids/CSG/src/G4PBox.cc
index 13bb7c29630e76f661d4cab64e3586af991c7043..d6eb9f39999c8608a94dfb5a5c990ee1560bc753 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc b/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
index dc903a640b8cc06464c1488a2db435655d8ac68f..1ee76064da0d1457b485c56fbfee540a18c92faf 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // History:
diff --git a/source/persistency/geometry/solids/CSG/src/G4PCons.cc b/source/persistency/geometry/solids/CSG/src/G4PCons.cc
index 978c6b9d193f7eb0a3c1310d16bc8a3d3a97a549..3f6e3148cc449ac5fd0652f1ec2691828f37542e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PCons
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PPara.cc b/source/persistency/geometry/solids/CSG/src/G4PPara.cc
index a2f907d914388394dc0f6283a5aad90aa62b3ce2..3488d6918c58eb12856fecef25225c0698b24ec6 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PPara
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PSphere.cc b/source/persistency/geometry/solids/CSG/src/G4PSphere.cc
index 6bd704bb650336854faefef1e19504a232d4f4ad..3b00137ff7114a5b623e641c02b9641f418fde03 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PSphere
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTorus.cc b/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
index 35a84f3b197018df5cd6c561bd9c5267c5e8f213..38911e5a3caa8fad6b0188427636c712d86b9a10 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTorus.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PTorus
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTrap.cc b/source/persistency/geometry/solids/CSG/src/G4PTrap.cc
index 0e16b1d2710e0a1aeee1abb65b7854b7c0ce859f..e2affbd210344f18f7e160fdd2102bc850c3315b 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PTrap
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTrd.cc b/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
index b2d76ad379afa49695e30f2346e1b2557a2ae6cd..8cf7b27e86c99d0f624f4a1792a95e19b0bd5b66 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PTrd.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // Implementation for G4Trd class
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTubs.cc b/source/persistency/geometry/solids/CSG/src/G4PTubs.cc
index 0536330184f2d89e4a6fb85678f8039266e1f6d2..869188cf4148512e0ade6907ed227c6d81740e83 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // class G4PTubs
diff --git a/source/persistency/geometry/solids/specific/include/G4PHype.ddl b/source/persistency/geometry/solids/specific/include/G4PHype.ddl
index b82e138fcda5e2ff4ee9c7b9306a717d601684b8..505a70e9403d643f9cbea4f27dc20752db996a14 100644
--- a/source/persistency/geometry/solids/specific/include/G4PHype.ddl
+++ b/source/persistency/geometry/solids/specific/include/G4PHype.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PHype.ddl,v 1.1 2000/05/11 10:10:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PHype
 //
diff --git a/source/persistency/geometry/solids/specific/src/G4PHype.cc b/source/persistency/geometry/solids/specific/src/G4PHype.cc
index ae85f107aaaee12c7ba99914cc458e506c5d74ff..65ad13575ac4879d7a3d007046b05cd1bd7ac5d9 100644
--- a/source/persistency/geometry/solids/specific/src/G4PHype.cc
+++ b/source/persistency/geometry/solids/specific/src/G4PHype.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PHype.cc,v 1.1 2000/05/11 10:10:16 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PHype
 //
diff --git a/source/persistency/global/include/G4DatabaseTypes.hh b/source/persistency/global/include/G4DatabaseTypes.hh
index f660d1e35f3864b1f2c4483cb63c57599298e77c..7137edb7f20720c184368857336571efa39cd719 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // file description:
diff --git a/source/persistency/global/include/G4PersistentSchema.hh b/source/persistency/global/include/G4PersistentSchema.hh
index ac4b740b7f65eb0d4f63b38680b1535849236f20..57062e5ba44f15088bb5a2813256c09195d79f04 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2a47d07aec497fadb336c31e690a8026879f7b91..35afe101f490a018db4e42d152894cce45a9e67e 100644
--- a/source/persistency/global/include/G4PersistentTypes.hh
+++ b/source/persistency/global/include/G4PersistentTypes.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistentTypes.hh,v 1.2 1999/12/15 14:51:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // Persistent-capable typedefs for Geant4/Persistency category
diff --git a/source/persistency/global/include/G4Pglobals.hh b/source/persistency/global/include/G4Pglobals.hh
index 4ad8b7c97480559acf9b88ac5ee567d332da7cb6..1c12b872de660d89d3548c214d63b001c4475caa 100644
--- a/source/persistency/global/include/G4Pglobals.hh
+++ b/source/persistency/global/include/G4Pglobals.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Pglobals.hh,v 1.1 2000/11/02 12:40:31 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Pglobals.hh,v 1.2 2001/03/08 15:38:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // Wrapper header file to protect globals.hh from ooddlx
@@ -68,7 +68,7 @@ class   G4VSolid {};
 
 #ifndef G4UNITSTEST_HH
 #define G4UNITSTEST_HH
-#include "G4UnitsTest.hh"
+#include "G4SIunits.hh"
 #endif
 
 typedef int    EAxis;
diff --git a/source/persistency/global/include/G4VMaterialMap.hh b/source/persistency/global/include/G4VMaterialMap.hh
index 96bb9e14ec7e5ec478543f46631fe05a8e1fc5d5..4189e9fa5cb32cd89ab1d2331e16ed0343a357f9 100644
--- a/source/persistency/global/include/G4VMaterialMap.hh
+++ b/source/persistency/global/include/G4VMaterialMap.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VMaterialMap.hh,v 1.1 2000/06/09 12:53:25 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VMaterialMap_hh
diff --git a/source/persistency/global/include/G4VPersistentSubDbMan.hh b/source/persistency/global/include/G4VPersistentSubDbMan.hh
index 051b597fe5210ee97a8e002e7e2bd77e58d7a716..5303712b4b631869da4d3a7098b93ba36371460a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VPersistentSubDbMan 
 //
diff --git a/source/persistency/global/include/G4VPersistentSubMan.hh b/source/persistency/global/include/G4VPersistentSubMan.hh
index 45584dcd5db9b2b6e1964e9ff04ef2dbb5850ef8..17cb2fa6a91998880cd6af7151bc1084b2a9b978 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VPersistentSubMan 
 //
diff --git a/source/persistency/global/src/G4VMaterialMap.cc b/source/persistency/global/src/G4VMaterialMap.cc
index 46745ff3dc08db9bd4c3a6bc3814d93b506a517a..b83d2727dc97e42fc2e1e155654a8c73e7832678 100644
--- a/source/persistency/global/src/G4VMaterialMap.cc
+++ b/source/persistency/global/src/G4VMaterialMap.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VMaterialMap.cc,v 1.1 2000/06/09 12:53:51 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4VMaterialMap.hh"
diff --git a/source/persistency/global/src/G4VPersistentSubDbMan.cc b/source/persistency/global/src/G4VPersistentSubDbMan.cc
index afbee2a27b9c07f7eaddb5aebb48c697f9d8ed4c..7f18498f741ac1a5c8c93df41b3e0ab3031b5702 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VPersistentSubDbMan 
 //
diff --git a/source/persistency/global/src/G4VPersistentSubMan.cc b/source/persistency/global/src/G4VPersistentSubMan.cc
index e4c22861fffb55a45c23ae5d6b892ac346f3a769..72f371c9275bec054f1e2102b2fc28f7ccb5a71a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4VPersistentSubMan 
 //
diff --git a/source/persistency/management/include/G4PersistencyManager.hh b/source/persistency/management/include/G4PersistencyManager.hh
index 2034217fd3c01bdccaaef06856e24568f0c045a7..cfb0c7a9b2ad74b3b3814c46e612d0652beab8c9 100644
--- a/source/persistency/management/include/G4PersistencyManager.hh
+++ b/source/persistency/management/include/G4PersistencyManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistencyManager.hh,v 1.15 1999/12/15 14:51:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 37892f3a81bfb47902aebe6119c43eb0f45876ac..67ac893b3b14c6a3a5916d366669503ec8ddb601 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/persistency/management/include/G4TransactionManager.hh b/source/persistency/management/include/G4TransactionManager.hh
index 9bc0e14afe8be748cf29ef35b2e9ee2370c20f4b..85aea8742620be8174667b909657e9238e98adb6 100644
--- a/source/persistency/management/include/G4TransactionManager.hh
+++ b/source/persistency/management/include/G4TransactionManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TransactionManager.hh,v 1.7 2000/12/05 14:40:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description:
diff --git a/source/persistency/management/src/G4PersistencyManager.cc b/source/persistency/management/src/G4PersistencyManager.cc
index 2e8e898bd4870c9cd2e6c42834dd7acf10032ce0..d1b7e478df82f54d50ff5f40f0942947dea646ca 100644
--- a/source/persistency/management/src/G4PersistencyManager.cc
+++ b/source/persistency/management/src/G4PersistencyManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PersistencyManager.cc,v 1.16 1999/12/15 14:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PersistencyManager 
 //
diff --git a/source/persistency/management/src/G4PersistencyMessenger.cc b/source/persistency/management/src/G4PersistencyMessenger.cc
index 985105d6174305ab0f018142c87aefac724e022f..4d507e04682d6e97a3f200c4ee14433e8282367c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4PersistencyMessenger.hh"
diff --git a/source/persistency/management/src/G4TransactionManager.cc b/source/persistency/management/src/G4TransactionManager.cc
index 12c13911c588089551cd8579418c3243a76e8552..84857db28ada1b6bce697b9efc03a46c0505da61 100644
--- a/source/persistency/management/src/G4TransactionManager.cc
+++ b/source/persistency/management/src/G4TransactionManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TransactionManager.cc,v 1.6 1999/12/15 14:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4TransactionManager 
 //
diff --git a/source/persistency/run/include/G4PRun.ddl b/source/persistency/run/include/G4PRun.ddl
index ad3c2331968435b48380876642dae289f4c73755..37865e70bd3096de2823d13ae68f7e8805a37841 100644
--- a/source/persistency/run/include/G4PRun.ddl
+++ b/source/persistency/run/include/G4PRun.ddl
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PRun.ddl,v 1.8 2000/12/15 08:02:21 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/run/include/G4PersistentRunMan.hh b/source/persistency/run/include/G4PersistentRunMan.hh
index e6dcda3bbfc393d2bd2cbf869260afbb5c842a39..e9794b5e52f3c66b0074630b61620b79524c86d4 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.9 2000/12/15 07:55:32 morita Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description:
diff --git a/source/persistency/run/src/G4PRun.cc b/source/persistency/run/src/G4PRun.cc
index aaa80badb86fb665ac363778076299b494493060..647f7a3bc2910a3d83ad92c3cb992bcaf53b2f82 100644
--- a/source/persistency/run/src/G4PRun.cc
+++ b/source/persistency/run/src/G4PRun.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PRun.cc,v 1.5 1999/12/15 14:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4Run.hh"
diff --git a/source/persistency/run/src/G4PersistentRunMan.cc b/source/persistency/run/src/G4PersistentRunMan.cc
index 73dccd5551771f3c9c33b22ccb8fd79dc5e1d2dc..1d81a93badf3298c0b2781427003f1d2902d6319 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // class G4PersistentRunMan 
 //
diff --git a/source/processes/GNUmakefile b/source/processes/GNUmakefile
index 08a89a861768fd6ebbac1f2b5c8ccee1380d5c56..4c6a53221caafbc4ee7f86d1aac860e73720e95b 100644
--- a/source/processes/GNUmakefile
+++ b/source/processes/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.10 2000/06/11 11:24:26 hpw Exp $
+# $Id: GNUmakefile,v 1.11 2001/03/15 09:10:40 gcosmo Exp $
 # ----------------------------------------------------------------------
 # GNUmakefile for processes library, Gabriele Cosmo 27-Jun-1998
 # ----------------------------------------------------------------------
@@ -8,7 +8,7 @@ name := G4processes
 SUBDIRS  = management optical decay transportation parameterisation
 SUBDIRS += electromagnetic/muons electromagnetic/standard
 SUBDIRS += electromagnetic/utils electromagnetic/xrays
-SUBDIRS += electromagnetic/lowenergy
+SUBDIRS += electromagnetic/integral electromagnetic/lowenergy
 SUBDIRS += photolepton_hadron
 SUBDIRS += hadronic/management hadronic/util hadronic/processes 
 SUBDIRS += hadronic/cross_sections hadronic/stopping
@@ -29,7 +29,7 @@ SUBDIRS += hadronic/models/radiative_decay
 
 
 SUBLIBS  = G4procman G4optical G4decay G4transportation G4parameterisation
-SUBLIBS += G4muons G4emstandard G4emutils G4xrays
+SUBLIBS += G4muons G4emstandard G4emutils G4integral G4xrays
 SUBLIBS += G4emlowenergy
 SUBLIBS += G4photolepton_hadron
 SUBLIBS += G4hadronic_mgt G4hadronic_util G4hadronic_proc
diff --git a/source/processes/decay/History b/source/processes/decay/History
index 1b1e655fabf90fc8b060215119006ab91a8f1dc6..1ffae8f7b3759ab17aee9425eacad1f177b18081 100644
--- a/source/processes/decay/History
+++ b/source/processes/decay/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.3 2000/10/25 00:00:48 kurasige Exp $
+$Id: History,v 1.6 2001/02/28 06:20:07 kurasige Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,15 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+- Feb 29, 01 H.Kurashige(decay-V03-00-03)
+- Fix minor bug in G4VExtDecayer 
+
+- Feb 22, 01 H.Kurashige(decay-V03-00-02)
+- Add G4VExtDecayer and modify G4Decay 
+
+- Jan 18, 01 H.Kurashige(decay-V03-00-01)
+-  Use PreAssignedDecayTime in G4DynamicParticle if necessary
+
 - Oct 24, 00 H.Kurashige(decay-V02-00-01)
 -  Bug fix in G4Decay::DecayIt (no decay if the particle is stable)
 
diff --git a/source/processes/decay/include/G4Decay.hh b/source/processes/decay/include/G4Decay.hh
index 54f3d0f081b720cb147b31e6298f958b9e9fa9fe..4d104631aac523b88fcbdb276d9a8faf35341696 100644
--- a/source/processes/decay/include/G4Decay.hh
+++ b/source/processes/decay/include/G4Decay.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Decay.hh,v 1.4 2000/10/20 11:28:23 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Decay.hh,v 1.6 2001/02/22 13:29:26 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ------------------------------------------------------------
@@ -24,7 +24,9 @@
 //   remove BuildPhysicsTable()   27 Nov. 1997   H.Kurashige
 //   modified for new ParticleChange 12 Mar. 1998  H.Kurashige
 //   added aPhysicsTable          2  Aug. 1998 H.Kurashige
-
+//   PreAssignedDecayTime         18 Jan. 2001 H.Kurashige
+//   Add External Decayer         23 Feb. 2001  H.Kurashige
+//
 #ifndef G4Decay_h
 #define G4Decay_h 1
 
@@ -32,6 +34,7 @@
 #include "globals.hh"
 #include "G4VRestDiscreteProcess.hh"
 #include "G4ParticleChangeForDecay.hh"
+class G4VExtDecayer;
 
 class G4Decay : public G4VRestDiscreteProcess 
 {
@@ -93,6 +96,13 @@ class G4Decay : public G4VRestDiscreteProcess
                              G4ForceCondition* condition
                             );
 
+    virtual G4double PostStepGetPhysicalInteractionLength(
+                             const G4Track& track,
+                             G4double   previousStepSize,
+                             G4ForceCondition* condition
+                            );
+
+
   protected: // With Description
     // GetMeanFreePath returns ctau*beta*gamma for decay in flight 
     // GetMeanLifeTime returns ctau for decay at rest
@@ -105,6 +115,11 @@ class G4Decay : public G4VRestDiscreteProcess
                               G4ForceCondition* condition
                             );
 
+  public: //With Description
+     void SetExtDecayer(G4VExtDecayer*);
+     const G4VExtDecayer* GetExtDecayer() const;
+     // Set/Get External Decayer
+    
   public:
      void  SetVerboseLevel(G4int value);
      G4int GetVerboseLevel() const;
@@ -134,17 +149,51 @@ class G4Decay : public G4VRestDiscreteProcess
  
     // ParticleChange for decay process
     G4ParticleChangeForDecay fParticleChangeForDecay;
+    
+    // External Decayer
+    G4VExtDecayer*    pExtDecayer;
 };
 
+inline G4double G4Decay::PostStepGetPhysicalInteractionLength(
+                             const G4Track& track,
+                             G4double   previousStepSize,
+                             G4ForceCondition* condition
+                            )
+{
+  // pre-assigned Decay time
+  G4double pTime = track.GetDynamicParticle()->GetPreAssignedDecayProperTime();
+
+  if (pTime < 0.) {
+    // normal case 
+    return G4VRestDiscreteProcess::PostStepGetPhysicalInteractionLength(track, previousStepSize, condition);
+  }
+
+  // condition is set to "Not Forced"
+  *condition = NotForced;
+  
+  // reminder proper time
+  fRemainderLifeTime = pTime - track.GetProperTime();
+  if (fRemainderLifeTime <= 0.0) fRemainderLifeTime = DBL_MIN;
+  
+  // use pre-assigned Decay time to determine PIL
+  G4double tau = track.GetDefinition()->GetPDGLifeTime();
+  return (fRemainderLifeTime/tau)*GetMeanFreePath(track, previousStepSize, condition);
+
+}
 inline
   G4double G4Decay::AtRestGetPhysicalInteractionLength(
                              const G4Track& track,
                              G4ForceCondition* condition
                             )
 {
-  fRemainderLifeTime = 
-    G4VRestDiscreteProcess::AtRestGetPhysicalInteractionLength(
-                             track, condition );
+  G4double pTime = track.GetDynamicParticle()->GetPreAssignedDecayProperTime();
+  if (pTime >= 0.) {
+    fRemainderLifeTime = pTime - track.GetProperTime();
+    if (fRemainderLifeTime <= 0.0) fRemainderLifeTime = DBL_MIN;
+  } else {
+    fRemainderLifeTime = 
+      G4VRestDiscreteProcess::AtRestGetPhysicalInteractionLength(track, condition );
+  }
   return fRemainderLifeTime;
 }
 
@@ -172,6 +221,17 @@ inline
   return DecayIt(aTrack, aStep);
 }
 
+inline
+ void G4Decay::SetExtDecayer(G4VExtDecayer* val)
+{
+  pExtDecayer = val;
+}
+
+inline
+ const G4VExtDecayer* G4Decay::GetExtDecayer() const
+{
+  return pExtDecayer;
+}
 
 #endif
 
diff --git a/source/processes/decay/include/G4VExtDecayer.hh b/source/processes/decay/include/G4VExtDecayer.hh
new file mode 100644
index 0000000000000000000000000000000000000000..b07bb455718c34e9c980fc1d08a96ffeb5d1fe5d
--- /dev/null
+++ b/source/processes/decay/include/G4VExtDecayer.hh
@@ -0,0 +1,84 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4VExtDecayer.hh,v 1.2 2001/02/28 06:18:36 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+//
+//
+// ------------------------------------------------------------
+//      GEANT 4 class header file
+//
+//      For information related to this code contact:
+//      CERN, CN Division, ASD group
+//
+// ------------------------------------------------------------
+//  New  scheme                      23 Feb. 2001  H.Kurahige
+// ------------------------------------------------------------
+//
+#ifndef G4VExtDecayer_h
+#define G4VExtDecayer_h 1
+
+#include "G4ios.hh"
+#include "globals.hh"
+#include "G4DecayProducts.hh"
+class G4Track;
+
+class G4VExtDecayer 
+{
+ // Class Description
+ //  This class is a Abstract class for external decayer
+ // G4VExtDecayer has one pure virtual method of
+ // ImportDecayProducts which return decay products  
+
+  public: //With Description
+    //  Constructors 
+    G4VExtDecayer(const G4String& name ="");
+
+    //  Destructor
+    virtual ~G4VExtDecayer(){}
+
+  private:
+    //  copy constructor
+      G4VExtDecayer(const G4VExtDecayer &){}
+
+    //  Assignment Operation (generated)
+      G4VExtDecayer & operator=(const G4VExtDecayer&){return *this;};
+
+  public: //With Description
+    virtual G4DecayProducts* ImportDecayProducts(
+			         const G4Track& aTrack
+                            ) = 0;
+
+    const G4String& GetName() const;
+    
+  protected:
+    G4String decayerName;
+};
+
+inline
+ G4VExtDecayer::G4VExtDecayer(const G4String& name):
+   decayerName(name)
+{
+}
+
+inline
+ const G4String& G4VExtDecayer::GetName() const
+{
+   return decayerName;
+}
+
+#endif
+
+
+
+
+
+
+
+
+
+
diff --git a/source/processes/decay/src/G4Decay.cc b/source/processes/decay/src/G4Decay.cc
index 52ced44f868e0e97600368ec6413099ee0af0d3d..0bce7ca9944286bd9756f86cccbcfd41e861b284 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.7 2000/10/25 00:01:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Decay.cc,v 1.8 2001/02/22 13:29:31 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -27,13 +27,16 @@
 //   to resonances    12 Dec. 1998   H.Kurashige 
 //   remove G4ParticleMomentum  6 Feb. 99 H.Kurashige
 //   modified  IsApplicable to activate G4Decay for resonances  1 Mar. 00 H.Kurashige 
+//   Add External Decayer         23 Feb. 2001  H.Kurashige
 //
+
 #include "G4Decay.hh"
 #include "G4DynamicParticle.hh"
 #include "G4DecayProducts.hh"
 #include "G4DecayTable.hh"
 #include "G4PhysicsLogVector.hh"
 #include "G4ParticleChangeForDecay.hh"
+#include "G4VExtDecayer.hh"
 
 // constructor
 G4Decay::G4Decay(const G4String& processName)
@@ -41,23 +44,27 @@ G4Decay::G4Decay(const G4String& processName)
                                 HighestBinValue(10.0),
                                 LowestBinValue(1.0e-3),
                                 TotBin(200),
-				verboseLevel(1)
+				verboseLevel(1),
+				pExtDecayer(0),
+				aPhysicsTable(0)
 {
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
     G4cerr << "G4Decay  constructor " << "  Name:" << processName << G4endl;
   }
 #endif
-  aPhysicsTable = NULL;
   pParticleChange = &fParticleChangeForDecay;
 }
 
 G4Decay::~G4Decay()
 {
-  if (aPhysicsTable != NULL) {
+  if (aPhysicsTable != 0) {
     aPhysicsTable->clearAndDestroy();
     delete aPhysicsTable;
   }
+  if (pExtDecayer) {
+    delete pExtDecayer;
+  }
 }
 
 G4bool G4Decay::IsApplicable(const G4ParticleDefinition& aParticleType)
@@ -236,62 +243,65 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
 
   //check if thePreAssignedDecayProducts exists
   const G4DecayProducts* o_products = (aParticle->GetPreAssignedDecayProducts());
-  G4bool isPreAssigned = (o_products != NULL);   
-  G4DecayProducts* products = NULL;
+  G4bool isPreAssigned = (o_products != 0);   
+  G4DecayProducts* products = 0;
+
+  // decay table
+  G4DecayTable   *decaytable = aParticleDef->GetDecayTable();
+ 
+  // check if external decayer exists
+  G4bool isExtDecayer = (decaytable == 0) && (pExtDecayer !=0);
+
+  // Error due to NO Decay Table 
+  if ( (decaytable == 0) && !isExtDecayer &&!isPreAssigned ){
+#ifdef G4VERBOSE
+    if (GetVerboseLevel()>0) {
+      G4cerr <<  "G4Decay::DoIt  : decay table not defined  for ";
+      G4cerr << aParticle->GetDefinition()->GetParticleName()<< G4endl;
+    }
+#endif
+    fParticleChangeForDecay.SetNumberOfSecondaries(0);
+    // Kill the parent particle
+    fParticleChangeForDecay.SetStatusChange( fStopAndKill ) ;
+    fParticleChangeForDecay.SetLocalEnergyDeposit(0.0); 
+    
+    ClearNumberOfInteractionLengthLeft();
+    return &fParticleChangeForDecay ;
+  }
 
   if (isPreAssigned) {
     // copy decay products 
     products = new G4DecayProducts(*o_products); 
+  } else if ( isExtDecayer ) {
+    // decay according to external decayer
+    products = pExtDecayer->ImportDecayProducts(aTrack);
   } else {
     // decay acoording to decay table
-    G4DecayTable   *decaytable = aParticleDef->GetDecayTable();
- 
-    if (decaytable == NULL){
-#ifdef G4VERBOSE
-      if (GetVerboseLevel()>0) {
-	G4cerr <<  "G4Decay::DoIt  : decay table not defined  for ";
-        G4cerr << aParticle->GetDefinition()->GetParticleName()<< G4endl;
-      }
-#endif
-      fParticleChangeForDecay.SetNumberOfSecondaries(0);
-      // Kill the parent particle
-      fParticleChangeForDecay.SetStatusChange( fStopAndKill ) ;
-      fParticleChangeForDecay.SetLocalEnergyDeposit(0.0); 
-
-      ClearNumberOfInteractionLengthLeft();
-      return &fParticleChangeForDecay ;
+    // choose a decay channel
+    G4VDecayChannel *decaychannel = decaytable->SelectADecayChannel();
+    if (decaychannel == 0 ){
+      // decay channel not found
+      G4Exception("G4Decay::DoIt  : can not determine decay channel ");
     } else {
-      // choose a decay channel
-      G4VDecayChannel *decaychannel = decaytable->SelectADecayChannel();
-      if (decaychannel == NULL){
-	// decay channel not found
+      G4int temp;
+      // execute DecayIt() 
 #ifdef G4VERBOSE
-	if (GetVerboseLevel()>0) {
-	  G4cerr <<  "G4Decay::DoIt  : can not determine decay channel " <<G4endl;
-	  decaytable ->DumpInfo();
-	}
-#endif
-      } else {
-	G4int temp;
-	// execute DecayIt() 
-#ifdef G4VERBOSE
-	if (GetVerboseLevel()>1) {
-	  G4cerr << "G4Decay::DoIt  : selected decay channel  addr:" << decaychannel <<G4endl;
-	  temp = decaychannel->GetVerboseLevel();
-	  decaychannel->SetVerboseLevel(GetVerboseLevel());
-	}
+      if (GetVerboseLevel()>1) {
+	G4cerr << "G4Decay::DoIt  : selected decay channel  addr:" << decaychannel <<G4endl;
+	temp = decaychannel->GetVerboseLevel();
+	decaychannel->SetVerboseLevel(GetVerboseLevel());
+      }
 #endif
-	products = decaychannel->DecayIt(aParticle->GetMass());
+      products = decaychannel->DecayIt(aParticle->GetMass());
 #ifdef G4VERBOSE
-        if (GetVerboseLevel()>1) {
-	  decaychannel->SetVerboseLevel(temp);
-	}
+      if (GetVerboseLevel()>1) {
+	decaychannel->SetVerboseLevel(temp);
+      }
 #endif
 #ifdef G4VERBOSE
       // for debug
       //if (! products->IsChecked() ) products->DumpInfo();
 #endif
-     } 
     }
   }
   
@@ -306,9 +316,10 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
     // AtRest case
     finalGlobalTime += fRemainderLifeTime;
     energyDeposit += aParticle->GetKineticEnergy();
+    if (isPreAssigned) products->Boost( ParentEnergy, ParentDirection); 
   } else {
     // PostStep case
-    products->Boost( ParentEnergy, ParentDirection); 
+    if (!isExtDecayer) products->Boost( ParentEnergy, ParentDirection); 
   }
 
   //add products in fParticleChangeForDecay
@@ -341,7 +352,7 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
      // add the secondary track in the List
      fParticleChangeForDecay.AddSecondary(secondary);
   }
-  if (!isPreAssigned) delete products;
+  delete products;
 
   // Kill the parent particle
   fParticleChangeForDecay.SetStatusChange( fStopAndKill ) ;
diff --git a/source/processes/electromagnetic/GNUmakefile b/source/processes/electromagnetic/GNUmakefile
index 9f5bd7084ed9e3f8f0b053eb0735056fd70abe4d..d56af6560bb93b3d11c64902f58666dd3df6bee5 100644
--- a/source/processes/electromagnetic/GNUmakefile
+++ b/source/processes/electromagnetic/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.2 1999/05/31 17:38:38 stesting Exp $
+# $Id: GNUmakefile,v 1.3 2001/03/05 10:52:05 maire Exp $
 # ------------------------------------------------------------------
 # GNUmakefile for electromagnetic library.  Gabriele Cosmo, 18/9/96.
 # ------------------------------------------------------------------
@@ -7,8 +7,8 @@ MAKEFLAGS= --no-print-directory
 
 name := G4electromagnetic
 
-SUBDIRS = muons standard utils xrays lowenergy
-SUBLIBS = G4muons G4emstandard G4emutils G4xrays G4emlowenergy
+SUBDIRS = muons standard utils xrays lowenergy integral
+SUBLIBS = G4muons G4emstandard G4emutils G4xrays G4emlowenergy G4integral
 
 ifndef G4INSTALL
   G4INSTALL = ../../..
diff --git a/source/processes/electromagnetic/History b/source/processes/electromagnetic/History
index 36821d6fac2c70be7ada15280fed66433785d947..9e932e4213a2491de0541e06e10bf5aa2767209d 100644
--- a/source/processes/electromagnetic/History
+++ b/source/processes/electromagnetic/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.4 2000/03/02 14:04:55 maire Exp $
+$Id: History,v 1.7 2001/03/05 10:52:05 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,20 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
      
+05 mar 01 mma (em-V03-00-04)
+- new subdirectory: integral
+  migration of all G4I.. processes from muons, standard, utils into integral
+     
+27 apr 00 mma  (em-V01-01-01)
+- G4endl (dec/iso)      
+     
+26 apr 00 mma  (em-V01-01-00)
+- all EnergyLoss classes renamed G4V... 
+  Most classes in standard and muons affected.
+- G4Muls moved in utils
+- bugs fixe in MuPairProduction  
+- cowork with geant4-01-01-ref-02
+     
 02 mar 00 mma  (em-V01-00-00)
 - new G4VEnergyLoss class and related structure
 - cowork with geant4-01-00-ref-06
diff --git a/source/processes/electromagnetic/integral/GNUmakefile b/source/processes/electromagnetic/integral/GNUmakefile
new file mode 100644
index 0000000000000000000000000000000000000000..21470da6dc55dd9030d883ecf76060be8a329ec9
--- /dev/null
+++ b/source/processes/electromagnetic/integral/GNUmakefile
@@ -0,0 +1,37 @@
+# $Id: GNUmakefile,v 1.1 2001/03/05 10:55:19 maire Exp $
+# --------------------------------------------------------------------
+# GNUmakefile for electromagnetic sub-library.  John Allison, 25/6/98.
+# --------------------------------------------------------------------
+
+name := G4integral
+
+ifndef G4INSTALL
+  G4INSTALL = ../../../..
+endif
+
+include $(G4INSTALL)/config/architecture.gmk
+
+CPPFLAGS += -I$(G4BASE)/global/management/include \
+            -I$(G4BASE)/global/HEPRandom/include \
+            -I$(G4BASE)/global/HEPGeometry/include \
+            -I$(G4BASE)/geometry/management/include \
+            -I$(G4BASE)/geometry/magneticfield/include \
+            -I$(G4BASE)/geometry/volumes/include \
+            -I$(G4BASE)/track/include \
+            -I$(G4BASE)/processes/management/include \
+            -I$(G4BASE)/processes/electromagnetic/utils/include \
+            -I$(G4BASE)/processes/electromagnetic/standard/include \
+            -I$(G4BASE)/particles/management/include \
+            -I$(G4BASE)/particles/bosons/include \
+            -I$(G4BASE)/particles/leptons/include \
+            -I$(G4BASE)/particles/hadrons/barions/include \
+            -I$(G4BASE)/particles/hadrons/mesons/include \
+            -I$(G4BASE)/particles/hadrons/ions/include \
+	    -I$(G4BASE)/intercoms/include \
+	    -I$(G4BASE)/materials/include
+
+include $(G4INSTALL)/config/common.gmk
+
+CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS))
+CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O))
+
diff --git a/source/processes/electromagnetic/integral/History b/source/processes/electromagnetic/integral/History
new file mode 100644
index 0000000000000000000000000000000000000000..14102a541213b9233f48d51768f65310866d73eb
--- /dev/null
+++ b/source/processes/electromagnetic/integral/History
@@ -0,0 +1,23 @@
+$Id: History,v 1.1 2001/03/05 10:55:19 maire 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 *
+     ----------------------------------------------------------
+     
+05 mar 01: mma (integral-V03-00-04)
+- creation of this subdirectory:
+  migration of all G4I.. processes from muons, standard, utils
+
diff --git a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.hh b/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.hh
similarity index 98%
rename from source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.hh
rename to source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.hh
index 7c3e83eb57cda3757f3c371bd4718fe7ff37faa7..2e2ce4a6bab3bdc59777f75c1d1e169aff8bba9f 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.hh
+++ b/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuBremsstrahlung.hh,v 1.3 2000/04/25 14:18:57 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuBremsstrahlung.hh,v 1.1 2001/03/05 10:55:19 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
diff --git a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.icc b/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.icc
similarity index 98%
rename from source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.icc
rename to source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.icc
index 9e71f7d92e4ecb52fd303e39e591f50e30d4f341..043ffd81ecf50faec71417d6265cc3c4500ddc28 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuBremsstrahlung.icc
+++ b/source/processes/electromagnetic/integral/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.2 1999/12/15 14:51:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuBremsstrahlung.icc,v 1.1 2001/03/05 10:55:19 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
diff --git a/source/processes/electromagnetic/muons/include/G4IMuIonisation.hh b/source/processes/electromagnetic/integral/include/G4IMuIonisation.hh
similarity index 97%
rename from source/processes/electromagnetic/muons/include/G4IMuIonisation.hh
rename to source/processes/electromagnetic/integral/include/G4IMuIonisation.hh
index ded9ecd9106b9ff72aa18861b0e256c8855ea26c..3b4ba7606a497a741771eef83105f7b7a5e1d0c1 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuIonisation.hh
+++ b/source/processes/electromagnetic/integral/include/G4IMuIonisation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuIonisation.hh,v 1.3 2000/04/25 14:18:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuIonisation.hh,v 1.1 2001/03/05 10:55:20 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4IMuIonisation.icc b/source/processes/electromagnetic/integral/include/G4IMuIonisation.icc
similarity index 98%
rename from source/processes/electromagnetic/muons/include/G4IMuIonisation.icc
rename to source/processes/electromagnetic/integral/include/G4IMuIonisation.icc
index 011ab6c22b090e586106ae1908bfedd42aa72885..a8a60325cedb7d2d9dd262ca23c3756fd6d1fa62 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuIonisation.icc
+++ b/source/processes/electromagnetic/integral/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.2 1999/12/15 14:51:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuIonisation.icc,v 1.1 2001/03/05 10:55:20 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.hh b/source/processes/electromagnetic/integral/include/G4IMuPairProduction.hh
similarity index 98%
rename from source/processes/electromagnetic/muons/include/G4IMuPairProduction.hh
rename to source/processes/electromagnetic/integral/include/G4IMuPairProduction.hh
index 98a2114753d058861e64ffbcb74327c834fcc739..261c58c0970dc1003f51a52424d5f0b630db4f68 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.hh
+++ b/source/processes/electromagnetic/integral/include/G4IMuPairProduction.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMuPairProduction.hh,v 1.3 2000/04/25 14:18:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuPairProduction.hh,v 1.1 2001/03/05 10:55:20 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.icc b/source/processes/electromagnetic/integral/include/G4IMuPairProduction.icc
similarity index 98%
rename from source/processes/electromagnetic/muons/include/G4IMuPairProduction.icc
rename to source/processes/electromagnetic/integral/include/G4IMuPairProduction.icc
index e09a7ca8726e12828a1630cc9d5d8f83d6a1190b..f42cf1680d76c535ed8e4acc5f376c264b81f219 100644
--- a/source/processes/electromagnetic/muons/include/G4IMuPairProduction.icc
+++ b/source/processes/electromagnetic/integral/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.2 1999/12/15 14:51:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuPairProduction.icc,v 1.1 2001/03/05 10:55:20 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/utils/include/G4IMultipleScattering.hh b/source/processes/electromagnetic/integral/include/G4IMultipleScattering.hh
similarity index 98%
rename from source/processes/electromagnetic/utils/include/G4IMultipleScattering.hh
rename to source/processes/electromagnetic/integral/include/G4IMultipleScattering.hh
index 3c7bbb6d95d6a17b0c4f8576bbf5c5cd2d12db2e..e292de720a8461ea06715cdebbbc08c8670b13fe 100644
--- a/source/processes/electromagnetic/utils/include/G4IMultipleScattering.hh
+++ b/source/processes/electromagnetic/integral/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 2000/03/20 14:44:03 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMultipleScattering.hh,v 1.1 2001/03/05 10:55:20 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id:
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/utils/include/G4IMultipleScattering.icc b/source/processes/electromagnetic/integral/include/G4IMultipleScattering.icc
similarity index 98%
rename from source/processes/electromagnetic/utils/include/G4IMultipleScattering.icc
rename to source/processes/electromagnetic/integral/include/G4IMultipleScattering.icc
index 577f09806a622377cc682ded3df626fbf46f3557..12ab4c0a283a9e34613305a41f8992c706c6d928 100644
--- a/source/processes/electromagnetic/utils/include/G4IMultipleScattering.icc
+++ b/source/processes/electromagnetic/integral/include/G4IMultipleScattering.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IMultipleScattering.icc,v 1.1 2000/03/20 14:44:03 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMultipleScattering.icc,v 1.1 2001/03/05 10:55:20 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // -------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.hh b/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.hh
similarity index 98%
rename from source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.hh
rename to source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.hh
index b09d350d983c640701c6d01018554e6bfa289aa5..21c35672783f3f97a654327d5d01fe3b3e28a83c 100644
--- a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.hh
+++ b/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeBremsstrahlung.hh,v 1.4 2000/04/25 14:33:00 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeBremsstrahlung.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.icc b/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.icc
similarity index 98%
rename from source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.icc
rename to source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.icc
index e7aa63fa745ec2004afdb26e9007c8cb1ddde1b8..0978afc1448d16b647a8a5fb81082fb399734e9b 100644
--- a/source/processes/electromagnetic/standard/include/G4IeBremsstrahlung.icc
+++ b/source/processes/electromagnetic/integral/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.3 1999/12/15 14:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeBremsstrahlung.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeIonisation.hh b/source/processes/electromagnetic/integral/include/G4IeIonisation.hh
similarity index 97%
rename from source/processes/electromagnetic/standard/include/G4IeIonisation.hh
rename to source/processes/electromagnetic/integral/include/G4IeIonisation.hh
index 52534641b042b2bf3a22556bbf8abf721535079a..a9a79e05d0d464d8fcfe21c5bd439b05fcdeb3b9 100644
--- a/source/processes/electromagnetic/standard/include/G4IeIonisation.hh
+++ b/source/processes/electromagnetic/integral/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.4 2000/04/25 14:33:00 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeIonisation.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeIonisation.icc b/source/processes/electromagnetic/integral/include/G4IeIonisation.icc
similarity index 98%
rename from source/processes/electromagnetic/standard/include/G4IeIonisation.icc
rename to source/processes/electromagnetic/integral/include/G4IeIonisation.icc
index dd8d4ce61234d002fa52af48931a9feb7940d498..8c9781eb5ec318161c6a410c39038291cad9d167 100644
--- a/source/processes/electromagnetic/standard/include/G4IeIonisation.icc
+++ b/source/processes/electromagnetic/integral/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.3 1999/12/15 14:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeIonisation.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.hh b/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.hh
similarity index 97%
rename from source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.hh
rename to source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.hh
index e7d21345a28d7cf0a253a05c567b43a414ebd154..3ea2321f0e2302042a45a5392dc7066ff096a983 100644
--- a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.hh
+++ b/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IeplusAnnihilation.hh,v 1.2 1999/12/15 14:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeplusAnnihilation.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.icc b/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.icc
similarity index 98%
rename from source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.icc
rename to source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.icc
index e01dfae20c60dcc0e30f95a3de803df1c1d63332..67d7133ec7b4f7f678c00f50a53c7fdcffdc8abf 100644
--- a/source/processes/electromagnetic/standard/include/G4IeplusAnnihilation.icc
+++ b/source/processes/electromagnetic/integral/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.2 1999/12/15 14:51:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeplusAnnihilation.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IhIonisation.hh b/source/processes/electromagnetic/integral/include/G4IhIonisation.hh
similarity index 97%
rename from source/processes/electromagnetic/standard/include/G4IhIonisation.hh
rename to source/processes/electromagnetic/integral/include/G4IhIonisation.hh
index 5951bed6a06593a4bdb9e322279cf0accf979a6c..1a51cce5bdc032e1cf247c5cb6e81d3d3fab6518 100644
--- a/source/processes/electromagnetic/standard/include/G4IhIonisation.hh
+++ b/source/processes/electromagnetic/integral/include/G4IhIonisation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4IhIonisation.hh,v 1.4 2000/04/25 14:33:01 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IhIonisation.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4IhIonisation.icc b/source/processes/electromagnetic/integral/include/G4IhIonisation.icc
similarity index 98%
rename from source/processes/electromagnetic/standard/include/G4IhIonisation.icc
rename to source/processes/electromagnetic/integral/include/G4IhIonisation.icc
index fcc89c63bb9035ab3966e50a469651fb893de2cf..2a4ccf3700d617f7e11ba3891040c62aa13cd5eb 100644
--- a/source/processes/electromagnetic/standard/include/G4IhIonisation.icc
+++ b/source/processes/electromagnetic/integral/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.2 1999/12/15 14:51:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IhIonisation.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4VIMuEnergyLoss.hh b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.hh
similarity index 98%
rename from source/processes/electromagnetic/muons/include/G4VIMuEnergyLoss.hh
rename to source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.hh
index c56ca718076d78408a30c75356941d3a0f11b9ce..3cc8741e4cb0fcafd32e70b802f8b29ed2fdef8b 100644
--- a/source/processes/electromagnetic/muons/include/G4VIMuEnergyLoss.hh
+++ b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIMuEnergyLoss.hh,v 1.3 2000/08/15 09:40:16 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIMuEnergyLoss.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // -------------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4VIMuEnergyLoss.icc b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.icc
similarity index 98%
rename from source/processes/electromagnetic/muons/include/G4VIMuEnergyLoss.icc
rename to source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.icc
index 712dab210209857adb05a0e714acfa323fc3e3bd..48b2f1bdaf73d5a3d566b80f0cca62b4d0afe7e8 100644
--- a/source/processes/electromagnetic/muons/include/G4VIMuEnergyLoss.icc
+++ b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIMuEnergyLoss.icc,v 1.1 2000/04/25 14:18:59 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIMuEnergyLoss.icc,v 1.1 2001/03/05 10:55:22 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4VIeEnergyLoss.hh b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.hh
similarity index 98%
rename from source/processes/electromagnetic/standard/include/G4VIeEnergyLoss.hh
rename to source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.hh
index 30cd9ea089a3a098b2ee2e0de15044af918a3626..1a9ea387d03886b3e4309ad30160460c14902fa4 100644
--- a/source/processes/electromagnetic/standard/include/G4VIeEnergyLoss.hh
+++ b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIeEnergyLoss.hh,v 1.3 2000/08/15 09:42:14 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIeEnergyLoss.hh,v 1.1 2001/03/05 10:55:22 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4VIeEnergyLoss.icc b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.icc
similarity index 95%
rename from source/processes/electromagnetic/standard/include/G4VIeEnergyLoss.icc
rename to source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.icc
index 000a01307c4a70b2d9294327d0f45d3a84b90a0a..341a701db8128cf6fbffe51ac061a7ade1fcedf5 100644
--- a/source/processes/electromagnetic/standard/include/G4VIeEnergyLoss.icc
+++ b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIeEnergyLoss.icc,v 1.1 2000/04/25 14:33:02 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIeEnergyLoss.icc,v 1.1 2001/03/05 10:55:22 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4VIhEnergyLoss.hh b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.hh
similarity index 98%
rename from source/processes/electromagnetic/standard/include/G4VIhEnergyLoss.hh
rename to source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.hh
index 47c11c0f7cb4071759271c4d3ee84483b2dbfe75..aaa0d50f7ac5f2b8b6af71244edbb2ffad81b504 100644
--- a/source/processes/electromagnetic/standard/include/G4VIhEnergyLoss.hh
+++ b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIhEnergyLoss.hh,v 1.3 2000/08/15 09:42:14 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIhEnergyLoss.hh,v 1.1 2001/03/05 10:55:22 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4VIhEnergyLoss.icc b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.icc
similarity index 94%
rename from source/processes/electromagnetic/standard/include/G4VIhEnergyLoss.icc
rename to source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.icc
index 6b7a6f6e3d6ffc36d3763be1c05a0e2863115afc..43496edffabc5f3fefdd1ed2a069bf8203b40429 100644
--- a/source/processes/electromagnetic/standard/include/G4VIhEnergyLoss.icc
+++ b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIhEnergyLoss.icc,v 1.1 2000/04/25 14:33:02 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIhEnergyLoss.icc,v 1.1 2001/03/05 10:55:22 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id:
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/src/G4IMuBremsstrahlung.cc b/source/processes/electromagnetic/integral/src/G4IMuBremsstrahlung.cc
similarity index 98%
rename from source/processes/electromagnetic/muons/src/G4IMuBremsstrahlung.cc
rename to source/processes/electromagnetic/integral/src/G4IMuBremsstrahlung.cc
index 6d57c3a5efbd81a85c63a44a7140152922e357f3..4c7f069c82d41171570ef0b7d5cbc0c979f47b64 100644
--- a/source/processes/electromagnetic/muons/src/G4IMuBremsstrahlung.cc
+++ b/source/processes/electromagnetic/integral/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.4 2000/04/25 14:19:00 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuBremsstrahlung.cc,v 1.1 2001/03/05 10:55:23 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //    
 // --------------------------------------------------------------
@@ -821,6 +821,8 @@ void G4IMuBremsstrahlung::BuildLambdaTable(const G4ParticleDefinition& ParticleT
       delete theMeanFreePathTable;
    }
    theMeanFreePathTable = new G4PhysicsTable( G4Material::GetNumberOfMaterials() ) ;
+  
+   PartialSumSigma.clearAndDestroy();
    PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
 
    G4PhysicsLogVector* ptrVector;
@@ -860,7 +862,7 @@ void G4IMuBremsstrahlung::ComputePartialSumSigma(const G4ParticleDefinition* Par
    const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
    G4double GammaEnergyCut = (G4Gamma::GetCutsInEnergy())[Imate];
 
-   PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+   PartialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -870,7 +872,7 @@ void G4IMuBremsstrahlung::ComputePartialSumSigma(const G4ParticleDefinition* Par
                  ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
                                                  (*theElementVector)(Ielem)->GetZ(), 
                                                  GammaEnergyCut );
-        PartialSumSigma(Imate)->insertAt(Ielem, SIGMA);
+        PartialSumSigma[Imate]->push_back(SIGMA);
    }
 }
 
@@ -1181,9 +1183,9 @@ G4Element* G4IMuBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))(NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
   for ( G4int i=0; i < NumberOfElements; i++ )
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
        << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
diff --git a/source/processes/electromagnetic/muons/src/G4IMuIonisation.cc b/source/processes/electromagnetic/integral/src/G4IMuIonisation.cc
similarity index 99%
rename from source/processes/electromagnetic/muons/src/G4IMuIonisation.cc
rename to source/processes/electromagnetic/integral/src/G4IMuIonisation.cc
index 7c2ed25193276e6dc39efc41a10b4103868f0c2b..ac6e9de2c89af3fb37df3a801466333b009cf0b4 100644
--- a/source/processes/electromagnetic/muons/src/G4IMuIonisation.cc
+++ b/source/processes/electromagnetic/integral/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.4 2000/04/25 14:19:01 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuIonisation.cc,v 1.1 2001/03/05 10:55:23 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/src/G4IMuPairProduction.cc b/source/processes/electromagnetic/integral/src/G4IMuPairProduction.cc
similarity index 99%
rename from source/processes/electromagnetic/muons/src/G4IMuPairProduction.cc
rename to source/processes/electromagnetic/integral/src/G4IMuPairProduction.cc
index 84d144912959a42dbb9b055f291d1cf5961c08ac..db9cba66a85abbad7e34f5a0ea60f02561e37363 100644
--- a/source/processes/electromagnetic/muons/src/G4IMuPairProduction.cc
+++ b/source/processes/electromagnetic/integral/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.5 2000/04/25 14:19:01 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMuPairProduction.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -809,6 +809,7 @@ void G4IMuPairProduction::BuildLambdaTable(const G4ParticleDefinition& ParticleT
       delete theMeanFreePathTable;
    }
    theMeanFreePathTable = new G4PhysicsTable( G4Material::GetNumberOfMaterials() ) ;
+   PartialSumSigma.clearAndDestroy();
    PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
 
    if(&ParticleType == theMuonPlus )
@@ -854,7 +855,7 @@ void G4IMuPairProduction::ComputePartialSumSigma(const G4ParticleDefinition* Par
    G4double ElectronEnergyCut = (G4Electron::GetCutsInEnergy())[Imate];
    G4double PositronEnergyCut = (G4Positron::GetCutsInEnergy())[Imate];
 
-   PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+   PartialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -865,7 +866,7 @@ void G4IMuPairProduction::ComputePartialSumSigma(const G4ParticleDefinition* Par
                                                  (*theElementVector)(Ielem)->GetZ(), 
                                                  ElectronEnergyCut,PositronEnergyCut );
 
-        PartialSumSigma(Imate)->insertAt(Ielem, SIGMA);
+        PartialSumSigma[Imate]->push_back(SIGMA);
    }
 }
 
@@ -1403,12 +1404,12 @@ G4Element* G4IMuPairProduction::SelectRandomAtom(G4Material* aMaterial) const
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))(NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
 
   for ( G4int i=0; i < NumberOfElements; i++ )
   {
 
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   }
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
        << "' has no elements, NULL pointer returned." << G4endl;
diff --git a/source/processes/electromagnetic/utils/src/G4IMultipleScattering.cc b/source/processes/electromagnetic/integral/src/G4IMultipleScattering.cc
similarity index 99%
rename from source/processes/electromagnetic/utils/src/G4IMultipleScattering.cc
rename to source/processes/electromagnetic/integral/src/G4IMultipleScattering.cc
index 3bc06bd206884b0c419a4e4ed9c6dcf04a9f8e42..8a048e7ec61c06525b2b2b67635f32f69fb46341 100644
--- a/source/processes/electromagnetic/utils/src/G4IMultipleScattering.cc
+++ b/source/processes/electromagnetic/integral/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.1 2000/03/20 14:44:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IMultipleScattering.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc b/source/processes/electromagnetic/integral/src/G4IeBremsstrahlung.cc
similarity index 99%
rename from source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc
rename to source/processes/electromagnetic/integral/src/G4IeBremsstrahlung.cc
index a8cea897c4d362f36d87d4880ad66db0db4c4d10..3448a59e191be0cf0954263ef208c1475b983da0 100644
--- a/source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc
+++ b/source/processes/electromagnetic/integral/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.5 2000/04/25 14:33:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeBremsstrahlung.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -928,7 +928,9 @@ void G4IeBremsstrahlung::BuildLambdaTable(const G4ParticleDefinition& ParticleTy
    }
    theMeanFreePathTable = new G4PhysicsTable( G4Material::GetNumberOfMaterials() ) ;
 
+   PartialSumSigma.clearAndDestroy();
    PartialSumSigma.resize( G4Material::GetNumberOfMaterials() );
+
    G4PhysicsLogVector* ptrVector;
    for ( G4int J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
        { 
@@ -966,7 +968,7 @@ void G4IeBremsstrahlung::ComputePartialSumSigma(const G4ParticleDefinition* Part
    const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
    G4double GammaEnergyCut = (G4Gamma::GetCutsInEnergy())[Imate];
 
-   PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+   PartialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -976,7 +978,7 @@ void G4IeBremsstrahlung::ComputePartialSumSigma(const G4ParticleDefinition* Part
                  ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
                                                  (*theElementVector)(Ielem)->GetZ(), 
                                                  GammaEnergyCut );
-        PartialSumSigma(Imate)->insertAt(Ielem, SIGMA);
+        PartialSumSigma[Imate]->push_back(SIGMA);
    }
 }
 
@@ -1402,9 +1404,9 @@ G4Element* G4IeBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))(NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
   for ( G4int i=0; i < NumberOfElements; i++ )
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
        << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
diff --git a/source/processes/electromagnetic/standard/src/G4IeIonisation.cc b/source/processes/electromagnetic/integral/src/G4IeIonisation.cc
similarity index 99%
rename from source/processes/electromagnetic/standard/src/G4IeIonisation.cc
rename to source/processes/electromagnetic/integral/src/G4IeIonisation.cc
index 324632bf57c8f8fad94fdafc210ee49bc1d528cb..024e0292d15c57ae52db858b486c0658d3963dca 100644
--- a/source/processes/electromagnetic/standard/src/G4IeIonisation.cc
+++ b/source/processes/electromagnetic/integral/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.5 2000/04/25 14:33:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeIonisation.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // -------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc b/source/processes/electromagnetic/integral/src/G4IeplusAnnihilation.cc
similarity index 99%
rename from source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc
rename to source/processes/electromagnetic/integral/src/G4IeplusAnnihilation.cc
index 38cbd0209aab005eb963aad55be737af77d1ee3a..4473ada6ad267e3ade6e70bd16339f7409677009 100644
--- a/source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc
+++ b/source/processes/electromagnetic/integral/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.6 1999/12/15 14:51:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IeplusAnnihilation.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4IhIonisation.cc b/source/processes/electromagnetic/integral/src/G4IhIonisation.cc
similarity index 99%
rename from source/processes/electromagnetic/standard/src/G4IhIonisation.cc
rename to source/processes/electromagnetic/integral/src/G4IhIonisation.cc
index efd153c35b5a037ab73f36a7dab5dd44907d6543..99dda36482d5955aee54a13336c60ac719c663e9 100644
--- a/source/processes/electromagnetic/standard/src/G4IhIonisation.cc
+++ b/source/processes/electromagnetic/integral/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.9 2000/08/01 08:12:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4IhIonisation.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
diff --git a/source/processes/electromagnetic/muons/src/G4VIMuEnergyLoss.cc b/source/processes/electromagnetic/integral/src/G4VIMuEnergyLoss.cc
similarity index 99%
rename from source/processes/electromagnetic/muons/src/G4VIMuEnergyLoss.cc
rename to source/processes/electromagnetic/integral/src/G4VIMuEnergyLoss.cc
index ba5be9837f220d486f95e456156feea84b811d00..dc94d2d2fc387def2f8a12ea5e9f4031a9318aee 100644
--- a/source/processes/electromagnetic/muons/src/G4VIMuEnergyLoss.cc
+++ b/source/processes/electromagnetic/integral/src/G4VIMuEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIMuEnergyLoss.cc,v 1.3 2000/08/15 09:40:41 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIMuEnergyLoss.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4VIeEnergyLoss.cc b/source/processes/electromagnetic/integral/src/G4VIeEnergyLoss.cc
similarity index 99%
rename from source/processes/electromagnetic/standard/src/G4VIeEnergyLoss.cc
rename to source/processes/electromagnetic/integral/src/G4VIeEnergyLoss.cc
index 79524ceb78dc37b82b08e5a06ac1c96773cad543..891d84531dc88e70aa3d4dc00af946bef6ef9e0f 100644
--- a/source/processes/electromagnetic/standard/src/G4VIeEnergyLoss.cc
+++ b/source/processes/electromagnetic/integral/src/G4VIeEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIeEnergyLoss.cc,v 1.3 2000/08/15 09:42:45 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIeEnergyLoss.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //  
 // $Id: 
 // -----------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4VIhEnergyLoss.cc b/source/processes/electromagnetic/integral/src/G4VIhEnergyLoss.cc
similarity index 99%
rename from source/processes/electromagnetic/standard/src/G4VIhEnergyLoss.cc
rename to source/processes/electromagnetic/integral/src/G4VIhEnergyLoss.cc
index 736870094188e927822ba4b9892a27f16f30e437..6b159d9bff7af4d6e0ce6482be4443936fbccef1 100644
--- a/source/processes/electromagnetic/standard/src/G4VIhEnergyLoss.cc
+++ b/source/processes/electromagnetic/integral/src/G4VIhEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VIhEnergyLoss.cc,v 1.3 2000/08/15 09:42:45 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VIhEnergyLoss.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // -----------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/History b/source/processes/electromagnetic/lowenergy/History
index 3697279a961ea7498a8919f4efcc9d1cfe4b06b5..f5f53c8f09c616fb0cf16c24532dd9bfa35221ca 100644
--- a/source/processes/electromagnetic/lowenergy/History
+++ b/source/processes/electromagnetic/lowenergy/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.57 2000/12/14 09:46:23 gcosmo Exp $
+$Id: History,v 1.58 2001/02/05 17:45:13 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,15 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+05.02.2001 - G.Cosmo, tag emlowen-V03-00-00
+             Migration to STL for G4DataVector and G4OrderedTable:
+             o Removed obsolete class G4Data. G4DataVector is now used instead.
+             o Modified files:
+               G4LowEnergyBremsstrahlung[.hh.icc.cc], G4FirstLevel.hh,
+               G4LowEnergyGammaConversion[.hh.cc], G4LowEnergyIonisation[.hh.cc],
+               G4LowEnergyPhotoElectric[.hh.cc], G4LowEnergyRayleigh[.hh.cc],
+               G4LowEnergyCompton[.hh.cc], G4LowEnergyUtilities[.hh.cc].
+
 14.12.2000 - G.Cosmo, tag emlowen-V02-00-23
              Removed inclusion of CLHEP/String/Strings.h from G4LowEnergyUtilities.cc.
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4Data.hh b/source/processes/electromagnetic/lowenergy/include/G4Data.hh
deleted file mode 100644
index dfc1881572159d0c306b48335825a1e6a4579435..0000000000000000000000000000000000000000
--- a/source/processes/electromagnetic/lowenergy/include/G4Data.hh
+++ /dev/null
@@ -1,54 +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:     G4Data.hh
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 1 Giugno 1999
-//
-//      Modifications: 
-//   
-//
-// Class description:
-// Utility for Low Energy electromagnetic e/photon processes
-// Further documentation available from http://www.ge.infn.it/geant4/lowE
-
-// -------------------------------------------------------------------
-
-#ifndef G4DATA_HH
-#define G4DATA_HH
-
-#include "G4DataVector.hh"
-
-class G4Data : public G4DataVector{
-
-
-public:
-
- ~G4Data();
-
-  G4bool operator == (const G4Data& ) const;
-
-  G4bool operator < (const G4Data&) const;
-
-};
-
-#endif
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh b/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh
index bad5ddeb3ba0059e0ec6e6026adc2d85c8b2af8e..858e1851e2abec72df29d51c2db87e8c3ec51512 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh
@@ -29,10 +29,10 @@
 #ifndef G4FIRSTLEVEL_HH
 #define G4FIRSTLEVEL_HH
 
-#include "G4Data.hh"
+#include "G4DataVector.hh"
 #include "g4rw/tpordvec.h"
 
-class G4FirstLevel : public G4RWTPtrOrderedVector< G4Data >{
+class G4FirstLevel : public G4RWTPtrOrderedVector< G4DataVector >{
 
 
 public:
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
index 41a99d52036affee78356bc266d773b06a299413..98c94e8670be1d4c32152481e770d093a09e880f 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.12 2000/11/03 10:29:50 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyBremsstrahlung.hh,v 1.13 2001/02/05 17:45:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -101,7 +101,7 @@ private:
   
   G4SecondLevel* ATable; 
   G4FirstLevel* BTable;
-  G4Data* ZNumVec;
+  G4DataVector* ZNumVec;
 
   G4LowEnergyUtilities util;
   // partial sum of total crosssection
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc
index 7e46167cdd4b511cc4d78d4d50c3c18ab17e121b..98bde0b94152aa11c0f3b9fb9570bccf206b5724 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.13 2000/04/19 13:20:53 lefebure Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyBremsstrahlung.icc,v 1.14 2001/02/05 17:45:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
@@ -83,8 +83,8 @@ inline G4double G4LowEnergyBremsstrahlung::ComputeA(const G4int AtomicNumber,con
 
   G4double aVal;
   G4FirstLevel* oneAtomCoeff = (*ATable)[AtomicNumber-1];
-  G4Data* ElectEnVec = (*oneAtomCoeff)[0];
-  G4Data* AValueVec = (*oneAtomCoeff)[1];
+  G4DataVector* ElectEnVec = (*oneAtomCoeff)[0];
+  G4DataVector* AValueVec = (*oneAtomCoeff)[1];
 
   aVal = util.DataLogInterpolation(ElectronKinEnergy, (*ElectEnVec), (*AValueVec));
 	
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
index 1fcabf55c958f43c62737f3e598606c4faf7291e..be22a6354f67e3149d158602f218a14685d980cc 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.7 2000/11/03 10:29:50 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyCompton.hh,v 1.8 2001/02/05 17:45:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -72,7 +72,7 @@ private:
   G4SecondLevel* theCrossSectionTable;
   G4SecondLevel* theScatteringFunctionTable;
   G4PhysicsTable* theMeanFreePathTable;
-  G4Data* ZNumVec;
+  G4DataVector* ZNumVec;
 
   G4LowEnergyUtilities util;
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
index 0dd7e27b866d47c7f4225efac5e65fda2de873b5..a34d14617d04c401d1711f3d6d34f6622448632c 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LowEnergyCompton.icc,v 1.11 2000/06/22 02:25:25 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
index 4ab8bc7e679a837ea1109d0c256cbf35fe2ac5ae..c487ea2975ac42dd13957d71b0253d0a8a675fcf 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.6 2000/11/03 10:29:50 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyGammaConversion.hh,v 1.7 2001/02/05 17:45:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -81,7 +81,7 @@ private:
   G4double LowestEnergyLimit; 
   G4double HighestEnergyLimit;
   G4int NumbBinTable; 
-  G4Data* ZNumVec;
+  G4DataVector* ZNumVec;
   G4double MeanFreePath; // actual Mean Free Path (current medium)
 };
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
index ca087981219022565b9280f5597042850957fbc0..abd042d72bba1d6b1e287ec8e3017ceff9ed2309 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LowEnergyGammaConversion.icc,v 1.9 2000/06/22 02:25:25 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
index d69e4e2f7f7476d26f9f7899cc90aebdd143a3c5..b0c7ee91a7cd7724646a25e1b4ea0fc3a2ea712f 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.16 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyIonisation.hh,v 1.17 2001/02/05 17:45:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -65,7 +65,7 @@ public:
 			   G4double previousStepSize,
 			   G4ForceCondition* condition ) ;
 
-  inline G4double GetTransitionShell(G4int k){return(thePrimShVec(k));};
+  inline G4double GetTransitionShell(G4int k){return(thePrimShVec[k]);};
 
   G4VParticleChange *PostStepDoIt(const G4Track& track,         
 				  const G4Step& Step ) ;                 
@@ -130,8 +130,8 @@ private:
   allAtomTable* theSamplingCoeffTable;
   G4SecondLevel* theBindingEnergyTable;  
   G4DataVector thePrimShVec;
-  G4Data* ZNumVec;
-  G4Data* ZNumVecFluor;
+  G4DataVector* ZNumVec;
+  G4DataVector* ZNumVecFluor;
 
   G4LowEnergyUtilities util;
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
index 6fbd8ea7a05ae146c9738c489a6142930dfcbb99..002664a789381be2c134d48041ab694d2d2eb4ab 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.14 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyPhotoElectric.hh,v 1.15 2001/02/05 17:45:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -67,7 +67,7 @@ public:
   G4double GetCrossSection(G4DynamicParticle* aDynamicGamma,
 			    G4Element* anElement);
 
-  inline G4double GetTransitionShell(G4int k){return(thePrimShVec(k));};
+  inline G4double GetTransitionShell(G4int k){return(thePrimShVec[k]);};
 
   G4VParticleChange* PostStepDoIt(const G4Track& aTrack, const G4Step& aStep);
   
@@ -106,8 +106,8 @@ private:
   allAtomTable* theFluorTransitionTable;
   G4SecondLevel* theBindingEnergyTable;   
   G4DataVector thePrimShVec;
-  G4Data* ZNumVec;
-  G4Data* ZNumVecFluor;
+  G4DataVector* ZNumVec;
+  G4DataVector* ZNumVecFluor;
 
   G4LowEnergyUtilities util;
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
index bfa288a4e3ca7fe6da6adfbf0e253960f422b220..ce30ce36ed682116f9e0bfc168fcea60c8d88fc9 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LowEnergyPhotoElectric.icc,v 1.14 2000/06/22 02:25:26 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
index 92c6822227d6af69eadca7e95a7ee4adaacd45af..1b6d292c82faeee9b4a1ff5e7169941ad37bee84 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.7 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyRayleigh.hh,v 1.8 2001/02/05 17:45:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -72,7 +72,7 @@ private:
   G4SecondLevel* theCrossSectionTable; 
   G4SecondLevel* theFormFactorTable;
   G4PhysicsTable* theMeanFreePathTable;  
-  G4Data* ZNumVec;
+  G4DataVector* ZNumVec;
 
   G4LowEnergyUtilities util;
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
index 1a176ae76c0c9824ad57a4225a0f638a5c1ca86f..2758acc64992df91272ee661f244e844795d82c5 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LowEnergyRayleigh.icc,v 1.10 2000/06/22 02:25:26 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh
index cb93f8b10bce93db2174033849b41eb248f71093..ec2dd52149b2919f92c5a981fddf8b4bc5d5e669 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.6 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyUtilities.hh,v 1.7 2001/02/05 17:45:16 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -50,26 +50,26 @@ public:
   G4SecondLevel* BuildSecondLevelTables(const G4int, const G4int, const char*);
 
   //inline functions
-  G4int FindBinLocation(const G4double BinValue, const G4Data& arg);
+  G4int FindBinLocation(const G4double BinValue, const G4DataVector& arg);
   G4int FindBinLocation(const G4double, const G4PhysicsVector*);
 
   G4double DataLogInterpolation(const G4double, 
-				const G4Data&,
-				const G4Data&);
+				const G4DataVector&,
+				const G4DataVector&);
 
   G4double DataLogInterpolation(const G4double Argument, 
 				const G4double AtomicNumber, 
 				const G4PhysicsTable* Table);
 
   G4double DataSemiLogInterpolation(const G4double, 
-				    const G4Data&, 
-				    const G4Data&);
+				    const G4DataVector&, 
+				    const G4DataVector&);
 
 };
 
-inline G4int G4LowEnergyUtilities::FindBinLocation(const G4double arg, const G4Data& vec){
+inline G4int G4LowEnergyUtilities::FindBinLocation(const G4double arg, const G4DataVector& vec){
 
-  G4int numberOfBin = vec.length();
+  G4int numberOfBin = vec.size();
   G4int lowerBound = 0;
   G4int upperBound = numberOfBin-1;
 
@@ -91,12 +91,12 @@ inline G4int G4LowEnergyUtilities::FindBinLocation(const G4double arg, const G4D
 
 
 inline G4double G4LowEnergyUtilities::DataLogInterpolation(const G4double Argument, 
-                                                               const G4Data& argVec, 
-                                                               const G4Data& valVec){
+                                                               const G4DataVector& argVec, 
+                                                               const G4DataVector& valVec){
 
   G4int theLoc = FindBinLocation(Argument, argVec); 
 
-  if(theLoc == argVec.length()-1){
+  if(theLoc == argVec.size()-1){
     return valVec[theLoc];
   }
 
@@ -162,12 +162,12 @@ inline G4double G4LowEnergyUtilities::DataLogInterpolation(const G4double Argume
 }
 
 inline G4double G4LowEnergyUtilities::DataSemiLogInterpolation(const G4double Argument, 
-                                                                const G4Data& argVec, 
-                                                                const G4Data& valVec){
+                                                                const G4DataVector& argVec, 
+                                                                const G4DataVector& valVec){
 
   G4int theLoc = FindBinLocation(Argument, argVec); 
 
-  if(theLoc == argVec.length()-1){
+  if(theLoc == argVec.size()-1){
     return valVec[theLoc];
   }
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh
index d1bf72c70d49a8a331fe6f5dd48116fa868c687f..7c1c658c4679ed67f5462bebd409469f6f29112f 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VeLowEnergyLoss.hh,v 1.3 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 3.4.2000 Veronique Lefebure:
 //          Move utils/include/G4VEnergyLoss.hh to 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh
index 7ac24738221d61dd8fba8801f1cacbcb2689974f..1e5856cbfeab25556a698e79f6b9de693a0d24fd 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eLowEnergyLoss.hh,v 1.1 2000/04/04 13:47:35 lefebure Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc
index ac4e863ce232c504bffb808c7d3e0058b615a320..fcb2ef46520046f65310b8b8ae6b07492f7fdf0a 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eLowEnergyLoss.icc,v 1.1 2000/04/04 13:47:36 lefebure Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh
index 534f91910cdcd9eb44ba999fb9d352c4c69513a5..609c6909a8b77f12ede0fd0201eac9eb11eadb9c 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hLowEnergyLoss.hh,v 1.9 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc
index 8182fea5dcdc0cb35f9790be356576baa7b95706..356f298df79906502a12c855bc4f4f7bc200adef 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hLowEnergyLoss.icc,v 1.1 2000/03/31 15:15:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id:
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/src/G4Data.cc b/source/processes/electromagnetic/lowenergy/src/G4Data.cc
deleted file mode 100644
index 70e8588c7343283b219ab1b87a0cd30a9366ffd2..0000000000000000000000000000000000000000
--- a/source/processes/electromagnetic/lowenergy/src/G4Data.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:     G4Data.hh
-//
-//      Author:        Alessandra Forti (Alessandra.Forti@cern.ch)
-// 
-//      Creation date: 1 Giugno 1999
-//
-//      Modifications: 
-//      
-// -------------------------------------------------------------------
-
-#include "G4Data.hh"
-
-
-G4Data::~G4Data(){
-
-  this->clear();
-}
-
-G4bool G4Data::operator == (const G4Data& input) const {
-
-  return(this->length() == input.length());
-
-}
-
-G4bool G4Data::operator < (const G4Data& input) const {
-
-  return(this->length() < input.length());
-
-}
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
index 93e4f288866429c515e7b70eb0253a78fd1d5bcb..c5646a625148592b46897247ed542f0bf9a2c188 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4LowEnergyBremsstrahlung.cc,v 1.27 2000/09/20 16:49:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyBremsstrahlung.cc,v 1.28 2001/02/05 17:45:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -75,7 +75,6 @@ G4LowEnergyBremsstrahlung::~G4LowEnergyBremsstrahlung()
      }
 
      if(ZNumVec){
-       
        ZNumVec->clear();
        delete ZNumVec;
      }
@@ -151,7 +150,7 @@ void G4LowEnergyBremsstrahlung::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
@@ -200,7 +199,7 @@ void G4LowEnergyBremsstrahlung::BuildZVec(){
     delete ZNumVec;
   }
 
-  ZNumVec = new G4Data(); 
+  ZNumVec = new G4DataVector(); 
   for (G4int J=0 ; J < numOfMaterials; J++){ 
  
     const G4Material* material= (*theMaterialTable)[J];        
@@ -211,12 +210,9 @@ void G4LowEnergyBremsstrahlung::BuildZVec(){
 
       G4double Zel = (*theElementVector)(iel)->GetZ();
 
-      if(ZNumVec->contains(Zel) == FALSE){
-
-	ZNumVec->insert(Zel);
-      }
-      else{
-	
+      if( !(ZNumVec->contains(Zel)) ) {
+	ZNumVec->push_back(Zel);
+      } else{
 	continue;
       }
     }
@@ -301,6 +297,7 @@ void G4LowEnergyBremsstrahlung::BuildMeanFreePathTable()
    G4Material* material;
    G4double* CutInKineticEnergy = G4Gamma::Gamma()->GetCutsInEnergy() ;
 
+   PartialSumSigma.clearAndDestroy();
    PartialSumSigma.resize(NumbOfMaterials);
 
    G4double LowEdgeEnergy , Value;
@@ -362,7 +359,7 @@ void G4LowEnergyBremsstrahlung::ComputePartialSumSigma(const G4double KineticEne
    const G4ElementVector* theElementVector = aMaterial->GetElementVector(); 
    const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
 
-   PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+   PartialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -374,7 +371,7 @@ void G4LowEnergyBremsstrahlung::ComputePartialSumSigma(const G4double KineticEne
      
      SIGMA += theAtomNumDensityVector[Ielem]*interCrsSec;
 	 
-     PartialSumSigma(Imate)->insert(SIGMA);
+     PartialSumSigma[Imate]->push_back(SIGMA);
    }
 }
 
@@ -661,9 +658,9 @@ G4Element* G4LowEnergyBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) co
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))(NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
   for ( G4int i=0; i < NumberOfElements; i++ )
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   return (*theElementVector)(0);
 }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
index 7c6aae8daae04f450238d1ce5c9b8c76dba5594c..fc853f5eb7c1e123045b4680eda93671db8e5d7e 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.20 2000/07/11 18:46:47 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyCompton.cc,v 1.21 2001/02/05 17:45:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -71,7 +71,6 @@ G4LowEnergyCompton::~G4LowEnergyCompton()
    }
 
    if(ZNumVec){
-     
      ZNumVec->clear();
      delete ZNumVec;
    }
@@ -105,7 +104,7 @@ void G4LowEnergyCompton::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
@@ -126,7 +125,7 @@ void G4LowEnergyCompton::BuildScatteringFunctionTable(){
   theScatteringFunctionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
@@ -143,12 +142,11 @@ void G4LowEnergyCompton::BuildZVec(){
   G4int numOfMaterials = theMaterialTable->length();
 
   if(ZNumVec){
-
     ZNumVec->clear();
     delete ZNumVec;
   }
 
-  ZNumVec = new G4Data(); 
+  ZNumVec = new G4DataVector(); 
   for (G4int J=0 ; J < numOfMaterials; J++){ 
  
     const G4Material* material= (*theMaterialTable)[J];        
@@ -160,11 +158,8 @@ void G4LowEnergyCompton::BuildZVec(){
       G4double Zel = (*theElementVector)(iel)->GetZ();
 
       if(ZNumVec->contains(Zel) == FALSE){
-
-	ZNumVec->insert(Zel);
-      }
-      else{
-	
+	ZNumVec->push_back(Zel);
+      }  else{
 	continue;
       }
     }
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
index 8d5f4edd1ffa4f10d3155d1959c2b57be476997a..0262092e5a91da0c8879e7aeeb89148483609a6e 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.15 2000/09/04 18:18:08 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyGammaConversion.cc,v 1.16 2001/02/05 17:45:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -69,7 +69,6 @@ G4LowEnergyGammaConversion::~G4LowEnergyGammaConversion()
    }
 
    if(ZNumVec){
-     
      ZNumVec->clear();
      delete ZNumVec;
    }
@@ -98,7 +97,7 @@ void G4LowEnergyGammaConversion::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
@@ -115,12 +114,11 @@ void G4LowEnergyGammaConversion::BuildZVec(){
   G4int numOfMaterials = theMaterialTable->length();
 
   if(ZNumVec){
-
     ZNumVec->clear();
     delete ZNumVec;
   }
   
-  ZNumVec = new G4Data(); 
+  ZNumVec = new G4DataVector(); 
   for (G4int J=0 ; J < numOfMaterials; J++){ 
     
     const G4Material* material= (*theMaterialTable)[J];        
@@ -132,11 +130,8 @@ void G4LowEnergyGammaConversion::BuildZVec(){
       G4double Zel = (*theElementVector)(iel)->GetZ();
       
       if(ZNumVec->contains(Zel) == FALSE){
-	
-	ZNumVec->insert(Zel);
-      }
-      else{
-	
+	ZNumVec->push_back(Zel);
+      }      else{
 	continue;
       }
     }
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
index fb232913de8988964326978e93cb42b167e86053..6e89f89b5cbb24c79cac24ae982ae0d5084c224f 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.40 2000/09/20 16:49:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyIonisation.cc,v 1.41 2001/02/05 17:45:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // -------------------------------------------------------------
@@ -258,7 +258,7 @@ void G4LowEnergyIonisation::BuildShellCrossSectionTable(){
    allAtomShellCrossSec = new allAtomTable();
    G4int dataNum = 2;
  
-   for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+   for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
      G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
@@ -291,10 +291,10 @@ void G4LowEnergyIonisation::BuildFluorTransitionTable(){
   }
   
   theFluorTransitionTable = new allAtomTable();
-  ZNumVecFluor = new G4Data(*ZNumVec);
+  ZNumVecFluor = new G4DataVector(*ZNumVec);
   G4int dataNum = 3;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     if(AtomInd > 5){
       
@@ -321,7 +321,7 @@ void G4LowEnergyIonisation::BuildSamplingCoeffTable(){
   
   G4int dataNum = 17;
 
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     oneAtomTable* oneAtomShellSc = util.BuildSecondLevelTables(AtomInd, dataNum, "ioni/io-co-");
     
@@ -346,7 +346,7 @@ void G4LowEnergyIonisation::BuildZVec(){
     delete ZNumVec;
   }
 
-  ZNumVec = new G4Data(); 
+  ZNumVec = new G4DataVector(); 
   for (G4int J=0 ; J < numOfMaterials; J++){ 
  
     const G4Material* material= (*theMaterialTable)[J];        
@@ -358,11 +358,8 @@ void G4LowEnergyIonisation::BuildZVec(){
       G4double Zel = (*theElementVector)(iel)->GetZ();
 
       if(ZNumVec->contains(Zel) == FALSE){
-
-	ZNumVec->insert(Zel);
-      }
-      else{
-	
+	ZNumVec->push_back(Zel);
+      } else{
 	continue;
       }
     }
@@ -452,8 +449,8 @@ G4double G4LowEnergyIonisation::ComputeCrossSection(const G4double AtomIndex,
   for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
 
     G4double crossSec = 0;
-    G4Data* EnergyVector = (*(*oneAtomCS)[ind])[0];
-    G4Data* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+    G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
+    G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
 
     if(IncEnergy < (*EnergyVector)[1]){ // First element is the shell number
 
@@ -484,8 +481,8 @@ G4double G4LowEnergyIonisation::ComputeCrossSectionWithCut(const G4double AtomIn
   for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
 
     G4double crossSec = 0;
-    G4Data* EnergyVector = (*(*oneAtomCS)[ind])[0];
-    G4Data* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+    G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
+    G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
 
     TotalCrossSection += GetShellCrossSectionwithCut(AtomIndex,ind,IncEnergy,CutEnergy);
   }
@@ -507,8 +504,8 @@ G4double G4LowEnergyIonisation::GetShellCrossSection(const G4double AtomicNumber
 
   if( ind >= oneAtomCS->entries() ) return crossSec ;
 
-  G4Data* EnergyVector = (*(*oneAtomCS)[ind])[0];
-  G4Data* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+  G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
+  G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
 
   if(KineticEnergy < (*EnergyVector)[1]){ // First element is the shell number
 
@@ -561,27 +558,27 @@ G4double G4LowEnergyIonisation::GetShellCrossSectionwithCut(
 
   const G4int CoeffNumber = oneShellCoeffTable->entries();
 
-  const G4Data* energyVec = (*oneShellCoeffTable)[0];
-  const G4int LastPar = energyVec->length()-1;
-  G4Data Parms;
+  const G4DataVector* energyVec = (*oneShellCoeffTable)[0];
+  const G4int LastPar = energyVec->size()-1;
+  G4DataVector Parms;
 
   for(G4int ind = 1; ind < CoeffNumber-2; ind++){
 
-    const G4Data* oneCoeffVec = (*oneShellCoeffTable)[ind];
+    const G4DataVector* oneCoeffVec = (*oneShellCoeffTable)[ind];
 
     if(KineticEnergy < (*energyVec)[0]){
-      Parms.insert((*oneCoeffVec)[0]);
+      Parms.push_back((*oneCoeffVec)[0]);
     }
 
     else if(KineticEnergy > (*energyVec)[LastPar]){
 
-      Parms.insert((*oneCoeffVec)[LastPar]);
+      Parms.push_back((*oneCoeffVec)[LastPar]);
     }
 
     else{
 
       G4double par = util.DataSemiLogInterpolation(KineticEnergy,(*energyVec),(*oneCoeffVec));
-      Parms.insert(par);
+      Parms.push_back(par);
     }
   }
 
@@ -763,27 +760,27 @@ G4double G4LowEnergyIonisation::GetShellEnergyLosswithCut(
 
   const G4int CoeffNumber = oneShellCoeffTable->entries();
 
-  const G4Data* energyVec = (*oneShellCoeffTable)[0];
-  const G4int LastPar = energyVec->length()-1;
-  G4Data Parms;
+  const G4DataVector* energyVec = (*oneShellCoeffTable)[0];
+  const G4int LastPar = energyVec->size()-1;
+  G4DataVector Parms;
 
   for(G4int ind = 1; ind < CoeffNumber-2; ind++){
 
-    const G4Data* oneCoeffVec = (*oneShellCoeffTable)[ind];
+    const G4DataVector* oneCoeffVec = (*oneShellCoeffTable)[ind];
 
     if(KineticEnergy < (*energyVec)[0]){
-      Parms.insert((*oneCoeffVec)[0]);
+      Parms.push_back((*oneCoeffVec)[0]);
     }
 
     else if(KineticEnergy > (*energyVec)[LastPar]){
 
-      Parms.insert((*oneCoeffVec)[LastPar]);
+      Parms.push_back((*oneCoeffVec)[LastPar]);
     }
 
     else{
 
       G4double par = util.DataSemiLogInterpolation(KineticEnergy,(*energyVec),(*oneCoeffVec));
-      Parms.insert(par);
+      Parms.push_back(par);
     }
   }
 
@@ -1125,8 +1122,8 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
     
     // Fluorescence data start from element 6
 
-     if(thePrimShVec.length() != 0){thePrimShVec.clear();}
-     thePrimShVec.insert(thePrimaryShell);
+     if(thePrimShVec.size() != 0){thePrimShVec.clear();}
+     thePrimShVec.push_back(thePrimaryShell);
      if(AtomIndex > 5){
       
       G4bool ThereAreShells = TRUE;
@@ -1288,8 +1285,8 @@ G4int G4LowEnergyIonisation::SelectRandomShell(const G4int AtomIndex
   for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
 
     G4double crossSec;
-    G4Data* EnergyVector = (*(*oneAtomCS)[ind])[0];
-    G4Data* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+    G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
+    G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
     if(IncEnergy < (*EnergyVector)[0]){ //First element is the shell number
 
       crossSec = 0;
@@ -1403,7 +1400,7 @@ G4bool G4LowEnergyIonisation::SelectRandomTransition(G4int thePrimShell,
     G4double PartSum = 0;
     
     TransProb = 1; 
-    while(TransProb < (*(*TransitionTable)[ShellNum])[ProbCol]->length()){
+    while(TransProb < (*(*TransitionTable)[ShellNum])[ProbCol]->size()){
       
       PartSum += (*(*(*TransitionTable)[ShellNum])[ProbCol])[TransProb];
       
@@ -1457,21 +1454,21 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
   // 2) Interpolate coefficients (I need the incoming electron kinetic energy)
   const G4int CoeffNumber = oneShellCoeffTable->entries();
 
-  const G4Data* energyVec = (*oneShellCoeffTable)[0];
-  const G4int LastPar = energyVec->length()-1;
-  G4Data Parms;
+  const G4DataVector* energyVec = (*oneShellCoeffTable)[0];
+  const G4int LastPar = energyVec->size()-1;
+  G4DataVector Parms;
 
   for(G4int ind = 1; ind < CoeffNumber-2; ind++){
 
-    const G4Data* oneCoeffVec = (*oneShellCoeffTable)[ind]; 
+    const G4DataVector* oneCoeffVec = (*oneShellCoeffTable)[ind]; 
 
     if(KinEn < (*energyVec)[0]){
-      Parms.insert((*oneCoeffVec)[0]);
+      Parms.push_back((*oneCoeffVec)[0]);
     }
 
     else if(KinEn > (*energyVec)[LastPar]){
 
-      Parms.insert((*oneCoeffVec)[LastPar]);
+      Parms.push_back((*oneCoeffVec)[LastPar]);
     }
 
     else{
@@ -1480,7 +1477,7 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
       // can be negative. 
 
       G4double par = util.DataSemiLogInterpolation(KinEn,(*energyVec),(*oneCoeffVec));
-      Parms.insert(par);
+      Parms.push_back(par);
     }
   }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
index 0e4d07cc61b0acc7b113ed92d06d7dbc83daf912..11487bd8ce347f947c509a5c0484966a2362ccfd 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.26 2000/07/11 18:46:48 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyPhotoElectric.cc,v 1.27 2001/02/05 17:45:21 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -93,7 +93,6 @@ G4LowEnergyPhotoElectric::~G4LowEnergyPhotoElectric()
 
    // ClearAndDestroy of this tables is called in their destructors
    if (theFluorTransitionTable) {
-
       delete theFluorTransitionTable;
    }
 
@@ -103,14 +102,12 @@ G4LowEnergyPhotoElectric::~G4LowEnergyPhotoElectric()
    }
 
    if(ZNumVec){
-     
      ZNumVec->clear();
      delete ZNumVec;
    }
    
    if(ZNumVecFluor){
-
-     ZNumVecFluor->clear();
+     ZNumVecFluor->erase(ZNumVecFluor->begin(),ZNumVecFluor->end());
      delete ZNumVecFluor;
    }
 
@@ -157,7 +154,7 @@ void G4LowEnergyPhotoElectric::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
@@ -181,7 +178,7 @@ void G4LowEnergyPhotoElectric::BuildShellCrossSectionTable(){
    allAtomShellCrossSec = new allAtomTable();
    G4int dataNum = 2;
  
-   for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+   for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
      G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
@@ -217,10 +214,10 @@ void G4LowEnergyPhotoElectric::BuildFluorTransitionTable(){
   }
   
   theFluorTransitionTable = new allAtomTable();
-  ZNumVecFluor = new G4Data(*ZNumVec);
+  ZNumVecFluor = new G4DataVector(*ZNumVec);
   G4int dataNum = 3;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     if(AtomInd > 5){
       
@@ -244,12 +241,11 @@ void G4LowEnergyPhotoElectric::BuildZVec(){
   G4int numOfMaterials = theMaterialTable->length();
 
   if(ZNumVec){
-
     ZNumVec->clear();
     delete ZNumVec;
   }
 
-  ZNumVec = new G4Data(); 
+  ZNumVec = new G4DataVector(); 
   for (G4int J=0 ; J < numOfMaterials; J++){ 
  
     const G4Material* material= (*theMaterialTable)[J];        
@@ -261,11 +257,8 @@ void G4LowEnergyPhotoElectric::BuildZVec(){
       G4double Zel = (*theElementVector)(iel)->GetZ();
 
       if(ZNumVec->contains(Zel) == FALSE){
-
-	ZNumVec->insert(Zel);
-      }
-      else{
-	
+	ZNumVec->push_back(Zel);
+      } else{
 	continue;
       }
     }
@@ -290,8 +283,8 @@ G4double G4LowEnergyPhotoElectric::ComputeCrossSection(const G4double AtomIndex,
   for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
 
     G4double crossSec = 0;
-    G4Data* EnergyVector = (*(*oneAtomCS)[ind])[0];
-    G4Data* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+    G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
+    G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
 
     if(IncEnergy < (*EnergyVector)[1]){ // First element is the shell number
 
@@ -412,12 +405,12 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
   G4int thePrimaryShell = (G4int) (*(*theBindEnVec)[0])[subShellIndex];
   G4double BindingEn = ((*(*theBindEnVec)[1])[subShellIndex])*MeV;
   
-  if(thePrimShVec.length() != 0){
+  if(thePrimShVec.size() != 0){
     
     thePrimShVec.clear();
   }
 
-  thePrimShVec.insert(thePrimaryShell);
+  thePrimShVec.push_back(thePrimaryShell);
 
   // Create lists of pointers to DynamicParticles (photons and electrons)
   G4ParticleVector photvec;
@@ -578,8 +571,8 @@ G4int G4LowEnergyPhotoElectric::SelectRandomShell(const G4int AtomIndex,
   for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
 
     G4double crossSec;
-    G4Data* EnergyVector = (*(*oneAtomCS)[ind])[0];
-    G4Data* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+    G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
+    G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
     if(IncEnergy < (*EnergyVector)[0]){ //First element is the shell number
 
       crossSec = 0;
@@ -643,7 +636,6 @@ G4LowEnergyPhotoElectric::SelectRandomAtom(const G4DynamicParticle* aDynamicPhot
   }
   return (*theElementVector)(0);
 }
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 //
@@ -701,7 +693,7 @@ G4bool G4LowEnergyPhotoElectric::SelectRandomTransition(G4int thePrimShell,
       G4double PartSum = 0;
       
       TransProb = 1; 
-      while(TransProb < (*(*TransitionTable)[ShellNum])[ProbCol]->length()){
+      while(TransProb < (*(*TransitionTable)[ShellNum])[ProbCol]->size()){
 	
 	PartSum += (*(*(*TransitionTable)[ShellNum])[ProbCol])[TransProb];
 	
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
index 060375c90cdb59f9502b8a27b5714091bef61943..42088cb6517eeecea91dd3313a1cc4f545010dfd 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.18 2000/07/11 18:46:48 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyRayleigh.cc,v 1.19 2001/02/05 17:45:21 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -71,7 +71,6 @@ G4LowEnergyRayleigh::~G4LowEnergyRayleigh()
    }
 
    if(ZNumVec){
-     
      ZNumVec->clear();
      delete ZNumVec;
    }
@@ -104,7 +103,7 @@ void G4LowEnergyRayleigh::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
@@ -125,7 +124,7 @@ void G4LowEnergyRayleigh::BuildFormFactorTable(){
   theFormFactorTable = new G4SecondLevel();
   G4int dataNum = 2;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->entries(); TableInd++){
+  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
@@ -142,12 +141,11 @@ void G4LowEnergyRayleigh::BuildZVec(){
   G4int numOfMaterials = theMaterialTable->length();
 
   if(ZNumVec){
-
     ZNumVec->clear();
     delete ZNumVec;
   }
 
-  ZNumVec = new G4Data(); 
+  ZNumVec = new G4DataVector(); 
   for (G4int J=0 ; J < numOfMaterials; J++){ 
  
     const G4Material* material= (*theMaterialTable)[J];        
@@ -159,11 +157,8 @@ void G4LowEnergyRayleigh::BuildZVec(){
       G4double Zel = (*theElementVector)(iel)->GetZ();
 
       if(ZNumVec->contains(Zel) == FALSE){
-
-	ZNumVec->insert(Zel);
-      }
-      else{
-	
+	ZNumVec->push_back(Zel);
+      } else{
 	continue;
       }
     }
@@ -366,3 +361,4 @@ G4Element* G4LowEnergyRayleigh::SelectRandomAtom(const G4DynamicParticle* aDynam
 
 
 
+
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc
index f47e181192969b7ab9f64895d9856a83e3f967ac..77cec9af5544a79510fe83df71567b24b42051f5 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.7 2000/12/14 09:43:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4LowEnergyUtilities.cc,v 1.8 2001/02/05 17:45:21 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -82,7 +82,7 @@ G4SecondLevel* G4LowEnergyUtilities::BuildSecondLevelTables(const G4int TableInd
   
   for(G4int j = 0; j < ParNum; j++){ 
     
-    oneShellPar->insertAt(j,new G4Data());
+    oneShellPar->insertAt(j,new G4DataVector());
   }
   
   G4double a = 0;
@@ -101,7 +101,7 @@ G4SecondLevel* G4LowEnergyUtilities::BuildSecondLevelTables(const G4int TableInd
 	
 	for(G4int j = 0; j < ParNum; j++){ 
 	  
-	  oneShellPar->insertAt(j,new G4Data());
+	  oneShellPar->insertAt(j,new G4DataVector());
 	}
       }
       
@@ -122,12 +122,12 @@ G4SecondLevel* G4LowEnergyUtilities::BuildSecondLevelTables(const G4int TableInd
       
       if(k%ParNum != 0){	
 	
-	(*oneShellPar)[k-1]->insert(a);
+	(*oneShellPar)[k-1]->push_back(a);
 	k++;
       }
       else if(k%ParNum == 0){
 	
-	(*oneShellPar)[k-1]->insert(a);
+	(*oneShellPar)[k-1]->push_back(a);
 	k = 1;
       }
     }
@@ -181,7 +181,7 @@ G4FirstLevel* G4LowEnergyUtilities::BuildFirstLevelTables(const G4int TableInd,
   
   for(G4int j = 0; j < ParNum; j++){ 
     
-    oneAtomPar->insertAt(j,new G4Data());
+    oneAtomPar->insertAt(j,new G4DataVector());
   }
   
   G4double a = 0;
@@ -198,12 +198,12 @@ G4FirstLevel* G4LowEnergyUtilities::BuildFirstLevelTables(const G4int TableInd,
       
       if(k%ParNum != 0){	
 	
-	(*oneAtomPar)[k-1]->insert(a);
+	(*oneAtomPar)[k-1]->push_back(a);
 	k++;
       }
       else if(k%ParNum == 0){
 	
-	(*oneAtomPar)[k-1]->insert(a);
+	(*oneAtomPar)[k-1]->push_back(a);
 	k = 1;
       }
     }
diff --git a/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc b/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc
index 75f34b2ceee8cabf9bd5d1b0b418ac934afe3eff..b9e0013b9d5401611f1a6c10d8ea3b15a411e855 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VeLowEnergyLoss.cc,v 1.6 2000/11/22 16:06:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc b/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc
index d63719249517f39b20bcd216296ec82876b6a6cf..45ba1538481a6e3690fbecba1809fd801aea220f 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eLowEnergyLoss.cc,v 1.7 2000/09/20 16:49:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //  
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc
index 147597c3a5b683794ac02e1a5379743225d6b555..ba77cb4982eef261cc734d56123e79c9bc7651cc 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hLowEnergyLoss.cc,v 1.8 2000/11/05 12:17:06 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
diff --git a/source/processes/electromagnetic/muons/History b/source/processes/electromagnetic/muons/History
index 92ede53802574018db3d16289a43fd0ec1a2f385..8b33bad7d18f515d352cc64237770c6864f30433 100644
--- a/source/processes/electromagnetic/muons/History
+++ b/source/processes/electromagnetic/muons/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.5 2000/11/08 14:29:11 maire Exp $
+$Id: History,v 1.11 2001/03/23 15:09:37 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,26 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+23 mar 01 L.Urban (muons-V03-00-05)
+- R.Kokoulin's correction to energy loss has been commented out
+  in G4MuIonisation.cc
+     
+05 mar 01 mma (muons-V03-00-04)
+- new subdirectory: integral
+  migration of all G4I.. processes from muons, standard, utils into integral
+
+05 feb 01: G. Cosmo (muons-V03-00-02)
+- STL migration for G4OrderedTable and G4DataVector.
+  Modified files: G4IMuBremsstrahlung.cc, G4IMuPairProduction.cc,
+                  G4MuBremsstrahlung.cc, G4MuPairProduction.cc
+
+24 jan 01: L. Urban (muons-V03-00-01)
+- bug fixed in muon bremstrahlung , in G4MuBremstrahlung.cc 
+   in PostStepDoIt.
+ 
+16 jan 01: mma (muons-V03-00-00)
+- small corrections in MuEnergyLoss.cc L.Urban 11-01-01
      
 08 nov 00: mma (muons-V02-00-03)
 - signature in GetLossWithFluct changed L.Urban 30/10/00
diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
index f4887d2217d0d26c25570514eb642aea6ac9b836..ab2b8e070410797a9d922f75af5b8e39e10c29be 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.8 2000/05/23 09:55:37 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0d8d7923c042632c267a5b30595730aa2492c67a..654f747a702141a5a74bb7115bafa499aa204389 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.3 1999/12/15 14:51:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation.hh b/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
index baec638cc869a1210b0c25f3fcf567a6e6a8a055..39f69a826500438e9a6c822a87a03ebd76d9180c 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.8 2000/04/25 14:18:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation.icc b/source/processes/electromagnetic/muons/include/G4MuIonisation.icc
index cff9d9d7e846dec5e7813024106be2920e1dfa41..64805fc6d232e522189279fcbb79f1fde5b87b74 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.2 1999/12/15 14:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh b/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
index e0ee8a314409efbd13d55b6c59f552b7d5a15c1a..fcd4079590e0fe94202de67bf5b8e5b41dc0fb00 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.8 2000/05/23 16:03:25 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc b/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc
index 8fe70ed04967ac011289258d0520ff8b4a9d3303..02fd70222ff7c521f8412481f6d7d76325c82fdb 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.3 2000/02/10 08:29:13 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
diff --git a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh
index 53086be1797be9c6f027a5a84e5c1cb31de248a8..30c7cb916b4a2e87ea5b54fed277d81d49f78cf0 100644
--- a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh
+++ b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VMuEnergyLoss.hh,v 1.2 2000/06/07 16:50:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // -------------------------------------------------------------------
 //      GEANT 4 class header file 
 //
diff --git a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc
index c5b8c8d81e8a8b2650da4ea3b07a1748d686230d..1c663c62aca19db07695b7c40df46f79d866d209 100644
--- a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc
+++ b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VMuEnergyLoss.icc,v 1.1 2000/04/25 14:18:59 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
diff --git a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
index 4e694314fb8016c5bb6b3b03f82ef2c3b70bcbc7..51d20156b1bc27e19869e5345f628c29f12cdf1a 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.12 2000/05/23 09:58:48 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MuBremsstrahlung.cc,v 1.14 2001/02/05 17:50:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //    
 // --------------------------------------------------------------
@@ -35,7 +35,7 @@ G4double G4MuBremsstrahlung::tdat[]={1.e3,1.e4,1.e5,1.e6,1.e7,1.e8,1.e9,1.e10};
 G4int G4MuBremsstrahlung::NBIN = 1000;    // 100 ;
 G4double G4MuBremsstrahlung::ya[1001]={0.};
 G4double G4MuBremsstrahlung::proba[5][8][1001]={0.};
-G4double G4MuBremsstrahlung::CutFixed=1.*keV ;
+G4double G4MuBremsstrahlung::CutFixed=0.98*keV ;
 
 
 G4double G4MuBremsstrahlung::LowerBoundLambda = 1.*keV ;
@@ -210,6 +210,7 @@ void G4MuBremsstrahlung::BuildLambdaTable(
       delete theMeanFreePathTable;
   }
   theMeanFreePathTable = new G4PhysicsTable(G4Material::GetNumberOfMaterials());
+  PartialSumSigma.clearAndDestroy();
   PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
 
   G4PhysicsLogVector* ptrVector;
@@ -249,7 +250,7 @@ void G4MuBremsstrahlung::ComputePartialSumSigma(
                                     aMaterial->GetAtomicNumDensityVector();
    G4double GammaEnergyCut = (G4Gamma::Gamma()->GetCutsInEnergy())[Imate];
 
-   PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+   PartialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -260,7 +261,7 @@ void G4MuBremsstrahlung::ComputePartialSumSigma(
                                             (*theElementVector)(Ielem)->GetZ(), 
                                             (*theElementVector)(Ielem)->GetA(), 
                                                  GammaEnergyCut );
-        PartialSumSigma(Imate)->insertAt(Ielem, SIGMA);
+        PartialSumSigma[Imate]->push_back(SIGMA);
    }
 }
 
@@ -448,7 +449,6 @@ void G4MuBremsstrahlung::MakeSamplingTables(
          for(G4int ib=0; ib<=nbin; ib++)
          {
            proba[iz][it][ib] /= CrossSection ;
-
          }
        }
      }
@@ -461,6 +461,9 @@ G4VParticleChange* G4MuBremsstrahlung::PostStepDoIt(const G4Track& trackData,
                                                   const G4Step& stepData)
 {
 
+  static G4double ysmall = -100. ;
+  static G4double ytablelow = -5. ;
+ 
   aParticleChange.Initialize(trackData);
   G4Material* aMaterial=trackData.GetMaterial() ;
 
@@ -487,7 +490,9 @@ G4VParticleChange* G4MuBremsstrahlung::PostStepDoIt(const G4Track& trackData,
   G4double dy = 5./G4float(NBIN) ;
 
   G4double ymin=log(log(GammaEnergyCut/CutFixed)/log(KineticEnergy/CutFixed)) ;
-  G4int iymin = G4int((ymin+5.)/dy+0.5) ;  
+
+  if(ymin < ysmall)        
+    return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
 
   //  sampling using tables 
   G4double v,xc,x,yc,y ;
@@ -518,23 +523,30 @@ G4VParticleChange* G4MuBremsstrahlung::PostStepDoIt(const G4Track& trackData,
       itt=it ;
     }
   }
+  G4int iymin = G4int((ymin+5.)/dy+0.5) ;  
 
-  G4double r = G4UniformRand() ;
+  if(ymin < ytablelow)
+  {
+    y = ymin + G4UniformRand()*(ytablelow-ymin) ;
+  }
+  else
+  {
+    G4double r = G4UniformRand() ;
 
-  iy = iymin-1 ;
-  delmin = proba[izz][itt][NBINminus1]-proba[izz][itt][iymin] ;
-  do {
-       iy += 1 ;
-     } while ((r > (proba[izz][itt][iy]-proba[izz][itt][iymin])/delmin)
-               &&(iy < NBINminus1)) ;
+    iy = iymin-1 ;
+    delmin = proba[izz][itt][NBINminus1]-proba[izz][itt][iymin] ;
+    do {
+         iy += 1 ;
+       } while ((r > (proba[izz][itt][iy]-proba[izz][itt][iymin])/delmin)
+                 &&(iy < NBINminus1)) ;
 
-  //sampling is Done uniformly in y in the bin
-    y = ya[iy] + G4UniformRand() * ( ya[iy+1] - ya[iy] ) ;
+    //sampling is Done uniformly in y in the bin
+     y = ya[iy] + G4UniformRand() * ( ya[iy+1] - ya[iy] ) ;
+  }
 
   x = exp(y) ;
 
   v = CutFixed*exp(x*log(KineticEnergy/CutFixed)) ;            
-
   if( v <= 0.)
      return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
 
@@ -584,9 +596,9 @@ G4Element* G4MuBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))(NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
   for ( G4int i=0; i < NumberOfElements; i++ )
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material " << aMaterial->GetName()
        << " has no elements, NULL pointer returned." << G4endl;
   return NULL;
diff --git a/source/processes/electromagnetic/muons/src/G4MuIonisation.cc b/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
index c1acebf25a1a87faa8a047ef088646d5bd2cd5a0..1a286e3d0ee36749924253db59815afcf954dcc3 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.11 2000/05/23 09:58:47 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MuIonisation.cc,v 1.12 2001/03/23 07:27:29 urban Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -25,6 +25,7 @@
 // 08-04-98: remove 'tracking cut' of the ionizing particle, MMa
 // 26/10/98: new stuff from R.Kokoulin + cleanup , L.Urban
 // 10/02/00  modifications , new e.m. structure, L.Urban
+// 23/03/01: R.Kokoulin's correction is commented out, L.Urban
 // --------------------------------------------------------------
  
 
@@ -228,12 +229,12 @@ void G4MuIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
         ionloss -= delta + sh ;
         ionloss /= beta2 ;
          
-        // correction of R. Kokoulin  
-        G4double E = LowEdgeEnergy+ParticleMass ;
-        G4double epmax = RateMass*E*E/(RateMass*E+ParticleMass) ;
-        G4double apar = log(2.*epmax/electron_mass_c2) ;
-        ionloss += fine_structure_const*(log(2.*E/ParticleMass)-apar/3.)*
-                                        apar*apar/twopi ; 
+      // correction of R. Kokoulin  // has been taken out *************** 
+      //  G4double E = LowEdgeEnergy+ParticleMass ;
+      //  G4double epmax = RateMass*E*E/(RateMass*E+ParticleMass) ;
+      //  G4double apar = log(2.*epmax/electron_mass_c2) ;
+      //  ionloss += fine_structure_const*(log(2.*E/ParticleMass)-apar/3.)*
+      //                                  apar*apar/twopi ; 
 
         ionloss *= Factor*ElectronDensity ;
       }
diff --git a/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc b/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
index d70df82c613ef9423cdb0db2c5b071d7fb5099b4..a7c5f3395aa0ec8fa769d4f904565e02c4060cbd 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.15 2000/05/23 09:58:49 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MuPairProduction.cc,v 1.16 2001/02/05 17:50:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
@@ -237,7 +237,9 @@ void G4MuPairProduction::BuildLambdaTable(
    }
   theMeanFreePathTable = new 
                       G4PhysicsTable( G4Material::GetNumberOfMaterials() ) ;
-   PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
+
+  PartialSumSigma.clearAndDestroy();
+  PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
 
    G4PhysicsLogVector* ptrVector;
    for ( G4int J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
@@ -276,7 +278,7 @@ void G4MuPairProduction::ComputePartialSumSigma(
   G4double ElectronEnergyCut = (G4Electron::GetCutsInEnergy())[Imate];
   G4double PositronEnergyCut = (G4Positron::GetCutsInEnergy())[Imate];
 
-  PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+  PartialSumSigma[Imate] = new G4DataVector();
 
   G4double SIGMA = 0. ;
 
@@ -287,7 +289,7 @@ void G4MuPairProduction::ComputePartialSumSigma(
                                         (*theElementVector)(Ielem)->GetZ(), 
                                         ElectronEnergyCut,PositronEnergyCut );
 
-    PartialSumSigma(Imate)->insertAt(Ielem, SIGMA);
+    PartialSumSigma[Imate]->push_back(SIGMA);
   }
 }
 
@@ -801,12 +803,12 @@ G4Element* G4MuPairProduction::SelectRandomAtom(G4Material* aMaterial) const
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))
-                                                      (NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])
+                                                      [NumberOfElements-1]);
 
   for ( G4int i=0; i < NumberOfElements; i++ )
   {
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   }
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
        << "' has no elements, NULL pointer returned." << G4endl;
diff --git a/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc b/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc
index b0560cb4193d09ab5de54aab15e595fe345453e4..26ef05608b27bbe59ebc6bfffdd4925a054f1cc0 100644
--- a/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc
+++ b/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VMuEnergyLoss.cc,v 1.7 2000/10/30 07:17:30 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VMuEnergyLoss.cc,v 1.8 2001/01/11 10:42:52 urban Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
@@ -104,6 +104,14 @@ G4VMuEnergyLoss::~G4VMuEnergyLoss()
   LOGRTable=lrate/NbinEloss;
   RTable   =exp(LOGRTable);
 
+  //set physically consistent value for finalRange
+  //  and parameters for en.loss step limit
+  if(finalRange > G4Electron::Electron()->GetCuts())
+    finalRange = G4Electron::Electron()->GetCuts() ;
+  c1lim = dRoverRange ;
+  c2lim = 2.*(1.-dRoverRange)*finalRange ;
+  c3lim = -(1.-dRoverRange)*finalRange*finalRange;
+
   G4bool MakeTable ;
   ParticleMass = aParticleType.GetPDGMass() ; 
   G4double Charge = aParticleType.GetPDGCharge()/eplus ;
diff --git a/source/processes/electromagnetic/standard/History b/source/processes/electromagnetic/standard/History
index f69382b39925379812ba35e4379d7f833126aa98..f68d8ffb505f8c6181f8d26bc319722ab2c49817 100644
--- a/source/processes/electromagnetic/standard/History
+++ b/source/processes/electromagnetic/standard/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.14 2000/11/17 15:03:16 maire Exp $
+$Id: History,v 1.21 2001/03/27 15:10:51 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,37 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+     
+27 mar 01 mma (stand-V03-00-05)
+- commented out the printing of subcutoff energies at initialization
+     
+05 mar 01 mma (stand-V03-00-04)
+- new subdirectory: integral
+  migration of all G4I.. processes from muons, standard, utils into integral
+       
+22 feb 01: mma (stand-V03-00-03)
+- G4PhotoElectricEffect.  DoIt: removed protection against low energy gamma,
+    after correction in SandiaTable (materials-V03-00-05)
+- G4EplusAnnihilation. PostStepDoIt: check with fStopButAlive instead of
+   energy == 0. 
+
+05 feb 01: G.Cosmo (stand-V03-00-02)
+- Migration to STL for G4DataVector and G4OrderedTable.
+  Modified files: G4SynchrotronRadiation.hh, G4IeBremsstrahlung.cc,
+                  G4eBremsstrahlung.cc.
+
+23 jan 01: mma (stand-V03-00-01)
+- corrections in e/hEnergyLoss.cc: AlongStepDoIt L.Urban 23-01-01
+  PostStep information is not used any more in AlongStepDoIt
+  when generating sub-cutoff delta rays. (bug found by Babar)
+     
+16 jan 01: mma (stand-V03-00-00)
+- small corrections in e/hEnergyLoss.cc L.Urban 11-01-01
+  to ensure consistency between cut in range and step limitation
+  due to energy loss (finalRange data member <-> cut in range)
+- change in energy loss computation in eBrems.hh and .cc L.Urban 11-01-01
+  parametrization of energy loss due to soft brems has been corrected,
+  it was too big for big cut values.
 
 17 Nov 00 mma : stand-V02-00-04
      
diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
index 26ccba55d80f385fab1f1b62b00f79965ffbd42c..97a0fc4f2eb9bc2488da9ae07643a2496fa41f9f 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.4 1999/12/17 16:20:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ------------ G4ComptonScattering physics process ------
 //                   by Michel Maire, April 1996
diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc b/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc
index 319082f8648c6211f5c29c848e4ec5a751245296..493cf961391528225b841ed43da1a4065e03b22c 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.2 1999/12/15 14:51:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion.hh b/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
index 509e21727c19b1f4e493a2c8918516dbe511fcd4..a64be688911e685fc94dc6d13265c79d31041117 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.4 1999/12/17 18:26:11 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      ------------ G4GammaConversion physics process ------
 //                   by Michel Maire, 24 May 1996
diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion.icc b/source/processes/electromagnetic/standard/include/G4GammaConversion.icc
index 30b6e2d06055f8ff07bddc8eadfc0e2c6bfb81a0..3dc44da1b05ccc60f26b9e793618275e4712b62d 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.2 1999/12/15 14:51:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4PAIonisation.hh b/source/processes/electromagnetic/standard/include/G4PAIonisation.hh
index b1402d56daf383d161447b72b595a7f8838ea5f7..0a12499e3ad171de0dd17a4b4dcd2808290878c5 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.7 2000/09/22 14:44:07 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4PAIonisation.icc b/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
index 23a50a1a843f5f5975b4c12053b96e3287f7875c..a629a7e48c85152985818099cd1eb97344f1454e 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
@@ -86,7 +86,7 @@ GetMeanFreePath( const G4Track&          trackData,
 // G4cout<<"G4PAIonisation::GetMeanFreePath is called"<<G4endl ;
 
   G4int iTkin, iPlace ;
-  G4double charge, charge2, massRatio, kinE, scaledE, meanFreePath ;
+  G4double charge, charge2, mass, massRatio, kinE, gamma, scaledE, meanFreePath ;
   G4double E1, E2, W, W1, W2, primaryIon ; 
 
  *condition = NotForced ;
@@ -98,9 +98,14 @@ GetMeanFreePath( const G4Track&          trackData,
   {
     const G4DynamicParticle* aParticle = trackData.GetDynamicParticle() ;
     kinE = aParticle->GetKineticEnergy() ;
+    mass = aParticle->GetDefinition()->GetPDGMass() ;
+    gamma = 1.0 + kinE/mass ;
+
+    if(gamma < 1.2) return meanFreePath = DBL_MAX ;
+
     charge = aParticle->GetDefinition()->GetPDGCharge() ;
     charge2 = charge*charge ;
-    massRatio = proton_mass_c2/aParticle->GetDefinition()->GetPDGMass() ;
+    massRatio = proton_mass_c2/mass ;
     scaledE = kinE*massRatio ;
 
     for(iTkin=0;iTkin<G4PAIonisation::GetBinNumber();iTkin++)
@@ -235,7 +240,8 @@ GetdEdx( G4double scaledTkin, G4double charge2 )
 inline G4bool G4PAIonisation::IsApplicable(
                             const G4ParticleDefinition& particle)
 {
-   return(particle.GetPDGCharge() != 0.);
+   return( particle.GetPDGCharge() != 0. && 
+           particle.GetPDGMass()    > 0.     );
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/electromagnetic/standard/include/G4PAIxSection.hh b/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
index 59d5a022fdbe086774437630da46ac171995b16c..195703168ce2c30e44b96d47aff76709f470ddc3 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.4 1999/12/15 14:51:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4PAIxSection.hh -- header file
diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
index af7f638c96b8d06bb03e858ca54014e09dec31db..cc57083d0ea9c5613576d5c17c61dc88cbd294d4 100644
--- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
+++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
@@ -5,11 +5,10 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhotoElectricEffect.hh,v 1.5 1999/12/17 18:26:12 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhotoElectricEffect.hh,v 1.6 2001/02/22 16:05:42 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-//      ------------ G4PhotoElectricEffect physics process ------
-//                   by Michel Maire, April 1996
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //
 // 12-06-96, Added SelectRandomAtom() method and new data member
 //           for cumulative total cross section, by M.Maire
@@ -21,7 +20,8 @@
 // 13-08-98, new methods SetBining() PrintInfo()
 // 17-11-98, use table of atomic shells in PostStepDoIt, mma
 // 06-01-99, Sandia crossSection below 50 keV, V.Grichine mma 
-// ------------------------------------------------------------
+// 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 // class description
 //
diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
index df59fcb4ed2a261e2993d641e8735e49deb108d8..c204945c2ac4f2478c6d241c5309258d46280858 100644
--- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
+++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
@@ -5,20 +5,11 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhotoElectricEffect.icc,v 1.3 1999/12/15 14:51:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhotoElectricEffect.icc,v 1.4 2001/02/22 16:05:43 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-// 
-// ---------------------------------------------------------------
-//      GEANT 4 class inlined methods file
-//
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4PhotoElectricEffect physics process ---------
-//                   by Michel Maire, April 1996
-// ***************************************************************
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
 // 12-06-96, update by M.Maire
 // 17-09-96, PartialSumSigma(i)
 //           split ComputeBinbingEnergy(), M.Maire
@@ -27,8 +18,8 @@
 // 20-11-97, change for lowest energy limit default action
 // 17-11-98, use table of atomic shells in PostStepDoIt, mma
 // 06-01-99, use Sandia crossSection, V.Grichine mma
-// ---------------------------------------------------------------
 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 inline G4bool G4PhotoElectricEffect::IsApplicable(const G4ParticleDefinition& particle)
diff --git a/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
index 6ab95df5d3f5cdb2c02b34bdb700bc60d8861148..5202d87116d28d06035d2eb1b7727bee92e32238 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.4 2000/11/17 15:03:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------- G4PolarizedComptonScattering physics process -----
 //                   by Vicente Lara, March 1998
diff --git a/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh b/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
index 05f298cee51b0373c74a0c8345e6b4c664252588..a34ff29eef384bcd59500b51996aab478a2d32cf 100644
--- a/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
+++ b/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SynchrotronRadiation.hh,v 1.3 2000/11/01 15:30:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SynchrotronRadiation.hh,v 1.4 2001/02/05 17:53:51 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
@@ -43,7 +43,6 @@
 #include "G4Positron.hh"
 
 
-#include "G4OrderedTable.hh" 
 #include "G4PhysicsTable.hh"
 #include "G4PhysicsLogVector.hh"
  
diff --git a/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh
index 8a2adf96a378f241ff5892a4a8a190ac7e40b479..087c8b8393268fe961807fe18d55808f54f565a1 100644
--- a/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPAIenergyLoss.hh,v 1.2 2000/06/07 17:00:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
diff --git a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh
index 641748158e9bef13fd860319d841dddb9cd6b4c6..d90f09e13b429c41050febe5253d189c44abd819 100644
--- a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VeEnergyLoss.hh,v 1.5 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc
index 3caadb2b24c81e9d05a06465fb0622fe2777c240..507ca987b744527e10c9bb7bf93761d1142f7b17 100644
--- a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VeEnergyLoss.icc,v 1.2 2000/05/23 14:39:26 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
diff --git a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh
index 183b5309b2389729c6d7521bc54d4606befc5686..47539140af5b9e2facaabfe9bfd08f121f63cc90 100644
--- a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VhEnergyLoss.hh,v 1.7 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
diff --git a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc
index 8de48d3823716df4eb7f27ccf32b313436c9c1fc..a8bcf89c354dee157178bf22293b0a32cad28f67 100644
--- a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VhEnergyLoss.icc,v 1.2 2000/05/23 14:39:27 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
index d3fe1aca302b33864a8b127a3a1734349ce0c157..f4024fcdf1f6aa4e17418e309f11cfdeee5adf96 100644
--- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
+++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eBremsstrahlung.hh,v 1.7 2000/08/08 10:26:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4eBremsstrahlung.hh,v 1.8 2001/01/11 10:39:48 urban Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -93,9 +93,6 @@ class G4eBremsstrahlung : public G4VeEnergyLoss
      G4double ComputeBremLoss(G4double Z,G4double natom,G4double T,
                               G4double Cut,G4double x);
 
-     G4double ComputeXYPolynomial(G4double x,G4double y,G4int xSize,
-                                  G4int ySize,const G4double coeff[]);
-
      G4double ComputePositronCorrFactorLoss(G4double AtomicNumber,
                                             G4double KineticEnergy,
                                             G4double GammaEnergyCut);
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc
index c9d628d16cf6a2d0378c857365ef329b5c894f27..7925e0d77cea7aaa8500bad5c02d6aa5dc0b96bf 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.3 2000/05/23 15:44:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation.hh b/source/processes/electromagnetic/standard/include/G4eIonisation.hh
index 53d50ee78db10a344498503c2060bf05385327a0..4edf934a1d8ba8241ceee53bb78457dd157bb4e7 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.7 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation.icc b/source/processes/electromagnetic/standard/include/G4eIonisation.icc
index b7adb06e3fd3fac8460ad65786b947bb9b768983..ca62605b799fced0734bbd587ddf2600655ae2b5 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.3 1999/12/15 14:51:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
index cc1ed1f9708e8f31392b14e363adfccb749bb7c8..505ee0fc9348a478ad2353a473bc56f3103c1223 100644
--- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
+++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
@@ -5,16 +5,16 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eplusAnnihilation.hh,v 1.3 1999/12/17 18:26:12 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-//      ------------ G4eplusAnnihilation process ------
-//                   by Michel Maire, 7 july 1996
+// $Id: G4eplusAnnihilation.hh,v 1.4 2001/02/22 18:26:07 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
 // 10-01-97, crossection table + meanfreepath table, M.Maire
 // 17-03-97, merge 'in fly' and 'at rest', M.Maire
 // 31-08-98, new methods SetBining() and PrintInfo() 
-// ------------------------------------------------------------
+// 
 
 // class description
 //
diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
index 068986ab3edc21a4c7f472ad2d7dcb39c92c3965..08012b9aa3100e107abc2dd365b82a00cccff93b 100644
--- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
+++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
@@ -5,24 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eplusAnnihilation.icc,v 1.2 1999/12/15 14:51:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4eplusAnnihilation.icc,v 1.3 2001/02/22 18:26:08 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-// 
-// ---------------------------------------------------------------
-//      GEANT 4 class inlined methods file
-//
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4eplusAnnihilation process ---------
-//                   by Michel Maire, 7 July 1996
-// ***************************************************************
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
 // 10-01-97, crossection table + meanfreepath table, M.Maire
 // 17-03-97, merge 'in fly' and 'at rest', M.Maire
-// ---------------------------------------------------------------
-
+// 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 inline G4bool G4eplusAnnihilation::IsApplicable(const G4ParticleDefinition& particle)
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation.hh b/source/processes/electromagnetic/standard/include/G4hIonisation.hh
index ce17b8a5c6b1f183994513d672f43e9b4dec31bc..95600214e95388c64b240faa1544beb12fec6ad9 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.10 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation.icc b/source/processes/electromagnetic/standard/include/G4hIonisation.icc
index defb3a635c393b7515849f1249002befb08c2bad..12b9f7b33f2a53ddfa4bc3dc377de3402e5127b4 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.3 1999/12/15 14:51:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/lof b/source/processes/electromagnetic/standard/include/lof
deleted file mode 100644
index c99f84f8ed8832bae34e62217de6fe69c1c200ea..0000000000000000000000000000000000000000
--- a/source/processes/electromagnetic/standard/include/lof
+++ /dev/null
@@ -1,10 +0,0 @@
-G4IMultipleScattering.hh
-G4IMultipleScattering.icc
-G4IeBremsstrahlung.hh
-G4IeBremsstrahlung.icc
-G4IeEnergyLoss.hh
-G4IeEnergyLoss.icc
-G4IeIonisation.hh
-G4IeIonisation.icc
-G4IeplusAnnihilation.hh
-G4IeplusAnnihilation.icc
diff --git a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
index ea838f0fb05e621a726f3112658e1141043b53ad..b99d3607f2dd19f70f59ed7497ae9ebe8d76a6c9 100644
--- a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
+++ b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ComptonScattering.cc,v 1.4 2000/11/17 15:03:17 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //------------ G4ComptonScattering physics process --------
diff --git a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
index 46b6450aa6772bc57e77fcb3c3eccde33cd7457d..776d0005a74d23cd76d78392e9271d1feb14901a 100644
--- a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
+++ b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GammaConversion.cc,v 1.4 2000/08/03 08:36:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4PAIonisation.cc b/source/processes/electromagnetic/standard/src/G4PAIonisation.cc
index 7d24b168b7af3b5cab55fb1d5a66fcc19ee3924c..455053800d2872d34e0b8fd4bdb0e8465bd3f7b3 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.13 2000/09/22 14:46:38 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PAIonisation.cc,v 1.14 2001/02/01 15:12:50 grichine Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // **************************************************************
@@ -489,15 +489,16 @@ G4VParticleChange* G4PAIonisation::AlongStepDoIt( const G4Track& trackData,
 
   E = aParticle->GetKineticEnergy() ;
 
-  G4double Charge = aParticle->GetDefinition()->GetPDGCharge() ;
-
-  G4double Chargesquare = Charge*Charge ;
+  G4double mass = aParticle->GetDefinition()->GetPDGMass() ;
+  G4double gamma = 1.0 + E/mass ;
 
-  G4double MassRatio = proton_mass_c2/aParticle->GetDefinition()->GetPDGMass() ;
+  if( gamma < 1.2 ) return &aParticleChange ; 
 
+  G4double Charge = aParticle->GetDefinition()->GetPDGCharge() ;
+  G4double Chargesquare = Charge*Charge ;
+  G4double MassRatio = proton_mass_c2/mass ;
   ScaledE = E*MassRatio ;
 
-
   ParticleCutInKineticEnergyNow =
                (aParticle->GetDefinition()->GetEnergyCuts())[index] ;
 
diff --git a/source/processes/electromagnetic/standard/src/G4PAIxSection.cc b/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
index 2d93cb372510ca68a276f9c30f3133a8eb880cbc..c192252cec49420bfba43fc6001d815b8c463199 100644
--- a/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
+++ b/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PAIxSection.cc,v 1.4 1999/12/15 14:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4PAIxSection.cc -- class implementation file
diff --git a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
index 60424bee7a16fc5d5c478b58bdcf0329a1919636..67cfd23d867e05239f35c32f7fe62afb7c78a9cc 100644
--- a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
+++ b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
@@ -5,21 +5,11 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4PhotoElectricEffect.cc,v 1.11 2000/06/22 08:57:11 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhotoElectricEffect.cc,v 1.12 2001/02/22 16:05:43 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-// 
-// --------------------------------------------------------------
-//      GEANT 4 class implementation file
-//      CERN Geneva Switzerland
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4PhotoElectricEffect physics process --------
-//                   by Michel Maire, April 1996
-// **************************************************************
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
 // 12-06-96, Added SelectRandomAtom() method, by M.Maire
 // 21-06-96, SetCuts implementation, M.Maire
 // 17-09-96, PartialSumSigma(i)
@@ -34,8 +24,11 @@
 // 20-05-99, protection against very low energy photons ,L.Urban
 // 08-06-99, removed this above protection from the DoIt. mma
 // 21-06-00, in DoIt, killing photon: aParticleChange.SetEnergyChange(0.); mma
-// 22-06-00, in DoIt, absorbe very low energy photon (back to 20-05-99); mma  
-// --------------------------------------------------------------
+// 22-06-00, in DoIt, absorbe very low energy photon (back to 20-05-99); mma
+// 22-02-01, back to 08-06-99 after correc in SandiaTable (materials-V03-00-05)  
+// 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 #include "G4PhotoElectricEffect.hh"
 #include "G4EnergyLossTables.hh"
@@ -244,10 +237,10 @@ G4VParticleChange* G4PhotoElectricEffect::PostStepDoIt(const G4Track& aTrack,
    G4int NbOfShells = anElement->GetNbOfAtomicShells();
    G4int i=0;
    while ((i<NbOfShells)&&(PhotonEnergy<anElement->GetAtomicShell(i))) i++;
-   G4double BindingEnergy = 0.;
-   if (i<NbOfShells) BindingEnergy = anElement->GetAtomicShell(i);
+
+   if (i==NbOfShells) return G4VDiscreteProcess::PostStepDoIt(aTrack,aStep);
       
-   G4double ElecKineEnergy = PhotonEnergy - BindingEnergy;
+   G4double ElecKineEnergy = PhotonEnergy - anElement->GetAtomicShell(i);
    if ((G4EnergyLossTables::GetRange(G4Electron::Electron(),
         ElecKineEnergy,aMaterial)>aStep.GetPostStepPoint()->GetSafety())
         ||
diff --git a/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
index 64a23db34f817b9357fb30fcbd26b44aab4ce178..9734380e4c16dff5483c2c7c2ad76e36b13e5c11 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.4 2000/11/17 15:03:18 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------- G4PolarizedComptonScattering physics process -------
diff --git a/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc b/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
index 62f7cef64b986ab099a531b56fabfe5092b9f5f2..21d8c727b9436ebccc63a0a0f58810471775305f 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.3 2000/11/01 15:30:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc
index 9e106aea5bd08594a00bd2d1fcdf947969e2606f..eff33e3ab4b52b4c072c96a16adb9f55cba2893e 100644
--- a/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPAIenergyLoss.cc,v 1.1 2000/04/25 14:33:10 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
diff --git a/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc
index 3202848a9272664a4057c70d0925c2a8b3e4dd1b..d3c55fd0da0889650c9f29c05dbd04436f6cdd86 100644
--- a/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VeEnergyLoss.cc,v 1.8 2000/10/30 07:01:09 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VeEnergyLoss.cc,v 1.11 2001/03/27 15:10:52 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //  
 
 // --------------------------------------------------------------
@@ -16,6 +16,8 @@
 // 02/02/99  important correction in AlongStepDoIt , L.Urban
 // 28/04/99  bug fixed (unit independece now),L.Urban
 // 10/02/00  modifications , new e.m. structure, L.Urban
+// 23/01/01  bug fixed in AlongStepDoIt , L.Urban
+// 27/03/01 : commented out the printing of subcutoff energies
 // --------------------------------------------------------------
 
  
@@ -99,6 +101,14 @@ void G4VeEnergyLoss::BuildDEDXTable(
   LOGRTable=lrate/NbinEloss;
   RTable   =exp(LOGRTable);
 
+  //set physically consistent value for finalRange 
+  //  and parameters for en.loss step limit
+  if(finalRange > G4Electron::Electron()->GetCuts())
+    finalRange = G4Electron::Electron()->GetCuts() ;
+  c1lim = dRoverRange ;
+  c2lim = 2.*(1.-dRoverRange)*finalRange ;
+  c3lim = -(1.-dRoverRange)*finalRange*finalRange;
+
   // Build energy loss table as a sum of the energy loss due to the
   // different processes.                                           
   //
@@ -278,16 +288,16 @@ void G4VeEnergyLoss::BuildDEDXTable(
      if(!setMinDeltaCutInRange )
      MinDeltaCutInRange = G4Electron::Electron()->GetCuts()/10. ;
 
-     if((subSecFlag) && (&aParticleType==G4Electron::Electron()))
-     {
-       G4cout << G4endl;
-       G4cout.precision(5) ;
-       G4cout << " eIoni   Minimum Delta cut in range=" << MinDeltaCutInRange/mm
-              << "  mm." << G4endl;
-       G4cout <<  G4endl;
-       G4cout << "           material       min.delta energy(keV) " << G4endl;
-       G4cout << G4endl;
-     }
+//     if((subSecFlag) && (&aParticleType==G4Electron::Electron()))
+//     {
+//       G4cout << G4endl;
+//       G4cout.precision(5) ;
+//       G4cout << " eIoni   Minimum Delta cut in range=" << MinDeltaCutInRange/mm
+//              << "  mm." << G4endl;
+//       G4cout <<  G4endl;
+//       G4cout << "           material       min.delta energy(keV) " << G4endl;
+//       G4cout << G4endl;
+//     }
 
        if(MinDeltaEnergy) delete MinDeltaEnergy ;
        MinDeltaEnergy = new G4double [numOfMaterials] ; 
@@ -307,15 +317,15 @@ void G4VeEnergyLoss::BuildDEDXTable(
 	 if(MinDeltaEnergy[mat]>G4Electron::Electron()->GetCutsInEnergy()[mat])
 	     MinDeltaEnergy[mat]=G4Electron::Electron()->GetCutsInEnergy()[mat] ;
 
-	 if((subSecFlag) && (&aParticleType==G4Electron::Electron()))
-         {
-	   G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName()
-	 	  << G4std::setw(15) << MinDeltaEnergy[mat]/keV ;
-           if(LowerLimitForced[mat])
-              G4cout << "  lower limit forced." << G4endl;
-           else
-              G4cout << G4endl ; 
-         }
+//	 if((subSecFlag) && (&aParticleType==G4Electron::Electron()))
+//         {
+//	   G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName()
+//	 	  << G4std::setw(15) << MinDeltaEnergy[mat]/keV ;
+//           if(LowerLimitForced[mat])
+//              G4cout << "  lower limit forced." << G4endl;
+//           else
+//              G4cout << G4endl ; 
+//         }
 
        }
   }
@@ -370,7 +380,7 @@ G4VParticleChange* G4VeEnergyLoss::AlongStepDoIt( const G4Track& trackData,
   if(finalT < MinKineticEnergy) finalT = 0. ;
 
   MeanLoss = E - finalT ;
- 
+
   // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   //  start of subcutoff generation
 
@@ -466,7 +476,7 @@ G4VParticleChange* G4VeEnergyLoss::AlongStepDoIt( const G4Track& trackData,
            N = Ndeltamax ;
         G4double Px,Py,Pz ;
         G4ThreeVector ParticleDirection ;
-        ParticleDirection=stepData.GetPostStepPoint()->
+        ParticleDirection=stepData.GetPreStepPoint()->
                                    GetMomentumDirection() ;
         Px =ParticleDirection.x() ;
         Py =ParticleDirection.y() ;
@@ -524,8 +534,6 @@ G4VParticleChange* G4VeEnergyLoss::AlongStepDoIt( const G4Track& trackData,
                zd=z1+frperstep*dz*urandom ;
                G4ThreeVector DeltaPosition(xd,yd,zd) ;
                DeltaTime=time0+frperstep*dTime*urandom ;
-               ParticleDirection=stepData.GetPostStepPoint()->
-                                     GetMomentumDirection() ;    
                     
                G4ThreeVector DeltaDirection(dirx,diry,dirz) ;
                DeltaDirection.rotateUz(ParticleDirection);
diff --git a/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc
index 0ed3cf1b0a4c83af67d92e745dc21f172fe80a6f..1ca6e41cc6c1bebf46499e8568d34c0948eb65bb 100644
--- a/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VhEnergyLoss.cc,v 1.13 2000/10/30 07:01:09 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VhEnergyLoss.cc,v 1.16 2001/03/27 15:10:52 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // -----------------------------------------------------------
@@ -23,6 +23,8 @@
 //            energy losses of ions
 // 17/08/00 : V.Ivanchenko change EnergyLossFluctuation 
 // 18/08/00 : V.Ivanchenko bug fixed in GetConstrained 
+// 23/01/01 : bug fixed in AlongStepDoIt , L.Urban
+// 27/03/01 : commented out the printing of subcutoff energies
 // --------------------------------------------------------------
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -117,6 +119,14 @@ void G4VhEnergyLoss::BuildDEDXTable(
   LOGRTable=lrate/NbinEloss;
   RTable   =exp(LOGRTable);
 
+  //set physically consistent value for finalRange
+  //  and parameters for en.loss step limit
+  if(finalRange > G4Electron::Electron()->GetCuts())
+    finalRange = G4Electron::Electron()->GetCuts() ;
+  c1lim = dRoverRange ;
+  c2lim = 2.*(1.-dRoverRange)*finalRange ;
+  c3lim = -(1.-dRoverRange)*finalRange*finalRange;
+
   // create table if there is no table or there is a new cut value
   G4bool MakeTable = false ;
      
@@ -315,16 +325,16 @@ void G4VhEnergyLoss::BuildDEDXTable(
    if(!setMinDeltaCutInRange)
      MinDeltaCutInRange = G4Electron::Electron()->GetCuts()/10.;
 
-  if((subSecFlag) && (aParticleType.GetParticleName()=="proton"))
-  {
-    G4cout << G4endl;
-    G4cout.precision(5) ;
-    G4cout << " hIoni    Minimum Delta cut in range=" << MinDeltaCutInRange/mm
-           << "  mm." << G4endl;
-    G4cout << G4endl;
-    G4cout << "           material        min.delta energy(keV) " << G4endl;
-    G4cout << G4endl;
-  }
+//  if((subSecFlag) && (aParticleType.GetParticleName()=="proton"))
+//  {
+//    G4cout << G4endl;
+//    G4cout.precision(5) ;
+//    G4cout << " hIoni    Minimum Delta cut in range=" << MinDeltaCutInRange/mm
+//           << "  mm." << G4endl;
+//    G4cout << G4endl;
+//    G4cout << "           material        min.delta energy(keV) " << G4endl;
+//    G4cout << G4endl;
+//  }
 
     if(MinDeltaEnergy) delete MinDeltaEnergy ;
     MinDeltaEnergy = new G4double [numOfMaterials] ;
@@ -343,15 +353,15 @@ void G4VhEnergyLoss::BuildDEDXTable(
       if(MinDeltaEnergy[mat]>G4Electron::Electron()->GetCutsInEnergy()[mat])
         MinDeltaEnergy[mat]=G4Electron::Electron()->GetCutsInEnergy()[mat] ;
 
-     if((subSecFlag) && (aParticleType.GetParticleName()=="proton"))
-     {
-       G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName()
-	      << G4std::setw(15) << MinDeltaEnergy[mat]/keV ;
-	   if(LowerLimitForced[mat])
-	 	G4cout << "  lower limit forced." << G4endl;
-	   else
-	 	G4cout << G4endl ;
-     }
+//     if((subSecFlag) && (aParticleType.GetParticleName()=="proton"))
+//     {
+//       G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName()
+//	      << G4std::setw(15) << MinDeltaEnergy[mat]/keV ;
+//	   if(LowerLimitForced[mat])
+//	 	G4cout << "  lower limit forced." << G4endl;
+//	   else
+//	 	G4cout << G4endl ;
+//     }
     }
 }
       
@@ -570,12 +580,12 @@ G4VParticleChange* G4VhEnergyLoss::AlongStepDoIt(
 
         G4double Px,Py,Pz ;
         G4ThreeVector ParticleDirection ;
-        ParticleDirection=stepData.GetPostStepPoint()->
+        ParticleDirection=aParticle->
                                    GetMomentumDirection() ;
         Px =ParticleDirection.x() ;
         Py =ParticleDirection.y() ;
         Pz =ParticleDirection.z() ;
-     
+
         G4int subdelta = 0;
 
         if(N > 0)
diff --git a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
index 2a7c5f25fd8edd48a80691b0805bfe7cda5000a0..6e033f0a661f5a1507ebfda1108adaf1631fda0c 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.13 2000/09/21 09:34:29 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4eBremsstrahlung.cc,v 1.15 2001/02/05 17:53:52 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -265,40 +265,13 @@ void G4eBremsstrahlung::BuildLossTable(const G4ParticleDefinition& aParticleType
         }
 
        theLossTable->insert(aVector);
+
     }
 
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double G4eBremsstrahlung::ComputeXYPolynomial(G4double x,  G4double y,
-                                             G4int xSize, G4int ySize,
-                                             const G4double coeff[])
-{
-  // Computes the polynomial (1 y y^2 ...) * matrix * (1 x x^2 ...) .
-  // xSize and ySize are the dimensions of the matrix,
-  // coeff containts the elements, stored row-wise.    
-  
-  G4double* a= new G4double[xSize];
-  G4int i, j;
-
-  for (i=0; i<xSize; i++) a[i]= 0.0;  
-
-  G4int index= 0; G4double yy= 1.0;
-  for (j=0; j<ySize; j++)
-    { for (i=0; i<xSize; i++) a[i]+= coeff[index++]*yy;     
-      yy*= y;
-    }
-  
-  G4double r= a[0]; G4double xx= x;
-  for (i=1; i<xSize; i++) { r+= a[i]*xx; xx*= x;}  
-  
-  delete[] a;
-  return r;
-}                                             
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 G4double G4eBremsstrahlung::ComputeBremLoss(G4double Z,G4double natom,
                          G4double T,G4double Cut,G4double x)
 
@@ -354,6 +327,9 @@ G4double G4eBremsstrahlung::ComputeBremLoss(G4double Z,G4double natom,
      0.00017519
 
     } ;
+ static G4double aaa=0.414 ;
+ static G4double bbb=0.345 ;
+ static G4double ccc=0.460 ;
 
   G4int iz = 0 ;
   G4double delz = 1.e6 ;
@@ -390,6 +366,9 @@ G4double G4eBremsstrahlung::ComputeBremLoss(G4double Z,G4double natom,
   if(T <= Cut)
     loss *= exp(alosslow*log(T/Cut)) ;
 
+ //  correction ................................
+ loss *= (aaa+bbb*T/Tlim)/(1.+ccc*T/Tlim) ;
+
   loss *= fl ;
 
   loss /= Avogadro ; 
@@ -438,7 +417,9 @@ void G4eBremsstrahlung::BuildLambdaTable(const G4ParticleDefinition& ParticleTyp
                              }
    theMeanFreePathTable = new G4PhysicsTable(G4Material::GetNumberOfMaterials());
    
+   PartialSumSigma.clearAndDestroy();
    PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
+ 
    G4PhysicsLogVector* ptrVector;
    for ( G4int J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
        { 
@@ -694,7 +675,8 @@ void G4eBremsstrahlung::ComputePartialSumSigma(const G4ParticleDefinition* Parti
    const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
    G4double GammaEnergyCut = (G4Gamma::GetCutsInEnergy())[Imate];
 
-   PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+
+   PartialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -704,7 +686,7 @@ void G4eBremsstrahlung::ComputePartialSumSigma(const G4ParticleDefinition* Parti
                  ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
                                                  (*theElementVector)(Ielem)->GetZ(), 
                                                  GammaEnergyCut );
-        PartialSumSigma(Imate)->insertAt(Ielem, SIGMA);
+        PartialSumSigma[Imate]->push_back(SIGMA);
    }
 }
 
@@ -956,9 +938,9 @@ G4Element* G4eBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))(NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
   for ( G4int i=0; i < NumberOfElements; i++ )
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
        << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
diff --git a/source/processes/electromagnetic/standard/src/G4eIonisation.cc b/source/processes/electromagnetic/standard/src/G4eIonisation.cc
index 143daa4796d4172f747c0d2f27a3fb48c32c1d80..e4c73a5af54bd5a76ac7267a832752c213e4802a 100644
--- a/source/processes/electromagnetic/standard/src/G4eIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4eIonisation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4eIonisation.cc,v 1.10 2000/05/23 14:42:21 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // -------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
index 1e89634bfa14c5e9d747ffe31e89e3fe0c395e82..7d4ea6f3e56f808ad163421d5ed6a375e81126f5 100644
--- a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
+++ b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
@@ -5,26 +5,19 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4eplusAnnihilation.cc,v 1.2 1999/12/15 14:51:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4eplusAnnihilation.cc,v 1.3 2001/02/22 18:26:09 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-// 
-// --------------------------------------------------------------
-//      GEANT 4 class implementation file
-//      CERN Geneva Switzerland
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      History: first implementation, based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4eplusAnnihilation process --------
-//                   by Michel Maire, 7 July 1996
-// **************************************************************
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
 // 10-01-97, crossection table + mean free path table, M.Maire
 // 17-03-97, merge 'in fly' and 'at rest', M.Maire
 // 23-03-97, protection in BuildPhysicsTable, M.Maire
 // 31-08-98, new methods SetBining() and PrintInfo()
-// --------------------------------------------------------------
+// 22-02-01, postStepDoIt: fStopButAlive instead of kineEnergy == 0.  
+// 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 #include "G4eplusAnnihilation.hh"
 #include "G4UnitsTable.hh"
@@ -182,13 +175,13 @@ G4VParticleChange* G4eplusAnnihilation::PostStepDoIt(const G4Track& aTrack,
 
    aParticleChange.Initialize(aTrack);
 
-   // Do not make anything if PositKinEnergy=0. , the annihilation then
+   // Do not make anything if particle is stopped, the annihilation then
    // should be performed by the AtRestDoIt!
-   if (PositKinEnergy == 0.) return &aParticleChange;
+   if (aTrack.GetTrackStatus() == fStopButAlive) return &aParticleChange;
 
-   G4double gama = 1. + PositKinEnergy/electron_mass_c2;
-   G4double gamap1 = gama+1. , gamam1 = gama-1. , sqgrate = sqrt(gamam1/gamap1)/2. ,
-                                                  sqg2m1  = sqrt(gamam1*gamap1);
+   G4double gamam1 = PositKinEnergy/electron_mass_c2;
+   G4double gama   = gamam1+1. , gamap1 = gamam1+2. , sqgrate = sqrt(gamam1/gamap1)/2. ,
+                                                      sqg2m1  = sqrt(gamam1*gamap1);
 
    // limits of the energy sampling
    G4double epsilmin = 0.5 - sqgrate , epsilmax = 0.5 + sqgrate;
diff --git a/source/processes/electromagnetic/standard/src/G4hIonisation.cc b/source/processes/electromagnetic/standard/src/G4hIonisation.cc
index a25ee6e2c42d98cc19404fd9ba7e873b27371bff..0905f9f437764dc21c3cf7b85f18dc5b1f5220e5 100644
--- a/source/processes/electromagnetic/standard/src/G4hIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4hIonisation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4hIonisation.cc,v 1.12 2000/08/10 22:13:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
diff --git a/source/processes/electromagnetic/utils/History b/source/processes/electromagnetic/utils/History
index 637f5483cf4245d93bb09419babe467b3fe0eab4..034ab132631ab641d4431dde24eec0ad80a916dd 100644
--- a/source/processes/electromagnetic/utils/History
+++ b/source/processes/electromagnetic/utils/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.6 2000/11/17 14:55:27 maire Exp $
+$Id: History,v 1.15 2001/03/27 14:34:05 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,33 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
      
+27 mar 01: L.Urban (utils-V03-00-06)
+- another bug fixed in G4VEnergyLoss.cc , in the fluct code.
+  The code gave in some cases (very rarely) small negative energy loss
+  for small (~ micrometer) step size , now it is cured.
+
+23 mar 01: L.Urban (utils-V03-00-05)
+- bug fixed in fluct in G4VEnergyLoss.cc
+  Some int internal variables have been changed to doubles,
+  anomaly at extreme high energy/high cut (zero energy deposit)
+  is cured.
+     
+05 mar 01 mma (utils-V03-00-04)
+- new subdirectory: integral
+  migration of all G4I.. processes from muons, standard, utils into integral
+     
+01 feb 01: L.Urban (utils-V03-00-01)
+- bug fixed in the fluctuation code , in G4VEnergyLoss.cc
+  This bug affected the width of the energy loss/energy deposit
+  distribution in the case of small cut value, the distribution
+  was too narrow....
+     
+16 jan 01: mma (utils-V03-00-00)
+- bug fixed in MultipleScattering.cc L.Urban 11-01-01 
+  there was an error in computation of the transport
+  cross section, the cross section was too small for
+  low energy (below few MeV for electrons)
+    
 09 nov 00: mma (utils-V02-00-04)
 - G4EnergyLossMessenger : subdirectory /process/eLoss created 
   + class description
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh b/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh
index 7df33c239248f8d8feda2f0b5e5b44fe8287d91b..ac007e54e2a962ceca0d1fcc41ee8a9f04806e05 100644
--- a/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh
+++ b/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyLossMessenger.hh,v 1.3 2000/11/09 15:52:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // Class Description:
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
index bf31b05ff06480d32e71f262878241cf20bc053a..3ea95fe71cc23229cbdb25262545ade159491b63 100644
--- a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
+++ b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyLossTables.hh,v 1.10 2000/11/04 16:47:28 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id:
 //
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc
index 9aecf0f03cacbe582cdf6e707f161ca812cc759b..17441a0ddd4986c0e3bbbb7d8697e59af947be20 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.12 2000/11/04 16:47:28 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id:
 // Inline members of the G4EnergyLossTables class
diff --git a/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh b/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh
index deafef6a64be3239939272bda6b0d520f2bd884e..e9a8aa0cd8185b58817b7429c9842f7e27947ca5 100644
--- a/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh
+++ b/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MultipleScattering.hh,v 1.1 2000/03/20 14:44:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id:
 // --------------------------------------------------------------
diff --git a/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc b/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc
index 68933ae235acc5db879fc9dba5d6e050ff45ff15..69d095649674b13b51074895e6b2ddc58e6172f4 100644
--- a/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc
+++ b/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MultipleScattering.icc,v 1.2 2000/03/24 08:08:08 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // -------------------------------------------------------------
diff --git a/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh b/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh
index dd6d1ffb4caaaf2e8daa795ac9a5218f183a39e4..a4a714335c52c112d011cdcd81713303b105234c 100644
--- a/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh
+++ b/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VEnergyLoss.hh,v 1.9 2000/10/30 06:49:46 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc b/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc
index 3e8bcef3d0b897984229a813abd11c3a161e2708..dc5cb1d1c0c5eacae5f90a66962916e86da69d46 100644
--- a/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc
+++ b/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EnergyLossMessenger.cc,v 1.3 2000/11/09 15:52:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc b/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
index e2e421ce78f09c356209183024addefbc23d734d..fafcd802bfdf479cf902f3ede92c549aa7ff6e9c 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.13 2000/11/04 16:47:29 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------------- 
 // first version created by P.Urban , 06/04/1998
diff --git a/source/processes/electromagnetic/utils/src/G4MultipleScattering.cc b/source/processes/electromagnetic/utils/src/G4MultipleScattering.cc
index fd99e20eba307524323e3c85aa9fb7adaaeaac5a..2bb5adfe5d601d57a67d277db111eb50437b1a8c 100644
--- a/source/processes/electromagnetic/utils/src/G4MultipleScattering.cc
+++ b/source/processes/electromagnetic/utils/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.5 2000/08/10 13:15:13 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MultipleScattering.cc,v 1.6 2001/01/11 10:44:34 urban Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -27,6 +27,7 @@
 // 22/03/00: value of member cpar has changed! , L.Urban
 // 20/06/00: nuclear size correction for particles other than e+/e- only ,  L.Urban
 // 10/08/00 values of some data members has been changed, L.Urban
+// 09/11/00 bug corrected in sigma computation, L.Urban
 // --------------------------------------------------------------
 
 #include "G4MultipleScattering.hh"
@@ -292,11 +293,11 @@
      eps = rat2*epsfactor*bg2/Z23 ;
 
      if(eps<epsmin)
-       sigma = 2.*eps*eps*eps/3. ;
+       sigma = 2.*eps*eps ;
      else if(eps<epsmax)
-       sigma = log(1.+2.*eps)-2.*eps/(1.+eps) ;
+       sigma = log(1.+2.*eps)-2.*eps/(1.+2.*eps) ;
      else
-       sigma = log(2.*eps)-2.+2.5/eps ;
+       sigma = log(2.*eps)-1.+1./eps ;
 
      sigma *=ChargeSquare*AtomicNumber*AtomicNumber/rat2 ;
      sigma /= beta2*bg2 ;
@@ -483,7 +484,7 @@
     }
     else
       cth = -1.+2.*G4UniformRand() ;
-
+                                                                 
     sth = sqrt(1.-cth*cth) ;
 
     phi = twopi*G4UniformRand() ;
@@ -561,6 +562,7 @@
       }
     }
 
+
     return &fParticleChange ;
  
   }
diff --git a/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc b/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc
index 0f62848a2b3ea8df508b1d091b7cdba1855c600f..fafa03193181814256ed2229293cc2b316d97cf8 100644
--- a/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc
+++ b/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc
@@ -5,12 +5,17 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VEnergyLoss.cc,v 1.15 2000/10/30 06:50:49 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VEnergyLoss.cc,v 1.20 2001/03/27 12:16:35 urban Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // --------------------------------------------------------------
+//
+//  bug fixed in fluct., L.Urban 01/02/01
 //  bug fixed in fluct., L.Urban 26/05/00
+//  bug fixed in fluct., L.Urban 22/11/00
+//  bugfix in fluct.
+//  (some variables are doubles instead of ints now),L.Urban 23/03/01
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -903,7 +908,7 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
   G4double threshold,w1,w2,C,
            beta2,suma,e0,loss,lossc ,w,electronDensity;
   G4double a1,a2,a3;
-  G4int p1,p2,p3;
+  G4double p1,p2,p3 ;
   G4int nb;
   G4double Corrfac, na,alfa,rfac,namean,sa,alfa1,ea,sea;
   G4double dp1,dp3;
@@ -921,22 +926,22 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
   G4double tau   = Tkin/ParticleMass, tau1 = tau+1., tau2 = tau*(tau+2.);
   G4double Tm    = 2.*electron_mass_c2*tau2/(1.+2.*tau1*rmass+rmass*rmass);
 
-  if (Tm <= ipotFluct) Tm = ipotFluct ;
-  
-  if(Tm > threshold) Tm = threshold;
   beta2 = tau2/(tau1*tau1);
 
   // Gaussian fluctuation ?
   if(MeanLoss >= kappa*Tm)
   {
     electronDensity = aMaterial->GetElectronDensity() ;
-    siga = sqrt(Tm*(0.5-0.25*beta2)*step*
+    siga = sqrt(Tm*(1.0-0.5*beta2)*step*
                 factor*electronDensity*ChargeSquare/beta2) ;
     loss = G4RandGauss::shoot(MeanLoss,siga) ;
     if(loss < 0.) loss = 0. ;
     return loss ;
   }
 
+  if (Tm <= ipotFluct) Tm = ipotFluct ;
+  if(Tm > threshold) Tm = threshold;
+
   w1 = Tm/ipotFluct;
   w2 = log(2.*electron_mass_c2*tau2);
 
@@ -968,10 +973,10 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
         if(a3>alim)
         {
           siga=sqrt(a3) ;
-          p3 = G4std::max(0,int(G4RandGauss::shoot(a3,siga)+0.5));
+          p3 = G4std::max(0.,G4RandGauss::shoot(a3,siga)+0.5);
         }
         else
-          p3 = G4Poisson(a3);
+          p3 = G4float(G4Poisson(a3));
 
         loss = p3*e0 ;
 
@@ -987,24 +992,24 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
         if(a3>alim)
         {
           siga=sqrt(a3) ;
-          p3 = G4std::max(0,int(G4RandGauss::shoot(a3,siga)+0.5));
+          p3 = G4std::max(0.,G4RandGauss::shoot(a3,siga)+0.5);
         }
         else
-          p3 = G4Poisson(a3);
+          p3 = G4float(G4Poisson(a3));
 
         if(p3 > 0)
         {
           w = (Tm-e0)/Tm ;
-          if(p3 > nmaxCont2)
+          if(p3 > G4float(nmaxCont2))
           {
-            dp3 = G4float(p3) ;
+            dp3 = p3 ;
             Corrfac = dp3/G4float(nmaxCont2) ;
-            p3 = nmaxCont2 ;
+            p3 = G4float(nmaxCont2) ;
           }
           else
             Corrfac = 1. ;
 
-          for(G4int i=0; i<p3; i++) loss += 1./(1.-w*G4UniformRand()) ;
+          for(G4int i=0; i<G4int(p3); i++) loss += 1./(1.-w*G4UniformRand()) ;
           loss *= e0*Corrfac ;  
         }        
       }
@@ -1016,22 +1021,21 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a1>alim)
       {
         siga=sqrt(a1) ;
-        p1 = G4std::max(0,int(G4RandGauss::shoot(a1,siga)+0.5));
+        p1 = G4std::max(0.,G4RandGauss::shoot(a1,siga)+0.5);
       }
       else
-       p1 = G4Poisson(a1);
+       p1 = G4float(G4Poisson(a1));
 
       // excitation type 2
       if(a2>alim)
       {
         siga=sqrt(a2) ;
-        p2 = G4std::max(0,int(G4RandGauss::shoot(a2,siga)+0.5));
+        p2 = G4std::max(0.,G4RandGauss::shoot(a2,siga)+0.5);
       }
       else
-        p2 = G4Poisson(a2);
+        p2 = G4float(G4Poisson(a2));
 
       loss = p1*e1Fluct+p2*e2Fluct;
- 
       // smearing to avoid unphysical peaks
       if(p2 > 0)
         loss += (1.-2.*G4UniformRand())*e2Fluct;   
@@ -1044,26 +1048,26 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
       if(a3>alim)
       {
         siga=sqrt(a3) ;
-        p3 = G4std::max(0,int(G4RandGauss::shoot(a3,siga)+0.5));
+        p3 = G4std::max(0.,G4RandGauss::shoot(a3,siga)+0.5);
       }
       else
-        p3 = G4Poisson(a3);
+        p3 = G4float(G4Poisson(a3));
 
       lossc = 0.;
       if(p3 > 0)
       {
         na = 0.; 
         alfa = 1.;
-        if (p3 > nmaxCont2)
+        if (p3 > G4float(nmaxCont2))
         {
-          dp3        = G4float(p3);
+          dp3        = p3;
           rfac       = dp3/(G4float(nmaxCont2)+dp3);
-          namean     = G4float(p3)*rfac;
+          namean     = p3*rfac;
           sa         = G4float(nmaxCont1)*rfac;
           na         = G4RandGauss::shoot(namean,sa);
           if (na > 0.)
           {
-            alfa   = w1*G4float(nmaxCont2+p3)/(w1*G4float(nmaxCont2)+G4float(p3));
+            alfa   = w1*(G4float(nmaxCont2)+p3)/(w1*G4float(nmaxCont2)+p3);
             alfa1  = alfa*log(alfa)/(alfa-1.);
             ea     = na*ipotFluct*alfa1;
             sea    = ipotFluct*sqrt(na*(alfa-alfa1*alfa1));
@@ -1071,7 +1075,7 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
           }
         }
 
-        nb = G4int(G4float(p3)-na);
+        nb = G4int(p3-na);
         if (nb > 0)
         {
           w2 = alfa*ipotFluct;
@@ -1083,6 +1087,9 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
      }
     } 
 
+  if( loss < 0.)
+    loss = 0.;
+
   return loss ;
 }
 
diff --git a/source/processes/electromagnetic/xrays/GNUmakefile b/source/processes/electromagnetic/xrays/GNUmakefile
index 56d4bed3afe737fb164b2f6a63afb698781b0934..1b850f003ae93c3c0bbe944a41223e7da68626b0 100644
--- a/source/processes/electromagnetic/xrays/GNUmakefile
+++ b/source/processes/electromagnetic/xrays/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.1 1999/01/07 16:11:28 gunter Exp $
+# $Id: GNUmakefile,v 1.2 2000/10/24 13:55:28 gcosmo Exp $
 # --------------------------------------------------------------------
 # GNUmakefile for electromagnetic sub-library.  John Allison, 25/6/98.
 # --------------------------------------------------------------------
@@ -11,15 +11,14 @@ endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-CPPFLAGS += -I$(G4BASE)/global/management/include \
+CPPFLAGS += \
+            -I$(G4BASE)/global/management/include \
             -I$(G4BASE)/global/HEPRandom/include \
             -I$(G4BASE)/global/HEPGeometry/include \
             -I$(G4BASE)/geometry/management/include \
-            -I$(G4BASE)/geometry/magneticfield/include \
             -I$(G4BASE)/geometry/volumes/include \
             -I$(G4BASE)/track/include \
             -I$(G4BASE)/processes/management/include \
-            -I$(G4BASE)/management/include \
             -I$(G4BASE)/particles/management/include \
             -I$(G4BASE)/particles/bosons/include \
             -I$(G4BASE)/particles/leptons/include \
diff --git a/source/processes/electromagnetic/xrays/History b/source/processes/electromagnetic/xrays/History
index bbef51c577f2b719ce88c549a5f44421e4400490..6b434260424bd32e604bc0da8a12192077bae6fb 100644
--- a/source/processes/electromagnetic/xrays/History
+++ b/source/processes/electromagnetic/xrays/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.4 2000/10/06 06:46:12 gcosmo Exp $
+$Id: History,v 1.5 2000/11/13 20:17:51 gum Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,13 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+12 Nov 00: pg  (xrays-V02-00-04)
+- G4Cerenkov.cc: add check on CerenkovAngleIntegrals->IsFilledVectorExist()
+-                in method GetAverageNumberOfPhotons
+-                and a test for MeanNumPhotons <= 0.0 in DoIt
+
+09 Nov 00: mma (xrays-V02-00-03)
+
 04 oct 00: pg  (xrays-V02-00-02)
 - G4Cerenkov.cc: calculate secondary position from aStep.GetDeltaPosition().
 - G4Scintillation.cc: calculate secondary position from aStep.GetDeltaPosition().
diff --git a/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh b/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
index a68d22ad7ce8cf636bb2681152c851fd3684d7ad..e8bd48db51f105ee8b037d13b083f35b55887cb4 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.4 1999/12/15 14:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh b/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
index f65dc6dda06e44e807106823e91aa5de033b122c..896be7e6a9b7dc12ca606c975fbecb8c6b9b1f8a 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.6 2000/04/06 13:55:23 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4ForwardXrayTR -- header file
 //
diff --git a/source/processes/electromagnetic/xrays/include/G4Scintillation.hh b/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
index c0a001a7075907ad751800ff7d936bc2f14f675d..3241544976ed485456e4211ff8c425e14ee20de2 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.4 1999/12/15 14:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh b/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
index 36ca866623048bc1cb9fc03a5fb6922b32db70e1..f6c94b4f5f2e42b702f5a8c3ecd00683c28adef4 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.5 2000/04/03 13:45:28 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4TransitionRadiation  -- header file
 //
diff --git a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
index cd1518e6fc75210ab8dcb69394048b68874b6981..30d4a3a4c8d86bdf5d8099d1319ce8e4076f8658 100644
--- a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
+++ b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Cerenkov.cc,v 1.9 2000/11/13 01:09:48 gum Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Cerenkov Radiation Class Implementation
diff --git a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
index 5bbe6a444b2082c1ad1f539d21e29730b21acb2c..626adbbe40248c38e108ffe1229e8af156bac246 100644
--- a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
+++ b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ForwardXrayTR.cc,v 1.4 2000/02/09 10:41:18 grichine Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4ForwardXrayTR class -- implementation file
 
diff --git a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
index 60dfcc865b69e578f26374f892cac8dd61ddb78d..16794f60d06f0299cd1c263ad718beef96634e51 100644
--- a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
+++ b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Scintillation.cc,v 1.5 2000/09/19 03:13:04 gum Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Scintillation Light Class Implementation
diff --git a/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc b/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
index c45ecc8023ad042220d90c924d8f3f0c00ecb329..08643492db9bc8ab331d8d0540f4a54e2144d21d 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.2 1999/12/15 14:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 47ee9fcd1bfb1ceb718580c6eb7fc8e10f76b125..4f84cb1a3e64f82da53adaeedc92be81bb7122a5 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.3 2000/12/14 08:33:02 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 45535c020d88e1a3bb954e2f1edf02211dd239ce..ac07da7e79bc7525e3d1356efa57ea58583b9fb7 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.3 2000/12/14 08:33:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a533dfd892ca954e079b417a196bc5ca08f7d823..69f49f5ced49ebcf3e2f1df2ee20402f678604f5 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.4 2000/12/14 08:33:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e99665d488326f9745a86634cf08e8e9ed450616..0c71e7d0625a94edccb81349fc1c4432601a3c29 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.3 2000/12/14 08:33:04 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 41b0bce3a3b65997bf1aeabde9907a36bc49ac8f..836061701e0530087791615b90fe374a17ccbf01 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.3 2000/12/14 08:33:04 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 518bf9828986eae6bd0f2617f6f6aa20886f144e..fe1ea02f01010784bb87b507bc1f8008d26a1c6e 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.3 2000/12/14 08:33:04 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 physics class: G4HadronInelasticDataSet -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh b/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
index d57f7f23b20e4de1ec35473ebcae16ed59fb7b7a..65f071d9f521f04409aeb4e78cb2db9000263af9 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.4 2000/12/14 11:25:57 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 dd95d78f3643c367028f3086702c0932c098bdd9..47e4263a658497b64817ffb8ae3134513d500c4a 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.2 1999/12/15 14:52:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a72185c8aa36cb5afe7ce1b881ae5a6b275d6053..c180d04e0b8feaee735b978f2d63b7def5ee0f2a 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.2 1999/12/15 14:52:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 383750f67bd54c47b7249b961d4341c506661f7d..2cb504a808363eca1ec486c71d641d78f1820489 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.2 1999/12/15 14:52:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4HadronCrossSections.cc,v 1.3 2001/02/26 17:09:14 hpw Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Hadron Physics class G4HadronCrossSections
@@ -1235,6 +1235,7 @@ G4HadronCrossSections::CalcScatteringCrossSections(
       sigin = 49.*term*term;
    // Convert cross section from mb to default units
       siginelastic = sigin*millibarn;
+      if(aParticle->GetKineticEnergy() < 6*MeV) siginelastic = 0;
       sigelastic = 0.;
       return;
    }
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
index 3425034186b87a53be25dd116dbbf3f79cf5f091..46da66356c39f9c9408a2e041e02ade367b86ea3 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.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 101c802d8e647cfd9821812edaf37ba1273857cf..6d6f6e8d67dcca076eba6473118938fb9ca9588f 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.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4220f5d5740cd7d97a1de964d659681661752cf7..bf5766abd2d5afdbc49a9f317e8f9d15ba5cc57d 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.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 6b3444a2f82377a9ca02cafa08b99aa25cb69c11..cb66749fefced5074fb83975651ffdb44d51495e 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.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c5278c2e474a0d3d9b1b2ee5b8ad453ee1bf035c..c6a4073cdb79d732efdb301fa6e5fde2a486170f 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.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 fbd1963125d4f41e74b1713c345a8f0f4d21a334..da7070fb4bac3f4ba1b06ee1fa61cc00d98094b4 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.4 2000/09/20 16:52:36 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 83e8c0f65bd446567ea164007daedbcfacc81c4f..b572a04ec04a465f0708aeba9a89859dcbaf3ea6 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.4 2000/12/14 08:40:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 83ffc0cfb2d1b3e8d7a51b6b8281934f0fef28da..bf2cb55d09afc7f4ffc6a8563c82b4288d5d1585 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.5 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5195c91bdad403ade5dee32cde5066eed3757270..5f0e670581e9348e262e6450f7867c2fea9d3cb3 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.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 1c074aa5f4040d29576cda8b5c6063ca0b510944..44115c1c256a186ecc710f0f15fec8d8cf8c2f0c 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.3 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: Energy Range Manager
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/management/src/G4HadronicInteraction.cc b/source/processes/hadronic/management/src/G4HadronicInteraction.cc
index 2b77d74e7af95fd22dacf65e0358c477b125cf5b..e04a39a31e7980879d72302995f58d247f565dfd 100644
--- a/source/processes/hadronic/management/src/G4HadronicInteraction.cc
+++ b/source/processes/hadronic/management/src/G4HadronicInteraction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronicInteraction.cc,v 1.2 1999/12/15 14:52:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Interaction  base class
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/management/src/G4HadronicProcess.cc b/source/processes/hadronic/management/src/G4HadronicProcess.cc
index 1114157868b3a84bcf36a2677ff0a0e3af04a1e2..d60054202e531072ab5a9273e1785380f505c4d6 100644
--- a/source/processes/hadronic/management/src/G4HadronicProcess.cc
+++ b/source/processes/hadronic/management/src/G4HadronicProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronicProcess.cc,v 1.8 1999/12/15 14:52:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // HPW to implement the choosing of an element for scattering.
 #include "g4std/fstream"
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh
index 2b3fbf6b2d7b00caa3e71e4625a0aef46e71f3ed..70a78956ce262a8bded4ced33f5a88ab58ae5b47 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AlphaCoulombBarrier.hh,v 1.1 2000/06/09 11:36:49 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh
index baafbe4e6de326cf3c99946dd973908392f5151d..4a89d2cfdab01754e238432eba91963517bcce5c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CoulombBarrier.hh,v 1.1 2000/06/09 11:36:52 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh
index 10be489ef6b8597e8bb4496a111473819e2e2ab6..96c7ad2a9d9d3013947ddd35f52f3b8ce83b9124 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DeuteronCoulombBarrier.hh,v 1.1 2000/06/09 11:36:52 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
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 3cafe9a4215f0800b95469e694e8083ef8d4ba08..837e60d7fe779940da6999f0ddab0a9dbce7d072 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.4 1999/12/15 14:52:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a3b29e3967040c08fcfe91aae90069f7e01aa2df..2c3f7c60edaf413a57ea61ff047e5a4f183a1e4a 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.3 2000/06/09 11:36:52 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh
index aceb887ebd8e8dbb9ef2311807ebebc2a7fcd4ec..9221d652e513d10a447da494ab8b7d746a8c2e7b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4He3CoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh
index e9f4af6fa853a2a12421e4854ebb471d79c67851..a2f2f7b7dae2ea4c9cd882d43ff8e1f8045a8473 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronCoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh
index 1f1fff3fb76cc5f0b09a2098f9a6b5d534123935..b90171d2501f5015dee83f3618c6097e88c18b02 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProtonCoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh
index da0ba3fe9d9e33af73f775eef7100bbf543a55ab..7a80e662bc4f0153b2d5a00f030eb7cddd03b746 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh
@@ -72,6 +72,6 @@ private:
 
 };
 
-#include "G4Solver.templates.cc"
+#include "G4Solver.icc"
 
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.icc
similarity index 100%
rename from source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc
rename to source/processes/hadronic/models/generator/de_excitation/include/G4Solver.icc
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh
index e0f9d1c6096c9bc9487fedee0d80ffc00777bc6e..eaee53da41f0c9c6c56b60ed36410b6f3627adb9 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh
@@ -2,6 +2,8 @@
 #define G4StatMFMacroCanonical_h 1
 
 #include "g4rw/tpordvec.h"
+#include "g4rw/tvvector.h"
+#include "g4rw/tvordvec.h"  
 
 #include "G4Fragment.hh"
 #include "G4StatMFFragment.hh"
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh
index 84a24d2d0e9777502a2f41f37d59fd042a4dbd08..7246ed6ac83e7fd1ffc82801d18ca39af257805b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TritonCoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh
index cabffcb7fb729b56e3da6765c522a5263d20e036..0c40e4ed903689d3342ffe5072bfd6b1081ba8c8 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VCoulombBarrier.hh,v 1.1 2000/06/09 11:36:54 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
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 3e883e44bbf919c206ba6462e72d8e359ff6f501..7508dd0fd6c2fc10ca16380af04949dd99769ae1 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.3 2000/06/09 11:36:54 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc
index 0e383d20d61eeea735526068c41a5cafaf5684a2..bc9f4e7195f4edf554acc3514606ca7ec348f6df 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AlphaCoulombBarrier.cc,v 1.1 2000/06/09 11:43:34 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc
index 532aeedb2f5338daaf4899581afd8714ded46784..29d980d44238a4187b6381bff198ab394677cd44 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4CoulombBarrier.cc,v 1.1 2000/06/09 11:43:35 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc
index 95fa3b86a2093c3b72b73cf08fb56d96195dd77d..652e47a6b1b15f68202307d4f3c6fc26fcbef948 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DeuteronCoulombBarrier.cc,v 1.1 2000/06/09 11:43:35 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
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 8beecb31945df5e345f5d3f63b5ab66dcf97cd82..ea15e87efa2c1b141bc0ec8147322f80bfeaa0b1 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
@@ -52,7 +52,7 @@ void G4DiscreteGammaTransition::SelectGamma()
     G4int iGamma = 0;
     for(iGamma=0;iGamma < nGammas;iGamma++)
     {
-      if(random <= _level.GammaCumulativeProbabilities().at(iGamma))
+      if(random <= (_level.GammaCumulativeProbabilities())[iGamma])
 	break;
     }
 
@@ -62,7 +62,7 @@ void G4DiscreteGammaTransition::SelectGamma()
 
     G4double eCorrection = _level.Energy() - _excitation;
 
-    _gammaEnergy = _level.GammaEnergies().at(iGamma) - eCorrection;
+    _gammaEnergy = (_level.GammaEnergies())[iGamma] - eCorrection;
 
 //  Warning: the following check is needed to avoid loops:
 //  Due essentially to missing nuclear levels in data files, it is
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 f8a5834c61b827d2996525c565c9611b4165786b..cea7a268c96601197618b743b62c61cdcab92aee 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.6 2000/06/21 14:26:24 stesting Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c5af3549c79e172d221d95f0f56693ae0888606e..adc1d0cbd82a51d29059d21e6f32f6fc37066708 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.3 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc
index c065673badf208b681cdd3c428d3ce3eeebc868b..b1352e05aecf2b47beb6c3cde89aebc6775b6123 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4He3CoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc
index cb6053a405cc59cb30716165825bb46dea4e332f..185ed86f8315dd8e7b335c0518a7b6ebca584e6a 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronCoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
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 2d6defbd242ad8513e20536a1ab226aa4a53b191..6cdd0f188dcb7bf83efb317975f93fea6d73b4fd 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
@@ -40,13 +40,13 @@ G4NuclearLevel::G4NuclearLevel(const G4double energy, const G4double halfLife,
   _halfLife = halfLife;
   _angularMomentum = angularMomentum;
   G4int i;
-  for (i=0; i<eGamma.entries(); i++)
+  for (i=0; i<eGamma.size(); i++)
     {
-      _energies.insert(eGamma.at(i));
-      _weights.insert(wGamma.at(i));
-      _polarities.insert(polarities.at(i));
+      _energies.push_back(eGamma[i]);
+      _weights.push_back(wGamma[i]);
+      _polarities.push_back(polarities[i]);
     }
-  _nGammas = _energies.entries();
+  _nGammas = _energies.size();
   MakeProbabilities();
   MakeCumProb();
 }
@@ -131,15 +131,15 @@ void G4NuclearLevel::PrintAll() const
 	 << ", " << _nGammas << " photons" << G4endl;
   G4int i;
   G4cout << "     Gammas: ";
-  for (i=0; i<_nGammas; i++) { G4cout << _energies.at(i) << " "; }
+  for (i=0; i<_nGammas; i++) { G4cout << _energies[i] << " "; }
   G4cout << G4endl << "     Weights: ";
-  for (i=0; i<_nGammas; i++) { G4cout << _weights.at(i) << " "; }
+  for (i=0; i<_nGammas; i++) { G4cout << _weights[i] << " "; }
   G4cout << G4endl << "     Relative transition probabilities ";
-  for (i=0; i<_nGammas; i++) { G4cout << _prob.at(i) << " "; }
+  for (i=0; i<_nGammas; i++) { G4cout << _prob[i] << " "; }
   G4cout << G4endl << "     Cumulative probabilities: ";
-  for (i=0; i<_nGammas; i++) { G4cout << _cumProb.at(i) << " "; }
+  for (i=0; i<_nGammas; i++) { G4cout << _cumProb[i] << " "; }
   G4cout << G4endl << "     Polarities: ";
-  for (i=0; i<_nGammas; i++) { G4cout << _polarities.at(i) << " "; }
+  for (i=0; i<_nGammas; i++) { G4cout << _polarities[i] << " "; }
   G4cout << G4endl;      
 
   return;
@@ -152,13 +152,13 @@ void G4NuclearLevel::MakeProbabilities()
   G4int i = 0;
   for (i=0; i<_nGammas; i++)
     {
-      sum += _weights.at(i);
+      sum += _weights[i];
     }
 
   for (i=0; i<_nGammas; i++)
     {
-      if (sum > 0.) { _prob.insert(_weights.at(i) / sum); }
-      else { _prob.insert(1./_nGammas); }
+      if (sum > 0.) { _prob.push_back(_weights[i] / sum); }
+      else { _prob.push_back(1./_nGammas); }
     }
   return;
 }
@@ -168,14 +168,14 @@ void G4NuclearLevel::MakeCumProb()
 {
   if (_nGammas > 0)
     {
-      G4double sum = _prob.at(0);
-      _cumProb.insert(sum);
+      G4double sum = _prob[0];
+      _cumProb.push_back(sum);
       
       G4int i = 0;
       for (i=1; i<_nGammas; i++)
 	{
-	  sum += _prob.at(i);
-          _cumProb.insert(sum);
+	  sum += _prob[i];
+          _cumProb.push_back(sum);
 	}
     }
   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 cbe39797106bd52da0f232e15aa2f2caf18b502c..d876178ed84ce236859e9cdb0e4c23f6c43f41c8 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
@@ -243,22 +243,22 @@ void G4NuclearLevelManager::MakeLevels()
 
   while (Read(inFile))
     {
-      eLevel.insert(_levelEnergy);
-      eGamma.insert(_gammaEnergy);
-      wGamma.insert(_probability);
-      pGamma.insert(_polarity);
-      hLevel.insert(_halfLife);
-      aLevel.insert(_angularMomentum);
+      eLevel.push_back(_levelEnergy);
+      eGamma.push_back(_gammaEnergy);
+      wGamma.push_back(_probability);
+      pGamma.push_back(_polarity);
+      hLevel.push_back(_halfLife);
+      aLevel.push_back(_angularMomentum);
     }
 
   // ---- MGP ---- Don't forget to close the file 
   inFile.close();
 
-  G4int nData = eLevel.entries();
+  G4int nData = eLevel.size();
 
   //  G4cout << " ==== MakeLevels ===== " << nData << " data read " << G4endl;
 
-  G4double thisLevelEnergy = eLevel.at(0);
+  G4double thisLevelEnergy = eLevel[0];
   G4double thisLevelHalfLife = 0.;
   G4double thisLevelAngMom = 0.;
   G4DataVector thisLevelEnergies;
@@ -269,7 +269,7 @@ void G4NuclearLevelManager::MakeLevels()
   G4int i;
   for (i=0; i<nData; i++)
     {
-      e = eLevel.at(i);
+      e = eLevel[i];
       if (e != thisLevelEnergy)
       {
 	//	  G4cout << "Making a new level... " << e << " " 
@@ -288,13 +288,13 @@ void G4NuclearLevelManager::MakeLevels()
 	  thisLevelWeights.clear();
 	  thisLevelPolarities.clear();
 	  thisLevelEnergy = e;
-	}
+      }
       // Append current data
-      thisLevelEnergies.insert(eGamma.at(i));
-      thisLevelWeights.insert(wGamma.at(i));
-      thisLevelPolarities.insert(pGamma.at(i));
-      thisLevelHalfLife = hLevel.at(i);
-      thisLevelAngMom = aLevel.at(i);
+      thisLevelEnergies.push_back(eGamma[i]);
+      thisLevelWeights.push_back(wGamma[i]);
+      thisLevelPolarities.push_back(pGamma[i]);
+      thisLevelHalfLife = hLevel[i];
+      thisLevelAngMom = aLevel[i];
     }
   // Make last level
   if (e > 0.)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc
index 1cd06020bd5301fd9d659c89b6f9559803e1edc5..39354fb5ac5d3e0431e4e560319c84bda44131d8 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProtonCoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
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 e99e01fd3ae20d25234cff9324917fa8a0f6cf19..e20b3e86f40a275fe280bf196658a9bb5869eee6 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StatMFMacroCanonical.cc,v 1.6 2000/08/03 08:47:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 
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 8ed39eaa21c13bd5b034b99aa883c06ed9525dac..28473e5bad9021bd0ef28f931b4e5b5ae5e4539a 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StatMFMicroPartition.cc,v 1.8 2000/08/03 08:47:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------------
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc
index d1b182ad212eb338f75afcfa8321e0b4dd98919b..3fde34b7388befdbecd0de6169c146ed53b0b757 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TritonCoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc
index 882e3e2bd9e994b15353aac8815e35b3d29828be..eee71bcfddf67043eedf85d032664bec6c3b769b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VCoulombBarrier.cc,v 1.1 2000/06/09 11:43:37 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
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 11c3e248e3a1708ed3a0a9d99a22470de0c68f72..e5d60a7d7d47ca1c188f0766479c808a5d295ab0 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.3 2000/06/09 11:43:37 larazb Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
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 a6da26521ec849b30e7ee5ed824a37e3f9c05b9d..7d2e2021bee3d46648c6f2a6f8cfd1558617db01 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.3 1999/12/15 14:52:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b116613ddf52c0b9ffde182c73b0e7ecb3ea6566..001c1562d50395c964a55f3dc1479e2e0e01fa90 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.4 2000/12/14 09:25:54 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Class Description
 // Final state production code for hadron inelastic scattering above 20 GeV
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 4c57a17e9f3493df7a9f2f63289e7f8f3d27b8b2..92298f0d715795f63c9c229f03076be2042b35af 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.3 1999/12/15 14:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f2abe20dbd5d4677cc211974839e873ea5809748..db049610e90418b5729cbb2823d99d07fb740bd7 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DiffractiveSplitableHadron.cc,v 1.2 1999/12/15 14:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // ------------------------------------------------------------
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 6b03ad200466813dcbddcbbbf094345a19e63392..b383fa5e718a6bd936a904fb5f97f94a99f4a2a0 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FTFModel.cc,v 1.4 1999/12/15 14:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // ------------------------------------------------------------
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 6422bc321e9902e5909f2a122f78dbdf56b1f6ab..253d11e9f77a0d22a93493d4814cbdf607510a3c 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FTFParticipants.cc,v 1.3 2000/08/19 16:23:48 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
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 351a5f3fe2e37d0d89ae1011e5dafd06567a9937..4813429e1ef5e355d03f5d1168ffe85b5fcfbafc 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.3 2000/12/14 09:28:53 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // Class Description
diff --git a/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc b/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
index a2d5f194f2c2515b1f23c33d15eb2b8072730bfa..aa1bfb1cd3ac14876155cf933914d50ef9ff9b25 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4TheoFSGenerator
 #include "G4DynamicParticle.hh"
diff --git a/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh b/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
index 134cb982c0b11ae734688a3e9c3f727a10a7a391..11e879baa3b7354c5a8a00f047c0c0e2b9594d51 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.4 2000/08/19 16:24:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f0432a40083b1ae5d90aaa0c8c6f2746ab27f07e..9922c43de271e8b648183e22a33f745462492fa6 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.4 2000/12/14 09:36:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5872cdcf6f580b1253e5b55061dbbd43d7b17e9d..261b663fcdeed772a207bf786a0b31ad45a0d6e2 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.6 2000/12/14 09:36:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 17c83befca24e97fefa4dc2fe691105a1e940bc8..17cfc8100516b2b1178dc17df91641a928d5e564 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.2 1999/12/15 14:52:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 bb077751279f2a427562c81171948e03ca56a551..1b0e63ce831e3fa635870fa0b67e5ad3a75f4897 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.3 2000/05/23 13:41:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8c7d808f6fc2ce6449e5ce93aef1a162433d1063..5d8ed45f01eb3e7260e10616eb37d0362104ee51 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.4 2000/12/14 09:36:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 3d62d08fc48f47948c95a7784cb569c1cbb74b8d..19f0f3033bb50ae36bd2a0c26a69e35660b56098 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.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e9f5a2af6c62ad7b048701a70ffd0d2572380053..79b850c7ef08a67b849f82a1034c5f316239bfba 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.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 6c21b79656a6dab5a1c618a23af36fc6c662dc1b..086368408e517ce8fd4b767bb6cce9681721cb2b 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.3 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c4268a62773ff8272e06749908fab5e7863c23ff..e6f1b3bf6e4cb9238cbcd60a26f0aab1872f3999 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.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 710eceda2ed38145db0faa71e481ad19edbbd19d..34c96fa8683d425bfb892464fa4a2528d0d68169 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.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 cf6fe809ad86f67109845f828034e821a7f8836f..d8ac59569ad8393b0f26d90ef24abb2f3bb41b59 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.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4VPreCompoundModel.hh"
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 88815df731f5b22bb45a06bc6712304ab4732860..bda5e6c6c8383349586ab9d3da3f78ba8a0a93de 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.2 1999/12/15 14:52:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4InelasticSplitableHadron_h
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 f84bc9500dacd9fff468c73bc94fb2285109ec7b..651d5762558c8c5b1e2c111b65b6ebbc6ac10a25 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.2 1999/12/15 14:52:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 9fa8ccacc77df535d775504e943a87c16dc21d60..add67f0037b4c22cfd2f15ffb68d28c47e623876 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.2 1999/12/15 14:52:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 fc9891ef722b769f55aada43218abe3dfa62feb5..0e4cf100465deade053d4984e0e63853cbf0345d 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.3 2000/09/18 07:40:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 eb860c3b726b132ff76fae2fc63161b8ee93fd66..ced0d11200f8cf4cf2a38aeb96d17452a582ff1c 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.3 1999/12/15 14:52:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5a706a2afb96ba87fed2b039224ad9df27006b88..70fc1a3571bd92f75497835a20c152c8afde0aa1 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.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8f78b0dab05b4942720a2d6043bde544ea77cf1d..45d4eab9c924aff3f5d3098b8544141680af1938 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.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 da4b7adfbab55a0e4ecd34ca3d6970b65c943c24..0e92a98745f9c1b9e1a6e04ae85e6ded0f54d1bf 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.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ac3fd2d0b1a8cd780b3e217a08be41b0282c37ec..2be26dcba293a2e8569b6c5211a82963125a6f40 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.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4484c0bcfb0d0530350a0a227d183eeb3ce33a82..ce05f45abd0626e4e4245567b6736ed464b97095 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.3 2000/08/02 08:13:05 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c327116f5e52ddf66fe4dc53b11ebdd6c50af433..973fcefe73affa5f0c8b3fab0b6de7d90b9989c1 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.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4VertexCode_h
 #define G4VertexCode_h 1
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 4c163919c13d17305b3535fe85b43c439158abba..215c55510cc9656116c7ab083d6da442be26c1fd 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.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 83fe9347e1f9837e54e796698b3e12f0f37035ef..b7f8a905045bffc674d86fb48135331b3638f318 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.3 2000/09/18 07:40:45 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ab5e3ec2893396fd07911e0068ed7dc072f4f5c3..2613fb12f2c38f7f0f636fe280776aec5f91b000 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.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4PomeronCrossSection.hh"
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 f0fbe1d52cd01a6b852d00e6812e0918595fa67c..995d7cc066ad8198e8097ba96e3971b899a6e72c 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.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 258f9d2b27a316d4025a32124f16741e0933782a..dc9b26f5cc9e654a2b3affd0896614bd62e1a682 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VParticipants.cc,v 1.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
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 75a0028ca87ba0ce810120cc959bd7dd1f3985ae..89f0995d4f035fd1a2df4227583f1549022982e8 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPartonStringModel.cc,v 1.7 2000/08/02 08:13:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //// ------------------------------------------------------------
 //      GEANT 4 class implementation file
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 dcd5ff6af36146f093c356943a69dc2327a1398c..ebb8192bbea6d123daa3e32bcea71d73840cc0ae 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.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c6c27d603b13f7fc05c0684a58f0a55c7f723504..55ae4f5016d880aea5287dd969828784c4cef8da 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.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 714f12833e45b8fe87946149790c1a0beb049ce8..50e25afbeec38b26d2615005951b397ec1dc8003 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.6 2000/11/10 08:30:07 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 26f58b2b930aa9d537e498241a90b3f59b6d7673..0888a867fb3566b677196b7c7ba287a0a8d5031e 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.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $ Maxim Komogorov
+// GEANT4 tag $Name: geant4-03-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 1f213dca3b39b36fe6ce2b47a015b2c22248a046..b594972a2ba07979ce667e922f053beacfc62931 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.3 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 40ce1174159e423e715900b79e014c484d84f67a..eaec55db86294ca1d5baf84d0a890315e76b0bae 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.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 169c9e825bd5be8ed6b7885082d7f9fd84ced6cf..f329b8e1f6aa18467d399f1b25e65364d5eedb67 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VLongitudinalStringDecay.hh,v 1.7 2000/08/02 08:14:13 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
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 f445603dc6b2d1a95b9be9bfcc3dfdbc35915bdf..ea1e3c233ef38a69a535a1776a0c0f8d5eb54a3c 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.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8ec1cdbee6a5153c2e430caa262ef6a22370c7b5..ab13f4a092c53c809ac99ff0512340a87f50f43a 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.4 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 50fe24f364ee36890e0925036c561a225faf5de2..ae614ef3634e8618ff0c08365df6d7c87c77a55f 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.3 1999/12/15 14:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 209c26b5cba11241b4d77766176cf60fbd541532..21f38c7ba64c4170dbd1e053a8132d97bd69f666 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VLongitudinalStringDecay.cc,v 1.6 1999/12/15 14:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //  Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh b/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
index bccfc87d1bad68d41a7a70b8988746913fce2d8a..8e4c4b96dd26082626fc944912b6defbebd9e4e6 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.5 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c56f2dc0e2897d8ff1054258ba91548778d547ae..06799ee043d7110a6c24b58052b22c44f3d4f363 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.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5f3e69478e85761a0a6817397bf9cc2a39c06f0f..86edcb9c1041997759a854986ef0d74f09d1f7cf 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.6 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 51f07b2fd34aae3eed4ab092dff62f5f207246e3..d8a5ce5de94a8dd94aea1910b46204899e8d8b5b 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.2 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 80ed0d76520107f0d0e45ec3a47a713269fcf546..454a7304f35fc5e0554f4cfad7afac2595077421 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Fragment.hh,v 1.7 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
diff --git a/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh b/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh
index 29d9abba1d34d67abe474b60d60315e66232bc1f..221fe943f295b82b0f48a3522ef595bad63b8696 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.2 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 62b0c2d5eccc0bdd5e08d504f8f0beee07932688..4395249a915a5944a64a72d3079551a3fab8f173 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.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 df493fd8ac79ced1b8e360a662c9b681a57f2925..16ac5e72b640031455db3394009c01d8ea7bdc98 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.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 feb56677d2a9dc1b5f118ccb22b87ca4ac0a4702..52500ecb580d87795eb1a9f2e56b3978d28a3f12 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.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 511b3888ad183f0f0bad3df06c44d0c5f8bde071..9f41a71fe6e903554d4eb4c952fcdab5e8bc7fbc 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.3 2000/05/23 13:41:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d22ad4bfbfc332f54ed000f03e9c533d05ffc9cf..c5556a060a31c0fc2d15e520e2195e548140e893 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.3 2000/05/23 13:41:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 14894e4054b241921caf5fd2410d40a44d0bc204..aa4687642f626e9f934525ff3410ebf95e4853f8 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Nucleon.hh,v 1.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4Nucleon_h
 #define G4Nucleon_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4Parton.hh b/source/processes/hadronic/models/generator/util/include/G4Parton.hh
index d2e13678b14e9689f46d43e03382d5cc466c52c3..9d982bdc7b8afdb83b5a97da705248daea13ab49 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Parton.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Parton.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Parton.hh,v 1.9 2000/08/02 08:15:31 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4Parton_h
diff --git a/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh b/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh
index 8f44a6cb563187f91fd1b1999dc580faa94d182f..bb89451db873600ddbc717e22e1517f0d6a59612 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.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 bcada10dd1af4262ba7c31c6ca39db1eaa6b6a81..034703a91ce2f38c5cf6affb2b77642e77fcf3d2 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.3 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // ------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc b/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
index 4589ad73a24aa8c52d8b7d21adbb19328d2c7abf..5f7822b1132c09176724226abec99d07d2a5a1be 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Fancy3DNucleus.cc,v 1.8 2000/08/11 08:22:15 hweber Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc b/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc
index a4557fdc98f2ac5a2cf2688625c39012067adad1..dc30a8833a1fba76ce0a28b30bc42eacec149a69 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.2 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 fdc6ea5a21adb145e4d6f50139fd908cf6a90125..eb948aad509ea435b1f3cc02ebe53f12b6dc7e92 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Fragment.cc,v 1.8.2.1 2000/11/23 08:31:22 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
diff --git a/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc b/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
index 14cf163b3f9693e93365c132c8b2446c5de05e1c..49edfc61c4a8e15426dfc5672ca51d7f8db31965 100644
--- a/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GeneralPhaseSpaceDecay.cc,v 1.2 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: G4GeneralSpaceDecay.cc,v 1.0 1998/05/21
 // ----------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc b/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
index 73b6d3049c686d4e959b17bdf0c5a4785f0c38cc..10a21f2897a7d2da8e4b9d29cc28bd4df3f4c7dc 100644
--- a/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KineticTrack.cc,v 1.10 2000/12/07 14:38:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: G4KineticTrack.cc,v 1.0 1998/05/20
 // -----------------------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc b/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc
index 198e0a05c1be28dfb0d792f526811fe55ea7f0cb..aba49bb59c62ea4002e75f1ac23b6332bc2d2486 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.6 2000/05/23 13:41:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 53ba5e156b5a56f1fc62d26b0284d9ac7a24ac6a..69c8a1dd03352fe41c6091e77e67a2321d7f04ed 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.4 2000/05/23 13:41:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a1481855856213fb75649de847c15934b1b7aaf9..720fa427824485eb3cfa2967038eaeb9b5145e44 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Nucleon.cc,v 1.3 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4Nucleon.hh"
 
diff --git a/source/processes/hadronic/models/generator/util/src/G4Parton.cc b/source/processes/hadronic/models/generator/util/src/G4Parton.cc
index 908ac9303bc41fc1588972d0ff7a9336468be818..2b5ea4315a2f8f9c5f0ead0ed9887e2555ac10f3 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Parton.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Parton.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Parton.cc,v 1.7 2000/08/02 08:15:47 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
index 62cdba3b5081cb763bf913788cc8430f993bf47b..b816a234cd0bf575dee2f9c4429c4fe68dc8890d 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.4 2000/12/14 09:02:41 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d39f20e8343a0f4f82e0c5266cf465608c0c483c..0c67069e247c03b3937c5121a241cec8c1b1f9f4 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5620d8db3427413f7e8ab1f125324819451ad910..30bfa921d9d5176c3967571ce15a57f3fb263d10 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 db5e583dac78095527bfb69bd3f17d8e9e405ab0..86105eb5ce1948e7430db01a3c5c0ad906083ba9 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 08e5e225cf9e96f1a85a9f795b15376c2c5d80e1..fc9c0b41833edcd7d4fa9cccc16bcfb683d3ed36 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 392bcd5a033803fd579062f6352f43f5e71c3c52..8f97c63580c9078b1d33d1e3443ca66f79a36fd4 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 390172b52046ebb644d7ef90107ed3dda550c2e3..f9581f6f4c37900727ed21fbc953f2aa67d63808 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7f3c3bd1238aff426f7b33b1d5fe0781c07836f4..652094a7b326c0f61f497d94f83c8dd321293786 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 60334f5217d4159b383104f3c04fb0222fa9b292..791da1c0c48140d92cfd9562e60dc0e09ed626d7 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 08c70c702b7bb7b0845c27d876aa15c5e64fd208..71efb855d145780ca89354be2cb5a3550da6a25d 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b1e097b40199c4ed0a5db977a30913d01c6850c6..c98ee9defcbc6e2d4c8d26b890892a87740949b1 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.4 2000/07/09 09:48:10 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 94c2b7f6412f92f4c0cfa865149f0a6b8fb360d8..369525c996b7f5937626f55dc022cef34c774430 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 75ce3f0940c704f4d3c7b908bf525077674f2a6a..d0caab18945cadac98d53cf7ec56695877315c5c 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7838e96e5a659eb026e83b12260c5a3dc5523753..438a32dc91905b45cc6b0007e4fd6aebf4488c1d 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.3 1999/12/15 14:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ab3c3cd676152e024c3b5e708d0b67f6819c7941..3ff68f0e09ff963e3367ad538763611cd13dec00 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 44a80b455d57520117cf0ec4024b94144a5e7745..e045d829fc7bfd3179c45563266128e370c78b11 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7e9b8c112051f1fde91e215a2f0a516a4d35ffd9..6c5d5000bb460727ee8dc01485cb2bede7fad8c5 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 fd1779241e9c69be739e581819222f0a029543d5..c0e621ba8af1f2398c88f570e78f77087792b4a6 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4c9eb46c32e7daf16a61987422715133a84b0fc2..9beaa4af753a3edddaf9498d13d33519da693e9f 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a90c07b8e2efeefa445ec521cb5b03a7e24df3c2..4342dd353b711c280ff008b0d05d3dd19636be78 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 67f421a28037bfef0d96f90185f0505813bbcf6a..a4c71ca78bfda72412e2e24db7106813f21efba9 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 91aa83e0d9fc27f2a1649899ce4de3324661ecfd..febaa09016f5d08dade8da1699158e5e941b951e 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.3 1999/12/15 14:52:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 212797da6b1caaa9ad1420cb04ac6d909d683cb3..7f284771e67476d0f722ceeaa7c21a49a581a159 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 75328d70888befb7627c1ac6ea995f62d2785a4f..b2ef3a516f6cbc1a3715d086c0ae1c17db215444 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 62c44be4558297a35908a6f1c374904ecbf081f3..deda0d7200df53e5a24de12a706bddb3970f0449 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c34e5e9b830cda6e35d35e9efdea220c4b45630f..60d251a83a07a3575cbbb46e3fd91a3646cda7eb 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 10e481cf43cda9508178c2e8f5bc0796eb29da98..260b028a6c982e5b389ca679215debdbc6dec6be 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEVector.hh,v 1.4 1999/12/15 16:42:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Gheisha friend class G4KinematicParticle  -- header file
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
index bedc3406ded8a12c2626f8ba315bf874236626c5..3c751c83d0bd13d6386faf71331d861509bdcf1f 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 eae25d55cf2369c2bd4edc553793a00b4b084e6b..0c8812096238cfd20dcf8701c989fdf7b393c90a 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.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 3011279c3efbb578c990d3b2df02b0fafbcbff81..3acedc94076c96915c742f977c1dcedd5211de1d 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiKaonZeroInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
index ac9d35e441a06aa36efc887664e7f1b3759ea0c0..8e60ccd754a4af5a92c72327f363018653228b4e 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiLambdaInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
index e326cfda9375b7158b6e800872e880d414430b90..d46797a1b68228a78242f08ccdf453ae3e65ff31 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiNeutronInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
index 86d4738995d5e8641b499d60861c2119617337db..16b1db00d3e54382ba901623672d3ecbcb6f42c6 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiOmegaMinusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
index f4e084bbbd7688ebadc741112040d7972b9c1f2a..fc9c8d71708658539f5319dbfa14222b56c41175 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiProtonInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
index 61afaf29c5c0e07ad5e40bc4705c3d9d6c16af6b..28bc17db4c0d2d00b6868f7b4e3b4fddf1d92c75 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiSigmaMinusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
index 860acccf65bf85f0292fed56bbb9d67c1a329aa8..5a6625591c97e8e5e217758b03f1e5abb2c32982 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiSigmaPlusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
index ab3bf0998ed995dd0b88107b0487f59cfb603225..d3ed9bb65a41adb58b0d3e420f48ceab6978d1bf 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.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
index e9cb46ddb34aed7596aaf4f4e4e8eb5fdfbe8112..41f93e8701cc367a8c3e2afc616228cb7a85963a 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiXiMinusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
index 7e1623d6f0f0b8aca4ea9dafef806634a5ef0534..0fa3fc4dfd685db3eb75b408cd5395f8958e2446 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEAntiXiZeroInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
index bf6f12d2f299b62efa774bb6702b0d6d93bea7ab..c7a243ddd6564ce43df99db7bcb6131f2face0e8 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEInelastic.cc,v 1.5 2000/07/09 09:48:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
index 1d3e2ea0fff91719ef825521c3ba79f6d716b726..6a22947d571397877447985a7b5e6b029aea3364 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonMinusInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
index da8ffa4e7627bbf3bfbae2276b1042cf5a9f3644..feec61aa5c7e4161e1cd4043d559ceb123e22c61 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonPlusInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
index a83a273335417800ed38dcfd5777b660d38090e7..07c14f292a7032bfbcc7487e9e79da961b99b466 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEKaonZeroInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
index d853d2e7605c35b340644cdde6dac70f0785703d..4150f069ee03d50e71c413857f25d84edffc456f 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.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
index 5ee81cdeddcee600861560583384d300611227cc..7286d43befe1dc005bf3833fb5ed1a67459a38af 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.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
index eba8e4820d34ed938c86d48cff9193483cbc65c2..a753722f526707fcbebd1ae31cc9103980e99de7 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HELambdaInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
index 78c8807360737e2759200c0383909363a6d9c527..077a0d95cbe1035447966df449be3be5b0650c55 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HENeutronInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
index 183e5fb97c3314e48770657b4b6f271edb3df14d..93c7871aa2d081a81b3135310ce328595ffe3dfe 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEOmegaMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
index e356d95de5f9d422d6bd3eb1b8871936bd3d60c4..fbf2ef37361b7464e6747c04dec323ba49b4ef14 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPionMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
index 3485c66b1190d87339b7a30b1330ebd4cf20401b..0672e9b057ea4b688e00dc973229ee097d2d6de5 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPionPlusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
index d7daa4f54b8cd3e53e842d5e8b7774f6d22e434c..42b2a904fd6d924c07bf8ca4ee25467fd02daef9 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEPlot.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
index e7673bbc206493b9062446add7311a43a5cc7435..1b788075de7c9db95c36da641696fc0ed3f2e133 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEProtonInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
index b9023e13e79916e807ddadfd9602b435866edc03..0a4eb03d70d39a184442a2cc3c2ca1be2e1e91da 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HESigmaMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
index f263cb4a3390bbd32f9b58949f6256826685504a..bb4ed4ceed2c464eaed2409f632b8cbc8121bd9d 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HESigmaPlusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
index 3a6b2a99c0eca91629944e53b906789ddbba9af1..b1d3ed633a0039daf4b0499c187251a78f280060 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.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
index 11a29bcd1b61eddc0af453232c5edec931998d23..77dd83fd1f88d3040b1ce5a9714bdc7bcae0e5b5 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEVector.cc,v 1.5 2000/08/09 07:24:21 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
index 71cc9ec5ca09360fbbaadf377269428cdf46ece7..c80ed464ede5a63534e6d4c264353175d6b8a77f 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEXiMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
index de38339d902a67280d4cddac4fe85b2aa871dee4..dec1fe67c8670a8817546b7414c807f9d8d78cd8 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HEXiZeroInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/processes/hadronic/models/low_energy/include/G4LCapture.hh b/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
index 87cd2e24aac5fdf9ecfa940d6e57697883704497..5d4e8dee021c6f59d7b7defa18f78a460e086559 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.5 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2f867d2d145e966aa7827e23bd5db056cbbed62f..80d9e6d08dfe8e9c61bb3f6f459df96782566074 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 17611afda75d8e06ed7935634d479853f40be2cf..9878f01bb6f2b0a9646a049f27e01db1ec1e4410 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0839a0d7cca1cd11d0722a2dc0a87d446a0f6c42..c32eadf01b011639e8982bd3a177b0ccddc97d34 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 37da656953c603fee09e9ed422c732b475c7bf13..d9e8518f7d453b905debc6f4ce73422e05d87963 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c2dbe3589e47b1097e3801e85b0dbeb79f1e2492..0ff98bacb34aaefdf1cded6f372d64a48c808ab6 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a88a3e487854608dd1e174e2d265e9a752644fcf..5a84264554623ac13196ad78ecac655d4e40577b 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d095490731b1b3091d52a7fd7185c9a4654f939c..ce3e612e1132413c3998a7ee2589af30e5ebacb7 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4bf3c0387aa42ec2f21113eb75cb078c089d7865..e450b84c534213dd1743d67d0359eda619993152 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5c4644a96b40f621e08c56f27e0c759e141b910d..a55e565377bf838d6c507f428fc2c58b3898939f 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 3f0d8f2850a2a4bf593699550c5b8a9a1524c556..22081d6a2644910841775f949fdaf7b82eee48ae 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 32f4b7694450e01c3f34ae98d0e67152e73fe220..57a71a32d4dff9e936204cbb955972ddbdfb4409 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 870b9fcec54622fc3b2d87689714bb0eeaae1a4d..90ed2a69a8cda1cbcfd697037132059e1cc61086 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5d54d23145579c217ffb55fb3016b83abc56b803..b4faab24858e6caaa40d70f3065a984aada4ec39 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5007579bab3da11994288aec4abfb22c6b0aefdc..16a1a96773caf0c5f02046ed4589ddfd0b31adbb 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 cf49f355b5b0057bb2c3f7188c400d31d7d5d5c9..d9e55f95049a349b7f56597f079c1b28b27e3a5c 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a2b9158a578b03f611f87050552b55b43ee1f571..9ef408a1fde06f8afa1fbabe9bf806356b812a14 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b33692d2c5958a5a09e0319f3d8a8d37e36286fb..44f805dcc545c73653bbf8cda6d2772ee5001ff3 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f79e0a5ad761dee781ecf43967ff06fb3a0e9361..04b5059211f98094e2836fd13810cab27b9b0f8d 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e338996ef6f6bf419633d3c197ac2981ffb98e35..22bcb5fe84e8a41def5d3d93891832212a7500ca 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 999fce966f135fcbe62bea7d1d2eed29d28dfa55..aea0fe9d5a37a5b9df0801719525cfd326e2f1e5 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8e8dc6c5a0d70a9ab624c712b58f1c5317c38cf6..dc7430923f0cb11dd5ae7811fdeeaaab27e8057e 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 74352c51c350ca8a98bda6edbcda5e1e41a4d11f..9fd7d813177724d5e9a2869497adf6ec582e0dda 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.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a9fbe90ebf3384f0cd6a2d13b36645749213541d..fa2e4491c2841cfb3c4d75cc0a4935748f4e088f 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.3 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 85f508a9cf52cf71cdb1999327b591c81c19e38a..7bdc981e390e46f2f827c36b5cfcf79761dbd5d1 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.3 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 404e51c7a9196be76db03a1b92a95e61e9aa4639..971dc9bbf4e5eb676d12b6698307fbe0dea2572f 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.5 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ad729847cf317b423953a30f7ffa39e16b09af90..ec1dfe99ea529517224e36b843c62069af9ee9a2 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.5 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0b35b3164e89631dc584184e16798c762239c14c..b1a399729467b34cc4f5d34d0e6a8621434bfc86 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LCapture.cc,v 1.4 2000/08/03 08:49:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Model: Low-energy Neutron Capture
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
index 99bd911e24f788318528baa754549c3c6329e393..7abd3718181ee3331a8079a7981de6a3c20deeec 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiLambdaInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiLambda Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
index 0c9a76b7c75cd0867e1016e5b2686b5892e20e7f..d301ae3a518c3d0e4ed477522acb5c14448a5fdf 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiNeutronInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiNeutron Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
index 5f5321c87b31a35898ff152fd31b5c06caf9b652..476faf48e5b9dececcbfe240c243356fd7501b7d 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiOmegaMinusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiOmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
index 1b5f991cb3e34368a4b7b880561331a6c6b0af0c..af76d25f105ddf3f4a46c2ec16f244a0ae9d97cb 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiProtonInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiProton Inelastic Process
  // J.L. Chuma, TRIUMF, 13-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
index b0f7fe4a6773dfcfd7e0b33fb4ba564e5c72ef25..20398d81c61df9b34db06326ffa50aec7a6be687 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiSigmaMinusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiSigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
index 171bb93679a45ce1eafa6076435f796c13979628..635bb5b46a9ca6a274d2ea602e7f83ee257430fc 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiSigmaPlusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiSigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
index 21c340b398b21bc1a5755cd6cbe841eafc1caaf8..f4a3416f213b7e1c7aa2cfb846a2c8785c6afedf 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiXiMinusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiXiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
index 06388d8aec6eb1226618838fabb393ebd2053870..be1ba19213754dfeed1d38234856de079e61e38a 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEAntiXiZeroInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: AntiXiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
index bc502e8d3d4cbfc42100529e8f96d2317c47a1e7..fc0e4d3e6f809c36552b5fd06d32ddde80db78fe 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonMinusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: Low Energy KaonMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
index c5143b377b29f48fbabf2d64f1bb5f94a5aa435b..43fc19966ec4377f4688f7aed978a543ea8436d1 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonPlusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: Low Energy KaonPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
index 88d667da0fa65c81681b06c70ab45b5cf67c19c1..1139537517b50e233b9cc5ee3be549e53f95dff3 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonZeroLInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: Low Energy KaonZeroLong Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
index cad9bd394278bdf498abdae6ae245a404c1ea699..07d0348af82a4c932b1a1be9c9957ccf2aaed5eb 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEKaonZeroSInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: Low Energy KaonZeroShort Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
index 81eb07f0f9cf85a6145695c528c352bd4f63514c..abd0854f01f40f0658102dbe5791c01f3c277466 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LELambdaInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: Lambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
index accc20e11e8dafda2fd72dd11d0fda7406e41b88..c1daaabd94e5015efa4c3e767b776e0535acac61 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEOmegaMinusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: OmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
index 15dac64f20838b4cafda56a682802b5e02044f5c..81635add9875c27d7d13d8cf00606742bbe46482 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEPionPlusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: PionPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
index d58158d9f103c2d03b9b5db8d38ce686a4f2fc78..74dc010ef21f3e77d86ca1a5c90f6a7b3d1c9c43 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LESigmaMinusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: SigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
index 2940424ad61c85b18deb6dc7f626b300e50af352..f23e9bd2baf48aec3652b59fad6452cd8cd313d2 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LESigmaPlusInelastic.cc,v 1.2 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: SigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
index a223198b562df6b29e5c4b819994fd6dd88aa4b4..6ceb58b60049bb59a717be8239586f07932be48e 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEXiMinusInelastic.cc,v 1.2 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: XiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
index 7b2a38a2840f104ce407514b497238ed0db4d3d5..e2c89578ce721619a4da546605b440dc6d1dba73 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LEXiZeroInelastic.cc,v 1.2 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: XiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LElastic.cc b/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
index 7ea8945fb54604f9677d6871b3444acd57502425..4697b2fc26c0cda2c313eee43d821290043705e6 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LElastic.cc,v 1.3 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Physics model class G4LElastic
 //
diff --git a/source/processes/hadronic/models/low_energy/src/G4LFission.cc b/source/processes/hadronic/models/low_energy/src/G4LFission.cc
index c5407a8351c80f0c60ab4b81cbea20c76f28be97..14e0bebfb3ce1286a09421259eada6da12362987 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LFission.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LFission.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LFission.cc,v 1.4 2000/08/03 08:49:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Model: Low Energy Fission
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
index 8a3d36b8800b7a29e9d09382d8f54d0bfdaccd1f..abca4fae2c1973c120c6744b9f38fff246f04315 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a9bc1ebe9090c04af649e935885b5ac19caebb9b..9c3c0479ef255b40476dc94204a66e4da0665f66 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4InterpolationManager.hh,v 1.5 1999/12/15 14:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4InterpolationManager_h
 #define G4InterpolationManager_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
index b5ae7934337c04f9aa4db93a4c7b924cf2ffa091..576d0cd47e3225380677dabab13f93bedea35f72 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 1784acdda61120445657d0c325819bde10f2066f..90bee8be3bc9c40572c3d4a2cb01ce664b449647 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 218f16a8fe822f54159435093fbb18f30536d795..d9e0dda5e75845f30cd1800b103fe8f4967fe1aa 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4a9f9a80325c0136b30a29e8aadc5569143d205b..680314ec94f9f95b1a7c9c2b5ad13722cb8bb61c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b46a1b45ceb83911070d3cb15d95cc62a397b2a3..73134c5a43d053388b048443b567d6b2a3ed1277 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2ab30df3d413a04a877781d26eff8f1cd8110411..4adae101702fc6c8251652887aa539d6a1036833 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5a2097fedd12de04f63f6c5bab1452b6b4bdfeda..7eae2783c9507c6ffd5a06fbb86f8491006d2188 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 9f787c730b9db933c798a251652807444eb2c699..d3dfa9ede09f18ea9d561f7a9a52e34e87985943 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2a2b24a6708f72b1c042ab9ad65c5ed185c882fe..1bd1bc825c3f1215722b504fae508285cd224a92 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 62db225991b65abd832f4aaba6ef123ec1c77fed..905dc4bbbc5ca6eba6979f32cd9db20672d34b48 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b835a436893e7b7353021771c61e5984b1b14fd2..1823ac5d25c9e0cafecdac1bd33c84102a196b0f 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 dbabc2d2fbb8e12ef36315884a9aa56c93246c3a..503452c146c84649e4bfd7c530b54101cf070b02 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a96552f0bd90731fa1e70c0cc08c2f5b87b850df..22ef870afb43a3b3d924b6cad578738706deb473 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 dd88a5627329b23e03e9d83b3dff734c2c72e902..a53cbb284f69c6fe436b666802648e07f424f0ff 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 79ba192019143b5eb4a59380ee672f22c1cc902b..a29e462147fe87a12f020d3269057969d8304681 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPAngular.hh,v 1.4 1999/12/15 14:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPAngular_h
 #define G4NeutronHPAngular_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
index b0a8cd3817e9e8238c51efa36422c1ac00d05314..e2ababc7857c290ef812dfec6ca4816274b036ed 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPAngularP.hh,v 1.4 1999/12/15 14:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPAngularP_h
 #define G4NeutronHPAngularP_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
index 46e7b3b97608720c08d4a7f8cd354cfe3766e21e..de13d179f26a43573fb7e195db6b3d769b94a5f1 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPArbitaryTab.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPArbitaryTab_h
 #define G4NeutronHPArbitaryTab_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
index 60fda2c5e6b3740f806214b2a2c634c4fcfd3a4c..dc32494d2c648727e915946234109b516d9ae292 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.4 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f5908dd764907ea753eb5123ee0da7f63a50ba17..da9bcb7a451812256560c571290c3bf14a2bb931 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.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 fbbbd1de826a7961d53bc3dbd8d470d916f0cdc1..d345cd1b6b3a250fd459eae2519363b8f1434914 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c73128707fdf37c8a3c3057dc9d307659765cdcb..a2fed9f039d3e88b89a71f7a949bd541507d71fa 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 62ba41c18b50514c32fc5bcfab594e004ce46539..09fc13c647c25bfa466eca6b2878bb9657d46f38 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.3 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 3319e508f22ce5372e78439d72fec4447bee1941..026520263afc64cc4208b08705beacbf2bd48731 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPContAngularPar.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPContAngularPar_h
 #define G4NeutronHPContAngularPar_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
index 54234b043edd8027a6e38e59c678dd576782ceb2..b3b07e480a286dbbcf9b3806fe64b27e9dbc1cfe 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPContEnergyAngular.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPContEnergyAngular_h
 #define G4NeutronHPContEnergyAngular_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
index 3f0765c7b9c3bfabda886c9c44a1127303285679..b46cc53440bc1a73dc2378333eaa2831c2c02865 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 1dd4d7ef48c16b39888d37e47eaa5f9434fd8187..0bbd5943aa4d3519e724cec7bd477c19bbd5bee0 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0e352ad2269f8b88d30ce69cc26c2638a05f8fa9..937bc00c1ede7a15c3a1808d26e00cb700785d47 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 3f97a04ae52fc815c9bb8abd583f8b557754d5f3..07f530d63fee769a33664b8f58a0df83db81c9ec 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPData.hh,v 1.3 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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/G4NeutronHPDataPoint.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
index 018c2fd29130ce5b5c74306f8e8be1062cbcda5e..3761845ae804bc9324936040701e3528d324b920 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0d1b1c1bcf472ecfd1641ba81fdc7be037efdcd4..c0683bb9abcc676ecc6dd26d4c04e99d7ed6a8b6 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPDeExGammas.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPDeExGammas_h
 #define G4NeutronHPDeExGammas_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
index b866b33f2341494fea4bc98e743333518843275d..7c394bfee9aa4ee974c22fdff2b3ccb75d56084e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPDiscreteTwoBody_h
 #define G4NeutronHPDiscreteTwoBody_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
index e73231f48409f7654098ae73a381bacf7bfc6332..fa778e2e8d51918a49aa4c1fce6980722b2797f7 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.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 249ce8e253599ae0b06ea82b744515c25acc11e1..aa03c834d8e0f25f0094e3a0d9aefd22d00b445d 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.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 6c273ec83d8326412736c4b23e52fe33f4da69ba..d310330358e6866f73c6a3be757aeba65d727de1 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 499f911aa3b9869b21bda6ac883a2a77d00cf243..36d56c2180ea1f725bdedd5c9e461813ccda99f8 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 cf6269eb066c882f47d093dd32b48660b5875955..b2bee388cbb6e1c4506b2520989106bcfcdbf9f1 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPEnAngCorrelation.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPEnAngCorrelation_h
 #define G4NeutronHPEnAngCorrelation_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
index 4906b27c67d334ba33c1f40376ebc38176164c86..f31210d516a90002716b1306fa143e54c9664aec 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPEnergyDistribution.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPEnergyDistribution_h
 #define G4NeutronHPEnergyDistribution_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
index 2e718d0266b9e46a7f19fcf3a533b6b029915f18..f399f80a2542bc253de74134a9b7498b936d8bba 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPEvapSpectrum.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPEvapSpectrum_h
 #define G4NeutronHPEvapSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
index b5e20588e80ac5654b044b5739a9312cfe0a50b0..bc3973ea9e3e9e326db9b824d35a7ed832953ed1 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8d9cc7c11c5b1e7beb01cb8f452fb6e330d54474..be19f155be9973b646b6324bc9f66dbc25294101 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 1eb4da50db6f9eb23b8bd4103abce46a7c0f4ded..84621d670906be49098e3caccd692f24426abd7f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFastLegendre.hh,v 1.5 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPFastLegendre_h
 #define G4NeutronHPFastLegendre_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
index 2f995d9b40e1c383af70ea5ae492f60fad7b6416..39ef7c305b35c9ae98866403019102024d1c50d6 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7f1e1cbe2f6ce6220bfe72ab089dbf54872e5395..a2021a0d13de02a507f1d73b0b563e2ff4b4e100 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 af17fb7bc67e94e8d28093fb1568df7f987a5587..2d68a40e391e2c2947501eb6e44e5cc9edebe8a7 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7845fedeb838452bce4f3b0e03a0bf319830b1d5..01e4cd31a94dbaa696ac2be5292bde20ffde8825 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.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 3f7795f7d13e139780fd9074ea2cdab6327c2a77..62858804bf0b361cf33a3a79680f96b5ff424308 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.4 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d249f19e5b8f326ebcef232a1c5398360807e16b..ccb85e564c67d2fdc515f1e7a4a1f5480d05951b 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.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c435836fa49b4dde167f7bb92e3156a4e44b22c7..72d8c7d347216041bced03d778f6db8ee62b2a37 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFissionERelease.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPFissionERelease_h
 #define G4NeutronHPFissionERelease_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
index d734e23467c759f6fadc9552fb648107be5ea9bf..a3b1eded477e5206e0cc6eff3f888eb05dbd797a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5cf342e6695c413bfe99ae2bcf3aa2ff3c95505f..33b7426de1dfdad1d3ea9dd326ba12cf11ce84bb 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPFissionSpectrum.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPFissionSpectrum_h
 #define G4NeutronHPFissionSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
index 934b242848d7f4a2e2e10cda4dd5cd0db23d1c8b..6c3d5b2004c54c7a0a514a9e70168bbfecbbd074 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPGamma.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPGamma_h
 #define G4NeutronHPGamma_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
index 7821e5f8c4498a41c9cbad1f5098a12f09b1ee8d..9e0322fafe495cbb40f5cb987993778b58c960a5 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ebe95a7a5424113b8e45b528f4f39911ab21f137..f60f77f6addf2c255898bb2226ec82f051d18a84 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.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 80aaac4eedc48c8193e11c2e4b7ba1d80ee6c373..8d346de7458fa3fc45c8602621061ce1fe908cf0 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.4 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 13d496b2324a44dedb4c69f01ca5a0a5f18dac2d..25ff2837b76e2d29f3abb9dacfb0c30c2e884205 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.4 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 53d8003a4f67eb35d9d9f3034d5e9172348981d6..799e7ca99719a34d81649e13905c1424e9f1fe46 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.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 cb0ca9dc0a2648cdc0d01da3fbd467c145245253..ef47bfe6e10cc7eda07450df2d8bf9e7c2c9bde8 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPInterpolator.hh,v 1.5 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPInterpolator_h
 #define G4NeutronHPInterpolator_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
index 0e49187cf7052faf5dda6ea0148644278e584ac3..6a53f64b114cf220a2dd5d18021f88987aa25fbb 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPIsoData.hh,v 1.7 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPIsoData_h
 #define G4NeutronHPIsoData_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
index 6a973057552c2f42d3a7be00f1f1e0a3ec18e9d7..2b80fd84d2d0d6dc6be753c80150838a8ef24410 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPIsotropic.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPIsotropic_h
 #define G4NeutronHPIsotropic_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
index 5a89d65c750c23b8a0f9e4e84699320f135a222f..29a3e6fcc3699429cdf625029097a30342c5ef50 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7a172b67fa0ce93603627b6ce84119f4196373f9..7f945025f9e9d298d8c3217f5c365a78708607c2 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ffc8e60a1113049047cc1367f593802f75cf43cf..5b74da0a062755e242cfd5b5aad861cd1d2ebffe 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPLabAngularEnergy.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPLabAngularEnergy_h
 #define G4NeutronHPLabAngularEnergy_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
index 1270edcdaa97a6a38e16378f1a82b759fce05da0..f5f857efa45ca5f6b2cdf32b605a4fe5420c6e1f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPLegendreStore.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPLegendreStore_h
 #define G4NeutronHPLegendreStore_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
index 1f9c44bab8f1445ff912b35d71f7964e7e9990c4..4d11b88508ec09cd1aea7e846566258549122284 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPLegendreTable.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPLegendreTable_h
 #define G4NeutronHPLegendreTable_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
index bcc5fa99d99c19c007c1897e01275267715d0aeb..c13dc7d0b2bbbe6d8e7732d128a5d8d39a51a946 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPLevel.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPLevel_h
 #define G4NeutronHPLevel_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
index c643775d3e26d3ceb56f6b5a17420c87413b8d42..253ad6785c1ad18ea32111ccd692948bbfe51e8b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPList.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPList_h
 #define G4NeutronHPList_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
index f6ad7ab46a0580d3d80d7387ed3e8830fe442da8..7442530303ab0ccd9c87933254aa0ba8ae61cf14 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPMadlandNixSpectrum_h
 #define G4NeutronHPMadlandNixSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
index a050030b0910c76fd3895a39f9c7753269a7847a..d0820c99e2b45920fba79ccb699754043d116e03 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f9cc1ebaf611936488afe486cb05b9b04d4bcd72..57521bd3cd3e64aa60e9f903907eb55af8e33408 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0464cb6c700ba31925d004fcc21ec3f362ca642a..84f25af7f9929a1acff73487dcde82c6fd632782 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 516946185226092987111e88c1d262129cf0a10c..f6f9a7a5f295db857bbebde52afc2d24d93348c8 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 795f0b4020240060067d10f418418209907e8c52..141585cca902d556cac2cdfdd902e624f44e2111 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPNBodyPhaseSpace_h
 #define G4NeutronHPNBodyPhaseSpace_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
index 0b5098a378684b366b49559b7a06abb3d33e26d0..894dc633b722ce4e38c034bfddb493c869269089 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 aff5bb520a799481efdedf6c0fc263abdb8ce027..a5dc022e61f08b440a13f093c05cdc126a892335 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 80d440c6de51a0fb560204dc736c1b918d180361..1d88595873b76fbbe284da990af8ef15f599f926 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 51ba0791d6cafc39b22b3bf2d61d4dd84584fe43..e9099adb2a1f900b66af7a0b576b584e92d6b8ea 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 24d22aebf619fb09b4bc6d60221154e40e01eff1..b4279b417b050b852b128f6d1e7c9110869aa63e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 3610fd520228980c2a401aa0e1db29061529f625..8c6a34dcbeb4a101195aa714208d3244d80e5a87 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 47c347a7de967d77cb1f137a37a2ba82065de6d5..e3738948efa425b5f778a7ca686f3ebc1a4a5c9f 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 28513ace696309aa0e486afb5b2ab8b7a7bbd5d8..c1f3473d0b395d73a3bc53593f6b1c36f65982cf 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 9db47e336f984c5f075352ae340a02dd6b91ac78..67e49342f0e75225b36bf6aeaaa6bedbf67fc86f 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7bc851665cb6e2754596508cf9f5f09907211907..aa20c5b12c495f2a06da8c4ef341638b1a382769 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNames.hh,v 1.6 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPNames_h
 #define G4NeutronHPNames_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
index 6de9522911dea8a2ed9ed4bbd4c96c63f2398ded..4f1b69ff51413b35b4154111b11eb88855361f3e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPNeutronYield.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPNeutronYield_h
 #define G4NeutronHPNeutronYield_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
index afaaf30e7a7337c2d331863ad6940f2f5edff5fd..d5a2cd14b8c863bcbcd4f57deb05284156b7c08e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 26be60daa1f72026f3edc6af7873c831edbc5de3..74bca10c39184fbe40c3109b16c10dc4139f39d9 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e1ecadada20fef1a9f97fd3679ac26bcbc1b387e..4ef68592b5f77811be1f30ccc6284af49e2cb487 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b9758bd3a9c82de0e79a9732db7ba61a0765bfdb..df14fd50e8e733bd6f9851d16201ff89be46458e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 1d341a9b3c4d063d20372ae4a32d718e68d3c38e..349c76998bc5ffb3bce4354d29ce278663ec4f98 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPartial.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPPartial_h
 #define G4NeutronHPPartial_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
index e7aec426d92578b580584e2ea0972db4e297e0cc..1155de79f92562c23069fb31cdfac7b8cc02553f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPhotonDist.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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/G4NeutronHPPhotonXSection.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
index 4040eea22594fd11768a3ea65aad671cf8d094ef..e7b8d03ec383253c99d1a1af74bab4fcbe94f47a 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPhotonXSection.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPPhotonXSection_h
 #define G4NeutronHPPhotonXSection_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
index 455b3e9aa6e6c65c7b787f5b3be31a28f4d5e93d..fd97c91d9c657b7f2ac84a2bbd142898d787e5c9 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPPolynomExpansion.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPPolynomExpansion_h
 #define G4NeutronHPPolynomExpansion_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
index b566f2ccd022564f01d951702204219b9bc8b9cf..aa02a356fca8808cbd598da4eb58ad54168859cc 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPProduct.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPProduct_h
 #define G4NeutronHPProduct_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
index a70eff7092cb9b4a65d55ef732c467e59ba376a6..a17e4e3e38e381fe263f56f7abeb0dca21a34900 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0843dd81426b25aa96d2803a94c32c26a17cfc85..3c4eb5a4ec9f33d312cba1cfe74fa7e7b7285dff 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPSimpleEvapSpectrum_h
 #define G4NeutronHPSimpleEvapSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
index cdcb380ce560556ec88c35bd2c9900501e63d600..290c886d174376d8246d2cf1b010f85650e1f79b 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 28147e51a79461a64f344bcd986382c076ac9826..bcd76e8ed24821805c907785bf613950c88cda4d 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a8bb03cc9bcd092720185fe3a5378e5f939f28a2..fbbac0507096b4bc71ede14a5bf122c4f2705227 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-03-00 $
+// GEANT4 tag $Name: geant4-03-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 78165e1560c12a8a4541e4d3c6c65d536103861a..e879273744d3fdd8155ae8330bb1a7c2e7ac2ba7 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPVector.hh,v 1.14 2000/11/20 10:07:41 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPVector_h
 #define G4NeutronHPVector_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
index a455065c7179a6ce398e548e6d26f834cb5f60fe..69e085c73caf04333c759749290903d4048009cc 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPWattSpectrum.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4NeutronHPWattSpectrum_h
 #define G4NeutronHPWattSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
index d4b17e3cdeafb18602eb49a87ac70d20e50f6af3..f448620534b2ee62639a03bc9c21978d1bf3f075 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4VNeutronHPEDis.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4VNeutronHPEDis_h
 #define G4VNeutronHPEDis_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
index e11c4127ecf3bfc5d80867792bacc1dee5067c48..59736768bcfd9270d640e917f2efb79b6ee501f3 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4VNeutronHPEnergyAngular.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4VNeutronHPEnergyAngular_h
 #define G4VNeutronHPEnergyAngular_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
index 83e65e63f5fa39bdf3b07e2b04593f0a214aac8b..575f33cc5f526489070482c3c10d466b77005269 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
@@ -29,16 +29,18 @@ void G4NeutronHPCaptureData::BuildPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-  G4int numberOfElements = G4Element::GetNumberOfElements();
+  size_t numberOfElements = G4Element::GetNumberOfElements();
   theCrossSections = new G4PhysicsTable( numberOfElements );
 
   // make a PhysicsVector for each element
 
   static const G4ElementTable *theElementTable = G4Element::GetElementTable();
-  for( G4int i=0; i<numberOfElements; ++i )
-    (*theCrossSections)(i) =
-      G4NeutronHPData::
+  for( size_t i=0; i<numberOfElements; ++i )
+  {
+     G4PhysicsVector* physVec = G4NeutronHPData::
       Instance()->MakePhysicsVector((*theElementTable)[i], this);
+     theCrossSections->push_back(physVec);
+  }
 }
 
 void G4NeutronHPCaptureData::DumpPhysicsTable(const G4ParticleDefinition& aP)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
index 143d1889e65da5b3a6367a645135768cacc3d724..ddd81ec1e992cffad69630d2d490b9e60454e786 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
@@ -29,16 +29,18 @@ void G4NeutronHPElasticData::BuildPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-  G4int numberOfElements = G4Element::GetNumberOfElements();
+  size_t numberOfElements = G4Element::GetNumberOfElements();
   theCrossSections = new G4PhysicsTable( numberOfElements );
 
   // make a PhysicsVector for each element
 
   static const G4ElementTable *theElementTable = G4Element::GetElementTable();
-  for( G4int i=0; i<numberOfElements; ++i )
-    (*theCrossSections)(i) =
-      G4NeutronHPData::
+  for( size_t i=0; i<numberOfElements; ++i )
+  {
+    G4PhysicsVector* physVec = G4NeutronHPData::
       Instance()->MakePhysicsVector((*theElementTable)[i], this);
+    theCrossSections->push_back(physVec);
+  }
 }
 
 void G4NeutronHPElasticData::DumpPhysicsTable(const G4ParticleDefinition& aP)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
index 014c5eb63a623569fa628c95f3229a12c2aebb29..34e6c03d9b343f6d26a7e781f755585f14b4a2c0 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
@@ -30,16 +30,18 @@ void G4NeutronHPFissionData::BuildPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-  G4int numberOfElements = G4Element::GetNumberOfElements();
+  size_t numberOfElements = G4Element::GetNumberOfElements();
   theCrossSections = new G4PhysicsTable( numberOfElements );
 
   // make a PhysicsVector for each element
 
   static const G4ElementTable *theElementTable = G4Element::GetElementTable();
-  for( G4int i=0; i<numberOfElements; ++i )
-    (*theCrossSections)(i) =
-      G4NeutronHPData::
+  for( size_t i=0; i<numberOfElements; ++i )
+  {
+    G4PhysicsVector* physVec = G4NeutronHPData::
       Instance()->MakePhysicsVector((*theElementTable)[i], this);
+    theCrossSections->push_back(physVec);
+  }
 }
 
 void G4NeutronHPFissionData::DumpPhysicsTable(const G4ParticleDefinition& aP)
@@ -51,12 +53,14 @@ void G4NeutronHPFissionData::DumpPhysicsTable(const G4ParticleDefinition& aP)
 
 G4double G4NeutronHPFissionData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
 {
-  G4double result;
+  G4double result = 0;
   G4bool outOfRange;
   G4int index = anE->GetIndex();
     
-  if(anE->GetZ()<90) return 0;
+  if(anE->GetZ()<90) return result;
   result = (*((*theCrossSections)(index))).GetValue(
                              aP->GetKineticEnergy(), outOfRange);
+//   cout << "Element "<<anE->GetZ()<<endl;
+//   cout << "FissionHPCrossSection = "<<result<<endl;
   return result;
 }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
index 1ad7db220ef63b407a4236fb498cef87b28468a9..8b7b2dc1ff8cf0e8293da0424e40d1b7e0a381ad 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
@@ -8,7 +8,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronHPInelastic.cc,v 1.7 2000/11/09 16:14:22 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4NeutronHPInelastic.hh"
 
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
index d7f0a4ee4818ee084dc52518776b9ce289b8d96f..b319d83b82135cc8ddd6d2a0d00e1e076df58bee 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
@@ -29,16 +29,18 @@ void G4NeutronHPInelasticData::BuildPhysicsTable(const G4ParticleDefinition& aP)
 {
   if(&aP!=G4Neutron::Neutron()) 
      G4Exception("Attempt to use NeutronHP data for particles other than neutrons!!!");  
-  G4int numberOfElements = G4Element::GetNumberOfElements();
+  size_t numberOfElements = G4Element::GetNumberOfElements();
   theCrossSections = new G4PhysicsTable( numberOfElements );
 
   // make a PhysicsVector for each element
 
   static const G4ElementTable *theElementTable = G4Element::GetElementTable();
-  for( G4int i=0; i<numberOfElements; ++i )
-    (*theCrossSections)(i) =
-      G4NeutronHPData::
+  for( size_t i=0; i<numberOfElements; ++i )
+  {
+     G4PhysicsVector* physVec = G4NeutronHPData::
       Instance()->MakePhysicsVector((*theElementTable)[i], this);
+     theCrossSections->push_back(physVec);
+  }
 }
 
 void G4NeutronHPInelasticData::DumpPhysicsTable(const G4ParticleDefinition& aP)
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
index 654269b1b803e332141d0b70780a087238500edb..5f2590851c7c8b1751c24b4a9e8af1c524ed5d2a 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4NeutronHPNBodyPhaseSpace.hh"
 #include "G4Gamma.hh"
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh b/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh
index fc49c127dc7bc2884bc1135f0b45e2cd3d80bf6a..aaf5ca516196aa3b9df64971b002a1e3662e367e 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForRadDecay.hh,v 1.5 2000/06/14 17:51:32 flei Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh
index 746fbc8c245a202ac8e35a5db8747300fe073cb8..de278c49ac2d037e0a143ff374488946fb253747 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.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e92680b9628a003211d27a253b00395bff1fe2c0..d3c226699a4aa2fb9d55e85b57b077d790e44a69 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.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c0781b260874281945b91aeb4f2bfaf5cdd9181b..82e7d9c39220dd8599acfe2c053b63ac2acfade7 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.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e3cd1419af3182054c8d597056b14d21be8a6f82..fd7028ff57f105dde37f7e4259fb18b0e2b7829d 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.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2f6ecd221819e1ad7d7ddc8fd2e145b694030731..1a053e089b76271cc9f610c7203f5876c99f40fc 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 6bf86052efc212313762bf1c7ff225a4a3ee3831..759ad925a8022975d0a131b70453930f84cb7b2e 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2f2975124661871c80c97a05271352b40a43307f..2f1f874017e8281dd12d3e5492b9241ef1190ed9 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 59f11b1d865d0cf504d1ab0f0f28f3a3feb2c6b3..10f60304433e88a79861f392c2877fdee1cbc6f8 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b016053544b95dc9cde01ffa435790aca1efcc27..8ca816404814fce7c9ee73c92fc57ac40dbedd12 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f05224ff0e231cdf1a0ca85407c459b2bdf847a8..3718b50c277eb0c01d9256e6921eca1e987f9d02 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e4c602ca7449d7838b52ebb45b5e3a2420829101..1429fab3bf7bf6b793173b0f0218aea72f51687a 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.4 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 46b1f15520187db28bf260dbdc893f264ef475b6..38364e905efe88f984400df2381d81950bafa2dc 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.4 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 55a5ca8e926b2f10b6d122da597997efb8445d4e..0c83dfd683c1131b39958fb0a127985a95404f7c 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.4 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ef4b8e48f3cb03034ff51b70bddcd1424ddaaaf7..3fbd4cff4e06ed2d90d0d3895156783da7dd35f8 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 34044acf16f54bcb4595d9b440c5d1c12f8cdc69..16f42372e7633dde84b9c51297ee68a99036753f 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0e6cec433baecb93ca3a3563fd51b0cac5da3af4..b769244b17f010d85cc88530c7b53058355430ff 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 62b06055d219ae46b8534d2fbed7220bc70f7074..7280063beae7ef29e33082fe82362d9f1f5a4ba4 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0e99d45dca677b66dff515f90dcf28963de2cd19..1d716c81857993eb2e7c130bd2e401352ec26994 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5a323483d5f85144f877a525e481a50cd55ffdbe..5596af3ff557948d013490cdda409575148f0aea 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 74f5b9d172823c6142348e68a0ec1bc75b074ebd..3e35dd07cfa17d928de808d20b19db62ea6ff008 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 1c65ba5fc90b35138a4c01efc3e72185d508b38f..715d33f8bc73957f943f212e0db28bbd91245669 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e58b3cea70bf64d2566136fbaf33900420fe6285..e40d7e015d4877f2eb56e1e2bbd355499d32885b 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 bd26d4c6b637e5dbc9a239659359833a486dd84e..157d9caa9be4fb163e757c41f8544d8fc414f260 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 82c372e3d7197469e48ad29f78faf4a772846fe3..db8dd42bc0b902002bfff056917bd3506164fed8 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 12ad64b7c414919173a83b1e2b34fb66d5610e90..a9859d130b018ec8bbc1483a574c9b22210d6881 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0b89664da960aae9022bb8efc9cfe304e8514bbb..c173c37d7cc57e9027c03887b3ab11d67ec1dd37 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b7d590ef0d81f6ae1455d02e2efa855d5779efc8..f63ef15fd1dab4d9c331ec89c581837d64a380c1 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ea31cc99ed960b1a65ea2742de61abb07a3eaf3e..7eebc4cf0be2954095029655c98b40360cb2d32f 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.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 62478406e897a1325cd0a35bdd3262a5091dc0b9..350b346993152166d276a1ff8a2fde6db9214dc8 100644
--- a/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronCaptureProcess.cc,v 1.2 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Process: Low-energy Neutron Capture
diff --git a/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc b/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
index 2b2756eb19c220581c266c9fec9531dd23ed6d82..97a3f82f0f8b616a5a6f92f27df8da6a64be4ed6 100644
--- a/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronElasticProcess.cc,v 1.2 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Process: Low-energy Elastic scattering
diff --git a/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc b/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
index 0b93a993c2711481b1a750c3c431f2b98021901d..9fbb2d9b2519527376f06bd1723bd076979307c6 100644
--- a/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HadronFissionProcess.cc,v 1.2 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // F.W. Jones, TRIUMF, 03-DEC-96
diff --git a/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh b/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh
index f57b0047ec07831ff6dfaf8b432e64815c73085d..4f41779c2fd4c44f57d7dea19807db7cbf3fe2fb 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.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 594989bee14c58bc45d6106d0b66b3bf26d3e208..4c4e74ea7b705a65c9bb67772d7b4372071c6946 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.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7ebb24ceb8d3546b166389565e1650b3e22c3947..973c32698d18862c210685ed0d73c87e5198305c 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.3 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b473a056eab7b79f8ddd8ce73223e3d2c5f34540..50c340169416edb5e7238ef1c02b4da13e62c448 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.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 09166c27476913752368a9f6ac28afb7e68a4f4c..823d566ebd00f3fee496f508b05c5dea8a6475d1 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.4 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 506dfccf1ebb1a0b8c71e76bed7a8639936a7967..50dedfc683be54fbdcd897604fb0b27f1cf95c36 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.4 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 74d70118196f9635f6c8e792dd273c319bebbb67..e2a1433e63146191887f2e4d5707ad7d617b0742 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.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 39e7dfa23544244e2de590ccf2171f0638ea8703..ce5fb9fd6e984f91a564c67fd3f78391657bcf3d 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.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d9538d5101d698e287b5a67db22b100e3fc513b4..1445fc669f0325533e6adb9f0a6309fb9e621b94 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.4 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 68594ea6f7f42e2fa6ffa35076c666e580ab6ea9..a55c95767233ccd392fa87941ecfd0b5545fc269 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e8ad773649b9676e79ca1f76d64ff8f1bb76f2a1..178bc361e39cbf9c603640fbb92bbe96810dc7ba 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c2d49182f96faa113b9909edc0a94fc2a48b5ead..483ed4fcc577fa1b40c17e101f9f9c37c3c13b58 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 9738c1508d6ce1fdc4843e2d144cee5c71aad15e..7f0fa7a5acf5147afc322bc88d9d90a2ee9b85bc 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 0d034ed9294bd80c182d98246da5427e3c5b6f45..351b24b054ca0af21eb1caf747575d44ad982862 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 32cde15e3ea5243ce5eb756c23d34fd0e2d99a00..4a5194a6f37ddc8879ca4d609f632afce8cc9eeb 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 05215b516826395b3d2c45360a32282e20ef3ea6..35eabaaafdea26a3554f1537a18405c728f44b16 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e0cad6dd3ed3b5570701b44ec3e0e92a9e231b35..ce18473827b9ad6ff844a6cd87dbee888cf1e6e5 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f82e14d8b30720ca29991c397847dd343cf6add3..1a0cb0e1891af63db61ff01ae2546097b1b7480b 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 10954f133076a0965dfaa7a249ce74c118dec188..7722e33e013cbc781b1ab3c751068b47af1ef3d6 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.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 06bbdc631015fe266f51c66657bf6c52229b686d..ad8863d61e1f8182ae03339e5578e2d44ce4e50e 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c29c0483a14ae00c5fbc3bafd1543da2f52f3ac1..088fdbff23acfb03355919404b9ae4db4cc157f7 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d1ed6d37a4feafae4179c58ec8088423cfb16e99..8b64613184418a622c7420873f7b986c65cbe41f 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7a232c0484cd6c5d3ed5fb372a9fa24bd84b8de7..0f4c78ce97a369df9dddba345febf838782c1724 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.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 20cd7edf9b900a2831a28c8e328fa3004155e9e4..2a74240300c929b23bea08bad6da12570a5f0393 100644
--- a/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiNeutronAnnihilationAtRest.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc b/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
index 2ff14c10389ce8ecfb5d166b76274179e0ede394..29204cbe933b06f28a6c71e0af91ee6822a13e4d 100644
--- a/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4AntiProtonAnnihilationAtRest.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc b/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
index 920984a6fcbc1cee09402fd025a6f8618b59e112..f53e31735855ca352145b9677ccb4fb7589b47f4 100644
--- a/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
+++ b/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DistributionGenerator.cc,v 1.4 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
index c34a496b3def96003e62ecee6ddb96e0d749e3ec..2e598c35a54a1abd541fcec27ff50ccf38450670 100644
--- a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
+++ b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4KaonMinusAbsorption.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
index 57f346622310e7af27ed6a66395759243473ab96..ab7ff12e8e375123d057ffeb1455c5cb872f0da6 100644
--- a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonMinusCaptureAtRest.cc,v 1.5 2000/07/12 09:19:53 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc b/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
index e719905852640155e0644b8e88e9d89a69f6e4f6..f4b621766e3c68dceb99b0617c0a27821f784515 100644
--- a/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NeutronCaptureAtRest.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc b/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
index 003166cb6a8169825a928c868d66740190dc25c9..9237b10d732282234ae4ef4da20cbf0c8e7d5283 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusAbsorptionAtRest.cc,v 1.4 1999/12/15 14:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
index f037346d4b4c250e7311e063bf24bd14e53da45d..4f96c0aaf64bc0deb5e6be70bd97087b37cfe5bc 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopAbsorption.cc,v 1.6 1999/12/15 17:51:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc
index 2b432cd580d7dc0821f41329181aa55a3699148d..4d24df399317eaeb6060ad10c320fea550aedfd0 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.4 2000/04/18 17:18:36 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 75b584b1f63077118f425946940955e1fae69fe3..e908fc147d867ec2ca429e1c7e684b0c1753d556 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.4 2000/04/18 17:18:36 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 c34cf113cf5dd3a7c62c815e07b53cf3444ce2f3..e09996e59fb21db3f6e6e8828a792d8408e6a273 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.4 2000/04/18 17:18:36 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 1d34cc00c527910a8205910efb96eda88c144fc6..baeffa8dc4c78bc9308f3b6fff69f3e7e8f87b2d 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.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8d6aabaf716d286598c6e34b8bc29015b5d164d9..7d4f1851a145a6d22d975e6a4b89b9b79d0b6e2d 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.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 22ebdd203a3a921ccb7f263e6bfdae58e2b35521..be851e3e946dd737476a896b37b0f1025f6cfb15 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PiMinusStopMaterial.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc
index 44e4fc80eb986cc5e03c6f5b2d15fa191b736b98..88e972cda4505ede49f1fb38f22c12e7bef82613 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.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 355c31a677583ce62556b9d93199e7271b2c2977..ff07f61322ecae9bb2725047c13c9eb3d3c490e4 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.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 18e106a985bdc289af5a9a027d07fd6a9815838f..1abad6d28c9cd47803bfa59e043791429c740331 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.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 f0f004d0f54e36709d280d9f07f6ecddbf74c04d..8621652ba62dc36a130c3735eeb4dfd75bfb8263 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.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d8a97f7d86be53a364235e1d51699f6e3d3acc5e..a047b27140bc29e5b4c03cfacfea8729f2a15417 100644
--- a/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PionMinusAbsorptionAtRest.cc,v 1.2 1999/12/15 14:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc b/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc
index add08ba30344d460c6a2266f4e9266d45bac4333..22e3e39718a08f300a46760c487e5fda99f16b76 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.4 1999/12/15 14:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 e0be226c0eb7df518198947d41407cc89cbbc413..9e09ae254876a2d51cc80b611c193075b1e01c37 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.4 1999/12/15 14:53:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a123c988c45cf9b48af49ef4f4d43e6a3c695346..b6b8efc955b10f8a43b44c1b7d31cf0d915d7d39 100644
--- a/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
+++ b/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4StopTheoDeexcitation.cc,v 1.4 1999/12/15 14:53:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/util/include/G4DynamicParticleVector.hh b/source/processes/hadronic/util/include/G4DynamicParticleVector.hh
index 9a03a45ba8448ffa83234ce6b7678630e82eb216..e7ec8f789d92e793c83b41edaac78c461f58c844 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.3 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 b58f46be121ced1cc779e742903fe4930bce5a0d..86be05e8b3feb330843960b1db5fd75621101599 100644
--- a/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
+++ b/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GHEKinematicsVector.hh,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
diff --git a/source/processes/hadronic/util/include/G4LightMedia.hh b/source/processes/hadronic/util/include/G4LightMedia.hh
index eda814d7bf36bba39ab6eab081c6fb5714a9d014..4bd54f3b07d6e83460b657efa63442a2428ca48f 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.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a8aa1f1217b297471f87db6f532edda1ef718f6b..dd02cbaa08daf3ca5585f0f052a7cd1e4dee3d7e 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.3 2000/12/14 08:56:46 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a4b390a2b4415ae79a8f66ae947187e9b8b69411..8e9e607a66c7ab1c049c94f434f7d79ad5d61ab3 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.3 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 64c874f5d3a759f460f6d9fb1ff091bf51612841..9a092abd24f2a47e2ae62459d852574a36e6983f 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.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ddd2456b1c16674da902afe619eb66f5623bbe89..4540e9d6c3c59ad6323d7b8e8ede79d7906c2070 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.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 af629f944a0d2fb42a0445d410d50ff49d408e96..22bacb45a0d4b4a9b6383a2a57ac4229e14fcfb8 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.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a1bfab19c34f63da1ec1cccf173e8b0e7afa03ee..4d99ea4b7d57c5499a43cfa04e10f79ff5ad0bef 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.3 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 77a146d617c4f961aad930818a2f80e45b4970ba..002150be1cedd31b1536e0fa350f069791e3d58c 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.4 2000/12/14 08:56:46 hpw Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 75aecaf5f37996fd32db98a555e05ab0f4c02db1..1773e45c79a82fc6675e5775cd10c8e6ee602e23 100644
--- a/source/processes/hadronic/util/src/G4LightMedia.cc
+++ b/source/processes/hadronic/util/src/G4LightMedia.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LightMedia.cc,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Process: Light Media Charge and/or Strangeness Exchange
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/util/src/G4Nucleus.cc b/source/processes/hadronic/util/src/G4Nucleus.cc
index 3fc1601c8ec4a144c2bbc3f19b6f4b5f03934040..18f2fc312b552c58f7d3f8a069b9e536422fdf2d 100644
--- a/source/processes/hadronic/util/src/G4Nucleus.cc
+++ b/source/processes/hadronic/util/src/G4Nucleus.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Nucleus.cc,v 1.5 2000/08/03 08:50:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
  // original by H.P. Wellisch
  // modified by J.L. Chuma, TRIUMF, 19-Nov-1996
diff --git a/source/processes/hadronic/util/src/G4ReactionKinematics.cc b/source/processes/hadronic/util/src/G4ReactionKinematics.cc
index a96d465e7f481a8548f3f94a85a972dc325d4c11..b8297faed2846c0be2eea94f5d8c3c2535452a6a 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.2 1999/12/15 14:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //      CERN Geneva Switzerland
 //
diff --git a/source/processes/hadronic/util/src/G4ReactionProduct.cc b/source/processes/hadronic/util/src/G4ReactionProduct.cc
index 878f54bbf2a6ab951bae6132cbee19af64d1de1e..8a576639a87ecdce641b47a6cadb4fe05c97260b 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.2 1999/12/15 14:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 d0ed6025724ef2d896eba8339ea74c5015880002..13855fcee350460cff66907d67b4915c30bd373c 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.2 1999/12/15 14:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4StableIsotopes.hh"
 
diff --git a/source/processes/management/History b/source/processes/management/History
index a197def6b2df2313140f5de82da3028f9383f9b0..5c34bbc06d6bfd309149cae31ea31440035a7699 100644
--- a/source/processes/management/History
+++ b/source/processes/management/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.15 2000/11/08 00:47:20 kurasige Exp $
+$Id: History,v 1.16 2001/03/12 06:39:21 kurasige Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,10 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+- Mar. 12, 01  H.Kurashige (procman-V03-00-00)
+- Modify Store/RetrievePhysicsTable methods 
+  (add a bool argument to specify ascii/binary mode)  
+
 - Nov 08, 00    H.Kurashige (procman-V02-00-01)
 - Added  Store/RetrievePhysicsTable (virtual) methods
 
diff --git a/source/processes/management/include/G4IVContinuousDiscreteProcess.hh b/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
index c760e79f4d17bccf5624370c82682da3783c125d..27b53a192021b1a55f58509d8b46d793c0dd48b4 100644
--- a/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IVContinuousDiscreteProcess.hh,v 1.6 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4IVRestDiscreteProcess.hh b/source/processes/management/include/G4IVRestDiscreteProcess.hh
index 0181b764240655793bd39a7159e5c84000afbb15..cfe38ca708ba1143d0af72148181db36b09533c6 100644
--- a/source/processes/management/include/G4IVRestDiscreteProcess.hh
+++ b/source/processes/management/include/G4IVRestDiscreteProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4IVRestDiscreteProcess.hh,v 1.6 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ParticleTypes.hh b/source/processes/management/include/G4ParticleTypes.hh
index d582770b3d919ac6997639dfacc6b28a88325b8c..cc4fd76de6b5cb577268e88bc60fe7e63c62774a 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.4 2000/02/25 10:11:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcTblElement.hh b/source/processes/management/include/G4ProcTblElement.hh
index 747f88488542d01d4e1105402658ea21f553fe35..85b370477af4489f51a34f12edda12899025879e 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.8 2000/11/03 03:44:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcTblElement.icc b/source/processes/management/include/G4ProcTblElement.icc
index 0e2b0c979815e6f2a249f5943714f676d9f32a18..6ab0957cec46de2e149ef52c35750fc2143a01d8 100644
--- a/source/processes/management/include/G4ProcTblElement.icc
+++ b/source/processes/management/include/G4ProcTblElement.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcTblElement.icc,v 1.5 2000/03/02 01:45:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessAttribute.hh b/source/processes/management/include/G4ProcessAttribute.hh
index c1b0a6d7f3158a21f83960a926c5bb392acc1cf4..a7bf6d0e81f70ed7cb87f512c060891115d17e0c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessManager.hh b/source/processes/management/include/G4ProcessManager.hh
index fbc2564a4d14fb93703ab1b10c58446ed57ca9b6..ddaeea61b6a49eb22bc398a1da7e11cb62ccba56 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.7 2000/03/02 01:16:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessManager.icc b/source/processes/management/include/G4ProcessManager.icc
index a7b794b72bdeed572ed21706811a2d3676b0c1de..b25a8eda9a508245b372214ae07b7449b4faa592 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.2 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/processes/management/include/G4ProcessManagerMessenger.hh b/source/processes/management/include/G4ProcessManagerMessenger.hh
index 09949a1641db4c3739a8037ae702a9990cbc7e44..7efce5bed530d21ce6ff35cdf16cc899325a3f43 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessTable.hh b/source/processes/management/include/G4ProcessTable.hh
index bb7121dde13fcbfd04d30075f1e93551735ea9ea..baf06d93c94735588f0d10d42b53943674b3ee48 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.6 2000/03/02 01:16:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessTable.icc b/source/processes/management/include/G4ProcessTable.icc
index 513e77ade086ea3e8322c91b4e0bc51478ac6e33..f6950e5cbab888a8b61c1ef9def42726b036ac6a 100644
--- a/source/processes/management/include/G4ProcessTable.icc
+++ b/source/processes/management/include/G4ProcessTable.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessTable.icc,v 1.3 2000/03/02 01:16:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  History:
 //   Use STL vector instead of RW vector    1. Mar 00 H.Kurashige
diff --git a/source/processes/management/include/G4ProcessTableMessenger.hh b/source/processes/management/include/G4ProcessTableMessenger.hh
index 3059e0a943c7e3f00b49c2d21ebb37df8ce518f8..6f48e7262f5a55ec986c7a421e6c5ba95cdb819c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessType.hh b/source/processes/management/include/G4ProcessType.hh
index 8101aae60714ff8ab9247d32870d191c8abdd442..2562fe0aac3c806c5ba301bd069119a336fdb959 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessVector.hh b/source/processes/management/include/G4ProcessVector.hh
index c190fbcb68d8b4800c31dd920cefb62807cc1d5c..985d3758d3fafc0564ed7c34c690dbd17fedcd22 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.6 2000/11/03 03:44:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessVector.icc b/source/processes/management/include/G4ProcessVector.icc
index 6d439894b5bdbf0a236c9913c4c61631da7dc104..49fe960adb47eb93da632af0723eb5cb633601e7 100644
--- a/source/processes/management/include/G4ProcessVector.icc
+++ b/source/processes/management/include/G4ProcessVector.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessVector.icc,v 1.1 2000/11/03 03:44:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 inline G4bool G4ProcessVector::operator==(const G4ProcessVector &right) const
 {
diff --git a/source/processes/management/include/G4VContinuousDiscreteProcess.hh b/source/processes/management/include/G4VContinuousDiscreteProcess.hh
index a56892103aeb535b59a9cf9e6c142ea00878e0a1..4cbdec7975687f4fbf9151b85249061d52723a6e 100644
--- a/source/processes/management/include/G4VContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4VContinuousDiscreteProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VContinuousDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VContinuousProcess.hh b/source/processes/management/include/G4VContinuousProcess.hh
index 1dda748321d6e482f551815d3c7b29525a9a14ec..d0fee7adb363b4b5031bc59a87172030c4721f88 100644
--- a/source/processes/management/include/G4VContinuousProcess.hh
+++ b/source/processes/management/include/G4VContinuousProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VContinuousProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VDiscreteProcess.hh b/source/processes/management/include/G4VDiscreteProcess.hh
index 7eb05263d1825e3f5b6f3a890c5effa9f8650a43..1974d276f83b8ae3810f51671063b4abf731f962 100644
--- a/source/processes/management/include/G4VDiscreteProcess.hh
+++ b/source/processes/management/include/G4VDiscreteProcess.hh
@@ -7,7 +7,7 @@
 // and all its terms.
 //
 // $Id: G4VDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VProcess.hh b/source/processes/management/include/G4VProcess.hh
index 0ffda3be9a08bb41512f081e2a2ab01b38f1367d..f69364ef097ff4bafe4b66c90fef29cfb72df9d5 100644
--- a/source/processes/management/include/G4VProcess.hh
+++ b/source/processes/management/include/G4VProcess.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VProcess.hh,v 1.7 2000/11/08 00:47:23 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VProcess.hh,v 1.8 2001/03/12 06:39:22 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -32,6 +32,8 @@
 //   Remove thePhysicsTable       2 Aug. 1998   H.Kurashige
 //   Add PILfactor and GPIL       3 Nov. 2000   H.Kurashige
 //   Add Store/RetrievePhysicsTable 8  Nov. 2000   H.Kurashige
+//   Modify Store/RetrievePhysicsTable methods 9 Mar. 2001   H.Kurashige
+
 #ifndef G4VProcess_h 
 #define G4VProcess_h 1
 
@@ -196,11 +198,15 @@ class G4VProcess
       // function. Not another BuildPhysicsTable, please.
 
 
-      virtual G4bool StorePhysicsTable(const G4String& directory){return true;}
+      virtual G4bool StorePhysicsTable(const G4String& directory, 
+				       G4bool          ascii = false)
+                                      {return true;}
       // Store PhysicsTable in a file. 
-      // (return false in caase of failure at I/O ) 
+      // (return false in case of failure at I/O ) 
  
-      virtual G4bool RetrievePhysicsTable(const G4String& directory){return false;}
+      virtual G4bool RetrievePhysicsTable(const G4String& directory, 
+				          G4bool          ascii = false)
+                                      {return false;}
       // Retrieve Physics from a file. 
       // (return true if the Physics Table can be build by using file)
       // (return false if the process has no functionality or in case of failure)
diff --git a/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh b/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
index 1e4c0dd221f988c810ae9adba60d2584b584c1dc..673d394cf2365e21259d6202a4996bf88fc1373f 100644
--- a/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestContinuousDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VRestContinuousProcess.hh b/source/processes/management/include/G4VRestContinuousProcess.hh
index b1f11c045b2cde6e4a83bba2149e9364bf143de5..63da0f24f4e33022e6bd0da88a0b3a0f017adc98 100644
--- a/source/processes/management/include/G4VRestContinuousProcess.hh
+++ b/source/processes/management/include/G4VRestContinuousProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestContinuousProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VRestDiscreteProcess.hh b/source/processes/management/include/G4VRestDiscreteProcess.hh
index da4cc4457a128103df28706735348a3739c07f50..cd0e2dae9ec6e2b6c2e319af06ed33bc6236683b 100644
--- a/source/processes/management/include/G4VRestDiscreteProcess.hh
+++ b/source/processes/management/include/G4VRestDiscreteProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4VRestProcess.hh b/source/processes/management/include/G4VRestProcess.hh
index a49bc0483dbdff762c91935401fa18ce3c15a530..5f6d3f11641ca8e2bab64a0f20856bf433728de7 100644
--- a/source/processes/management/include/G4VRestProcess.hh
+++ b/source/processes/management/include/G4VRestProcess.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRestProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4IVContinuousDiscreteProcess.cc b/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
index bef6dc6f15b5780b0abb7d1c62aae359f5973918..fa25ae659a842849335753b1eef8344e8374bd1f 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.5 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4IVRestDiscreteProcess.cc b/source/processes/management/src/G4IVRestDiscreteProcess.cc
index 8994f39d2e4c36512a1e66cb59d702943d447306..f30a962fe564dcb55da2a57a86f536402650b78b 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.5 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcTblElement.cc b/source/processes/management/src/G4ProcTblElement.cc
index 8e336cc054b9fff3fdbb26ac03040b0a21d73cf6..b10f2dca4ed26929d3bd8a1680640bc8fb0b7326 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.5 2000/11/03 03:44:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessAttribute.cc b/source/processes/management/src/G4ProcessAttribute.cc
index aefed1dbc3eb53df6f9ad1dd3bdb56862fed5a0c..ee0d4960bc3a8932e68872785038ade42e7138aa 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.3 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessManager.cc b/source/processes/management/src/G4ProcessManager.cc
index da45e5c788fb923a9b02e09b4540399b2c6373d5..ac977f46d5560690cc0acc90c22a8f05210f99d7 100644
--- a/source/processes/management/src/G4ProcessManager.cc
+++ b/source/processes/management/src/G4ProcessManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessManager.cc,v 1.16 2000/06/15 15:34:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessManagerMessenger.cc b/source/processes/management/src/G4ProcessManagerMessenger.cc
index dc3209f15cfe53509a2943ae923bb1b761af815e..4edc8a6b345ab51401ff748ed7e1799248d27024 100644
--- a/source/processes/management/src/G4ProcessManagerMessenger.cc
+++ b/source/processes/management/src/G4ProcessManagerMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessManagerMessenger.cc,v 1.4 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessTable.cc b/source/processes/management/src/G4ProcessTable.cc
index ed987a2b0d8eaa27f4fff947effb00858eb68b06..9b9f24757659c346e65940be11ba1dc957ca7ae0 100644
--- a/source/processes/management/src/G4ProcessTable.cc
+++ b/source/processes/management/src/G4ProcessTable.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessTable.cc,v 1.6 2000/11/03 03:44:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessTableMessenger.cc b/source/processes/management/src/G4ProcessTableMessenger.cc
index 2914436d0bff42c661d8f53c16bc07195702a0bc..fed9bc2b9a762d13bf546afbfa306241cb72b95a 100644
--- a/source/processes/management/src/G4ProcessTableMessenger.cc
+++ b/source/processes/management/src/G4ProcessTableMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessTableMessenger.cc,v 1.7 2000/03/02 01:16:06 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessVector.cc b/source/processes/management/src/G4ProcessVector.cc
index 04959d5284dfe0ec34ea723af60f7831724acb8b..5d4f7c2b0ed15c2c9e88cda1d903f60b8a3ca4e0 100644
--- a/source/processes/management/src/G4ProcessVector.cc
+++ b/source/processes/management/src/G4ProcessVector.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ProcessVector.cc,v 1.2 2000/11/03 06:15:34 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4VContinuousDiscreteProcess.cc b/source/processes/management/src/G4VContinuousDiscreteProcess.cc
index 6db650733f89f472f31b4a829da6b4ee7b42d73a..b17d4b05d895c9fea79ddbf1e1c09df2fe784219 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.2 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VContinuousProcess.cc b/source/processes/management/src/G4VContinuousProcess.cc
index 0308b8e141dc273ff94ff84bd9a14f463544a7eb..67341812673159e80e35ea14e2d932a28301f16b 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.2 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VDiscreteProcess.cc b/source/processes/management/src/G4VDiscreteProcess.cc
index 65d0e2ec898958fb5d3ad4412a729c242def947d..bb2a9c9125667ecfcb2f9226906b093963fee147 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.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VProcess.cc b/source/processes/management/src/G4VProcess.cc
index 082b1519fc6f3e5dc7a7fa06a5db9e2bc2d5ce71..9d8461fb077dcad63aa0a1f52196a368e5d32770 100644
--- a/source/processes/management/src/G4VProcess.cc
+++ b/source/processes/management/src/G4VProcess.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VProcess.cc,v 1.5 2000/11/03 07:09:31 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc b/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
index fe5854ea0f4ffb57f4292c36da130be0bfdd2bbb..9e087fb11a2f0057ec3132896e2a71ab7df34c6e 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.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestContinuousProcess.cc b/source/processes/management/src/G4VRestContinuousProcess.cc
index d3417f13bc2e26c5aaad0725bce5c0f989cb7ea8..dce8559a571692c807ed9f126dcf84da720f47e6 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.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestDiscreteProcess.cc b/source/processes/management/src/G4VRestDiscreteProcess.cc
index d387ee52698689443b06eb74b28c17bb26881f3d..5fea69564207086fe1517c4b45244461d1796790 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.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestProcess.cc b/source/processes/management/src/G4VRestProcess.cc
index d112f856e2f204b95971a912a74c324cd6404feb..646909f3dde8f3eeb06b56b8593f22db45429e80 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.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/processes/optical/History b/source/processes/optical/History
index 28e77c51008f1b874c8353fafef2d54b48f8df4c..effacdd80b7addc2e244f9f4a0590b2179d6cfa5 100644
--- a/source/processes/optical/History
+++ b/source/processes/optical/History
@@ -16,6 +16,20 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+30th January 2001 Peter Gumplinger (op-V03-00-05)
+- G4OpRayleigh.cc: allow for positiv and negative CosTheta and force the
+                   new momentum direction to be in the same plane as the
+                   new and old polarization vectors
+                   still bug report: 207
+
+29th January 2001 Peter Gumplinger (op-V03-00-04)
+- G4OpRayleigh.cc: fix calculation of SinTheta from CosTheta
+                   bug report: 207
+
+23rd January 2001 Peter Gumplinger (op-V03-00-02)
+- G4OpRayleigh.cc: Allow for Rayleigh scattering length to be defined for 
+           arbitrary material through the use of G4MaterialPropertyTable.
+
 5th October 2000  Peter Gumplinger (op-V02-00-02)
 - G4OpAbsorption.cc: Comment out warning - No Absorption length specified.
 
diff --git a/source/processes/optical/include/G4OpAbsorption.hh b/source/processes/optical/include/G4OpAbsorption.hh
index ce9ec0f1ecd1c44f490826cd33f573e36959ea6f..3d32f35a5fb28f798addc2ae7d24e987a0796602 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.5 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon Absorption Class Definition
diff --git a/source/processes/optical/include/G4OpBoundaryProcess.hh b/source/processes/optical/include/G4OpBoundaryProcess.hh
index 598952a996ab4ad328678dbd4356c731b0b3067b..2052b5f4da997afeac4c775b9440329c1ba2c6b9 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.5 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/optical/include/G4OpRayleigh.hh b/source/processes/optical/include/G4OpRayleigh.hh
index d641dd78dc85decbc69b57b77fb166e7a372222f..fc2070ae5accfcad5ce84e15c6d93eeb9712eaf8 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.4 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/optical/src/G4OpAbsorption.cc b/source/processes/optical/src/G4OpAbsorption.cc
index 1148ee6779efdf144668cd1821de0af28e9cd1f5..4ce15194a00b23e59ca1fcc5b8ba55ff1d0de47b 100644
--- a/source/processes/optical/src/G4OpAbsorption.cc
+++ b/source/processes/optical/src/G4OpAbsorption.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpAbsorption.cc,v 1.3 2000/09/19 03:19:17 gum Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon Absorption Class Implementation
diff --git a/source/processes/optical/src/G4OpRayleigh.cc b/source/processes/optical/src/G4OpRayleigh.cc
index b4fc91259083dd104ee77db709f5e91e464af56f..1c8d80c85b739c1f5e5276684316bee3286c2d41 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.2 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpRayleigh.cc,v 1.5 2001/01/31 04:08:12 gum Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -19,7 +19,13 @@
 // Version:     1.0
 // Created:     1996-05-31  
 // Author:      Juliet Armstrong
-// Updated:     1997-04-09 by Peter Gumplinger
+// Updated:     2001-01-30 by Peter Gumplinger
+//              > allow for positiv and negative CosTheta and force the
+//              > new momentum direction to be in the same plane as the
+//              > new and old polarization vectors
+//              2001-01-29 by Peter Gumplinger
+//              > fix calculation of SinTheta (from CosTheta)
+//              1997-04-09 by Peter Gumplinger
 //              > new physics/tracking scheme
 // mail:        gum@triumf.ca
 //
@@ -101,7 +107,9 @@ G4OpRayleigh::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
 	G4double rand = G4UniformRand();
 
 	G4double CosTheta = pow(rand, 1./3.);
-	G4double SinTheta = 1.-CosTheta*CosTheta;
+	G4double SinTheta = sqrt(1.-CosTheta*CosTheta);
+
+        if(G4UniformRand() < 0.5)CosTheta = -CosTheta;
 
 	// find azimuthal angle w.r.t old polarization vector 
 
@@ -120,35 +128,24 @@ G4OpRayleigh::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
         // Rotate new polarization direction into global reference system 
 
 	G4ThreeVector OldPolarization = aParticle->GetPolarization();
+        OldPolarization = OldPolarization.unit();
 
 	NewPolarization.rotateUz(OldPolarization);
+        NewPolarization = NewPolarization.unit();
 	
-        // -- new momentum direction is normal to the new polarization
-        // vector (components below expressed in reference system where
-        // new polarization vector is aligned with the z axis)
-
-        SinTheta = 1.0;
-        CosTheta = 0.0;
-
-        rand = G4UniformRand();
-
-        Phi = twopi * rand;
-        SinPhi = sin(Phi);
-        CosPhi = cos(Phi);
-
-        unit_x = SinTheta*CosPhi;
-        unit_y = SinTheta*SinPhi;
-        unit_z = CosTheta;
-
-        G4ThreeVector NewMomentumDirection(unit_x,unit_y,unit_z);
+        // -- new momentum direction is normal to the new
+        // polarization vector and in the same plane as the
+        // old and new polarization vectors --
 
-        // Rotate New momentum direction vector into global reference system 
+        G4ThreeVector NewMomentumDirection = 
+                              OldPolarization - NewPolarization * CosTheta;
 
-	NewMomentumDirection.rotateUz(NewPolarization);
+        if(G4UniformRand() < 0.5)NewMomentumDirection = -NewMomentumDirection;
+        NewMomentumDirection = NewMomentumDirection.unit();
 
-	aParticleChange.SetPolarizationChange(NewPolarization.unit());
+	aParticleChange.SetPolarizationChange(NewPolarization);
 
-	aParticleChange.SetMomentumChange(NewMomentumDirection.unit());
+	aParticleChange.SetMomentumChange(NewMomentumDirection);
 
         if (verboseLevel>0) {
 		G4cout << "New Polarization: " 
@@ -215,14 +212,36 @@ G4double G4OpRayleigh::GetMeanFreePath(const G4Track& aTrack,
         G4double thePhotonMomentum = aParticle->GetTotalMomentum();
 
         G4double AttenuationLength = DBL_MAX;
-        G4bool isOutRange;
 
-        if (aMaterial->GetName() == "Water")
-        {
-                AttenuationLength =
+        if (aMaterial->GetName() == "Water") {
+
+           G4bool isOutRange;
+
+           AttenuationLength =
                 (*thePhysicsTable)(aMaterial->GetIndex())->
-                                GetValue(thePhotonMomentum, isOutRange);
+                           GetValue(thePhotonMomentum, isOutRange);
         }
+        else {
+
+           G4MaterialPropertiesTable* aMaterialPropertyTable =
+                           aMaterial->GetMaterialPropertiesTable();
+
+           if(aMaterialPropertyTable){
+             G4MaterialPropertyVector* AttenuationLengthVector =
+                   aMaterialPropertyTable->GetProperty("RAYLEIGH");
+             if(AttenuationLengthVector){
+               AttenuationLength = AttenuationLengthVector ->
+                                    GetProperty(thePhotonMomentum);
+             }
+             else{
+//               G4cout << "No Rayleigh scattering length specified" << G4endl;
+             }
+           }
+           else{
+//             G4cout << "No Rayleigh scattering length specified" << G4endl; 
+           }
+        }
+
         return AttenuationLength;
 }
 
diff --git a/source/processes/parameterisation/History b/source/processes/parameterisation/History
index 68549f74c55e881910af9d7d7f2a0f7ae0a3dc63..bf412696da4fdd59aee3e882bbd61ba824454091 100644
--- a/source/processes/parameterisation/History
+++ b/source/processes/parameterisation/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.11 2000/11/14 16:14:18 gcosmo Exp $
+$Id: History,v 1.12 2001/04/03 15:26:42 japost Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,9 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Apr  3, 2001 J. Apostolakis - param-V03-00-00
+- Modified G4FastSimulationManagerProcess call to PropagatorInField ComputeStep
+   to use new interface with G4FieldTrack (in place of now obsolete interface.)
 
 Nov 14, 2000 G. Cosmo - param-V02-00-01
 - Moved specific parameterisation models to the new top category
diff --git a/source/processes/parameterisation/include/G4FastSimulationManager.hh b/source/processes/parameterisation/include/G4FastSimulationManager.hh
index 776f36f8e5fbaa81bb4daef66301fae1033f4d23..fbf1e280fb6db9f9114c20fd2d34fc5745108e52 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.6 2000/05/30 08:30:31 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh b/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
index 1114460c3feec8233aa82fe308ebc413eea58b7d..b2a91277313f5af826cf1a8863926d274087fc31 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.7 2000/05/30 08:30:32 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastSimulationMessenger.hh b/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
index a5aa4f60ba8f917a7285f0bd6c6efd69074f9cf4..14da16a74b35c598b228baed874fbe866c4c3d2c 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.3 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/processes/parameterisation/include/G4FastStep.hh b/source/processes/parameterisation/include/G4FastStep.hh
index 65ccd28f54321260c37ca34fffb2c7817dbb3faf..4e41de1523c51e771fb68c1cb4a99255a4c63693 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.5 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastStep.icc b/source/processes/parameterisation/include/G4FastStep.icc
index 885be91d075d6f73b64712f6d8ae100c1f3ae86d..328b05d7978ba49f2aea721aa434a5d405378312 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.2 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 db25400cd29a6eaebaae7bb7b314fbf3941ce988..924694106a4be619c45c596c88a00a6756ef7a21 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.4 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id:
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh b/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh
index 09ecd168d7435053b5a1b0b9b3b56d6feaadb587..b0734db810b7e1475ae27b2d28e26086bfcf3c23 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.4 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh b/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
index 9db9501f10838b3ca8f7d8aad1248fadb408341f..b45d9b1ed9f2c4ef802d30ec184f4f9e02e76fc7 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.7 2000/05/30 08:30:35 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4VFastSimulationModel.hh b/source/processes/parameterisation/include/G4VFastSimulationModel.hh
index 9511242394ca723ebf7a7a602467fb149a7498d2..e7515d040abc16844ae17b59f9ba6630fee24cb8 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.3 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/src/G4FastSimulationManager.cc b/source/processes/parameterisation/src/G4FastSimulationManager.cc
index d988564f33fe42b22f42835b007670709ac69f75..1da30b43a1987ad9924da6befc06b0700a1999a9 100644
--- a/source/processes/parameterisation/src/G4FastSimulationManager.cc
+++ b/source/processes/parameterisation/src/G4FastSimulationManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastSimulationManager.cc,v 1.4 2000/05/30 08:30:35 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc b/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
index 6418e5642789130fde6817801f45af378db21257..bd3f53a793cfe2001496862e1db2155bc4c429d3 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.4 1999/12/15 14:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4FastSimulationManagerProcess.cc,v 1.5 2001/04/03 15:24:14 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -367,9 +367,21 @@ G4double G4FastSimulationManagerProcess::AlongStepGetPhysicalInteractionLength(
 						 track.GetDynamicParticle()->
 						 GetMass());
 
+	      G4double restMass= track.GetDynamicParticle()->GetMass(); 
+	      G4ThreeVector spin  = track.GetPolarization() ;
+	      G4FieldTrack  aFieldTrack =
+		G4FieldTrack( track.GetPosition(), 
+			      track.GetMomentumDirection(),
+			      0.0, 
+			      track.GetKineticEnergy(),
+			      restMass,
+			      track.GetVelocity(),
+			      track.GetLocalTime(),    // tof lab ?
+			      track.GetProperTime(),   // tof proper
+			      &spin                   ) ;
+
 	      fGhostStepLength = fGhostFieldPropagator->ComputeStep( 
-						        track.GetPosition(), 
-						        track.GetMomentumDirection(),
+						        aFieldTrack, 
 						        currentMinimumStep,
 						        fGhostSafety);
 	      }
diff --git a/source/processes/parameterisation/src/G4FastSimulationMessenger.cc b/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
index ba7f0b48ac61593d43eacfff2b24fe3cf552374b..ec3e55ecd14bb5ad55feb3b451313a18b6f96249 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.3 1999/12/15 14:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4FastSimulationMessenger.hh"
diff --git a/source/processes/parameterisation/src/G4FastStep.cc b/source/processes/parameterisation/src/G4FastStep.cc
index 95dcceba4e71faab043c1d0343106a8f906edc6a..af3197f6290fdd5d84f4e0f17256fd8385e63f80 100644
--- a/source/processes/parameterisation/src/G4FastStep.cc
+++ b/source/processes/parameterisation/src/G4FastStep.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastStep.cc,v 1.7 2000/05/30 08:30:36 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/parameterisation/src/G4FastTrack.cc b/source/processes/parameterisation/src/G4FastTrack.cc
index 50e768f52ba546f693b71d0f6c6f755e06a3ba18..b05ff774bb9a60d3d9edbea27b996783f9d5671d 100644
--- a/source/processes/parameterisation/src/G4FastTrack.cc
+++ b/source/processes/parameterisation/src/G4FastTrack.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FastTrack.cc,v 1.4 2000/05/30 08:30:37 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
index f2f592de51b19901959809a5154b4e074ceff5e0..b62d82224c8ec376137482e84715457d2b2fd5c3 100644
--- a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
+++ b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GlobalFastSimulationManager.cc,v 1.6 2000/05/30 08:30:38 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/src/G4VFastSimulationModel.cc b/source/processes/parameterisation/src/G4VFastSimulationModel.cc
index 7cfaef522766f411eb71bc49300376d5c456e4b0..916cb6142136ff13a99b1f2487a582e33c4e542a 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.4 2000/05/30 08:30:39 mora Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/photolepton_hadron/History b/source/processes/photolepton_hadron/History
index a15234290f38b812765a41610fb7bf5eaca3f48e..b113737e38784921a94c195fcffb5485d8b1ad81 100644
--- a/source/processes/photolepton_hadron/History
+++ b/source/processes/photolepton_hadron/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.2 2000/08/03 09:08:10 gcosmo Exp $
+$Id: History,v 1.3 2001/02/05 18:02:12 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,10 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+05-Feb-2001: G.Cosmo (photolepton_hadron-V03-00-00)
+- STL migration for G4OrderedTable and G4DataVector.
+  Modified files: G4MuNuclearInteraction.cc.
+
 03-Aug-2000  G.Cosmo (photolepton_hadron-V02-00-00r)
 - Changed usage of RandFlat::shootBit() to RandBit::shootBit() to fix
   events' reproducibility problem.
diff --git a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh
index 1872977948bf1c21e8d6bf285116d38ed6b65652..fd0ef92c312e9a4cd1768ae67d4feebbceb72126 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.3 2000/06/11 10:35:12 jwellisc Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ------------------------------------------------------------
diff --git a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc
index 1895c97ff5dceed12b4eeba4dfc4fa06265c479f..a03db272cf8f8c14235a75589339b6e9487c9599 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.2 1999/12/15 14:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // ---------------------------------------------------------------
diff --git a/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc b/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc
index 3ab407fdfb037ef7fb4d13b8e8168564d34b6610..edfc49d5eddfa9d284357ec73af5ecbcf176f18e 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.7 2000/05/23 09:44:51 urban Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4MuNuclearInteraction.cc,v 1.8 2001/02/05 18:02:12 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // $Id: 
 // --------------------------------------------------------------
@@ -116,6 +116,8 @@ void G4MuNuclearInteraction::BuildPhysicsTable(
      delete theMeanFreePathTable;
   }
   theMeanFreePathTable = new G4PhysicsTable(G4Material::GetNumberOfMaterials());
+
+  PartialSumSigma.clearAndDestroy();
   PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
 
 
@@ -158,7 +160,7 @@ void G4MuNuclearInteraction::ComputePartialSumSigma(
    const G4ElementVector* theElementVector = aMaterial->GetElementVector(); 
    const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
 
-   PartialSumSigma(Imate) = new G4ValVector(NbOfElements);
+   PartialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -168,7 +170,7 @@ void G4MuNuclearInteraction::ComputePartialSumSigma(
                ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
                                         (*theElementVector)(Ielem)->GetZ(),
                                         (*theElementVector)(Ielem)->GetA()) ;
-        PartialSumSigma(Imate)->insertAt(Ielem, SIGMA);
+        PartialSumSigma[Imate]->push_back(SIGMA);
       }
 }
 
@@ -513,9 +515,9 @@ G4Element* G4MuNuclearInteraction::SelectRandomAtom(G4Material* aMaterial) const
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma(Index))(NumberOfElements-1));
+  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
   for ( G4int i=0; i < NumberOfElements; i++ )
-    if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
+    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
   G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
        << "' has no elements, NULL pointer returned." << G4endl;
   return NULL;
diff --git a/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc b/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc
index 223eed06cd86c77b389f6a07860388aea4165b8e..55f410050a401ff2688256cbd53ea51bce85119d 100644
--- a/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc
+++ b/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4MuonNucleusInteractionModel.cc,v 1.3 2000/08/03 09:06:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 // G4MuonNucleusInteractionModel.cc
diff --git a/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc b/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc
index a4783393c9b7d632b43b39f1fa103898f559dda0..335263660bb03e17616178a27ccff1374315f3a1 100644
--- a/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc
+++ b/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParametrizedHadronicVertex.cc,v 1.3 2000/08/03 09:06:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // --------------------------------------------------------------
 #include "G4ParametrizedHadronicVertex.hh"
diff --git a/source/processes/transportation/History b/source/processes/transportation/History
index 42e2ee1afd1b2b3faea8f4be9f3af8bd93664494..b5906c350679614d7a86ee0943c1176d87b649a0 100644
--- a/source/processes/transportation/History
+++ b/source/processes/transportation/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.4 2000/06/19 16:23:46 japost Exp $
+$Id: History,v 1.8 2001/03/19 12:13:38 japost Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,131 +16,144 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
-Jun  19, 2000   J. Apostolakis  transport-V01-01-02
-
-G4Transportation.cc: Set the True Step Length in G4Transportation.cc
-
-(Cosmetic:  updated other files to the head - as there were no differences from it.)
-
-
-May  15, 2000   J. Apostolakis	transport-V01-01-01
-
-G4Transportation.cc:  Set the material in materialChange, in order to get correct 
-                      behaviour for volumes that parameterise the material.
-   (Fix is dependant on changes to particleChangeForTransport and StepPoint)
-
-Modified setting of touchable change, in order to preserve const-ness where it exists.
-
-
-Nov  25, 1999   J. Apostolakis  transport-V00-01-01
-
-  transportation.cc: Added protection for the case of a zero step (when there is a field)
-
-  UserSpecialCuts:  Protection to use min range and min kinE only for charged particles
-
-
-June  9, 1999   J. Apostolakis  transport-01-00-02
-
-  Added a protection so that full relocation is not used for very small moves.
-
-
-Dec   4, 1998   J. Apostolakis  transport-00-04-01
-
-  The Velocity Vector for Transport in a magnetic field is now set correctly.
-    --> previously the scalar velocity was automatically promoted to a 3-vector
+Mar  19, 2001   J. Apostolakis  transport-V03-00-01
+------------------------------
+G4Transportation modified to use new FieldTrack, and get Kinetic Energy from it. 
+
+This new FieldTrack together with changes in associated Equation of Motion
+classes implement the momentum vector as independent variable in place of the
+velocity. 
+
+So this tag requires 
+ - new geometry/magneticfield tag "field-V03-00-01",  and 
+ - new geometry/volumes  tag "geomvol-V03-00-03" for new G4PropagatorInField ().
+
+
+Feb  27, 2001   J. Apostolakis  (transport-V03-00-00)
+------------------------------
+- G4Transportation.cc:
+  *   Modified calculation of energy at the end of field step
+       to make it more accurate at low velocities,
+       (while remaining correct at high gammas). 
+
+  This improves the energy determination. 
+  Together with electromagnetic/standard tag  "stand-V03-00-03"
+  this addresses the main problem in propagating in an electric field
+   (Problem report # 108 )
+
+Sep  22, 2000   V. Grichine	(transport-V02-00-00)  [recorded by G.Cosmo]
+---------------------------
+- G4Transportation.cc:
+  o added formula for Tkin corresponding directly to
+    relativistic definition of Tkin = Etot - mc^2 = mc^2(gamma -1),
+    where gamma is a particle Lorentz factor.
+  o general cosmetics.
+
+Jun  19, 2000   J. Apostolakis  (transport-V01-01-02)
+------------------------------
+- G4Transportation.cc: Set the True Step Length in G4Transportation.cc
+- Cosmetic:  updated other files to the head, as there were no differences
+  from it (CVS headers).
+
+May  15, 2000   J. Apostolakis	(transport-V01-01-01)
+------------------------------
+- G4Transportation.cc:  Set the material in materialChange, in order to get
+  correct behaviour for volumes that parameterise the material.
+  (Fix is dependant on changes to particleChangeForTransport and StepPoint)
+- Modified setting of touchable change, in order to preserve const-ness where
+  it exists.
+
+Nov  25, 1999   J. Apostolakis  (transport-V00-01-01)
+------------------------------
+- G4Transportation.cc: Added protection for the case of a zero step (when
+  there is a field)
+- G4UserSpecialCuts: protection to use min range and min kinE only for
+  charged particles.
+
+June  9, 1999   J. Apostolakis  (transport-01-00-02)
+------------------------------
+- Added a protection so that full relocation is not used for very small moves.
+
+Dec   4, 1998   J. Apostolakis  (transport-00-04-01)
+------------------------------
+- The Velocity Vector for Transport in a magnetic field is now set correctly.
+  (previously the scalar velocity was automatically promoted to a 3-vector)
 
 Nov  25, 1998  J. Apostolakis   
+-----------------------------
+- Added the direction to  LocateGlobalPointAndUpdateTouchable.
 
-  Added the direction to  LocateGlobalPointAndUpdateTouchable.
-
-Nov  19, 1998   J. Apostolakis  transport-00-03-04
-  Fixes:
-
+Nov  19, 1998   J. Apostolakis  (transport-00-03-04)
+------------------------------
+- Fixes:
   1) The final energy is set equal to the initial energy, because
      the PropagatorInField does not calculate it correctly yet.  NEEDS Fix
-
   2) If the requested step size is zero and safety is zero,  the
      step is now considered geometry limited.  (This can happen
      if a discrete process tries to take a  step that is very small
      compared to the mean free path.)  Problem observed by Laszlo in EM tests.
-
   3) PostStepGetInteractionLength now returns DBL_MAX, not kInfinity.
 
+Nov  11, 1998   J. Apostolakis  (transport-00-03-03)
+------------------------------
+- Changes to accomodate new interface of Field: 
+  G4PropagatorInField and G4FieldTrack.
 
-Nov  11, 1998   J. Apostolakis  transport-00-03-03
-
- Changes to accomodate new interface of Field: 
-         (G4PropagatorInField and G4FieldTrack. )
-
-Oct  30, 1998  J. Apostolakis   transport-00-03-02
-
-   In the case of magnetic field, a flag that determines whether the
- geometry limited the step was not set.
-
----------------------------- next two entries recorded Nov 25th : 
-
-Sep  16, 1998  J. Apostolakis   transport-00-03-01
-
-  Checks whether the particle is out of the world volume
-      If so it has exited and must be killed.
+Oct  30, 1998  J. Apostolakis   (transport-00-03-02)
+-----------------------------
+- In the case of magnetic field, a flag that determines whether the
+  geometry limited the step was not set.
 
+Sep  16, 1998  J. Apostolakis   (transport-00-03-01)
+-----------------------------
+- Checks whether the particle is out of the world volume,
+  if so it has exited and must be killed.
 
 Aug  28, 1998  J. Apostolakis 
-
-  The PostStepGetPhysicalInteractionLength has fixed (to return kInf)
+-----------------------------
+- The PostStepGetPhysicalInteractionLength has fixed (to return kInf)
   The boolean flags for touchables are now initialised. & Other small fixes ?
   Test code for non-relocating case added (for debugging).
 
-
-
-==================================================================================
-
 June 08, 1998   J. Apostolakis  (trans-06-04)
-
-   Corrected Safety computation for the case of the field (adding endpoint
-distance instead of curve length.) 
-
-   Added PostStepDoIt method that tries to relocate the particle using
-G4ParticleChangeForTransport
-
-   Transportation is no longer a G4ContinuousProcess. 
-
+------------------------------
+- Corrected Safety computation for the case of the field (adding endpoint
+  distance instead of curve length.) 
+- Added PostStepDoIt method that tries to relocate the particle using
+  G4ParticleChangeForTransport
+- Transportation is no longer a G4ContinuousProcess. 
 
 June 08, 1998   J. Apostolakis  (trans-06-03)
-
-    Modified it to recomputate Safety at the start of a step.  To do this
-it uses the previous step's  calculated safety and endpoint.
-
+------------------------------
+- Modified it to recomputate Safety at the start of a step.  To do this
+  it uses the previous step's  calculated safety and endpoint.
 
 June 08, 1998   J. Apostolakis  (trans-06-02)
-
-    Modified it to add re-computation of Safety at the endpoint of a step,
-when the safety would become negative.  This is done to allow processes
-to benefit from a realistic (geometrical) value of the safety.  The
-request to do this was from EM physics
-
+------------------------------
+- Modified it to add re-computation of Safety at the endpoint of a step,
+  when the safety would become negative.  This is done to allow processes
+  to benefit from a realistic (geometrical) value of the safety.  The
+  request to do this was from EM physics
 
 June 03, 1998   J. Apostolakis  (trans-06-01)
-
-  The safety we is now generalised to mean the limit of assumption of all
-processes. The AlongStepGPIL input value is not the remainder from the
-previous step's geometrical safety.
-
- So the transportation must recalculate the starting point's safety here.
-As a zeroeth order approximation we set it to zero.
-
-
-April 17, 1998  M. Maire      (recorded by John Apostolakis )
-
-A new process, G4UserSpecialCuts, was added to allow the
-user an alternative method to set some user cuts.
-
-
-April 15, 1998  H. Kurasige   (recorded by John Apostolakis )
-
-The transportation does the absolute minimum required to conform to 
-the new scheme for ParticleChange: G4VParticleChange is used in signature. 
-[ But default G4ParticleChange is still used ]. 
-
-April 14, 1998  John Apostolakis (recorded April 20th).
-History file Created
+------------------------------
+- The safety we is now generalised to mean the limit of assumption of all
+  processes. The AlongStepGPIL input value is not the remainder from the
+  previous step's geometrical safety.
+  So the transportation must recalculate the starting point's safety here.
+  As a zeroeth order approximation we set it to zero.
+
+April 17, 1998  M. Maire      [recorded by John Apostolakis]
+------------------------
+- A new process, G4UserSpecialCuts, was added to allow the
+  user an alternative method to set some user cuts.
+
+April 15, 1998  H. Kurasige   [recorded by John Apostolakis]
+---------------------------
+- The transportation does the absolute minimum required to conform to 
+  the new scheme for ParticleChange: G4VParticleChange is used in signature. 
+  [ But default G4ParticleChange is still used ]. 
+
+April 14, 1998  John Apostolakis
+--------------------------------
+- History file Created
diff --git a/source/processes/transportation/include/G4Transportation.hh b/source/processes/transportation/include/G4Transportation.hh
index 8470795ef80f93043f8dcb4a988cea97e9e3f800..f6851c2699e9bb680baee268ab00f36f3d0f4ed4 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.2 1999/12/15 14:53:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/transportation/include/G4Transportation.icc b/source/processes/transportation/include/G4Transportation.icc
index 0606e33d16ce68975a63479c39afbdb7e66ecc36..aed2fcfe128cb4f589a0602b6ff22b8110c954f1 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.2 1999/12/15 14:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // 
diff --git a/source/processes/transportation/include/G4UserSpecialCuts.hh b/source/processes/transportation/include/G4UserSpecialCuts.hh
index 4665eac66e5bf4a2af261d245c0e723584a9aa0c..79f7e86f2f096880299268090182340413aa1f25 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.3 1999/12/15 14:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // ------------------------------------------------------------
 //                  15 April 1998  M.Maire
 // ------------------------------------------------------------
diff --git a/source/processes/transportation/src/G4Transportation.cc b/source/processes/transportation/src/G4Transportation.cc
index 76d0f29f47a9997bafb868a5490ae6c29ceff577..e6a8d2fb5332ab44ac6accaa0fa229e23528cebd 100644
--- a/source/processes/transportation/src/G4Transportation.cc
+++ b/source/processes/transportation/src/G4Transportation.cc
@@ -5,53 +5,61 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Transportation.cc,v 1.11 2000/06/19 16:13:48 japost Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-
-//
+// $Id: G4Transportation.cc,v 1.14 2001/02/20 14:41:35 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 // ------------------------------------------------------------
 //	GEANT 4  include file implementation
 //
 //	For information related to this code contact:
-//	CERN, IT Division (formely CN), ASD group
+//	CERN, IT Division
 // ------------------------------------------------------------
 //
-//   This class is a process responsible for the transportation of 
+// This class is a process responsible for the transportation of 
 // a particle, ie the geometrical propagation that encounters the 
 // geometrical sub-volumes of the detectors.
 //
-//   It is also tasked with part of updating the "safety".
+// It is also tasked with part of updating the "safety".
 //
 // =======================================================================
-// Created:   19 March 1997, J. Apostolakis
-// Modified:   9 June  1999, J. Apostolakis & S.Giani: protect full relocation used in DEBUG 
-//                 		 for track that started on surface and went step < tolerance
+// Modified:   
+//            20 Febr 2001, J. Apostolakis:  update for new FieldTrack
+//            22 Sept 2000, V. Grichine:     update of Kinetic Energy
+//             9 June 1999, J. Apostolakis & S.Giani: protect full relocation
+//                               used in DEBUG for track that started on surface
+//                               and went step < tolerance
 //    				Also forced fast relocation in all DEBUG cases
 //    				 & changed #if to use DEBUG instead of VERBOSE
+// Created:  19 March 1997, J. Apostolakis
 // =======================================================================
 
 #include "G4Transportation.hh"
 
+///////////////////////////////////////////////////////////////////////////////
+//
+// Constructor
+
 G4Transportation::G4Transportation() :
-      G4VProcess(G4String("Transportation") )
+G4VProcess(G4String("Transportation") )
 {
-  G4TransportationManager* transportMgr;
+  G4TransportationManager* transportMgr ; 
+
+  transportMgr = G4TransportationManager::GetTransportationManager() ; 
 
-  transportMgr= G4TransportationManager::GetTransportationManager();
+  fLinearNavigator =   transportMgr->GetNavigatorForTracking() ; 
+  fFieldPropagator =   0 ; 
 
-  fLinearNavigator=   transportMgr->GetNavigatorForTracking();
-  fFieldPropagator=   0;
+  // fFieldExists= false ; 
 
-  // fFieldExists= false;
-  fParticleIsLooping = false;
+  fParticleIsLooping = false ; 
  
-  // fGlobalFieldMgr=    transportMgr->GetFieldManager();
-  fFieldPropagator=   transportMgr->GetPropagatorInField();
+  // fGlobalFieldMgr=    transportMgr->GetFieldManager() ;
+
+  fFieldPropagator=   transportMgr->GetPropagatorInField() ;
 
   // Find out if an electromagnetic field exists
   // 
-  // fFieldExists= transportMgr->GetFieldManager()->DoesFieldExist();
+  // fFieldExists= transportMgr->GetFieldManager()->DoesFieldExist() ;
   // 
   //   The above code is problematic, because it only works if
   // the field manager has informed about the detector's field 
@@ -61,354 +69,400 @@ G4Transportation::G4Transportation() :
   // the member function DoesGlobalFieldExist() in its place ...
   //    John Apostolakis, July 7, 1997
 
-  fTouchable1 = new G4TouchableHistory();
-  fTouchable2 = new G4TouchableHistory();
+  fTouchable1 = new G4TouchableHistory() ;
+  fTouchable2 = new G4TouchableHistory() ;
 
-  fIsTouchable1Free= true;
-  fIsTouchable2Free= true;
+  fIsTouchable1Free = true ;
+  fIsTouchable2Free = true ;
 
   // Initial value for safety and point-of-origin of safety
-  fPreviousSafety=0.0; 
-  fPreviousSftOrigin= G4ThreeVector(0.,0.,0.);
+
+  fPreviousSafety    = 0.0 ; 
+  fPreviousSftOrigin = G4ThreeVector(0.,0.,0.) ;
 
 }
 
+/////////////////////////////////////////////////////////////////////////////
+
 G4Transportation::~G4Transportation()
 {
-   delete fTouchable1;
-   delete fTouchable2;
+   delete fTouchable1 ;
+   delete fTouchable2 ;
 }
 
-// ------------------------------------------------------------------
-// G4double G4Transportation::GetContinuousStepLimit  (
-G4double G4Transportation::AlongStepGetPhysicalInteractionLength(
-	   const G4Track&  track,
-		 G4double  previousStepSize,
-		 G4double  currentMinimumStep,
-		 G4double& currentSafety,
-		 G4GPILSelection* selection
-	 )
-// ------------------------------------------------------------------
+//////////////////////////////////////////////////////////////////////////////
+//
+// Responsibilities:
+//    Find whether the geometry limits the Step, and to what length
+//    Calculate the new value of the safety and return it.
+//    Store the final time, position and momentum.
+
+G4double G4Transportation::
+AlongStepGetPhysicalInteractionLength(  const G4Track&  track,
+		                              G4double  previousStepSize,
+		                              G4double  currentMinimumStep,
+		                              G4double& currentSafety,
+		                              G4GPILSelection* selection  )
 {
-  // Responsibilities:
-  //    Find whether the geometry limits the Step, and to what length
-  //    Calculate the new value of the safety and return it.
-  //    Store the final time, position and momentum.
-  G4double geometryStepLength, newSafety; 
-  fParticleIsLooping = false;
+  G4double geometryStepLength, newSafety ; 
+  fParticleIsLooping = false ;
 
   // GPILSelection is set to defaule value of CandidateForSelection
   // It is a return value
-  *selection = CandidateForSelection;
+
+  *selection = CandidateForSelection ;
 
   // Get initial Energy/Momentum of the track
-  //
-  const G4DynamicParticle*  pParticle  = track.GetDynamicParticle();
-  G4double      startEnergy      = pParticle->GetKineticEnergy();
-  G4ThreeVector startMomentumDir = pParticle->GetMomentumDirection();
-  G4ThreeVector startPosition  = track.GetPosition();
-  // G4double   theTime        = track.GetGlobalTime();
+  
+  const G4DynamicParticle*  pParticle  = track.GetDynamicParticle() ;
+  G4double      startEnergy            = pParticle->GetKineticEnergy() ;
+  G4ThreeVector startMomentumDir       = pParticle->GetMomentumDirection() ;
+  G4ThreeVector startPosition          = track.GetPosition() ;
+
+  // G4double   theTime        = track.GetGlobalTime() ;
 
   // The Step Point safety is now generalised to mean the limit of assumption
   // of all processes, so it is not the previous Step's geometrical safety.
-  //
   // We calculate the starting point's safety here.
-  G4ThreeVector OriginShift= startPosition - fPreviousSftOrigin;
-  G4double      MagSqShift=  OriginShift.mag2();
-  if( MagSqShift >= sqr(fPreviousSafety) ){
-     currentSafety = 0.0;
-  }else{
-     currentSafety = fPreviousSafety - sqrt(MagSqShift);
-  }
 
+  G4ThreeVector OriginShift = startPosition - fPreviousSftOrigin ;
+  G4double      MagSqShift  = OriginShift.mag2() ;
+  if( MagSqShift >= sqr(fPreviousSafety) )
+  {
+     currentSafety = 0.0 ;
+  }
+  else
+  {
+     currentSafety = fPreviousSafety - sqrt(MagSqShift) ;
+  }
   // Is the particle charged ?
-  G4ParticleDefinition* pParticleDef=   pParticle->GetDefinition();
-  G4double              particleCharge= pParticleDef->GetPDGCharge(); 
 
-  G4bool   fieldExertsForce= false;
-  fGeometryLimitedStep= false;
+  G4ParticleDefinition* pParticleDef   = pParticle->GetDefinition() ;
+  G4double              particleCharge = pParticleDef->GetPDGCharge() ; 
+
+  G4bool   fieldExertsForce = false ;
+  fGeometryLimitedStep = false ;
 
   // There is no need to locate the current volume. It is Done elsewhere:
   //   On track construction 
   //   By the tracking, after all AlongStepDoIts, in "Relocation"
-  //
-
   //  Does the particle have an (EM) field force exerting upon it?
-  //
-  if( (particleCharge!=0.0) ){
+  
+  if( (particleCharge != 0.0) )
+  {
      
-     fieldExertsForce= this->DoesGlobalFieldExist();
+     fieldExertsForce= this->DoesGlobalFieldExist() ;
+
      // Future: will/can also check whether current volume's field is Zero or
      //  set by the user (in the logical volume) to be zero.
   }
-
   //  Choose the calculation of the transportation: Field or not 
-  //
+ 
   if( !fieldExertsForce ) 
   {
-     G4double linearStepLength;
+     G4double linearStepLength ;
      
      if( currentMinimumStep <= currentSafety )
      {
         // The Step is guaranteed to be taken
-	geometryStepLength=currentMinimumStep;
-	fGeometryLimitedStep= false;
+
+	geometryStepLength   = currentMinimumStep ;
+	fGeometryLimitedStep = false ;
      }
      else
      {
 	//  Find whether the straight path intersects a volume
-	linearStepLength= fLinearNavigator->ComputeStep( 
-					 startPosition, startMomentumDir,
-					 currentMinimumStep, newSafety);
 
+	linearStepLength = fLinearNavigator->ComputeStep( startPosition, 
+                                                          startMomentumDir,
+					                  currentMinimumStep, 
+                                                          newSafety) ;
         // Remember last safety origin & value.
-	fPreviousSftOrigin = startPosition;
-        fPreviousSafety= newSafety; 
+
+	fPreviousSftOrigin = startPosition ;
+        fPreviousSafety    = newSafety ; 
+
 	// The safety at the initial point has been re-calculated:
-        currentSafety= newSafety;
+
+        currentSafety = newSafety ;
 			    
-	if( linearStepLength <= currentMinimumStep){
+	if( linearStepLength <= currentMinimumStep)
+        {
 	   // The geometry limits the Step size (an intersection was found.)
-	   geometryStepLength=linearStepLength;
-	   fGeometryLimitedStep= true;
-	}else{
+
+	   geometryStepLength   = linearStepLength ;
+	   fGeometryLimitedStep = true ;
+	}
+        else
+        {
 	   // The full Step is taken.
-	   geometryStepLength=currentMinimumStep;
-	   fGeometryLimitedStep= false;
+
+	   geometryStepLength   = currentMinimumStep ;
+	   fGeometryLimitedStep = false ;
 	}
      }
-     endpointDistance= geometryStepLength;
+     endpointDistance = geometryStepLength ;
 
      // Calculate final position
-     fTransportEndPosition= startPosition+geometryStepLength*startMomentumDir;
+
+     fTransportEndPosition = startPosition + geometryStepLength*startMomentumDir ;
+
      // Momentum (& its direction) is unchanged
-     fTransportEndMomentumDir= startMomentumDir; 
-     fTransportEndKineticEnergy= track.GetKineticEnergy();
-     fParticleIsLooping = false;
-     fMomentumChanged = false; 
+
+     fTransportEndMomentumDir   = startMomentumDir ; 
+     fTransportEndKineticEnergy = track.GetKineticEnergy() ;
+     fParticleIsLooping         = false ;
+     fMomentumChanged           = false ; 
   }
   else
   {
-     G4double       momentumMagnitude=pParticle->GetTotalMomentum();
-     G4ThreeVector  EndUnitMomentum;
-     G4double       lengthAlongCurve;
-     G4double       restMass= pParticleDef->GetPDGMass();
+     G4double       momentumMagnitude = pParticle->GetTotalMomentum() ;
+     G4ThreeVector  EndUnitMomentum ;
+     G4double       lengthAlongCurve ;
+     G4double       restMass = pParticleDef->GetPDGMass() ;
  
-     fFieldPropagator->SetChargeMomentumMass(
-		     particleCharge,           // charge in e+ units
-		     momentumMagnitude,        // Momentum in Mev/c 
-		     restMass );  
-
-     G4ThreeVector spin = track.GetPolarization();   // Does it have it ?
-     G4ThreeVector velocityVector =   track.GetVelocity() 
-                                    * track.GetMomentumDirection(); 
-     G4FieldTrack  aFieldTrack = 
-       G4FieldTrack(  startPosition, 
-		      velocityVector,
-		      0.0, 
-		      track.GetKineticEnergy(),
-		      track.GetLocalTime(),    // tof lab ?
-		      track.GetProperTime(),   // tof proper
-		      &spin );
-
-     if( currentMinimumStep > 0 ) {
+     fFieldPropagator->SetChargeMomentumMass( particleCharge,   // charge in e+ units
+		                              momentumMagnitude, // Momentum in Mev/c 
+		                              restMass           ) ;  
+
+     G4ThreeVector spin           = track.GetPolarization() ;
+     G4FieldTrack  aFieldTrack =
+                    G4FieldTrack( startPosition, 
+				  track.GetMomentumDirection(),
+				  0.0, 
+				  track.GetKineticEnergy(),
+				  restMass,
+				  track.GetVelocity(),
+				  track.GetLocalTime(),    // tof lab ?
+				  track.GetProperTime(),   // tof proper
+				  &spin                   ) ;
+
+     if( currentMinimumStep > 0 ) 
+     {
         //  Do the Transport in the field (non recti-linear)
-        lengthAlongCurve=fFieldPropagator->ComputeStep( aFieldTrack,
-							currentMinimumStep, 
-							currentSafety,
-							track.GetVolume() );
-	//               ----------------
-	if( lengthAlongCurve< currentMinimumStep){
-	   geometryStepLength=lengthAlongCurve;
-	   fGeometryLimitedStep= true;
-	}else{
-  	   geometryStepLength=currentMinimumStep;
-	   fGeometryLimitedStep= false;
+
+        lengthAlongCurve = fFieldPropagator->ComputeStep( aFieldTrack,
+							  currentMinimumStep, 
+							  currentSafety,
+							  track.GetVolume() ) ;
+	if( lengthAlongCurve < currentMinimumStep)
+        {
+	   geometryStepLength   = lengthAlongCurve ;
+	   fGeometryLimitedStep = true ;
+	}
+        else
+        {
+  	   geometryStepLength   = currentMinimumStep ;
+	   fGeometryLimitedStep = false ;
 	}
-     }else{
-        geometryStepLength= lengthAlongCurve= 0.0;
-	fGeometryLimitedStep= false;
      }
-
+     else
+     {
+        geometryStepLength   = lengthAlongCurve= 0.0 ;
+	fGeometryLimitedStep = false ;
+     }
      // Remember last safety origin & value.
-     fPreviousSftOrigin = startPosition;
-     fPreviousSafety= currentSafety; 		    
+
+     fPreviousSftOrigin = startPosition ;
+     fPreviousSafety    = currentSafety ; 		    
         
      // Get the End-Position and End-Momentum (Dir-ection)
-     fTransportEndPosition= aFieldTrack.GetPosition();
+
+     fTransportEndPosition = aFieldTrack.GetPosition() ;
+
      // Momentum:  Magnitude and direction can be changed too now ...
-     fMomentumChanged = true; 
-     fTransportEndMomentumDir= aFieldTrack.GetMomentumDir();
-
-     // fTransportEndKineticEnergy= aFieldTrack.GetEnergy(); // Energy is wrong
-#if 0
-     G4ThreeVector endVelocity = aFieldTrack.GetVelocity();
-     G4double  veloc_sq = endVelocity.mag2();
-     fTransportEndKineticEnergy  = 0.5 * restMass * veloc_sq /
-                        ( 1 - veloc_sq / c_squared );   // Lorentz correction
+
+     fMomentumChanged         = true ; 
+     fTransportEndMomentumDir = aFieldTrack.GetMomentumDir() ;
+
+#if VELOCITY_RETURNED
+     G4ThreeVector endVelocity   = aFieldTrack.GetVelocity() ;
+     G4double  veloc_sq          = endVelocity.mag2() ;
+     G4double inverse_gamma      = sqrt( 1 - veloc_sq/c_squared ) ;
+     G4double  gamma = 1.0 / inverse_gamma;
+     G4double  kineticEnergy     = restMass*( gamma - 1.0 ) ; // Lorentz correction
+     // The equation below is more stable for small velocities.
+     G4double  kineticEnergy_agn = restMass* veloc_sq  / 
+                                    (inverse_gamma * (1.0 + inverse_gamma) ) ; 
 #endif
-     fTransportEndKineticEnergy = track.GetKineticEnergy();
 
-     // fTransportEndPolarization= aFieldTrack.GetSpin(); // Not yet possible
+     fTransportEndKineticEnergy  = aFieldTrack.GetKineticEnergy() ; 
 
-     fParticleIsLooping = fFieldPropagator->IsParticleLooping();
-     endpointDistance= (fTransportEndPosition-startPosition).mag();
-  }
+     //   fTransportEndKineticEnergy = track.GetKineticEnergy() ;
+     // fTransportEndPolarization= aFieldTrack.GetSpin() ; // Not yet possible
 
+     fParticleIsLooping = fFieldPropagator->IsParticleLooping() ;
+     endpointDistance   = (fTransportEndPosition - startPosition).mag() ;
+  }
   // If we are asked to go a step length of 0, and we are on a boundary
   //  then a boundary will also limit the step -> we must flag this.
-  if (currentMinimumStep == 0.0 ) {
-     if( currentSafety == 0.0 ){
-	fGeometryLimitedStep= true;
-     }
+
+  if (currentMinimumStep == 0.0 ) 
+  {
+     if( currentSafety == 0.0 )	fGeometryLimitedStep = true ;
   }
 
   // Update the safety starting from the end-point, if it will become 
   //  negative at the end-point.
-  // 
-  if( currentSafety < endpointDistance ) {
-      G4double endSafety;
-      endSafety = fLinearNavigator->ComputeSafety( fTransportEndPosition);
-      currentSafety= endSafety;
-      fPreviousSftOrigin = fTransportEndPosition;
-      fPreviousSafety= currentSafety; 
+  
+  if( currentSafety < endpointDistance ) 
+  {
+      G4double endSafety = fLinearNavigator->ComputeSafety( fTransportEndPosition) ;
+      currentSafety      = endSafety ;
+      fPreviousSftOrigin = fTransportEndPosition ;
+      fPreviousSafety    = currentSafety ; 
+
       // Because the Stepping Manager assumes it is from the start point, 
       //  add the StepLength
-      currentSafety += endpointDistance;
 
-#ifdef G4DEBUG_TRANSPORT      
-      cout.precision(5);
-      cout << "***Transportation::AlongStepGPIL ** " << G4endl ;
+      currentSafety     += endpointDistance ;
+
+#ifdef G4DEBUG_TRANSPORT 
+     
+      cout.precision(16) ;
+      cout << "***Transportation::AlongStepGPIL ** " << G4endl  ;
       cout << "  Called Navigator->ComputeSafety " << G4endl
 	   << "    with position = " << fTransportEndPosition << G4endl
-	   << "    and it returned safety= " << endSafety << 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."  << G4endl; 
+	   << "   which I return."  << G4endl ; 
 #endif
   }				    
 
-  fParticleChange.SetTrueStepLength(geometryStepLength) ;
+  fParticleChange.SetTrueStepLength(geometryStepLength)  ;
 
-  return geometryStepLength;
+  return geometryStepLength ;
 }
 
+/////////////////////////////////////////////////////////////////////////////
+//
+//   Initialize ParticleChange  (by setting all its members equal
+//                               to corresponding members in G4Track)
 
-G4VParticleChange* G4Transportation::AlongStepDoIt(
-			     const G4Track& track,
-			     const G4Step&  stepData
-			    )
+G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track,
+			                            const G4Step&  stepData )
 {
-  //   Initialize ParticleChange  (by setting all its members equal
-  //                               to corresponding members in G4Track)
-  fParticleChange.Initialize(track);
+  fParticleChange.Initialize(track) ;
 
-  //
   //  Code for specific process 
   
-  fParticleChange.SetPositionChange(fTransportEndPosition);
-  fParticleChange.SetMomentumChange(fTransportEndMomentumDir);
-  fParticleChange.SetEnergyChange(fTransportEndKineticEnergy);
-  fParticleChange.SetMomentumChanged(fMomentumChanged);
+  fParticleChange.SetPositionChange(fTransportEndPosition) ;
+  fParticleChange.SetMomentumChange(fTransportEndMomentumDir) ;
+  fParticleChange.SetEnergyChange(fTransportEndKineticEnergy) ;
+  fParticleChange.SetMomentumChanged(fMomentumChanged) ;
+
+  G4double deltaTime = 0.0 ;
 
-  G4double deltaTime=0.0;
 #if HARMONIC_MEAN_VELOCITY
-  G4double meanInverseVelocity;
-  meanInverseVelocity= 0.5/stepData.GetPreStepPoint()->GetVelocity()+
-                       0.5/stepData.GetPostStepPoint()->GetVelocity();  
-  if ( meanInverseVelocity < kInfinity ) {
-     deltaTime= track.GetStepLength() * meanInverseVelocity; 
+
+  G4double meanInverseVelocity ;
+  meanInverseVelocity = 0.5/stepData.GetPreStepPoint()->GetVelocity() +
+                        0.5/stepData.GetPostStepPoint()->GetVelocity() ; 
+ 
+  if ( meanInverseVelocity < kInfinity ) 
+  {
+     deltaTime = track.GetStepLength() * meanInverseVelocity ; 
   }
 #endif
-  G4double finalVelocity= track.GetVelocity();
-  if ( finalVelocity > 0.0 ) {
-     deltaTime= track.GetStepLength() / finalVelocity; 
-  }  
 
-  fParticleChange. SetTimeChange( track.GetGlobalTime() + deltaTime );
+  G4double finalVelocity = track.GetVelocity() ;
+
+  if ( finalVelocity > 0.0 )  deltaTime = track.GetStepLength()/finalVelocity ;  
+
+  fParticleChange. SetTimeChange( track.GetGlobalTime() + deltaTime ) ;
 
   // Now Correct by Lorentz factor to get "proper" deltaTime
-  //
-  G4double  restMass = track.GetDynamicParticle()->GetMass();
-  G4double deltaProperTime= deltaTime * (restMass / track.GetTotalEnergy());
+  
+  G4double  restMass       = track.GetDynamicParticle()->GetMass() ;
+  G4double deltaProperTime = deltaTime*( restMass/track.GetTotalEnergy() ) ;
+
+  fParticleChange.SetProperTimeChange( track.GetProperTime() + deltaProperTime ) ;
 
-  fParticleChange. SetProperTimeChange(track.GetProperTime() 
-				                        + deltaProperTime );
-  // fParticleChange.SetEnergyChange( Energy );
-  //fParticleChange. SetTrueStepLength( track.GetStepLength() );
+  // fParticleChange.SetEnergyChange( Energy ) ;
+  //fParticleChange. SetTrueStepLength( track.GetStepLength() ) ;
 
 #ifdef DETECT_LOOPER
   // If the particle is caught looping in a magnetic field (doing many steps)
   //    this kills it ...
   // But currently a user-limit maximum Step size alleviates this problem,
   //    so this code is no longer used.
-  if ( fParticleIsLooping ){
-      // Kill the looping particle  
-      fParticleChange.SetStatusChange( fStopAndKill ) ;
-      // ClearNumberOfInteractionLengthLeft();
+  if ( fParticleIsLooping )
+  {
+      // Kill the looping particle 
+ 
+      fParticleChange.SetStatusChange( fStopAndKill )  ;
+
+      // ClearNumberOfInteractionLengthLeft() ;
   }
 #endif
 
-  return &fParticleChange;
+  return &fParticleChange ;
 
 }
 
+////////////////////////////////////////////////////////////////////////////////
+//
 // This ensures that the PostStep action is always called,
 //   so that it can do the relocation if it is needed.
 // 
-G4double 
-G4Transportation::PostStepGetPhysicalInteractionLength(
-                             const G4Track& ,
-			     G4double   previousStepSize,
-			     G4ForceCondition* pForceCond
-			    )
+
+G4double G4Transportation::
+PostStepGetPhysicalInteractionLength( const G4Track& ,
+			                    G4double   previousStepSize,
+			                    G4ForceCondition* pForceCond )
 { 
-  *pForceCond= Forced; 
+  *pForceCond = Forced ; 
 
-  return DBL_MAX;  // was kInfinity; but convention now is DBL_MAX
+  return DBL_MAX ;  // was kInfinity ; but convention now is DBL_MAX
 }
 
-G4VParticleChange* G4Transportation::PostStepDoIt(
-			     const G4Track& track,
-			     const G4Step&  stepData
-			    )
+/////////////////////////////////////////////////////////////////////////////
+//
+
+G4VParticleChange* G4Transportation::PostStepDoIt( const G4Track& track,
+			                           const G4Step&  stepData )
 {
-  const G4VTouchable* retCurrentTouchable;   // The one to return
+  const G4VTouchable* retCurrentTouchable ;   // The one to return
 
   //   Initialize ParticleChange  (by setting all its members equal
   //                               to corresponding members in G4Track)
-  // 
-  // fParticleChange.Initialize(track);  // To initialise TouchableChange
-  fParticleChange.SetStatusChange(track.GetTrackStatus());
+  // fParticleChange.Initialize(track) ;  // To initialise TouchableChange
+
+  fParticleChange.SetStatusChange(track.GetTrackStatus()) ;
 
   // If the Step was determined by the volume boundary,
   // logically relocate the particle
-  //
-  if( fGeometryLimitedStep ){  
+  
+  if( fGeometryLimitedStep )
+  {  
     // fCurrentTouchable will now become the previous touchable, 
     //  and what was the previous will be freed.
     // (Needed because the preStepPoint can point to the previous touchable)
 
-    SetTheOtherTouchableFree(fCurrentTouchable);
-    fCurrentTouchable= GetFreeTouchable();
+    SetTheOtherTouchableFree(fCurrentTouchable) ;
+    fCurrentTouchable = GetFreeTouchable() ;
 
-    fLinearNavigator->SetGeometricallyLimitedStep();
-    fLinearNavigator-> LocateGlobalPointAndUpdateTouchable( 
-                                                track.GetPosition(),
-						track.GetMomentumDirection(),
-						fCurrentTouchable,
-			                        true);
+    fLinearNavigator->SetGeometricallyLimitedStep() ;
+    fLinearNavigator-> 
+    LocateGlobalPointAndUpdateTouchable( track.GetPosition(),
+					 track.GetMomentumDirection(),
+					 fCurrentTouchable,
+			                 true                    ) ;
 
     // Check whether the particle is out of the world volume 
     //   If so it has exited and must be killed.
-    if( fCurrentTouchable->GetVolume() == 0 ){
-       fParticleChange.SetStatusChange( fStopAndKill ) ;
+
+    if( fCurrentTouchable->GetVolume() == 0 )
+    {
+       fParticleChange.SetStatusChange( fStopAndKill )  ;
     }
-    retCurrentTouchable= fCurrentTouchable;
-    fParticleChange.SetTouchableChange( fCurrentTouchable );
+    retCurrentTouchable = fCurrentTouchable ;
+    fParticleChange.SetTouchableChange( fCurrentTouchable ) ;
   }
-  else{                    // fGeometryLimitedStep  is false
+  else
+  {                    // fGeometryLimitedStep  is false
 #ifdef G4DEBUG
     // Although the location is changed, we know that the physical 
     //   volume remains constant. 
@@ -417,93 +471,112 @@ G4VParticleChange* G4Transportation::PostStepDoIt(
     //     *except* if we have made a very small step from a boundary
     //      (ie remaining inside the tolerance
 
-    G4bool  startAtSurface_And_MoveEpsilon;
-    startAtSurface_And_MoveEpsilon=
-             (stepData.GetPreStepPoint()->GetSafety() == 0.0)
-          && (stepData.GetStepLength() < kCarTolerance );
-    if( startAtSurface_And_MoveEpsilon) {
+    G4bool  startAtSurface_And_MoveEpsilon ;
+    startAtSurface_And_MoveEpsilon =
+             (stepData.GetPreStepPoint()->GetSafety() == 0.0) && 
+             (stepData.GetStepLength() < kCarTolerance ) ;
+
+    if( startAtSurface_And_MoveEpsilon) 
+    {
 
        // fCurrentTouchable will now become the previous touchable, 
-       SetTheOtherTouchableFree(fCurrentTouchable);
-       fCurrentTouchable= GetFreeTouchable();
-
-       fLinearNavigator-> LocateGlobalPointAndUpdateTouchable( 
-                                                track.GetPosition(),
-						track.GetMomentumDirection(),
-						fCurrentTouchable,
-			                        true);
-       if( fCurrentTouchable->GetVolume() != track.GetVolume() ){
-          // 
-          G4cerr << " ERROR: A relocation within safety has caused a volume change! " << G4endl ; 
-          G4cerr << "   The old volume is called " 
-	         << track.GetVolume()->GetName() << G4endl; 
-          G4cerr << "   The new volume is called ";
-          if ( fCurrentTouchable->GetVolume() != 0 )
-	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << G4endl; 
-          else
-	     G4cerr << "Out of World" << G4endl; 
-
-          G4cerr.precision(7);
-          G4cerr << "   The position is " << track.GetPosition() <<  G4endl;
+       SetTheOtherTouchableFree(fCurrentTouchable) ;
+       fCurrentTouchable = GetFreeTouchable() ;
+
+       fLinearNavigator-> 
+       LocateGlobalPointAndUpdateTouchable( track.GetPosition(),
+					    track.GetMomentumDirection(),
+					    fCurrentTouchable,
+			                    true                     ) ;
+       if( fCurrentTouchable->GetVolume() != track.GetVolume() )
+       {
+         G4cerr << " ERROR: A relocation within safety has caused a volume change! " << G4endl  ; 
+         G4cerr << "   The old volume is called " 
+	         << track.GetVolume()->GetName() << G4endl ; 
+         G4cerr << "   The new volume is called " ;
+
+         if ( fCurrentTouchable->GetVolume() != 0 )
+	 {
+	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << G4endl ; 
+	 }
+         else
+	 {
+	     G4cerr << "Out of World" << G4endl ; 
+	 }
+         G4cerr.precision(7) ;
+         G4cerr << "   The position is " << track.GetPosition() <<  G4endl ;
 
           // Let us relocate again, for debuging
-          fLinearNavigator-> LocateGlobalPointAndUpdateTouchable( 
-                                                track.GetPosition(),
-						track.GetMomentumDirection(),
-						fCurrentTouchable,
-			                        true);
-          G4cerr << "   The newer volume is called " ;
-          if ( fCurrentTouchable->GetVolume() != 0 )
-	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << G4endl; 
-          else
-	     G4cerr << "Out of World" << G4endl; 
+
+         fLinearNavigator-> 
+         LocateGlobalPointAndUpdateTouchable( track.GetPosition(),
+					      track.GetMomentumDirection(),
+					      fCurrentTouchable,
+			                      true                     ) ;
+         G4cerr << "   The newer volume is called "  ;
+
+         if ( fCurrentTouchable->GetVolume() != 0 )
+	 {
+	     G4cerr << fCurrentTouchable->GetVolume()->GetName() << G4endl ;
+	 } 
+         else
+	 {
+	     G4cerr << "Out of World" << G4endl ; 
+	 }
        }
 
        assert( fCurrentTouchable->GetVolume()->GetName() == 
-               track.GetVolume()->GetName() );
-       retCurrentTouchable = fCurrentTouchable; 
-       fParticleChange.SetTouchableChange( fCurrentTouchable );
+               track.GetVolume()->GetName() ) ;
+
+       retCurrentTouchable = fCurrentTouchable ; 
+       fParticleChange.SetTouchableChange( fCurrentTouchable ) ;
        
-    }else{
-       retCurrentTouchable = track.GetTouchable();
-       fParticleChange.SetTouchableChange( track.GetTouchable() );
+    }
+    else
+    {
+       retCurrentTouchable = track.GetTouchable() ;
+       fParticleChange.SetTouchableChange( track.GetTouchable() ) ;
     }
     //  This must be done in the above if ( AtSur ) fails
     //  We also do it for if (true) in order to get debug/opt to  
     //  behave as exactly the same way as possible.
-    fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition());
+
+    fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition()) ;
 #else
     // ie #ifndef G4DEBUG does a quick relocation
     
     // The serves only to move the Navigator's location
-    fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition());
+
+    fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition()) ;
 
     // The value of the track's current Touchable is retained. 
     //    (and it must be correct because we must use it below to
     //      overwrite the (unset) one in particle change)
     //  Although in general this is fCurrentTouchable, at the start of
     //   a step it could be different ... ??
-    fParticleChange.SetTouchableChange( track.GetTouchable() );
-    retCurrentTouchable = track.GetTouchable();
+
+    fParticleChange.SetTouchableChange( track.GetTouchable() ) ;
+    retCurrentTouchable = track.GetTouchable() ;
 #endif
 
   }                   // endif ( fGeometryLimitedStep ) 
 
-  const G4VPhysicalVolume *pNewVol = retCurrentTouchable->GetVolume();
-  const G4Material *pNewMaterial=0; 
-  if( pNewVol != 0 ) pNewMaterial= pNewVol->GetLogicalVolume()->GetMaterial(); 
+  const G4VPhysicalVolume* pNewVol = retCurrentTouchable->GetVolume() ;
+  const G4Material* pNewMaterial   = 0 ;
+ 
+  if( pNewVol != 0 ) pNewMaterial= pNewVol->GetLogicalVolume()->GetMaterial() ; 
 
-  // ( <const_cast> pNewMaterial );
-  fParticleChange.SetMaterialChange( (G4Material *) pNewMaterial );
-  //    temporarily until Get/Set Material of ParticleChange, 
-  //    and StepPoint can be made const. 
+  // ( <const_cast> pNewMaterial ) ;
 
+  fParticleChange.SetMaterialChange( (G4Material *) pNewMaterial ) ;
 
+  //    temporarily until Get/Set Material of ParticleChange, 
+  //    and StepPoint can be made const. 
   // Set the touchable in ParticleChange
   //   this must always be done because the particle change always
   //   uses this value to overwrite the current touchable pointer.
-  //
-  fParticleChange.SetTouchableChange(retCurrentTouchable);
+  
+  fParticleChange.SetTouchableChange(retCurrentTouchable) ;
 
-  return &fParticleChange;
+  return &fParticleChange ;
 }
diff --git a/source/processes/transportation/src/G4UserSpecialCuts.cc b/source/processes/transportation/src/G4UserSpecialCuts.cc
index 7b3b695690be0eadb84d8232b5341dc0afa005d5..6f8484e41ce39d16ead30365468b51537dc89424 100644
--- a/source/processes/transportation/src/G4UserSpecialCuts.cc
+++ b/source/processes/transportation/src/G4UserSpecialCuts.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UserSpecialCuts.cc,v 1.3 1999/12/15 14:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 // --------------------------------------------------------------
 // History
diff --git a/source/readout/History b/source/readout/History
index d8b1cd75dfa66bfa15b3b8fdda0a596ebabc81ec..8f675b55f8289ae4f2690772721354ff0af64965 100644
--- a/source/readout/History
+++ b/source/readout/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.3 1999/11/09 00:33:45 asaim Exp $
+$Id: History,v 1.4 2001/02/08 06:18:28 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,15 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Feb 8, 2001, M.Asai (readout-V03-00-01)
+- Migration to STL vector classes
+  affected files :
+./readout/include/G4DCtable.hh
+./readout/include/G4DigiManager.hh
+./readout/include/G4VDigitizerModule.hh
+./readout/src/G4DCtable.cc
+./readout/src/G4DigiManager.cc
+
 Nov 4, 99, M.Asai (tag readout-V00-01-00)
 - entries() method is added to G4TDigiCollection
 - Commecnts are enriched for the software reference manual.
diff --git a/source/readout/include/G4DCtable.hh b/source/readout/include/G4DCtable.hh
index 5f28b3414d954a8ea7960bb326500710ed013e34..2339f4d8c462bf088899cf74780ca67f4d0d3a42 100644
--- a/source/readout/include/G4DCtable.hh
+++ b/source/readout/include/G4DCtable.hh
@@ -5,15 +5,16 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4DCtable.hh,v 1.5 2001/02/08 06:07:20 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4DCtable_H
 #define G4DCtable_H 1
 
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
+//#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -38,12 +39,12 @@ class G4DCtable
     G4int GetCollectionID(G4String DCname);
 
   private:
-    G4RWTValOrderedVector<G4String> DMlist;
-    G4RWTValOrderedVector<G4String> DClist;
+    G4std::vector<G4String> DMlist;
+    G4std::vector<G4String> DClist;
 
   public:
     inline G4int entries() const
-    { return DClist.entries(); }
+    { return DClist.size(); }
 
 };
 
diff --git a/source/readout/include/G4DMmessenger.hh b/source/readout/include/G4DMmessenger.hh
index d6174fa66a9dde911c36786b64820b8bca327869..5b7fd847a8a0c56c8e287e69f9f4c8ae0a898d8d 100644
--- a/source/readout/include/G4DMmessenger.hh
+++ b/source/readout/include/G4DMmessenger.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DMmessenger.hh,v 1.2.4.1 1999/12/07 20:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4DMmessenger.hh,v 1.3 1999/12/15 14:53:51 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4DMmessenger_h
diff --git a/source/readout/include/G4DigiManager.hh b/source/readout/include/G4DigiManager.hh
index a5c0a316980aa8f53e1afcf692d05eac165d4a3b..40c2c87caf00aba016001bb28f52405d97f35236 100644
--- a/source/readout/include/G4DigiManager.hh
+++ b/source/readout/include/G4DigiManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4DigiManager.hh,v 1.5 2001/02/08 06:07:21 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4DigiManager_h
@@ -21,7 +21,8 @@ class G4DMmessenger;
 #include "G4DCtable.hh"
 class G4RunManager;
 class G4SDManager;
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -85,7 +86,7 @@ class G4DigiManager
   private: 
       static G4DigiManager * fDManager;
       G4int verboseLevel;
-      G4RWTPtrOrderedVector<G4VDigitizerModule> DMtable;
+      G4std::vector<G4VDigitizerModule*> DMtable;
       G4DCtable* DCtable;
       G4DMmessenger* theMessenger;
       G4RunManager* runManager;
@@ -97,7 +98,7 @@ class G4DigiManager
       inline G4int GetCollectionCapacity() const
       { return DCtable->entries(); }
       inline G4int GetModuleCapacity() const
-      { return DMtable.entries(); }
+      { return DMtable.size(); }
       inline G4DCtable* GetDCtable() const
       { return DCtable; }
       inline void RestoreDCtable(G4DCtable* dc)
diff --git a/source/readout/include/G4VDigitizerModule.hh b/source/readout/include/G4VDigitizerModule.hh
index 215ef8801eb480ec05bc9a615c3de6e9e4d0e987..f66062ded3c349e65ba0f22c657d2afeb9d90ccb 100644
--- a/source/readout/include/G4VDigitizerModule.hh
+++ b/source/readout/include/G4VDigitizerModule.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4VDigitizerModule.hh,v 1.5 2001/02/08 06:07:21 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VDigitizerModule_H
@@ -15,7 +15,8 @@
 class G4DigiManager;
 class G4VDigiCollection;
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
+//#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
 // class description:
 //
@@ -52,12 +53,12 @@ class G4VDigitizerModule
   protected:
     G4DigiManager* DigiManager;
     G4String moduleName;
-    G4RWTValOrderedVector<G4String> collectionName;
+    G4std::vector<G4String> collectionName;
     G4int verboseLevel;
 
   public:
     inline G4int GetNumberOfCollections() const
-    { return collectionName.entries(); }
+    { return collectionName.size(); }
     inline G4String GetCollectionName(G4int i) const
     { return collectionName[i]; }
     inline G4String GetName() const
diff --git a/source/readout/src/G4DCtable.cc b/source/readout/src/G4DCtable.cc
index 3b463e5fddc0ce88417b06e354dbfb43434f7ca2..7165a28cfa1168f8a877914ed10da1f4d488b56a 100644
--- a/source/readout/src/G4DCtable.cc
+++ b/source/readout/src/G4DCtable.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // 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-03-00 $
+// $Id: G4DCtable.cc,v 1.4 2001/02/08 06:07:21 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4DCtable.hh"
@@ -17,11 +17,11 @@ G4DCtable::~G4DCtable() {;}
 
 G4int G4DCtable::Registor(G4String DMname,G4String DCname)
 {
-  for(int i=0;i<DClist.entries();i++)
+  for(int i=0;i<DClist.size();i++)
   { if(DClist[i]==DCname && DMlist[i]==DMname) return -1; }
-  DClist.insert(DCname);
-  DMlist.insert(DMname);
-  return DClist.entries();
+  DClist.push_back(DCname);
+  DMlist.push_back(DMname);
+  return DClist.size();
 }
 
 G4int G4DCtable::GetCollectionID(G4String DCname)
@@ -29,7 +29,7 @@ G4int G4DCtable::GetCollectionID(G4String DCname)
   G4int i = -1;
   if(DCname.index("/")==G4std::string::npos) // DCname only
   {
-    for(G4int j=0;j<DClist.entries();j++)
+    for(G4int j=0;j<DClist.size();j++)
     {
       if(DClist[j]==DCname)
       { 
@@ -40,7 +40,7 @@ G4int G4DCtable::GetCollectionID(G4String DCname)
   }
   else
   {
-    for(G4int j=0;j<DClist.entries();j++)
+    for(G4int j=0;j<DClist.size();j++)
     {
       G4String tgt = DMlist[j];
       tgt += "/";
diff --git a/source/readout/src/G4DMmessenger.cc b/source/readout/src/G4DMmessenger.cc
index 5063d0df84363d41302e31a582cc401430691e33..1e662e3866798be8c27473466c4ec9aa9a68877d 100644
--- a/source/readout/src/G4DMmessenger.cc
+++ b/source/readout/src/G4DMmessenger.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4DMmessenger.cc,v 1.1.10.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4DMmessenger.cc,v 1.2 1999/12/15 14:53:51 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // ---------------------------------------------------------------------
 
diff --git a/source/readout/src/G4DigiManager.cc b/source/readout/src/G4DigiManager.cc
index 499148fe5b02d20dc34f7fde03d9a0254b469bc4..f98d0481b85611720e981f2b43bef541d761f379 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.2.1 1999/12/08 17:35:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4DigiManager.cc,v 1.4 2001/02/08 06:07:21 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4DigiManager.hh"
@@ -44,7 +44,10 @@ G4DigiManager::G4DigiManager():verboseLevel(0)
 
 G4DigiManager::~G4DigiManager()
 {
-  DMtable.clearAndDestroy();
+  //DMtable.clearAndDestroy();
+  for(G4int i=0;i<DMtable.size();i++)
+  { delete DMtable[i]; }
+  DMtable.clear();
   delete DCtable;
   delete theMessenger;
 }
@@ -52,17 +55,20 @@ G4DigiManager::~G4DigiManager()
 void G4DigiManager::AddNewModule(G4VDigitizerModule* DM)
 {
   G4String DMname = DM->GetName();
-  if(DMtable.index(DM) != G4std::string::npos)
-  { 
-    G4cout << "<" << DMname << "> has already been registored." << G4endl; 
-    return;
+  for(int j=0;j<DMtable.size();j++)
+  {
+    if(DMtable[j]==DM)
+    { 
+      G4cout << "<" << DMname << "> has already been registored." << G4endl; 
+      return;
+    }
   }
-  else if( verboseLevel > 0 )
+  if( verboseLevel > 0 )
   {
     G4cout << "New DigitizerModule <" << DMname
          << "> is registored." << G4endl;
   }
-  DMtable.insert(DM);
+  DMtable.push_back(DM);
 
   G4int numberOfCollections = DM->GetNumberOfCollections();
   for(int i=0;i<numberOfCollections;i++)
@@ -95,7 +101,7 @@ void G4DigiManager::Digitize(G4String mName)
 
 G4VDigitizerModule* G4DigiManager::FindDigitizerModule(G4String mName)
 {
-  for(G4int i=0;i<DMtable.entries();i++)
+  for(G4int i=0;i<DMtable.size();i++)
   {
     if(DMtable[i]->GetName() == mName) return DMtable[i];
   }
@@ -177,13 +183,13 @@ void G4DigiManager::SetDigiCollection(G4int DCID,G4VDigiCollection* aDC)
 void G4DigiManager::SetVerboseLevel(G4int val)
 {
   verboseLevel = val;
-  for(G4int i=0;i<DMtable.entries();i++)
+  for(G4int i=0;i<DMtable.size();i++)
   { DMtable[i]->SetVerboseLevel(val); }
 }
 
 void G4DigiManager::List() const
 {
-  for(G4int i=0;i<DMtable.entries();i++)
+  for(G4int i=0;i<DMtable.size();i++)
   { G4cout << "   " << i << " : " << DMtable[i]->GetName() << G4endl; }
 }
 
diff --git a/source/readout/src/G4VDigitizerModule.cc b/source/readout/src/G4VDigitizerModule.cc
index b5773b316bcce012d3f8ad7e08bf83d2e6c6b1e3..d50dfe43501c1545b126b0b3e2b9acc41e63a16e 100644
--- a/source/readout/src/G4VDigitizerModule.cc
+++ b/source/readout/src/G4VDigitizerModule.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VDigitizerModule.cc,v 1.1.10.1 1999/12/07 20:52:58 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VDigitizerModule.cc,v 1.2 1999/12/15 14:53:52 gunter Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4VDigitizerModule.hh"
diff --git a/source/run/History b/source/run/History
index d6b531344ebd00c66dd7bf4b99fcaecf7bd92164..4765bceaab4d13035b543ac81c3e8fdf287162f4 100644
--- a/source/run/History
+++ b/source/run/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.27 2000/12/14 10:39:44 gcosmo Exp $
+$Id: History,v 1.29 2001/02/08 06:20:18 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,15 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Feb 8 2001, M.Asai (run-V03-00-01)
+- Migration to STL vector classes
+  affected files :
+./run/include/G4RunManager.hh
+./run/src/G4RunManager.cc
+
+Feb 7 2001, M.Asai (run-V03-00-00)
+- STL migration of G4RunManager
+
 Dec 14 2000, G.Cosmo (run-V02-00-06)
 - Updated date to G4RunManager.cc for public release 3.0.
 
diff --git a/source/run/include/G4Run.hh b/source/run/include/G4Run.hh
index b72fb0f964c4364a6017c19c57781dd558e95f21..804b51fd76f9ed4763ba7baae67ec3c0413c33e4 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.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4Run_h
diff --git a/source/run/include/G4RunManager.hh b/source/run/include/G4RunManager.hh
index d4c28cb4e74ec8be3062fa8aea05ee0d6b555463..4a5dffd1c131217d6c4adef836db880986db4a16 100644
--- a/source/run/include/G4RunManager.hh
+++ b/source/run/include/G4RunManager.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RunManager.hh,v 1.13 2000/11/13 01:24:20 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4RunManager.hh,v 1.15 2001/02/08 06:07:22 asaim Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -68,7 +68,7 @@ class G4Run;
 
 #include "G4EventManager.hh"
 #include "globals.hh"
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 class G4RunManager
 {
@@ -191,7 +191,7 @@ class G4RunManager
 
     G4Run* currentRun;
     G4Event* currentEvent;
-    G4RWTPtrOrderedVector<G4Event>* previousEvents;
+    G4std::vector<G4Event*>* previousEvents;
     G4int n_perviousEventsToBeStored;
 
     G4int storeRandomNumberStatus;
diff --git a/source/run/include/G4RunMessenger.hh b/source/run/include/G4RunMessenger.hh
index 3fc8619b22c3bdd0a56a2eef3c01a77ed1d0a255..b2e09ddfaa713bf7fd2405f8a31667919cda7924 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.6 2000/11/13 01:24:20 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/run/include/G4UserPhysicsListMessenger.hh b/source/run/include/G4UserPhysicsListMessenger.hh
index 8b7aeddab6ad0baadb3056dc98b58b750e2e5704..bf206c0ac0958f2abb375c27b2cf842555089dc2 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.6 2000/11/08 10:01:59 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/run/include/G4UserRunAction.hh b/source/run/include/G4UserRunAction.hh
index 4b41fa955ca0108504c73a222ecbbfb232cb1796..284048652f842b83937da4fb3cde06abc82f25e9 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.4 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4UserRunAction_h
diff --git a/source/run/include/G4VModularPhysicsList.hh b/source/run/include/G4VModularPhysicsList.hh
index 72a0800d2711986da5a34bff99860d282ce36339..1fd8e3e80c9a80b3de12458707fe014c05e02500 100644
--- a/source/run/include/G4VModularPhysicsList.hh
+++ b/source/run/include/G4VModularPhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VModularPhysicsList.hh,v 1.1 2000/11/14 23:53:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/run/include/G4VPersistencyManager.hh b/source/run/include/G4VPersistencyManager.hh
index 08cfca2de8c21b21b318567fc37491106323578a..08ceb4eb500c7d0ae32540e06cbc5a99a2155a45 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.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VPersistencyManager_h
diff --git a/source/run/include/G4VPhysicsConstructor.hh b/source/run/include/G4VPhysicsConstructor.hh
index 861bf7c204f7ac62bc222fc7d840fc2d3991069e..adbdae0656958e7088a17a37ccfbeec47ab8b830 100644
--- a/source/run/include/G4VPhysicsConstructor.hh
+++ b/source/run/include/G4VPhysicsConstructor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VPhysicsConstructor.hh,v 1.1 2000/11/14 23:53:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/run/include/G4VUserDetectorConstruction.hh b/source/run/include/G4VUserDetectorConstruction.hh
index 2040253477e8793df70bd2cfcc191fe2428e8e34..782e51df403e89a40904ea9cac9617658e2d4b2e 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.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VUserDetectorConstruction_h
diff --git a/source/run/include/G4VUserPhysicsList.hh b/source/run/include/G4VUserPhysicsList.hh
index ca3f76b60a931d3fc7fcb5dd6c2a5f9bfe3fb7a6..f6abcb1cf1ce53c8550a0aff856cbe90c698c6e2 100644
--- a/source/run/include/G4VUserPhysicsList.hh
+++ b/source/run/include/G4VUserPhysicsList.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUserPhysicsList.hh,v 1.8 2000/11/14 23:53:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/run/include/G4VUserPrimaryGeneratorAction.hh b/source/run/include/G4VUserPrimaryGeneratorAction.hh
index 87a6c81fedcd4b55eb0bc7662bc1153bd1ed3958..730acb2c13e162f47ee3cf1064260b0b5be449db 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.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #ifndef G4VUserPrimaryGeneratorAction_h
diff --git a/source/run/src/G4Run.cc b/source/run/src/G4Run.cc
index c1342c42973738eb03c45ae31be5e4d8b7224d35..91371fd224ba800ed00bea530e650dff13e6d978 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.2 1999/12/15 14:53:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4Run.hh"
diff --git a/source/run/src/G4RunManager.cc b/source/run/src/G4RunManager.cc
index b1650e627db8f602850f918ce2d952dfb2a78fc0..4fa9892e04470fe8f4693c0fe0d51a68d25a65e7 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.18 2000/12/14 10:38:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4RunManager.cc,v 1.23 2001/04/05 09:18:13 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -63,14 +63,14 @@ G4RunManager::G4RunManager()
   eventManager = new G4EventManager();
   timer = new G4Timer();
   runMessenger = new G4RunMessenger(this);
-  previousEvents = new G4RWTPtrOrderedVector<G4Event>;
+  previousEvents = new G4std::vector<G4Event*>;
   G4ParticleTable::GetParticleTable()->CreateMessenger();
   G4ProcessTable::GetProcessTable()->CreateMessenger();
   randomNumberStatusDir = "./";
   G4cout 
   << "**********************************************" << G4endl
-  << " Geant4 version $Name: geant4-03-00 $" << G4endl
-  << "                                (15-Dec-2000)" << G4endl
+  << " Geant4 version $Name: geant4-03-01 $" << G4endl
+  << "                                (06-Apr-2001)" << G4endl
   << "             Copyright : Geant4 Collaboration" << G4endl
   << "**********************************************" << G4endl;
 }
@@ -196,9 +196,12 @@ void G4RunManager::RunInitialization()
   G4StateManager* stateManager = G4StateManager::GetStateManager();
   stateManager->SetNewState(GeomClosed);
 
-  previousEvents->clearAndDestroy();
+  //previousEvents->clearAndDestroy();
+  for(G4int itr=0;itr<previousEvents->size();itr++)
+  { delete (*previousEvents)[itr]; }
+  previousEvents->clear();
   for(G4int i_prev=0;i_prev<n_perviousEventsToBeStored;i_prev++)
-  { previousEvents->insert((G4Event*)NULL); }
+  { previousEvents->push_back((G4Event*)NULL); }
 
   runAborted = false;
 
@@ -282,7 +285,10 @@ void G4RunManager::RunTermination()
 {
   G4StateManager* stateManager = G4StateManager::GetStateManager();
 
-  previousEvents->clearAndDestroy();
+  //previousEvents->clearAndDestroy();
+  for(G4int itr=0;itr<previousEvents->size();itr++)
+  { delete (*previousEvents)[itr]; }
+  previousEvents->clear();
 
   if(userRunAction) userRunAction->EndOfRunAction(currentRun);
 
@@ -302,8 +308,9 @@ void G4RunManager::StackPreviousEvent(G4Event* anEvent)
   { evt = anEvent; }
   else
   {
-    previousEvents->prepend(anEvent);
-    evt = previousEvents->removeLast();
+    previousEvents->insert(previousEvents->begin(),anEvent);
+    evt = previousEvents->back();
+    previousEvents->pop_back();
   }
   delete evt;
 }
diff --git a/source/run/src/G4RunMessenger.cc b/source/run/src/G4RunMessenger.cc
index 23e12e928119743316d39069444cecfb49be9c72..9e904f68491beb06397d56e6d866dbe865c09e72 100644
--- a/source/run/src/G4RunMessenger.cc
+++ b/source/run/src/G4RunMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RunMessenger.cc,v 1.7 2000/11/13 01:24:21 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4RunMessenger.hh"
diff --git a/source/run/src/G4UserPhysicsListMessenger.cc b/source/run/src/G4UserPhysicsListMessenger.cc
index 45ce50bfaf48bd1de2ac9addda87b4515e10405f..04f3124160d23e727f7bfc2cbf7257efb02f6f4a 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.5 2000/11/08 12:40:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/run/src/G4UserRunAction.cc b/source/run/src/G4UserRunAction.cc
index f6e07e755969325acd3cb9cbfbf90e5d9de0db6c..b2545fe586bb01c0ab9ba6d5c0493e7489b55847 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.3 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4UserRunAction.hh"
diff --git a/source/run/src/G4VPersistencyManager.cc b/source/run/src/G4VPersistencyManager.cc
index cb1abe63af013a51cf303a568fc691be2f95f5e7..74f1ea0b172b2942cbdb6ce14b48cf92957ff460 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.2 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4VPersistencyManager.hh"
diff --git a/source/run/src/G4VUserDetectorConstruction.cc b/source/run/src/G4VUserDetectorConstruction.cc
index 1a2fa745b60459ea7623126f338c9196c3d35f45..b04faa78ae151f81dc10c77240d746cee39b9ea2 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.2 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4VUserDetectorConstruction.hh"
diff --git a/source/run/src/G4VUserPhysicsList.cc b/source/run/src/G4VUserPhysicsList.cc
index 24364a88c79482c040235c08627b7d481e3e82e4..38033343a244a9c1a4565f5c6a0e6b2010c90ef7 100644
--- a/source/run/src/G4VUserPhysicsList.cc
+++ b/source/run/src/G4VUserPhysicsList.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUserPhysicsList.cc,v 1.12 2000/11/16 14:46:48 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/run/src/G4VUserPrimaryGeneratorAction.cc b/source/run/src/G4VUserPrimaryGeneratorAction.cc
index 5c474d392f33246ed625b7ea6e5814a82d245208..fd357186c5ea016b5828e160d0af1ae264a4870f 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.2 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4VUserPrimaryGeneratorAction.hh"
diff --git a/source/track/History b/source/track/History
index 039ec69dbe400782636cc02cc2f1a22d07d7f649..a88986c99932d5763a72d3f53320abfd7f08547a 100644
--- a/source/track/History
+++ b/source/track/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.23 2000/10/20 11:43:35 kurasige Exp $
+$Id: History,v 1.28 2001/03/06 09:59:14 kurasige Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,25 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Mar 7, 01  H.Kurashige (track-V03-00-04) 
+- Add protection for the zero-momentum case 
+  for UpdateStepForAlongStep in ParticleChange  (J.A)
+
+Feb 17, 01  H.Kurashige (track-V03-00-03)
+- Add Velocity and Setmethod in G4StepPoint
+- Add SetVelocity in G4Step.::InitializeStep
+- Modify G4StepPoint::GetVelocity to return correct velocity for optical photon
+
+Feb 17, 01  H.Kurashige (track-V03-00-02)
+- Fix G4Track::GetVelocity for Gamma
+
+Feb 12, 01 H.Kurashige (track-V03-00-01)
+- Remove thePolarizationChange from G4ParticleChangeForTransport.hh
+
+
+Feb 07, 01 H.Kurashige (track-V03-00-00)
+- Add copy constructor to G4Track 
+
 Oct 19, 00 H.kurashige (track-V02-00-01)
 - Bug fixes in copy constructor of G4ParticleChange
 
diff --git a/source/track/include/G4EvtBiasMechanism.hh b/source/track/include/G4EvtBiasMechanism.hh
index f4ce57fdbc2629aea5a9f52551dac7fb47bc0404..756f9599d9ee064280d439df6f5c8b84afce5565 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ForceCondition.hh b/source/track/include/G4ForceCondition.hh
index a5fd091ca0f65210a06e5e3cf14d3557b441090c..98339a787c8a3ad3e1f4e1f82c11dfe259a0adff 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4GPILSelection.hh b/source/track/include/G4GPILSelection.hh
index b27e6afbe8e547ef00cf221750c183706db9c564..5d37a4bbacb5dc74dd4250d42dfa19ec31e48e0f 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Mars5GeVMechanism.hh b/source/track/include/G4Mars5GeVMechanism.hh
index 1418098da993c1c02d5783c3d64d3dc4a1d36d56..9865a801d95455de00c5822530a13e39bd21cc5e 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChange.hh b/source/track/include/G4ParticleChange.hh
index a7c8e89a2b31a704e26e97aa5f093589dbfb91c1..26d1998bfe7f007fb857f41b29700402c19de70c 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.6 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChange.icc b/source/track/include/G4ParticleChange.icc
index 3dc60aea04932d17a97a8986112d8021813d9522..3800f7ba401c9a7c7d95c72459acb605cce61c3f 100644
--- a/source/track/include/G4ParticleChange.icc
+++ b/source/track/include/G4ParticleChange.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChange.icc,v 1.7 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 inline
diff --git a/source/track/include/G4ParticleChangeForDecay.hh b/source/track/include/G4ParticleChangeForDecay.hh
index 1e727e9fe646311e1cec923587d5e75c2307fd37..afe5cad1b76668075f5b139e70b39773fbd03c2c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChangeForLoss.hh b/source/track/include/G4ParticleChangeForLoss.hh
index 17eccb86badc2fb936ebc47dcc00983154e482c7..b1959d571d2dc6d4c3e4e335c8e0c0b36d09050c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChangeForMSC.icc b/source/track/include/G4ParticleChangeForMSC.icc
index 26bc3ba635efefabd7c45a838c624dc60234a155..43350bf2b4a4f03d85971267bcf41b59a8a3c2d9 100644
--- a/source/track/include/G4ParticleChangeForMSC.icc
+++ b/source/track/include/G4ParticleChangeForMSC.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForMSC.icc,v 1.3 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/track/include/G4ParticleChangeForRadDecay.hh b/source/track/include/G4ParticleChangeForRadDecay.hh
index 979792c9f971047cd79a88c49f8c8c8cdbf2165e..122600b59691d8650975f8b0e089b5b318f0305f 100644
--- a/source/track/include/G4ParticleChangeForRadDecay.hh
+++ b/source/track/include/G4ParticleChangeForRadDecay.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForRadDecay.hh,v 1.2 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4ParticleChangeForTransport.hh b/source/track/include/G4ParticleChangeForTransport.hh
index 5ee71e2c42dd2aeaa7412e30cb3cde0c47aaf27f..06d53076c11304fabf7229c9084d0bd232ac20ee 100644
--- a/source/track/include/G4ParticleChangeForTransport.hh
+++ b/source/track/include/G4ParticleChangeForTransport.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ParticleChangeForTransport.hh,v 1.5 2000/05/16 00:34:27 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ParticleChangeForTransport.hh,v 1.6 2001/02/12 07:56:32 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
@@ -18,6 +18,7 @@
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 10 May. 1998  H.Kurahige
 //   Added theMaterialChange                        16 FEb. 2000  H.Kurahige
+//   Remove thePolarizationChange		    12 Feb. 2001 H.Kurashige
 //
 // Class Description
 //  This class is a concrete class for ParticleChange for transportation
@@ -74,11 +75,6 @@ class G4ParticleChangeForTransport: public G4ParticleChange
     void SetMaterialChange(G4Material* fMaterial);
     //  Get/Set the material in the touchable of the current particle.
 
-    const G4ThreeVector* GetPolarizationChange() const;
-    void SetPolarizationChange(G4double Px, G4double Py, G4double Pz);
-    void SetPolarizationChange(const G4ThreeVector& finalPoralization);
-    // Get/Set thePolarizationChange vector.
-
     G4bool GetMomentumChanged() const;
     void SetMomentumChanged(G4bool b);
 
@@ -94,8 +90,6 @@ class G4ParticleChangeForTransport: public G4ParticleChange
     //  The flag which is set if mometum is changed in this stepi
     G4Material* theMaterialChange;
      //  The material where given track currently locates
-    G4ThreeVector thePolarizationChange;
-    //  The changed (final) polarization of a given track
 };
 
 #include "G4ParticleChangeForTransport.icc"
diff --git a/source/track/include/G4ParticleChangeForTransport.icc b/source/track/include/G4ParticleChangeForTransport.icc
index 9df1926c2a7ea6e6c45a2ec532e6fd8efb608e3f..8a3d2e6e53c3154dd0f3d2cd8e40f682e69e3623 100644
--- a/source/track/include/G4ParticleChangeForTransport.icc
+++ b/source/track/include/G4ParticleChangeForTransport.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForTransport.icc,v 1.5 2000/05/16 00:34:27 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/track/include/G4Step.hh b/source/track/include/G4Step.hh
index adf5af568a9564705bf472c82940662440892ce9..78f8d1de57159d92028577f1e652ad55269e3678 100644
--- a/source/track/include/G4Step.hh
+++ b/source/track/include/G4Step.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Step.hh,v 1.7 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Step.icc b/source/track/include/G4Step.icc
index fe5cd7f4bc03703d9ba44006250098126909e8ed..737153c8f49f18a5679aef001eb6555d27dd351e 100644
--- a/source/track/include/G4Step.icc
+++ b/source/track/include/G4Step.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Step.icc,v 1.3 2000/10/18 15:00:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Step.icc,v 1.4 2001/02/17 11:25:10 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -162,6 +162,7 @@ inline
    fpPreStepPoint->SetProperTime(fpTrack->GetProperTime());
    fpPreStepPoint->SetMomentumDirection(fpTrack->GetMomentumDirection());
    fpPreStepPoint->SetKineticEnergy(fpTrack->GetKineticEnergy());
+   fpPreStepPoint->SetVelocity(fpTrack->GetVelocity());
    fpPreStepPoint->SetTouchable(fpTrack->GetTouchable());
    fpPreStepPoint->SetMaterial( fpTrack->GetTouchable()->GetVolume()->GetLogicalVolume()->GetMaterial());
    fpPreStepPoint->SetPolarization(fpTrack->GetPolarization());
diff --git a/source/track/include/G4StepPoint.hh b/source/track/include/G4StepPoint.hh
index 1f7a1deb50990cd4ea0434f5435dfd12290dbd18..aecc14e08aad5c95532c1b6808cfd948d721c194 100644
--- a/source/track/include/G4StepPoint.hh
+++ b/source/track/include/G4StepPoint.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StepPoint.hh,v 1.6 2000/06/01 02:28:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4StepPoint.hh,v 1.7 2001/02/17 11:25:10 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -96,11 +96,7 @@ class G4StepPoint
      // Kinetic Energy of the track
 
   G4double GetVelocity() const;
-   // This velocity is the velocity as if in vacuum.
-   // (So it is not corrected for the refraction index
-   //   in the case of photons - optical or X-rays.)
-   // In order to get the velocity in the material, use
-   //   GetVelocity of G4Track.
+  void SetVelocity(G4double v);
    //
 
   G4double GetBeta() const;
@@ -163,6 +159,7 @@ class G4StepPoint
       // Time since track is created (in rest frame of particle)
    G4ThreeVector fMomentumDirection;
    G4double fKineticEnergy;
+   G4double fVelocity; 
    const G4VTouchable* fpTouchable;
    G4Material* fpMaterial;
       // Material of the volmue
diff --git a/source/track/include/G4StepPoint.icc b/source/track/include/G4StepPoint.icc
index ba3bff07e7b7f2bfdac8a2766787622f8d2817cc..e05e53841f4c679651deaf8f31177a76dce4da63 100644
--- a/source/track/include/G4StepPoint.icc
+++ b/source/track/include/G4StepPoint.icc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StepPoint.icc,v 1.2 2000/06/01 02:28:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4StepPoint.icc,v 1.3 2001/02/17 11:25:10 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
    inline const G4ThreeVector& G4StepPoint::GetPosition() const
@@ -77,28 +77,19 @@
 
    inline G4double G4StepPoint::GetVelocity() const
    { 
-     if(fMass==0.){
-        return c_light;
-     } 
-     else{ 
-        G4double tMomentum = sqrt(fKineticEnergy*fKineticEnergy +
-                                  2.0*fKineticEnergy*fMass);
-        G4double tTotalEnergy = fKineticEnergy + fMass; 
-        return tMomentum/tTotalEnergy*c_light;
-     }   
+     return fVelocity;
    }
-   // This velocity is the velocity as if in vacuum.
-   // (So it is not corrected for the refraction index
-   //   in the case of photons - optical or X-rays.)
-   // In order to get the velocity in the material, use
-   //   GetVelocity of G4Track.
-   //
+   inline void G4StepPoint::SetVelocity(G4double v)
+   { 
+     fVelocity = v;
+   }
+  
 
   inline G4double G4StepPoint::GetBeta() const
-   { return (fMass==0.) ? 
-      1.0 : 
-      sqrt(fKineticEnergy*fKineticEnergy + 2.0*fKineticEnergy*fMass)
-      /(fKineticEnergy+fMass); }
+   { 
+      return fVelocity/c_light;
+   }
+
     // Velocity of the track in unit of c(light velocity)
 
    inline G4double G4StepPoint::GetGamma() const
diff --git a/source/track/include/G4StepStatus.hh b/source/track/include/G4StepStatus.hh
index 964e9d4dd89a9eac4c505159f9b942fa93f37333..186d8800501efc16f0bda2a94cedd5c7fbf7acea 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4SteppingControl.hh b/source/track/include/G4SteppingControl.hh
index 7cb1a972a18b65ef80582a9e9e4b9099f2338bd8..003f205ee45254fc2349d155a46c629d68d403a1 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Track.hh b/source/track/include/G4Track.hh
index 312970a6f82665cc2755b938684d6d966e77f34c..d06f0d852030a6422e1412591d2351b3ec60cf9b 100644
--- a/source/track/include/G4Track.hh
+++ b/source/track/include/G4Track.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Track.hh,v 1.9 2000/10/18 15:00:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Track.hh,v 1.10 2001/01/18 12:25:08 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -55,11 +55,13 @@ public: // With description
 
 // Constructor
    G4Track();
+   G4Track(const G4Track&);
    G4Track(G4DynamicParticle* apValueDynamicParticle,
            G4double aValueTime,
            const G4ThreeVector& aValuePosition);
       // aValueTime is a global time
 
+   G4Track& operator=(const  G4Track&);
 //--------
 public: 
 
diff --git a/source/track/include/G4Track.icc b/source/track/include/G4Track.icc
index 6344b907b420d4e164c1ef14098122d4fb907f3b..80956a8288cd3e25a1bbe3cdde21125c12193b7f 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.6 2000/10/18 15:00:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //-----------------------------------------------------------------
 // Definitions of inline functions
diff --git a/source/track/include/G4TrackFastVector.hh b/source/track/include/G4TrackFastVector.hh
index 10bc717927e88e4d9c8593db21bf1eb1de798c61..262fa7ec170715e68c2e96b5af550aae77a4115c 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4TrackStatus.hh b/source/track/include/G4TrackStatus.hh
index 182b128ec4a60184251c2de50bdc21236b4a00fe..f922acb7f0780535b6d94d53f56ece7732313ced 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4VEvtBiasMechanism.hh b/source/track/include/G4VEvtBiasMechanism.hh
index 9cf896e3084c8e45f2497738f5911606ce82566e..bedf03a1c6d7db2f84d4214ec4f1d271b133ef32 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4VParticleChange.hh b/source/track/include/G4VParticleChange.hh
index 79918fe268d0ba7bf44076de44d481847fdd1aab..0a6a52c5070bc98eb58ddb64907f7c7879bff8f6 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-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/include/G4VParticleChange.icc b/source/track/include/G4VParticleChange.icc
index 5655552fadaf9c0f5e3a9c2ad77565b2b18571cb..88a89a152a36c23534d5a9565c406093c559bfed 100644
--- a/source/track/include/G4VParticleChange.icc
+++ b/source/track/include/G4VParticleChange.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VParticleChange.icc,v 1.5 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //----------------------------------------------------------------
 // Virtual methods for updating G4Step 
diff --git a/source/track/include/G4VUserTrackInformation.hh b/source/track/include/G4VUserTrackInformation.hh
index ca68079ace16c2a6e27e22e0f6b5f8ae799d3fc7..04406ba0cc4c43e384a03d3a93efada367944a9d 100644
--- a/source/track/include/G4VUserTrackInformation.hh
+++ b/source/track/include/G4VUserTrackInformation.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VUserTrackInformation.hh,v 1.2 2000/06/02 09:09:47 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4EvtBiasMechanism.cc b/source/track/src/G4EvtBiasMechanism.cc
index 1018978e32931d4e4110103eb65842ed0ef582b2..6bc052309ab9df36affcab7fd3270c91409e1f80 100644
--- a/source/track/src/G4EvtBiasMechanism.cc
+++ b/source/track/src/G4EvtBiasMechanism.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4EvtBiasMechanism.cc,v 1.3 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/track/src/G4Mars5GeVMechanism.cc b/source/track/src/G4Mars5GeVMechanism.cc
index c4215d4df3b922cd5fe4f72b9e47834802be1d2b..d2569049a4d3d4c6e29c3822c4eeb3f79e930eff 100644
--- a/source/track/src/G4Mars5GeVMechanism.cc
+++ b/source/track/src/G4Mars5GeVMechanism.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Mars5GeVMechanism.cc,v 1.4 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChange.cc b/source/track/src/G4ParticleChange.cc
index 36d918e580650f2c2bf3a0304184273ce9aac0db..b31c57f5a853c716a795d218711fc7c93ce968f6 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.11 2000/10/20 11:42:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ParticleChange.cc,v 1.12 2001/03/05 12:20:46 japost Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -235,9 +235,11 @@ G4Step* G4ParticleChange::UpdateStepForAlongStep(G4Step* pStep)
                 + ( CalcMomentum(theEnergyChange, theMomentumDirectionChange, mass)
 	            - pPreStepPoint->GetMomentum());
     G4double      tMomentum = pMomentum.mag();
-    G4ThreeVector direction( pMomentum.x()/tMomentum,
-			     pMomentum.y()/tMomentum,
-			     pMomentum.z()/tMomentum );
+    G4ThreeVector direction(1.0,0.0,0.0); 
+    if( tMomentum > 0. ){
+      G4double  inv_Momentum= 1.0 / tMomentum; 
+      direction= pMomentum * inv_Momentum;
+    }
     pPostStepPoint->SetMomentumDirection(direction);
     pPostStepPoint->SetKineticEnergy( energy );
   } else {
diff --git a/source/track/src/G4ParticleChangeForDecay.cc b/source/track/src/G4ParticleChangeForDecay.cc
index 58cc98b39881677ee9e941780251ee1ed28dfe0e..ca5525afb7f0330386fa8c428ee30421569b78c2 100644
--- a/source/track/src/G4ParticleChangeForDecay.cc
+++ b/source/track/src/G4ParticleChangeForDecay.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForDecay.cc,v 1.5 2000/02/13 15:08:27 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChangeForLoss.cc b/source/track/src/G4ParticleChangeForLoss.cc
index 2922291dca2b1e0d6fa3a1d331d49d63df816904..492aac2cff48ee8565fdc64cddef7b42d6b05b4c 100644
--- a/source/track/src/G4ParticleChangeForLoss.cc
+++ b/source/track/src/G4ParticleChangeForLoss.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForLoss.cc,v 1.5 2000/02/13 15:08:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChangeForMSC.cc b/source/track/src/G4ParticleChangeForMSC.cc
index e462c8be64d627ab89ce6dffa6de1650f619421d..2d322757b90d0827ee37b31ccea06dda1031ce47 100644
--- a/source/track/src/G4ParticleChangeForMSC.cc
+++ b/source/track/src/G4ParticleChangeForMSC.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ParticleChangeForMSC.cc,v 1.6 2000/02/13 15:08:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChangeForTransport.cc b/source/track/src/G4ParticleChangeForTransport.cc
index 65947fd4f89ca1b3b119b1594c4890f3c294c44a..8e457752ba2ab7e0e3532e5684bbf1d6c61a05c2 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.7 2000/05/16 00:34:27 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ParticleChangeForTransport.cc,v 1.8 2001/03/06 09:59:23 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -130,8 +130,13 @@ G4Step* G4ParticleChangeForTransport::UpdateStepForAlongStep(G4Step* pStep)
     G4ThreeVector pMomentum =  pPostStepPoint->GetMomentum() 
                      + ( CalcMomentum(theEnergyChange, theMomentumDirectionChange, mass)
 	                  - pPreStepPoint->GetMomentum());
-    G4double      tMomentum_inv = 1.0 / pMomentum.mag();
-    pPostStepPoint->SetMomentumDirection(pMomentum*tMomentum_inv);
+    G4double      tMomentum = pMomentum.mag();
+    G4ThreeVector direction(1.0,0.0,0.0); 
+    if( tMomentum > 0. ){
+      G4double  inv_Momentum= 1.0 / tMomentum; 
+      direction= pMomentum * inv_Momentum;
+    }
+    pPostStepPoint->SetMomentumDirection(direction);
     pPostStepPoint->SetKineticEnergy( energy );
   }
 
diff --git a/source/track/src/G4Step.cc b/source/track/src/G4Step.cc
index 56899bdf08ee1db6736080568671fc33f3680a30..538058f0311f6ebf06131e9826286a73d718b83f 100644
--- a/source/track/src/G4Step.cc
+++ b/source/track/src/G4Step.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Step.cc,v 1.4 1999/12/15 14:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4StepPoint.cc b/source/track/src/G4StepPoint.cc
index 6e3a3fcb5b62b397f0d22b73ea33be33a51b63eb..4b843ba3b2292b174b3a7e6b0a9e4f99eed2b50c 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.3 2000/02/16 16:10:06 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4StepPoint.cc,v 1.5 2001/02/17 11:27:13 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -52,7 +52,8 @@ G4StepPoint::G4StepPoint(const G4StepPoint &right):
   fpProcessDefinedStep(right.fpProcessDefinedStep),
   fMass(right.fMass),
   fCharge(right.fCharge),
-  fWeight(right.fWeight)
+  fWeight(right.fWeight),
+  fVelocity(right.fVelocity)
 {}
 
 
@@ -76,10 +77,7 @@ G4StepPoint & G4StepPoint::operator=(const G4StepPoint &right)
     fMass = right.fMass;
     fCharge = right.fCharge;
     fWeight = right.fWeight;
+    fVelocity = right.fVelocity;
   }
   return *this;
 }
-
-
-
-
diff --git a/source/track/src/G4Track.cc b/source/track/src/G4Track.cc
index 1a4b852c974453eb7508c8b0d3e4635340980d61..9ae9f350b728d1fea0371cbca5c11715b9169c34 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.4 2000/06/02 05:36:53 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Track.cc,v 1.11 2001/02/17 10:51:46 kurasige Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -19,7 +19,9 @@
 //     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
 //
 //---------------------------------------------------------------
-
+//   Add copy constructor            Hisaya Feb. 07 01
+//   Fix GetVelocity                 Hisaya Feb. 17 01
+//
 #include "G4Track.hh"
 
 G4Allocator<G4Track> aTrackAllocator;
@@ -38,6 +40,7 @@ G4Track::G4Track(G4DynamicParticle* apValueDynamicParticle,
    fPosition = aValuePosition;
    fpTouchable = 0;
    fpNextTouchable = 0; 
+   fpStep=0;
 
    fpLVAtVertex = 0;
    fpCreatorProcess = 0;
@@ -63,6 +66,7 @@ G4Track::G4Track()
    fTrackID = 0;
    fpTouchable = 0;
    fpNextTouchable = 0;
+   fpStep=0;
 
    fpDynamicParticle = 0;
    fpLVAtVertex = 0;
@@ -75,6 +79,12 @@ G4Track::G4Track()
 
    fpUserInformation = 0;
 }
+//////////////////
+G4Track::G4Track(const G4Track& right)
+//////////////////
+{
+  *this = right;
+}
 
 ///////////////////
 G4Track::~G4Track()
@@ -84,6 +94,42 @@ G4Track::~G4Track()
    delete fpUserInformation;
 }
 
+//////////////////
+G4Track & G4Track::operator=(const G4Track &right)
+//////////////////
+{
+  if (this != &right) {
+   fCurrentStepNumber = right.fCurrentStepNumber;
+   fGlobalTime = right.fGlobalTime;
+   fLocalTime = right.fLocalTime;
+   fTrackLength = right.fTrackLength;
+   fParentID = right.fParentID;
+
+   // Track ID is not copied and set to zero for new track
+   fTrackID = 0;
+
+   // pointers to Touchables or Step are not copied
+   fpTouchable = 0;
+   fpNextTouchable = 0;
+   fpStep=0;
+
+   fpDynamicParticle = new G4DynamicParticle(*(right.fpDynamicParticle));
+
+   fVtxKineticEnergy = right.fVtxKineticEnergy;
+   fVtxPosition = right.fVtxPosition;
+   fpLVAtVertex = right.fpLVAtVertex;
+   fpCreatorProcess = right.fpCreatorProcess;
+
+   fTrackStatus = right.fTrackStatus;
+   fBelowThreshold = right.fBelowThreshold;
+   fGoodForTracking = right.fGoodForTracking;
+   fWeight = right.fWeight;
+
+   fpUserInformation = right.fpUserInformation;
+  }
+  return *this;
+}
+
 ///////////////////
 G4double G4Track::GetVelocity() const
 ///////////////////
@@ -95,10 +141,9 @@ G4double G4Track::GetVelocity() const
   // mass less particle  
   if( mass == 0. ){
     velocity = c_light ; 
-    G4String name = fpDynamicParticle->GetDefinition()->GetParticleName();
 
     // special case for photons
-    if(( name=="gamma")||(name=="opticalphoton")){
+    if(fpDynamicParticle->GetDefinition()->GetParticleName()=="opticalphoton"){
       G4Material*
 	mat=fpTouchable->GetVolume()->GetLogicalVolume()->GetMaterial();
  
@@ -107,7 +152,7 @@ G4double G4Track::GetVelocity() const
           // light velocity = c/reflection-index 
 	  velocity /= 
 	    mat->GetMaterialPropertiesTable()->GetProperty("RINDEX")->
-	    GetMinProperty() ; 
+	    GetProperty(fpDynamicParticle->GetTotalMomentum()) ; 
 	}
       }  
     }
diff --git a/source/track/src/G4VEvtBiasMechanism.cc b/source/track/src/G4VEvtBiasMechanism.cc
index 9a527dde5a24b555edb509fa312561bfef0c86dc..e940d714505bbd37ae005b7c1dc09af7161376bb 100644
--- a/source/track/src/G4VEvtBiasMechanism.cc
+++ b/source/track/src/G4VEvtBiasMechanism.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VEvtBiasMechanism.cc,v 1.2 1999/12/15 14:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/track/src/G4VParticleChange.cc b/source/track/src/G4VParticleChange.cc
index bb52542f88dcaa1177a4f0f138299808c79b6433..d149d663603e364e2f3a6ba57782d18f05d2bc3f 100644
--- a/source/track/src/G4VParticleChange.cc
+++ b/source/track/src/G4VParticleChange.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VParticleChange.cc,v 1.5 2000/02/13 15:08:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/tracking/History b/source/tracking/History
index cbf5aff5cca2d5f32cde20ffdf045b9dcc00728b..42d2346671871620abbad12194f3cddcabe4556e 100644
--- a/source/tracking/History
+++ b/source/tracking/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.12 2000/06/02 10:23:31 kurasige Exp $
+$Id: History,v 1.18 2001/02/09 01:35:04 tsasaki Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,10 +16,27 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Feb 09, 01 T.Sasaki (tracking-V03-00-05)
+- Fix for linux etc.
+Feb 08, 01 T.Sasaki (tracking-V03-00-03)
+- STL migration: get rid of most of RW vectors
+Feb 05, 01 G.Cosmo (tracking-V03-00-02)
+- STL migration for G4OrderedTable and G4DataVector.
+  Modified files: G4VSteppingVerbose.hh.
+
+Jan 12, 01 T.Sasaki (tracking-V03-00-01)
+- correction of class description 
+
+Nov 04, 00 T.Sasaki (tracking-V02-00-02)
+- G4TrackingManager.icc has been modified for new biasing schme
+- Descriptions are added too header files
+
+Aug 30, 00 T.Sasaki (tracking-V02-00-01)
+- Protection for no AtRestDoIt procs. 
 
 June 2, 00 M.Asai (tracking-01-01-01)
 - Add SetUserTrackInformation(G4VUserTrackInformation*) to
- G4TrackingManager
+  G4TrackingManager
 - Fix problems in deleteing Touchable in G4SteppingManager (Hisaya) 
 
 Hune 1, 00 H.Kurashige
@@ -28,19 +45,27 @@ Hune 1, 00 H.Kurashige
 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
+
 Apr 15, 99 M.Asai (tracking-01-00-03)
 - Make arguments in user action classes take const pointers.
 - Make trajectory and trajectory point as derivable classes.
+
 Mar 23, 99 T.Sasaki    (tracking-01-00-02)
 - Fix for precision problem of safety in SteppingManager by John Apostolakis
 - G4VSteppingVerbose is introduced  
+
 Feb 18, 99 T.Sasaki (tracking-01-00-01)
 - ShowStep() method was moved from G4Step to G4SteppingVerbose
+
 Nov 25, 98 T.Sasaki    (tracking-00-04-03)
 - Fix to G4SteppingManager.cc to set proper 2ndary numbers.
+
 Nov 17 ,98 H.Kurashige (tracking-00-04-01)
 - Fixed treatment of safety in case of ApplyCuts flag is ON
 
diff --git a/source/tracking/include/G4SteppingManager.hh b/source/tracking/include/G4SteppingManager.hh
index 8ddf4ff34aca7cf3360849a0e08770986707b20b..3b6bdfe34241ea72026decaf797f72df9d2e8676 100644
--- a/source/tracking/include/G4SteppingManager.hh
+++ b/source/tracking/include/G4SteppingManager.hh
@@ -5,16 +5,21 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingManager.hh,v 1.12 2000/06/01 03:17:39 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SteppingManager.hh,v 1.16 2001/02/09 01:35:05 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 // 
 //---------------------------------------------------------------
 //
 // G4SteppingManager.hh
 //
-// Description:
-//   This class represents the manager who steers to move the give
-//   particle from the TrackingManger by one Step.
+// class description:
+//  This is the class which plays an essential role in tracking 
+//  the particle. It takes cares all message passing between
+//  objects in the different categories (for example, 
+//  geometry(including transportation), interactions in 
+//  matter, etc). It's public method 'stepping' steers to step 
+//  the particle.
+//  Geant4 kernel use only
 //
 // Contact:
 //   Questions and comments to this code should be sent to
@@ -24,7 +29,6 @@
 //---------------------------------------------------------------
 //   modified for new ParticleChange 12 Mar. 1998  H.Kurashige
 
-#include "g4rw/tvordvec.h"            // Include from 'RogueWave'
 
 class G4SteppingManager;
 
@@ -33,6 +37,7 @@ class G4SteppingManager;
 
 #include "G4ios.hh"                 // Include from 'system'
 #include "g4std/iomanip"                  // Include from 'system'
+#include "g4std/vector"                  // Include from 'system'
 #include "globals.hh"                 // Include from 'global'
 #include "Randomize.hh"               // Include from 'global'
 #include "G4Navigator.hh"             // Include from 'geometry'
@@ -56,22 +61,21 @@ class G4VSensitiveDetector;
 #include "G4TouchableHistory.hh"      // Include from 'geometry'
 
 //  must be changed in elegant way
-static const G4int SIZEofSelectedDoIt=100;
+static const size_t SizeOfSelectedDoItVector=100;
 // RogueWave Tools.h++
-   typedef G4RWTValOrderedVector<G4int> 
+   typedef G4std::vector<G4int> 
              G4SelectedAtRestDoItVector;
-   typedef G4RWTValOrderedVector<G4int> 
+   typedef G4std::vector<G4int> 
              G4SelectedAlongStepDoItVector;
-   typedef G4RWTValOrderedVector<G4int>
+   typedef G4std::vector<G4int>
              G4SelectedPostStepDoItVector;
 
-
 ///////////////////////
 class G4SteppingManager 
 ///////////////////////
 {
 //--------
-   public:
+public: //without description
 //--------
 
 // Constructor/Destructor
@@ -252,9 +256,9 @@ class G4SteppingManager
 
    G4int verboseLevel;
 
-   G4SelectedAtRestDoItVector *fSelectedAtRestDoItVector;
-   G4SelectedAlongStepDoItVector *fSelectedAlongStepDoItVector;
-   G4SelectedPostStepDoItVector *fSelectedPostStepDoItVector;
+   G4SelectedAtRestDoItVector* fSelectedAtRestDoItVector;
+   G4SelectedAlongStepDoItVector* fSelectedAlongStepDoItVector;
+   G4SelectedPostStepDoItVector* fSelectedPostStepDoItVector;
 
    G4double   fPreviousStepSize;
 
@@ -524,7 +528,7 @@ class G4SteppingManager
     }
   }
 
-#include "G4SteppingManager.icc"
+//#include "G4SteppingManager.icc"
 
 #endif
 
diff --git a/source/tracking/include/G4SteppingVerbose.hh b/source/tracking/include/G4SteppingVerbose.hh
index 4b32d2dfc0d92abf6f3d86a0da63d3f8a83aae27..a9181559fc84dc7c48e794895e07ebcf57cdfc51 100644
--- a/source/tracking/include/G4SteppingVerbose.hh
+++ b/source/tracking/include/G4SteppingVerbose.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingVerbose.hh,v 1.7 1999/12/15 14:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SteppingVerbose.hh,v 1.8 2000/11/11 06:34:09 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
 //
 // G4SteppingVerbose.hh
 //
-// Description:
+// class dscription:
 //   This class manages the vervose outputs in G4SteppingManager. 
 //   
 //
@@ -32,11 +32,11 @@ class G4SteppingVerbose;
 #include "G4VSteppingVerbose.hh"
 
 class G4SteppingVerbose : public G4VSteppingVerbose {
-public:   
+public:   // with description
 // Constructor/Destructor
   G4SteppingVerbose();
  ~G4SteppingVerbose();
-//
+// methods to be invoked in the SteppingManager
   void NewStep();
   void AtRestDoItInvoked();
   void AlongStepDoItAllDone();
diff --git a/source/tracking/include/G4TrackVector.hh b/source/tracking/include/G4TrackVector.hh
index ac45b16e6a811ecd5aee07ff8c9122d787eb754d..ad2c70e351d92ea4bf68cae86d5b649d29ce259a 100644
--- a/source/tracking/include/G4TrackVector.hh
+++ b/source/tracking/include/G4TrackVector.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackVector.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrackVector.hh,v 1.7 2001/02/08 07:39:51 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 //  G4TrackVector.hh
 //
-//  Description:
+//  class description:
 //    This class keeps a List of G4Track objects. It is implemented 
 //    as a RougeWave pointer ordered vector.
 //
@@ -27,11 +27,11 @@
 #ifndef G4TrackVector_h
 #define G4TrackVector_h 1
 
-#include "g4rw/tpordvec.h"           // Include from 'RogueWave'
+#include "g4std/vector"
 #include "G4Track.hh"              // Include form 'tracking'
 
 ///////////////////////////////////////////////////
-typedef G4RWTPtrOrderedVector<G4Track> G4TrackVector;
+typedef G4std::vector<G4Track*> G4TrackVector;
 ///////////////////////////////////////////////////
 
 #endif
diff --git a/source/tracking/include/G4TrackingManager.hh b/source/tracking/include/G4TrackingManager.hh
index 86636c7ee7e8cdd6d9f33d616e3c28780c5f8926..b6da364bc83590e7384e27641752d75bec05c260 100644
--- a/source/tracking/include/G4TrackingManager.hh
+++ b/source/tracking/include/G4TrackingManager.hh
@@ -5,17 +5,22 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackingManager.hh,v 1.9 2000/06/02 09:13:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrackingManager.hh,v 1.11 2001/01/12 05:55:28 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 // G4TrackingManager.hh
 //
-// Description:
-//   This class represents the manager who steers the tracking
-//   of a particle given from the event manager.
+// class description:
+//  This is an interface class among the event,  the track
+//  and the tracking category. It handles necessary 
+//  message passings between the upper hierarchical object, which 
+//  is the event manager (G4EventManager), and lower hierarchical 
+//  objects in the tracking category. It receives one track in an 
+//  event from the event manager and takes care to finish tracking it. 
+//  Geant4 kernel use only.
 //
 // Contact:
 //   Questions and comments to this code should be sent to
@@ -48,7 +53,7 @@ class G4TrackingManager
 {
 
 //--------
-   public:
+public: // without description
 //--------
 
 // Constructor/Destructor
diff --git a/source/tracking/include/G4TrackingMessenger.hh b/source/tracking/include/G4TrackingMessenger.hh
index 4d021699a5c12f47d0307a60a70bdeb7633adace..ebaee7fb3dbbad0366204a2d378c6ab3c9ad54e8 100644
--- a/source/tracking/include/G4TrackingMessenger.hh
+++ b/source/tracking/include/G4TrackingMessenger.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrackingMessenger.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrackingMessenger.hh,v 1.6 2000/11/11 06:34:10 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 // G4TrackingMessenger.hh
 //
-// Description:
+// class Description:
 //   This is a messenger class to interface to exchange information
 //   between tracking/stepping and UI.
 //
@@ -41,7 +41,7 @@ class G4TrackingMessenger: public G4UImessenger
 {
 
 //--------
-   public:
+public: // without description
 //--------
 
    G4TrackingMessenger(G4TrackingManager* trMan);
diff --git a/source/tracking/include/G4Trajectory.hh b/source/tracking/include/G4Trajectory.hh
index da366c630dff77c9531f67da87cbbd72835eaf3f..e830a7e365af133b970d7ef1498fd44f76635908 100644
--- a/source/tracking/include/G4Trajectory.hh
+++ b/source/tracking/include/G4Trajectory.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Trajectory.hh,v 1.9 2000/01/26 04:20:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Trajectory.hh,v 1.12 2001/02/09 01:35:05 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 // G4Trajectory.hh
 //
-// Description:
+// class description:
 //   This class represents the trajectory of a particle tracked.
 //   It includes information of 
 //     1) List of trajectory points which compose the trajectory,
@@ -38,7 +38,7 @@ class G4Trajectory;
 #include "G4Allocator.hh"
 #include <stdlib.h>                 // Include from 'system'
 #include "G4ios.hh"               // Include from 'system'
-#include "g4rw/tpordvec.h"            // G4RWTValOrderedVector
+#include "g4std/vector"            // G4RWTValOrderedVector
 #include "globals.hh"               // Include from 'global'
 #include "G4ParticleDefinition.hh"  // Include from 'particle+matter'
 #include "G4TrajectoryPoint.hh"     // Include from 'tracking'
@@ -47,13 +47,14 @@ class G4Trajectory;
 
 class G4Polyline;                   // Forward declaration.
 
+typedef G4std::vector<G4VTrajectoryPoint*>  TrajectoryPointContainer;
 ///////////////////
 class G4Trajectory : public G4VTrajectory
 ///////////////////
 {
 
 //--------
-   public:
+public: // with description
 //--------
 
 // Constructor/Destrcutor
@@ -86,7 +87,7 @@ class G4Trajectory : public G4VTrajectory
    virtual void ShowTrajectory() const;
    virtual void DrawTrajectory(G4int i_mode=0) const;
    virtual void AppendStep(const G4Step* aStep);
-   virtual int GetPointEntries() const { return positionRecord->entries(); }
+   virtual int GetPointEntries() const { return positionRecord->size(); }
    virtual G4VTrajectoryPoint* GetPoint(G4int i) const 
    { return (*positionRecord)[i]; }
    virtual void MergeTrajectory(G4VTrajectory* secondTrajectory);
@@ -97,7 +98,7 @@ class G4Trajectory : public G4VTrajectory
    private:
 //---------
 
-  G4RWTPtrOrderedVector<G4VTrajectoryPoint>* positionRecord;
+  TrajectoryPointContainer* positionRecord;
   G4int fTrackID;
   G4int fParentID;
   G4String ParticleName;
diff --git a/source/tracking/include/G4TrajectoryPoint.hh b/source/tracking/include/G4TrajectoryPoint.hh
index e075b4d9b5dad24d7e22ec0badda6b82621f94a5..3af1d76d87bfbac3e8154cbf65f1fcb0293fdb10 100644
--- a/source/tracking/include/G4TrajectoryPoint.hh
+++ b/source/tracking/include/G4TrajectoryPoint.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TrajectoryPoint.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrajectoryPoint.hh,v 1.6 2000/11/11 06:34:10 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 // G4TrajectoryPoint.hh
 //
-// Description:
+// class description:
 //   This class represents the trajectory of a particle tracked.
 //   It includes information of 
 //     1) List of trajectory points which compose the trajectory,
@@ -44,7 +44,7 @@ class G4TrajectoryPoint : public G4VTrajectoryPoint
 {
 
 //--------
-   public:
+public: // without description
 //--------
 
 // Constructor/Destructor
diff --git a/source/tracking/include/G4UserSteppingAction.hh b/source/tracking/include/G4UserSteppingAction.hh
index 68b5f7472b69095a89b936bdc6e3c22997a28f0d..233bffca55b8c2074264f978ff95b044d9dc2f9a 100644
--- a/source/tracking/include/G4UserSteppingAction.hh
+++ b/source/tracking/include/G4UserSteppingAction.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserSteppingAction.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UserSteppingAction.hh,v 1.6 2000/11/11 06:34:10 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 //  G4UserSteppingAction.hh
 //
-//  Description:
+// class description:
 //    This class represents actions taken place by the user at each
 //    end of stepping. 
 //
@@ -36,7 +36,7 @@ class G4UserSteppingAction
 {
 
 //--------
-   public:
+public: // with description
 //--------
 
 // Constructor and destructors
diff --git a/source/tracking/include/G4UserTrackingAction.hh b/source/tracking/include/G4UserTrackingAction.hh
index 81d7ed13a963e7c57bac7e721e238452472f07ab..b02854a88a0740bc11643afc03cebabe96052e18 100644
--- a/source/tracking/include/G4UserTrackingAction.hh
+++ b/source/tracking/include/G4UserTrackingAction.hh
@@ -5,17 +5,17 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UserTrackingAction.hh,v 1.5 1999/12/15 14:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UserTrackingAction.hh,v 1.7 2001/01/12 05:55:28 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 // G4UserTrackingAction.hh
 //
-// Description:
-//   This class represents actions taken place by the user at each
-//   end of stepping. 
+// class description:
+//   This class represents actions taken place by the user at 
+//   the start/end point of processing one track. 
 //
 // Contact:
 //   Questions and comments to this code should be sent to
@@ -38,7 +38,7 @@ class G4UserTrackingAction
 {
 
 //--------
-   public:
+public: // with description
 //--------
 
 // Constructor & Destructor
diff --git a/source/tracking/include/G4VSteppingVerbose.hh b/source/tracking/include/G4VSteppingVerbose.hh
index 69b7fdf0888b92ee63193e8ce92335c72ee9bce3..cdc79c71b85a80692e59168d55db9281cdc995af 100644
--- a/source/tracking/include/G4VSteppingVerbose.hh
+++ b/source/tracking/include/G4VSteppingVerbose.hh
@@ -5,17 +5,18 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSteppingVerbose.hh,v 1.5 2000/06/01 03:17:39 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VSteppingVerbose.hh,v 1.9 2001/02/08 07:39:52 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
 //
 // G4VSteppingVerbose.hh
 //
-// Description:
+// class description:
 //   This class manages the vervose outputs in G4SteppingManager. 
-//   
+//   The instance should be singleton. Users can inherit this 
+//   class to make their own verbosing class.
 //
 // Contact:
 //   Questions and comments to this code should be sent to
@@ -30,10 +31,11 @@
 class G4SteppingManager;
 
 #include "globals.hh"                 // Include from 'global'
+#include "g4rw/tvordvec.h"  
 class G4Navigator;
 class G4VPhysicalVolume;
 class G4VSensitiveDetector;
-class G4VProcess;
+#include "G4VProcess.hh"
 class G4ProcessVector;
 class G4SteppingManager;              // Include from 'tracking'
 class G4Track;
@@ -52,11 +54,11 @@ class G4VSteppingVerbose{
 // Constructor/Destructor
 protected:    // to force 'singleton'
   G4VSteppingVerbose();  
-public:   
+public:  
   virtual ~G4VSteppingVerbose();
   //
-public:   
-// 
+public:   // with description
+// static methods to set/get the object's pointer 
   static void SetInstance(G4VSteppingVerbose* Instance)
     {
       fInstance = Instance;
@@ -65,7 +67,7 @@ public:
     {
       return fInstance;
     }
-//
+// these method are invoked in the SteppingManager 
   virtual void NewStep() = 0;
   void CopyState();
   void SetManager(G4SteppingManager* const);
@@ -147,15 +149,15 @@ protected:
 
   G4int verboseLevel;
 
-  typedef G4RWTValOrderedVector<G4int> 
+  typedef G4std::vector<G4int> 
              G4SelectedAtRestDoItVector;
-  typedef G4RWTValOrderedVector<G4int> 
+  typedef G4std::vector<G4int> 
              G4SelectedAlongStepDoItVector;
-  typedef G4RWTValOrderedVector<G4int>
+  typedef G4std::vector<G4int>
              G4SelectedPostStepDoItVector;
-  G4SelectedAtRestDoItVector *fSelectedAtRestDoItVector;
-  G4SelectedAlongStepDoItVector *fSelectedAlongStepDoItVector;
-  G4SelectedPostStepDoItVector *fSelectedPostStepDoItVector;
+  G4SelectedAtRestDoItVector* fSelectedAtRestDoItVector;
+  G4SelectedAlongStepDoItVector* fSelectedAlongStepDoItVector;
+  G4SelectedPostStepDoItVector* fSelectedPostStepDoItVector;
 
   G4double   fPreviousStepSize;
 
diff --git a/source/tracking/include/G4VTrajectory.hh b/source/tracking/include/G4VTrajectory.hh
index 4e0a973dbc7c99904379aa03805bbcc538aaa391..71f889d7097fc0f385e4218a77b3bba5697e44bd 100644
--- a/source/tracking/include/G4VTrajectory.hh
+++ b/source/tracking/include/G4VTrajectory.hh
@@ -5,15 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VTrajectory.hh,v 1.4 2000/01/26 04:20:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VTrajectory.hh,v 1.5 2000/11/11 06:34:11 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
 //
 // G4VTrajectory.hh
 //
-// Description:
+// class description:
 //   This is the abstract base class of a trajectory.
 //
 // Contact:
@@ -33,7 +33,7 @@ class G4Step;
 
 class G4VTrajectory
 {
-   public:
+public: // without description
 
    G4VTrajectory() {;}
    virtual ~G4VTrajectory() {;}
diff --git a/source/tracking/include/G4VTrajectoryPoint.hh b/source/tracking/include/G4VTrajectoryPoint.hh
index d3d3038b543504e8be831c8b528a21005577c1e0..bf4fb24d1e4e2615b2af50d49f416c839c8b6994 100644
--- a/source/tracking/include/G4VTrajectoryPoint.hh
+++ b/source/tracking/include/G4VTrajectoryPoint.hh
@@ -5,10 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VTrajectoryPoint.hh,v 1.3 1999/12/15 14:53:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VTrajectoryPoint.hh,v 1.4 2000/11/11 06:34:11 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
+// class description
+//  The base class for the trajectory class
+
 #ifndef G4VTrajectoryPoint_h
 #define G4VTrajectoryPoint_h 1
 
diff --git a/source/tracking/src/G4SteppingManager.cc b/source/tracking/src/G4SteppingManager.cc
index bb858b6d5907b030af98aaad1c3c55db543aac6d..a0f2836296833cd6448bd480e0518b5c4fbca8dd 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.10 2000/06/02 09:53:29 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SteppingManager.cc,v 1.12 2001/02/08 07:48:39 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -58,12 +58,16 @@ G4SteppingManager::G4SteppingManager()
 	  KillVerbose = false;
    }
 #endif
-   fSelectedAtRestDoItVector 
-      = new G4SelectedAtRestDoItVector(SIZEofSelectedDoIt);
-   fSelectedAlongStepDoItVector 
-      = new G4SelectedAlongStepDoItVector(SIZEofSelectedDoIt);
-   fSelectedPostStepDoItVector 
-      = new G4SelectedPostStepDoItVector(SIZEofSelectedDoIt);
+   SetNavigator(G4TransportationManager::GetTransportationManager()
+		   ->GetNavigatorForTracking());
+
+   fSelectedAtRestDoItVector
+      = new G4SelectedAtRestDoItVector(SizeOfSelectedDoItVector);
+   fSelectedAlongStepDoItVector
+      = new G4SelectedAlongStepDoItVector(SizeOfSelectedDoItVector);
+   fSelectedPostStepDoItVector
+      = new G4SelectedPostStepDoItVector(SizeOfSelectedDoItVector);
+
    SetNavigator(G4TransportationManager::GetTransportationManager()
      ->GetNavigatorForTracking());
 
diff --git a/source/tracking/include/G4SteppingManager.icc b/source/tracking/src/G4SteppingManager2.cc
similarity index 91%
rename from source/tracking/include/G4SteppingManager.icc
rename to source/tracking/src/G4SteppingManager2.cc
index a7b8f3d75747683f8ff1621be990a5210340404c..bf04c3c045462799cd7fb2e996701d745112fe7e 100644
--- a/source/tracking/include/G4SteppingManager.icc
+++ b/source/tracking/src/G4SteppingManager2.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SteppingManager.icc,v 1.6 2000/08/30 07:10:01 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SteppingManager2.cc,v 1.1 2001/02/08 07:56:40 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -31,9 +31,10 @@
 #include "G4TransportationManager.hh"
 #include "G4UserLimits.hh"
 #include "G4EnergyLossTables.hh"
+#include "G4SteppingManager.hh"
 
 /////////////////////////////////////////////////
-inline void G4SteppingManager::GetProcessNumber()
+void G4SteppingManager::GetProcessNumber()
 /////////////////////////////////////////////////
 {
 
@@ -64,7 +65,7 @@ inline void G4SteppingManager::GetProcessNumber()
 
 
 /////////////////////////////////////////////////////////
-inline void G4SteppingManager::DefinePhysicalStepLength()
+ void G4SteppingManager::DefinePhysicalStepLength()
 /////////////////////////////////////////////////////////
 {
 
@@ -96,18 +97,18 @@ inline void G4SteppingManager::DefinePhysicalStepLength()
       // is defined by the user defined limit.
    }
 
-// GetPhysicalInteractionLength for PostStep
+// GPIL for PostStep
    fPostStepDoItProcTriggered = MAXofPostStepLoops;
 
    for(size_t np=0; np < MAXofPostStepLoops; np++){
      fCurrentProcess = (*fPostStepGetPhysIntVector)(np);
      if (fCurrentProcess== NULL) {
-       (*fSelectedPostStepDoItVector)(np) = 0;
+       (*fSelectedPostStepDoItVector)[np] = 0;
        continue;
      }   // NULL means the process is inactivated by a user on fly.
 
      physIntLength = fCurrentProcess->
-                     PostStepGetPhysicalInteractionLength( *fTrack,
+                     PostStepGPIL( *fTrack,
                                                  fPreviousStepSize,
                                                       &fCondition );
 #ifdef G4VERBOSE
@@ -117,19 +118,19 @@ inline void G4SteppingManager::DefinePhysicalStepLength()
 
      switch (fCondition) {
      case ExclusivelyForced:
-       (*fSelectedPostStepDoItVector)(np) = 4;
+       (*fSelectedPostStepDoItVector)[np] = 4;
        fStepStatus = fExclusivelyForcedProc;
 	   fStep->GetPostStepPoint()
 				 ->SetProcessDefinedStep(fCurrentProcess);
        break;
      case Conditionally:
-       (*fSelectedPostStepDoItVector)(np) = 3;
+       (*fSelectedPostStepDoItVector)[np] = 3;
        break;
      case Forced:
-       (*fSelectedPostStepDoItVector)(np) = 2;
+       (*fSelectedPostStepDoItVector)[np] = 2;
        break;
      default:
-       (*fSelectedPostStepDoItVector)(np) = 0;
+       (*fSelectedPostStepDoItVector)[np] = 0;
        if(physIntLength < PhysicalStep ){
          PhysicalStep = physIntLength;
 	 fStepStatus = fPostStepDoItProc;
@@ -142,20 +143,20 @@ inline void G4SteppingManager::DefinePhysicalStepLength()
    }
 
    if(fPostStepDoItProcTriggered<MAXofPostStepLoops)
-   (*fSelectedPostStepDoItVector)(fPostStepDoItProcTriggered) = 1;
+     (*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] = 1;
 
 
-// GetPhysicalInteractionLength for AlongStep
+// GPIL for AlongStep
    proposedSafety = DBL_MAX;
    G4double safetyProposedToAndByProcess = proposedSafety;
 
    for(size_t kp=0; kp < MAXofAlongStepLoops; kp++){
-     fCurrentProcess = (*fAlongStepGetPhysIntVector)(kp);
+     fCurrentProcess = (*fAlongStepGetPhysIntVector)[kp];
      if (fCurrentProcess== NULL) continue;
          // NULL means the process is inactivated by a user on fly.
 
      physIntLength = fCurrentProcess->
-                     AlongStepGetPhysicalInteractionLength( *fTrack,
+                     AlongStepGPIL( *fTrack,
                                                   fPreviousStepSize,
                                                        PhysicalStep,
 				       safetyProposedToAndByProcess,
@@ -194,12 +195,12 @@ inline void G4SteppingManager::DefinePhysicalStepLength()
 
 
 //////////////////////////////////////////////////////
-inline void G4SteppingManager::InvokeAtRestDoItProcs()
+void G4SteppingManager::InvokeAtRestDoItProcs()
 //////////////////////////////////////////////////////
 {
 
 // Select the rest process which has the shortest time before
-// it is invoked. In rest processes, GetPhysicalInteractionLength()
+// it is invoked. In rest processes, GPIL()
 // returns the time before a process occurs.
    G4double lifeTime, shortestLifeTime;
 
@@ -208,22 +209,22 @@ inline void G4SteppingManager::InvokeAtRestDoItProcs()
 
    int NofInactiveProc=0;
    for( size_t ri=0 ; ri < MAXofAtRestLoops ; ri++ ){
-     fCurrentProcess = (*fAtRestGetPhysIntVector)(ri);
+     fCurrentProcess = (*fAtRestGetPhysIntVector)[ri];
      if (fCurrentProcess== NULL) {
-       (*fSelectedAtRestDoItVector)(ri) = 0;
+       (*fSelectedAtRestDoItVector)[ri] = 0;
        NofInactiveProc++;
        continue;
      }   // NULL means the process is inactivated by a user on fly.
 
      lifeTime = 
-       fCurrentProcess->AtRestGetPhysicalInteractionLength( 
+       fCurrentProcess->AtRestGPIL( 
                                                      *fTrack,
                                                 &fCondition );
      if(fCondition==Forced){
-       (*fSelectedAtRestDoItVector)(ri) = 2;
+       (*fSelectedAtRestDoItVector)[ri] = 2;
      }
      else{
-       (*fSelectedAtRestDoItVector)(ri) = 0;
+       (*fSelectedAtRestDoItVector)[ri] = 0;
        if(lifeTime < shortestLifeTime ){
          shortestLifeTime = lifeTime;
 	 fAtRestDoItProcTriggered =  G4int(int(ri)); 
@@ -237,7 +238,7 @@ inline void G4SteppingManager::InvokeAtRestDoItProcs()
      G4Exception("G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " );
    }
 
-   (*fSelectedAtRestDoItVector)(fAtRestDoItProcTriggered) = 1;
+   (*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = 1;
 
    fStep->SetStepLength( 0. );  //the particle has stopped
    fTrack->SetStepLength( 0. );
@@ -248,10 +249,10 @@ inline void G4SteppingManager::InvokeAtRestDoItProcs()
    // Note: DoItVector has inverse order against GetPhysIntVector
    //       and SelectedAtRestDoItVector.
    //
-     if((*fSelectedAtRestDoItVector)(MAXofAtRestLoops-np-1) != 0){
+     if( (*fSelectedAtRestDoItVector)[MAXofAtRestLoops-np-1] != 0){
 
 
-       fCurrentProcess = (*fAtRestDoItVector)(np);
+       fCurrentProcess = (*fAtRestDoItVector)[np];
        fParticleChange 
          = fCurrentProcess->AtRestDoIt( *fTrack, *fStep);
                                
@@ -263,7 +264,7 @@ inline void G4SteppingManager::InvokeAtRestDoItProcs()
        fParticleChange->UpdateStepForAtRest(fStep);
 
        // Now Store the secondaries from ParticleChange to SecondaryList
-       G4Track* tempSecondaryTrack;
+       G4Track*  tempSecondaryTrack;
        G4bool tApplyCutFlag;
        G4double tProdThreshold;
        G4Material* tMaterial;
@@ -323,13 +324,13 @@ inline void G4SteppingManager::InvokeAtRestDoItProcs()
 	 // Set the process pointer which created this track 
 	 tempSecondaryTrack->SetCreatorProcess( fCurrentProcess );
 
-	 fSecondary->insert( tempSecondaryTrack );
+	 fSecondary->push_back ( tempSecondaryTrack );
        }
 
        // clear ParticleChange
        fParticleChange->Clear();
 
-     } //if(fSelectedAtRestDoItVector(np) != 0){
+     } //if(fSelectedAtRestDoItVector[np] != 0){
    } //for(size_t np=0; np < MAXofAtRestLoops; np++){
 
    fStep->UpdateTrack();
@@ -339,7 +340,7 @@ inline void G4SteppingManager::InvokeAtRestDoItProcs()
 
 
 /////////////////////////////////////////////////////////
-inline void G4SteppingManager::InvokeAlongStepDoItProcs()
+void G4SteppingManager::InvokeAlongStepDoItProcs()
 /////////////////////////////////////////////////////////
 {
 
@@ -353,7 +354,7 @@ inline void G4SteppingManager::InvokeAlongStepDoItProcs()
    fN2ndariesAlongStepDoIt = 0;
 
    for( size_t ci=0 ; ci<MAXofAlongStepLoops ; ci++ ){
-     fCurrentProcess = (*fAlongStepDoItVector)(ci);
+     fCurrentProcess = (*fAlongStepDoItVector)[ci];
      if (fCurrentProcess== NULL) continue;
          // NULL means the process is inactivated by a user on fly.
 
@@ -428,7 +429,7 @@ inline void G4SteppingManager::InvokeAlongStepDoItProcs()
 	 // Set the process pointer which created this track 
 	 tempSecondaryTrack->SetCreatorProcess( fCurrentProcess );
 
-	 fSecondary->insert( tempSecondaryTrack );
+	 fSecondary->push_back(  tempSecondaryTrack );
      }
 
      // Set the track status according to what the process defined
@@ -440,7 +441,7 @@ inline void G4SteppingManager::InvokeAlongStepDoItProcs()
 }
 
 ////////////////////////////////////////////////////////
-inline void G4SteppingManager::InvokePostStepDoItProcs()
+void G4SteppingManager::InvokePostStepDoItProcs()
 ////////////////////////////////////////////////////////
 {
 
@@ -454,7 +455,7 @@ inline void G4SteppingManager::InvokePostStepDoItProcs()
    //
      size_t npGPIL = MAXofPostStepLoops-np-1;
      
-     G4int tmp= (*fSelectedPostStepDoItVector)(npGPIL);
+     G4int tmp= (*fSelectedPostStepDoItVector)[npGPIL];
      if(tmp != 0){
 
        if ( ((tmp == 1) && (fStepStatus == fPostStepDoItProc)) ||
@@ -462,7 +463,7 @@ inline void G4SteppingManager::InvokePostStepDoItProcs()
             ((tmp == 3) && (fStepStatus == fAlongStepDoItProc)) ||
 	    ((tmp == 4) && (fStepStatus == fExclusivelyForcedProc)) ) {
 
-         fCurrentProcess = (*fPostStepDoItVector)(np);
+         fCurrentProcess = (*fPostStepDoItVector)[np];
          fParticleChange 
             = fCurrentProcess->PostStepDoIt( *fTrack, *fStep);
 
@@ -539,7 +540,7 @@ inline void G4SteppingManager::InvokePostStepDoItProcs()
 	    // Set the process pointer which created this track 
 	    tempSecondaryTrack->SetCreatorProcess( fCurrentProcess );
 
-	    fSecondary->insert( tempSecondaryTrack );
+	    fSecondary->push_back( tempSecondaryTrack );
          }
 
          // Set the track status according to what the process defined
diff --git a/source/tracking/src/G4SteppingVerbose.cc b/source/tracking/src/G4SteppingVerbose.cc
index f7afb84f23808a30cdc80c1e1ef87e753aa5c365..f2583ad99c57fb88f99d324ef75800d8f80f0f7e 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.6 1999/12/15 14:53:58 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SteppingVerbose.cc,v 1.7 2001/02/08 07:39:52 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -70,15 +70,15 @@ void G4SteppingVerbose::AtRestDoItInvoked()
      G4cout << " **List of AtRestDoIt invoked:" << G4endl;
      for(size_t np=0; np < MAXofAtRestLoops; np++){
        size_t npGPIL = MAXofAtRestLoops-np-1;
-       if( (*fSelectedAtRestDoItVector)(npGPIL) == 2 ){
+       if( (*fSelectedAtRestDoItVector)[npGPIL] == 2 ){
 	 npt++;                
-	 ptProcManager = (*fAtRestDoItVector)(np);
+	 ptProcManager = (*fAtRestDoItVector)[np];
 	 G4cout << "   # " << npt << " : " 
 	   << ptProcManager->GetProcessName() 
 	     << " (Forced)" << G4endl;
-       } else if ( (*fSelectedAtRestDoItVector)(npGPIL) == 1 ){
+       } else if ( (*fSelectedAtRestDoItVector)[npGPIL] == 1 ){
 	 npt++;                
-	 ptProcManager = (*fAtRestDoItVector)(np);
+	 ptProcManager = (*fAtRestDoItVector)[np];
 	 G4cout << "   # " << npt << " : " 
 	   << ptProcManager->GetProcessName() << G4endl;
        }
@@ -89,8 +89,8 @@ void G4SteppingVerbose::AtRestDoItInvoked()
      if( fN2ndariesAtRestDoIt > 0 ){
        G4cout << "   -- List of secondaries generated : " 
 	 << "(x,y,z,kE,t,PID) --" << G4endl; 
-       for( G4int lp1=(*fSecondary).entries()-fN2ndariesAtRestDoIt; 
-	   lp1<(*fSecondary).entries(); lp1++){
+       for( G4int lp1=(*fSecondary).size()-fN2ndariesAtRestDoIt; 
+	   lp1<(*fSecondary).size(); lp1++){
 	 G4cout << "      "
 		<< G4std::setw( 9)
 		<< G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length") << " "
@@ -141,10 +141,10 @@ void G4SteppingVerbose::AlongStepDoItAllDone()
         G4cout << "    ++List of secondaries generated " 
              << "(x,y,z,kE,t,PID):"
              << "  No. of secodaries = " 
-             << (*fSecondary).entries() << G4endl;
+             << (*fSecondary).size() << G4endl;
 
-        if((*fSecondary).entries()>0){
-           for(G4int lp1=0; lp1<(*fSecondary).entries(); lp1++){
+        if((*fSecondary).size()>0){
+           for(G4int lp1=0; lp1<(*fSecondary).size(); lp1++){
                G4cout << "      "
                     << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length") << " "
@@ -182,15 +182,15 @@ void G4SteppingVerbose::PostStepDoItAllDone()
 
         for(size_t np=0; np < MAXofPostStepLoops; np++){
 	    size_t npGPIL = MAXofPostStepLoops-np-1;
-            if((*fSelectedPostStepDoItVector)(npGPIL) == 2){
+            if( (*fSelectedPostStepDoItVector)[npGPIL] == 2){
                npt++;                
-               ptProcManager = (*fPostStepDoItVector)(np);
+               ptProcManager = (*fPostStepDoItVector)[np];
                G4cout << "      " << npt << ") " 
                     << ptProcManager->GetProcessName()  
                     << " (Forced)" << G4endl;
-	     } else if ((*fSelectedPostStepDoItVector)(npGPIL) == 1){
+	     } else if ( (*fSelectedPostStepDoItVector)[npGPIL] == 1){
                npt++;                
-               ptProcManager = (*fPostStepDoItVector)(np);
+               ptProcManager = (*fPostStepDoItVector)[np];
                G4cout << "      " << npt << ") " 
                     << ptProcManager->GetProcessName() << G4endl;
 	     }
@@ -201,12 +201,12 @@ void G4SteppingVerbose::PostStepDoItAllDone()
         G4cout << "    ++List of secondaries generated " 
              << "(x,y,z,kE,t,PID):"
              << "  No. of secodaries = " 
-             << (*fSecondary).entries() << G4endl;
+             << (*fSecondary).size() << G4endl;
         G4cout << "      [Note]Secondaries from AlongStepDoIt included."
              << G4endl; 
 
-        if((*fSecondary).entries()>0){
-	  for(G4int lp1=0; lp1<(*fSecondary).entries(); lp1++){
+        if((*fSecondary).size()>0){
+	  for(G4int lp1=0; lp1<(*fSecondary).size(); lp1++){
                G4cout << "      "
                     << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length") << " "
@@ -300,12 +300,12 @@ void G4SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw( 9)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length")<< " "
@@ -486,8 +486,8 @@ void G4SteppingVerbose::AlongStepDoItOneByOne()
 	       << fN2ndariesAlongStepDoIt << G4endl;
 
         if(fN2ndariesAlongStepDoIt>0){
-           for(G4int lp1=(*fSecondary).entries()-fN2ndariesAlongStepDoIt; 
-                     lp1<(*fSecondary).entries(); lp1++){
+           for(G4int lp1=(*fSecondary).size()-fN2ndariesAlongStepDoIt; 
+                     lp1<(*fSecondary).size(); lp1++){
                G4cout << "      "
                     << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length")<< " "
@@ -532,8 +532,8 @@ void G4SteppingVerbose::PostStepDoItOneByOne()
              << fN2ndariesPostStepDoIt << G4endl;
 
         if(fN2ndariesPostStepDoIt>0){
-           for(G4int lp1=(*fSecondary).entries()-fN2ndariesPostStepDoIt; 
-                     lp1<(*fSecondary).entries(); lp1++){
+           for(G4int lp1=(*fSecondary).size()-fN2ndariesPostStepDoIt; 
+                     lp1<(*fSecondary).size(); lp1++){
                G4cout << "      "
                     << G4std::setw( 9)
                     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x() , "Length")<< " "
diff --git a/source/tracking/src/G4TrackingManager.cc b/source/tracking/src/G4TrackingManager.cc
index eee0294d6749546a8b59fd65559d1d0409433c11..e6e5503d20165ed34073ee543173c23a537d46e3 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.5 1999/12/15 14:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrackingManager.cc,v 1.7 2001/02/09 01:35:06 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
@@ -55,8 +55,15 @@ void G4TrackingManager::ProcessOneTrack(G4Track* apValueG4Track)
   fpTrack = apValueG4Track;
 
   // Clear 2ndary particle vector
-  GimmeSecondaries()->clearAndDestroy();    
-
+  //  GimmeSecondaries()->clearAndDestroy();    
+  //  G4std::vector<G4Track*>::iterator itr;
+  G4int itr;
+  //  for(itr=GimmeSecondaries()->begin();itr=GimmeSecondaries()->end();itr++){ 
+  for(itr=0;itr<GimmeSecondaries()->size();itr++){ 
+     delete (*GimmeSecondaries())[itr];
+  }
+  GimmeSecondaries()->clear();  
+  
   // Pre tracking user intervention process.
   fpTrajectory = NULL;
   if( fpUserTrackingAction != NULL ) {
diff --git a/source/tracking/src/G4TrackingMessenger.cc b/source/tracking/src/G4TrackingMessenger.cc
index 55bc2750b819dde987ba7196612ddcb9a54756b5..9de4caab59a8f4097a886e97a5e3bd220fc84ce5 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.6 2000/01/23 09:51:36 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrackingMessenger.cc,v 1.7 2001/02/08 07:39:53 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/src/G4Trajectory.cc b/source/tracking/src/G4Trajectory.cc
index 843dca0a7d6073733a54fdb8d4c5c2e85ecd7ad7..0ac8237b4034246fd6474630c7c8add3d9ef9570 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.8 2000/01/26 04:20:34 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Trajectory.cc,v 1.11 2001/02/09 01:38:14 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ---------------------------------------------------------------
@@ -57,8 +57,9 @@ G4Trajectory::G4Trajectory(const G4Track* aTrack)
    PDGEncoding = fpParticleDefinition->GetPDGEncoding();
    fTrackID = aTrack->GetTrackID();
    fParentID = aTrack->GetParentID();
-   positionRecord = new G4RWTPtrOrderedVector<G4VTrajectoryPoint>;
-   positionRecord->insert(new G4TrajectoryPoint(aTrack->GetPosition()));
+   //   positionRecord = new G4RWTPtrOrderedVector<G4VTrajectoryPoint>;
+   positionRecord = new TrajectoryPointContainer();
+   positionRecord->push_back(new G4TrajectoryPoint(aTrack->GetPosition()));
 }
 
 //////////////////////////////////////////
@@ -70,11 +71,14 @@ G4Trajectory::G4Trajectory(G4Trajectory & right)
   PDGEncoding = right.PDGEncoding;
   fTrackID = right.fTrackID;
   fParentID = right.fParentID;
-  positionRecord = new G4RWTPtrOrderedVector<G4VTrajectoryPoint>;
-  for(int i=0;i<right.positionRecord->entries();i++)
+  //  positionRecord = new G4RWTPtrOrderedVector<G4VTrajectoryPoint>;
+  //  G4std::vector<G4VTrajectoryPoint*> *positionRecord;
+  positionRecord = new TrajectoryPointContainer();
+
+  for(int i=0;i<right.positionRecord->size();i++)
   {
     G4TrajectoryPoint* rightPoint = (G4TrajectoryPoint*)((*(right.positionRecord))[i]);
-    positionRecord->insert(new G4TrajectoryPoint(*rightPoint));
+    positionRecord->push_back(new G4TrajectoryPoint(*rightPoint));
   }
 }
 
@@ -83,7 +87,13 @@ G4Trajectory::G4Trajectory(G4Trajectory & right)
 G4Trajectory::~G4Trajectory()
 /////////////////////////////
 {
-  positionRecord->clearAndDestroy();
+  //  positionRecord->clearAndDestroy();
+  G4int i;
+  for(i=0;i<positionRecord->size();i++){
+    delete  (*positionRecord)[i];
+  }
+  positionRecord->clear();
+
   delete positionRecord;
 }
 
@@ -95,10 +105,10 @@ void G4Trajectory::ShowTrajectory() const
         << ":ParentID=" << fParentID << G4endl;
    G4cout << "Particle name : " << ParticleName 
         << "  Charge : " << PDGCharge << G4endl;
-   G4cout << "  Current trajectory has " << positionRecord->entries() 
+   G4cout << "  Current trajectory has " << positionRecord->size() 
         << " points." << G4endl;
 
-   for( size_t i=0 ; i < positionRecord->entries() ; i++){
+   for( size_t i=0 ; i < positionRecord->size() ; i++){
        G4TrajectoryPoint* aTrajectoryPoint = (G4TrajectoryPoint*)((*positionRecord)[i]);
        G4cout << "Point[" << i << "]" 
             << " Position= " << aTrajectoryPoint->GetPosition() << G4endl;
@@ -116,7 +126,7 @@ void G4Trajectory::DrawTrajectory(G4int i_mode) const
    if(i_mode>=0)
    {
      G4Polyline pPolyline;
-     for (int i = 0; i < positionRecord->entries() ; i++) {
+     for (int i = 0; i < positionRecord->size() ; i++) {
        G4TrajectoryPoint* aTrajectoryPoint = (G4TrajectoryPoint*)((*positionRecord)[i]);
        pos = aTrajectoryPoint->GetPosition();
        pPolyline.append( pos );
@@ -137,7 +147,7 @@ void G4Trajectory::DrawTrajectory(G4int i_mode) const
 
    if(i_mode!=0)
    {
-     for(int j=0; j<positionRecord->entries(); j++) {
+     for(int j=0; j<positionRecord->size(); j++) {
        G4TrajectoryPoint* aTrajectoryPoint = (G4TrajectoryPoint*)((*positionRecord)[j]);
        pos = aTrajectoryPoint->GetPosition();
        G4Circle circle( pos );
@@ -156,7 +166,7 @@ void G4Trajectory::DrawTrajectory(G4int i_mode) const
 void G4Trajectory::AppendStep(const G4Step* aStep)
 ////////////////////////////////////////////
 {
-   positionRecord->append( new G4TrajectoryPoint(aStep->GetPostStepPoint()->
+   positionRecord->push_back( new G4TrajectoryPoint(aStep->GetPostStepPoint()->
                                  GetPosition() ));
 }
   
@@ -175,10 +185,13 @@ void G4Trajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
 
   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
+  for(G4int i=1;i<ent;i++) // initial point of the second trajectory should not be merged
   { 
-    positionRecord->append(seco->positionRecord->removeAt(1));
+    positionRecord->push_back((*(seco->positionRecord))[i]);
+    //    positionRecord->push_back(seco->positionRecord->removeAt(1));
   }
+  delete (*seco->positionRecord)[0];
+  seco->positionRecord->clear();
 }
 
 
diff --git a/source/tracking/src/G4TrajectoryPoint.cc b/source/tracking/src/G4TrajectoryPoint.cc
index 69c4e3335a07ab4b5679e24b54e20607b35fd875..17a21c86663832f6a087573a24f1416ec5990d45 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.4 1999/12/15 14:53:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4TrajectoryPoint.cc,v 1.5 2001/02/08 07:39:53 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4UserSteppingAction.cc b/source/tracking/src/G4UserSteppingAction.cc
index a1d027ea687bd1873d02a3312b41a9f152777384..6927b98b1391246038624657367c6566a2d3199c 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.4 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UserSteppingAction.cc,v 1.5 2001/02/08 07:39:53 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4UserTrackingAction.cc b/source/tracking/src/G4UserTrackingAction.cc
index 9c38e1580e7c802f0d1c34ada73a766f2f5bf22e..6b3f0543d42fb69bd9f243b5078d54ab429bfda8 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.4 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4UserTrackingAction.cc,v 1.5 2001/02/08 07:39:53 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4VSteppingVerbose.cc b/source/tracking/src/G4VSteppingVerbose.cc
index 7af3377629983d426b3a6b4eba41da6225daed90..54b74bb0cf2c73efb707a9c186864e2db1bedabd 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.4 2000/06/14 08:21:00 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VSteppingVerbose.cc,v 1.5 2001/02/08 07:39:54 tsasaki Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
index c2b0b43bb81f1a077792b043451616ed2a4a2fca..fcf2264fd85f9648ca5d01768ca9237298f1067c 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DAWNFILE.hh,v 1.5 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE driver factory.
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
index 47e77204eeca5130e0308fb79f59856e126e380a..94d9503ec597e610dcac5433d8bda581a21e13e5 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DAWNFILESceneHandler.hh,v 1.5 1999/12/16 17:24:48 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Satoshi TANAKA
 
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
index de5bd1a6cedf4a374505a16242b2dfbf2a34805b..7a86e1a2a57df2613d03eab1e2e626e0cec97d51 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DAWNFILEViewer.hh,v 1.5 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE viewer - opens window, hard copy, etc.
diff --git a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
index 519c3d7ef8e9e2657bf2e37979392562fa223d64..29aede7363504355489de1d977c806c37aaf4a81 100644
--- a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRClientServer.hh,v 1.4 2000/02/29 09:54:38 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8fab1c7e76c00ce461d2c856815a5b63f42b8a11..bdb4df4944b93b6e287f187dddc813ec1807ea82 100644
--- a/source/visualization/FukuiRenderer/include/G4FRConst.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRConst.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRConst.hh,v 1.4 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 7f5e82c106a7563e9fb73652d738f7e7558832ef..558b0273d8245f8b2ff9e29d288a40b525135ae7 100644
--- a/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRFeatures.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 8cf64c7d436f6dbbafae8b9edc235cdd7a85fa3e..d91e67cdf1f92fa9c1339ce2f5096f3a701938be 100644
--- a/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRSocketConfig.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ////////////////////////////////
 ///// G4FRSocketConfig.h   /////
diff --git a/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh b/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
index 291be2671397017cd815320c2a67aae1d007cb69..ed7932813ac3f5ea93aba3b985c480c832d942fe 100644
--- a/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRSocketMacro.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 ///////////////////////////////
 ///// G4FRSocketMacro.hh  /////
diff --git a/source/visualization/FukuiRenderer/include/G4FRofstream.hh b/source/visualization/FukuiRenderer/include/G4FRofstream.hh
index 3a83598e2aa19065cb6e834b1f0f9a30acf1e8b3..57affe1f2025c3e03c82e455bc7f633c70231123 100644
--- a/source/visualization/FukuiRenderer/include/G4FRofstream.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRofstream.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRofstream.hh,v 1.3 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include"g4std/fstream"
 
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
index 77c3654f7e5a8bd36a89606a93d00757e6a73bb6..292888d79777e9cabb5debd44d12b529add955a0 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FukuiRenderer.hh,v 1.5 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Satoshi TANAKA
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
index f3c595a336ea80cb5bee86246eb9194bb99a34fb..bc9609fda83d64c8e0cf8c4782f5666dffeaf8c7 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FukuiRendererSceneHandler.hh,v 1.5 1999/12/16 17:24:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 11:19:19 JST 1996
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
index 86c63ec9786385d4cd2012771bf4ff8b98700fea..4f178e8c9999c77453eaab5fd092c74d7aaf5032 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FukuiRendererViewer.hh,v 1.5 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 37d8bf6a9b8b745b44a428f7533fe1a959787769..c45780d16ef8e1a75ae28784b6821351bb749f79 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DAWNFILE.cc,v 1.6 2000/08/19 18:34:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE factory.
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
index cda793744d770bbd9a9080ba4cb4f94e303fa15e..5706fc2d0fddb93efaebb530bdaeae0594b81e4e 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DAWNFILESceneHandler.cc,v 1.5 2000/05/16 15:56:43 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE scene.
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
index 2f577045449df1eada07191f5dae21bedd75b77b..e975b9bd75a5c36f8da296f4b80e32c15c6f6099 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4DAWNFILEViewer.cc,v 1.9 2000/05/15 07:48:27 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Satoshi TANAKA
 // DAWNFILE view - opens window, hard copy, etc.
diff --git a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
index d8c3613a62eea4b87ea0ad885d42a92bb109d28a..d817cf0f4ef9ed24cc5869e6d6f9834e22074ec6 100644
--- a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRClientServer.cc,v 1.3 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // Satoshi TANAKA, Wed Jul  3 14:14:29 JST 1996
 ////////////////////////////////
diff --git a/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc b/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc
index baf05ebf3b798b00d39f80b2ba4fdc2513294e5f..2f0d46902a4d66266bbcbd8e75b711b77cf1f371 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.10 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4FRSceneFunc.icc,v 1.11 2001/01/25 15:28:07 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 
@@ -242,6 +242,8 @@ void G4FRSCENE::AddPrimitive ( const G4Polyhedron& polyhedron )
 	G4cerr << "***** AddPrimitive( G4Polyhedron )\n";
 #endif
 
+	if (polyhedron.GetNoFacets() == 0) return;
+
 		//----- Initialize Fukui Renderer IF NECESSARY
 	FRBeginModeling();
 
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
index 050cb4e10b66e15d06b2d7b0e05024f013083750..5905c961b04d78e7d0e0f558d8f386a9bc57da12 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FukuiRenderer.cc,v 1.5 2000/08/19 18:34:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Satoshi TANAKA
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
index ac083689e8d46899a2c4599044e7b9b1bd9b0168..9280749603a065fe64259b31553ce13a32c0d782 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FukuiRendererSceneHandler.cc,v 1.4 2000/04/12 13:08:22 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 11:34:24 JST 1996
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
index 97c78b5b91bf5c9a384a20c0f93d12d0a9438c52..b35fbee4598e4785a2288a5c5e6600e1d4ef3e1e 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FukuiRendererViewer.cc,v 1.5 2000/05/13 10:57:51 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 12:09:11 JST 1996
diff --git a/source/visualization/History b/source/visualization/History
index a2c45d648ee61e4365573494c3e1423e18ed91e9..9bdcb96a72b3e1e5f43796647e2c48444f76014d 100644
--- a/source/visualization/History
+++ b/source/visualization/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.93 2000/11/03 22:06:33 allison Exp $
+$Id: History,v 1.110 2001/04/02 10:08:43 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -24,6 +24,126 @@ committal in the CVS repository !
 History file for visualization category
 ---------------------------------------
 
+2nd April 2001  John Allison  (vis-V03-00-09)
+- Fixed some warnings from DEC cxx.
+
+15th March 2001  John Allison  (vis-V03-00-08)
+- Changed rotation of phi-replicas in G4PhysicalVolumeModel.cc to
+  ensure correspondence with rule that phi=0 bisects the replica.
+  WARNING: Prior to this fix the graphics did NOT correspond to the
+  replica navigation.  If you have been relying on the graphics to
+  position daughter volumes in a phi-replica, navigation will have
+  been incorrect, possibly without causing a crash.  The above fix
+  will change the apparent position as shown by the graphics and you
+  will have to correct the positioning of daughters.  Make sure the
+  diaghters are all properly enclosed within the replica.  Graphics
+  and navigation now correspond,
+
+7th March 2001  John Allison  (vis-V03-00-07)
+- Cosmetic corrections for ISO compliance.
+
+23rd February 2001  John Allison  (vis-V03-00-06)
+- Removed all references to RogueWave.
+
+4th February 2001  John Allison  (vis-V03-00-05)
+- Reverted to /vis/viewer commands updating vis manager's view parameters.
+  Otherwise this can have a big effect on users if old commands are still
+  being used.  Let's schedule this change for the next version of Geant4.
+- Added the following new commands:
+  /vis/enable [true|false]
+  /vis/disable
+  /vis/verbose [<verbosity-integer>]
+  /vis/viewer/set/lineSegmentsPerCircle  [<number-of-sides-per-circle>]
+  /vis/viewer/set/sectionPlane ...
+  Only /vis/scene/add/text and /vis/scene/add/axes to go!!!
+
+4th February 2001  John Allison  (vis-V03-00-04)
+- /vis/viewer commands no longer update vis manager's view parameters.
+- Most /vis~/ copmmands give DEPRECATED warning, except:
+  /vis~/draw/axes
+  /vis~/draw/text
+  /vis~/set/section_plane
+  /vis~/set/sides
+  /vis~/set/verbose
+  which have still to be re-implemented.  All /vis~/ commands are still
+  available through /vis/ for the time being.  (Window size hint no longer
+   works.)
+- Added "auto refresh" to view parameters.
+- Added "default" view parameters to viewers.
+- Made OpenGL viewers "auto refresh" by default.
+- Added:
+  /vis/viewer/set/autoRefresh
+  /vis/viewer/set/projection
+- Added compound command:
+  /vis/drawView [<theta-deg>] [<phi-deg>]
+                [<pan-right>] [<pan-up>] [<pan-unit>]
+                [<zoom-factor>]
+                [<dolly>] [<dolly-unit>]
+
+4th February 2001  John Allison  (vis-V03-00-03)
+- Added several new vis commands:
+  /vis/viewer/dolly
+  /vis/viewer/dollyTo
+  /vis/viewer/lightsThetaPhi
+  /vis/viewer/lightsVector
+  /vis/viewer/pan
+  /vis/viewer/panTo
+  /vis/viewer/viewpointThetaPhi
+  /vis/viewer/viewpointVector
+  /vis/viewer/zoom
+  /vis/viewer/zoomTo
+  /vis/viewer/set/hiddenMarker
+  /vis/viewer/set/lightsMove
+
+3rd February 2001  John Allison  (vis-V03-00-02)
+- Tidied for CodeWizard.  Small changes to many files in management, modeling
+  and OpenGL.
+
+1st February 2001  John Allison  (vis-V03-00-01)
+- Fixed cause of crash when setting viewpoint before creating scene (Bug #157).
+  Solution: SetView no longer called when view parameters are changed.  In
+  any case it's called just before drawing, whixh is the right place.
+- Fixed /vis/set/sides problem (Satoshi Tanaka) (Bug #204).
+  Solution: Update view's view parameters in /vis/set/sides - had somehow
+  been overlooked.
+
+25th January 2001  John Allison
+- Added protection against empty G4Polyhedron objects.
+   FukuiRenderer/src/G4FRSceneFunc.icc
+   OPACS/src/G4GoSceneHandler.cc
+   OpenGL/src/G4OpenGLSceneHandler.cc
+   OpenInventor/src/G4OpenInventorSceneHandler.cc
+   VRML/src/G4VRML1SceneHandlerFunc.icc
+   VRML/src/G4VRML2SceneHandlerFunc.icc
+
+25th January 2001  John Allison  (opengl-V03-00-00)
+- Fixed Bug #120.  Implemented running re-calculation of up-vector in
+  the case of "object rotation" (lights move with camera) to prevent
+  "flipping" of view when camera passes through up-vector.  Note that
+  the default is "camera rotation" (lights do not move with camera,
+  i.e., remain fixed relative to object) so the default is that this
+  "flipping" can happen.  To set "object rotation" (lights move with
+  camera) use /vis/lights/move_with_camera true (soon to be
+  /vis/viewer/set/lights move-with-camera) or click "Object" radio
+  button on Rotation Panel in OpenGLXm mode.
+- Changed some objects to references for efficiency.  E.g.:
+  const G4Vector3D& vp = pView->fVP.GetViewpointDirection ().unit ();
+
+18th January 2001  John Allison
+- Corrected G4PhysicalVolumeModel.  This corrects a bug whereby the
+  requested drawing of a physical volume and its decendants starting
+  at a depth greater than 2 was incorrectly positioned on the screen.
+- /vis/scene/include commands withdrawn - use equivalent commands
+  /vis/scene/add.
+- OpenGL: cosmetic and minor performance improvements.
+
+16th January 2001  John Allison  (vis-03-00-00)
+- All vis commands "available" in all G4 states.
+- Other small cosmetic changes to commands.
+- OpenGL: square and circle markers correctly rendered.
+  Note: subsequent rotations in stored mode also rotate these markers.
+- Some small changes to test  - see test/History.
+
 2nd November 2000  Gunter Folger  (vis-V02-00-02)
 - Added targets includes and clean_libs to visualization/GNUmakefile.
 
diff --git a/source/visualization/OPACS/include/G4GoSceneHandler.hh b/source/visualization/OPACS/include/G4GoSceneHandler.hh
index 807ce6f535d75e30ffe29444474150336c782f25..a955df42c13b9cc0f99f5c3dfbfb8a053e1e166a 100644
--- a/source/visualization/OPACS/include/G4GoSceneHandler.hh
+++ b/source/visualization/OPACS/include/G4GoSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4GoSceneHandler.hh,v 1.6 2000/08/19 18:34:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4Wo.hh b/source/visualization/OPACS/include/G4Wo.hh
index c201665e43de136f91c7bc69d615d752d9649382..657e9d3cb0d0eee103a0603bbc54b26c65a04c6e 100644
--- a/source/visualization/OPACS/include/G4Wo.hh
+++ b/source/visualization/OPACS/include/G4Wo.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Wo.hh,v 1.5 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4WoViewer.hh b/source/visualization/OPACS/include/G4WoViewer.hh
index 05f98dd80d99df96d38992c61f10531d1cb96bf5..2f2d16865f0f6002e4dc516dee95c81b3db8c6b2 100644
--- a/source/visualization/OPACS/include/G4WoViewer.hh
+++ b/source/visualization/OPACS/include/G4WoViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4WoViewer.hh,v 1.4 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4Xo.hh b/source/visualization/OPACS/include/G4Xo.hh
index 301841efa4e10979b15528a64a2fe7e4fdcc7651..cd9da75ab73cf4c1c9b66180c7c8cd73baa9a866 100644
--- a/source/visualization/OPACS/include/G4Xo.hh
+++ b/source/visualization/OPACS/include/G4Xo.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Xo.hh,v 1.5 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4XoViewer.hh b/source/visualization/OPACS/include/G4XoViewer.hh
index f39055470460a789dba1fbfacc093b516d1e3bfc..9e65093da2cf5f249a295a331d27c78142c0bf19 100644
--- a/source/visualization/OPACS/include/G4XoViewer.hh
+++ b/source/visualization/OPACS/include/G4XoViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XoViewer.hh,v 1.4 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4GoSceneHandler.cc b/source/visualization/OPACS/src/G4GoSceneHandler.cc
index 3ce2644c5ffe73e84d6db91b0d5151ecdc6beed9..8523b73a899ea76679adabcdb84c5c266fbd5032 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.9 2000/06/07 22:36:02 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4GoSceneHandler.cc,v 1.10 2001/01/25 15:28:09 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
@@ -161,6 +161,9 @@ void G4GoSceneHandler::AddPrimitive (
 #ifdef DEBUG
   G4cout << "G4GoSceneHandler::AddPrimitive(G4Polyhedron&) " << G4endl;
 #endif
+
+  if (polyhedron.GetNoFacets() == 0) return;
+
   SetColour     (GetColour(polyhedron));
 
   OModeling     modeling = OModelingWireFrame;
diff --git a/source/visualization/OPACS/src/G4Wo.cc b/source/visualization/OPACS/src/G4Wo.cc
index 019584f24e8b6fe432c7f902acd9a79befccd5dd..9cb2562554982cb0874fbb8f8e3353380dedc6a9 100644
--- a/source/visualization/OPACS/src/G4Wo.cc
+++ b/source/visualization/OPACS/src/G4Wo.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Wo.cc,v 1.4 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4WoViewer.cc b/source/visualization/OPACS/src/G4WoViewer.cc
index 6d5f1fb25be38204d18523ada3b9c0809ba423ef..8edd9f711b5eeb122a903e379ffe03b3c124016d 100644
--- a/source/visualization/OPACS/src/G4WoViewer.cc
+++ b/source/visualization/OPACS/src/G4WoViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4WoViewer.cc,v 1.6 2000/05/28 13:35:14 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4Xo.cc b/source/visualization/OPACS/src/G4Xo.cc
index 2db282faa203bbf854f697814cf46f14f30a5849..9ad4a5b7173735c1b8c38e6f816b3c2f30090d3e 100644
--- a/source/visualization/OPACS/src/G4Xo.cc
+++ b/source/visualization/OPACS/src/G4Xo.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Xo.cc,v 1.5 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4XoViewer.cc b/source/visualization/OPACS/src/G4XoViewer.cc
index 57068b2002739065d0d3e5f956b6ff33d1c8c996..78d7eed99665bbdf47ed92464ae3ece87d9fe69b 100644
--- a/source/visualization/OPACS/src/G4XoViewer.cc
+++ b/source/visualization/OPACS/src/G4XoViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4XoViewer.cc,v 1.7 2000/05/13 10:57:31 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OpenGL/History b/source/visualization/OpenGL/History
index 14ccdf850aa9d195b4880bca0c9842e552f0834d..1509006994cbcd3837f41a65d28b472926b4274e 100644
--- a/source/visualization/OpenGL/History
+++ b/source/visualization/OpenGL/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.2 2000/05/22 08:34:58 johna Exp $
+$Id: History,v 1.4 2001/03/07 15:29:49 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -20,6 +20,24 @@ committal in the CVS repository !
 History file for visualization/OpenGL
 -------------------------------------
 
+7th March 2001  John Allison
+- Changed char* to const char* in many places and that gave problems in
+  calls to Xt and Xm.  Hope all's OK.  Differences:
+    cvs diff -r vis-V03-00-06 vis-V03-00-07
+
+25th January 2001  John Allison  (opengl-V03-00-00)
+- Implemented running re-calculation of up-vector in the case of "object
+  rotation" (lights move with camera) to prevent "flipping" of view when
+  camera passes through up-vector.  Note that the default is "camera
+  rotation" (lights do not move with camera, i.e., remain fixed relative
+  to object) so the default is that this "flipping" can happen.  To set
+  "object rotation" (lights move with camera) use
+  /vis/lights/move_with_camera true (soon to be
+  /vis/viewer/set/lights move-with-camera) or click "Object" radio button
+  on Rotation Panel in OpenGLXm mode.
+- Changed some objects to references for efficiency.  E.g.:
+  const G4Vector3D& vp = pView->fVP.GetViewpointDirection ().unit ();
+
 22nd May 2000  John Allison  (opengl-V01-01-00)
 - Fixed slow response of 2nd window of OpenGLXm.  Worked around Mesa bug
   by sharing static visuals in G4OpenGLXViewer (Guy Barrand):
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
index f3f99cc2a2e344e34c57685a4f385bd5a71192d2..8a3506f9a05e900d185a518d721c7461bf537e0f 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateSceneHandler.hh,v 1.4 2000/08/19 18:34:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
index 431f9c5e2ad2e089326223ef63af8ac7778ad90a..8f35193bb70e4be28af99f1c025a6605c947d02f 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.4 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLImmediateViewer.hh,v 1.5 2001/02/23 15:43:07 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -25,7 +25,6 @@
 #include "G4OpenGLImmediateSceneHandler.hh"
 #include "G4OpenGLTransform3D.hh"
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 class G4OpenGLSceneHandler;
 class G4OpenGLImmediateSceneHandler;
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
index dfc2576c571e9d0f96268afc41bbbe14f32cf749..b674dd3f450bcde994731b98884d0c66738d76ab 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateWin32.hh,v 1.4 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
index 65762d57c9985d119deaffb5647faddf19d94c36..f20d8fa64804a0450f1763dba11950a59352b86b 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.3 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.4 2001/02/23 15:43:07 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Class G4OpenGLImmediateWin32Viewer : a class derived from
@@ -22,7 +22,6 @@
 #include "G4OpenGLWin32Viewer.hh"
 
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 class G4OpenGLImmediateSceneHandler;
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
index 1dc14bdfc458e3d8dc5e801eb6a344cadbec42e7..3e9302ad3dc3167596530659a42b83d7b1cff8f0 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateX.hh,v 1.5 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
index 4908c543145ae0c35996d6d5baf5a00a01225bde..667424871415409ba43e7697806bb249641d1a34 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.4 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLImmediateXViewer.hh,v 1.5 2001/02/23 15:43:08 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -23,7 +23,6 @@
 #include "G4OpenGLXViewer.hh"
 
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 class G4OpenGLImmediateSceneHandler;
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
index f8f6a50f632775e4ff60fb58f38dfa6402302b12..69579bd79557cd6f3c2ac054b736463035c39998 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.4 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLImmediateXm.hh,v 1.5 2001/02/03 18:39:00 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,6 +22,7 @@
 class G4OpenGLImmediateXm: public G4VGraphicsSystem {
 public:
   G4OpenGLImmediateXm ();
+  virtual ~G4OpenGLImmediateXm ();
   G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
   G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");
 };
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
index f408e12af90ce50397e88527e94c363ed271275d..f011891a2d2d4000a2a7a909d10f399acdee02d1 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.3 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLImmediateXmViewer.hh,v 1.5 2001/02/23 15:43:08 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -23,7 +23,6 @@
 #include "G4OpenGLXmViewer.hh"
 
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 class G4OpenGLImmediateSceneHandler;
 
@@ -33,6 +32,7 @@ public G4OpenGLXmViewer, public G4OpenGLImmediateViewer{
 public:
   G4OpenGLImmediateXmViewer (G4OpenGLImmediateSceneHandler& scene,
 			   const G4String& name = "");
+  virtual ~G4OpenGLImmediateXmViewer ();
   void DrawView ();
 
 };
diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
index b3b87fcf808754ae2c04178fcd38c6f7c9c3b05e..3a27e83b5b7bdd3d0f77445cb73a7fe3e375abf0 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.5 1999/12/16 17:25:05 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLSceneHandler.hh,v 1.7 2001/01/18 11:59:00 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -53,13 +53,29 @@ public:
 
 protected:
   G4OpenGLSceneHandler (G4VGraphicsSystem& system,
-		 G4int id,
-		 const G4String& name = "");
+			G4int id,
+			const G4String& name = "");
   virtual ~G4OpenGLSceneHandler ();
   G4bool initialize_hlr;
 
 private:
+  void AddCircleSquare (const G4VMarker&, G4int nSides);
+  /**************************************************
+  Not needed - but see note on future development in .cc.
+  void DrawScreenPolygon (G4double size,
+		          const G4Point3D& centre,
+		          G4int nSides);
+  // Draws in screen coordinates.
+  *********************************/
+
+  void DrawXYPolygon (G4double size,
+		      const G4Point3D& centre,
+		      G4int nSides);
+  // Draws in world coordinates a polygon in the screen plane knowing
+  // viewpoint direction and up vector.
+
   GLdouble clear_colour[4];
+  static const GLubyte fStippleMaskHashed [128];
 };
 
 #include "G4OpenGLSceneHandler.icc"
diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
index bfc8ada4cfce4ab108c4534d8c0abdb2e244280e..088c244b5c76705db879a5772444c131744fb615 100644
--- a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
+++ b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLSceneHandler.icc,v 1.3 1999/12/16 17:25:06 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  20th January 1998
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
index 412f1647065ee72e3d9e65bc8ca875dd62e5db95..abb609cf819fbdc0b06aebafd2d3984a62a6d0f0 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.8 2000/08/19 18:34:23 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLStoredSceneHandler.hh,v 1.10 2001/02/23 15:43:08 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -24,6 +24,7 @@
 #include "G4RotationMatrix.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include "g4std/map"
+#include "g4std/vector"
 
 class G4OpenGLStored;
 
@@ -37,7 +38,6 @@ public:
   void BeginModeling ();
   void EndModeling ();
   static G4int GetSceneCount ();
-  G4bool fMemoryForDisplayLists; // avoid memory overflow
   
 private:
 friend class G4OpenGLStoredViewer;
@@ -47,15 +47,16 @@ friend class G4OpenGLStoredViewer;
   static G4int    fSceneIdCount;   // static counter for OpenGLStored scenes.
   static G4int    fSceneCount;     // No. of extanct scene handlers.
   G4int           fDisplayListId;  // Workspace.
+  G4bool  fMemoryForDisplayLists;  // avoid memory overflow
   
   // PODL = Persistent Object Display List.
   GLint           fTopPODL;       // List which calls the other PODLs.
-  G4RWTValOrderedVector<G4int> fPODLList; 
-  G4RWTValOrderedVector<G4Transform3D> fPODLTransformList; 
+  G4std::vector<G4int> fPODLList; 
+  G4std::vector<G4Transform3D> fPODLTransformList; 
   
   // TODL = Transient  Object Display List.
-  G4RWTValOrderedVector<G4int> fTODLList; 
-  G4RWTValOrderedVector<G4Transform3D> fTODLTransformList; 
+  G4std::vector<G4int> fTODLList; 
+  G4std::vector<G4Transform3D> fTODLTransformList; 
   
   // Stop-gap solution of structure re-use.
   // A proper implementation would use geometry hierarchy.
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
index 2be4d9293298a2f7c49970b196c9950343d27110..fd21987e5ba15e111ba6effff528fdb68953b87d 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.5 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLStoredViewer.hh,v 1.6 2001/02/23 15:43:09 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -25,7 +25,6 @@
 #include "G4OpenGLStoredSceneHandler.hh"
 #include "G4OpenGLTransform3D.hh"
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 class G4OpenGLStoredSceneHandler;
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
index d93a959894ba8959bf64d8a739579740dd8907f1..0e74d843be7d790a21648c7e8efa34daeef7f19a 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredWin32.hh,v 1.4 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
index 803294724e6e89546c68d35bb085151b3d4af16a..b592369c142266bae779ccda01de6e8fada37cd4 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredWin32Viewer.hh,v 1.2 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Class G4OpenGLStoredWin32Viewer : a class derived from
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
index 1538f71ba09fd098f55602089a7c681d13766af0..b19d053a97d8ac54f6b3024bdcadd1be18751540 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredX.hh,v 1.5 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
index f36406e3170e491620bbf77b4858c73d980d24fa..1f6fc2c299311575646fcc4ec4459a1c7ddad960 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredXViewer.hh,v 1.3 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
index 01bf5a0b64ec95e8c4fa1dcdaba55e4244f01f10..4e11773f0da5f1a2141109ea66b0db3cfe8426e1 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredXm.hh,v 1.4 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
index 60b4f1eebe0f6171db2e072305d26a21fba93f01..1eafbdbf03a786d95eb89c863be0e5e122733eb0 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.2 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLStoredXmViewer.hh,v 1.3 2001/02/03 18:39:04 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -29,6 +29,7 @@ public G4OpenGLXmViewer, public G4OpenGLStoredViewer{
   
 public:
   G4OpenGLStoredXmViewer (G4OpenGLStoredSceneHandler& scene, const G4String& name = "");
+  virtual ~G4OpenGLStoredXmViewer ();
   void DrawView ();
 
 };
diff --git a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
index 204122d42741482ca86b06bc5e3bc64c0fb0891c..7008fa53e05a9706d3af775a8c5fe864afe5dac3 100644
--- a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLTransform3D.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  24th October 1996
diff --git a/source/visualization/OpenGL/include/G4OpenGLViewer.hh b/source/visualization/OpenGL/include/G4OpenGLViewer.hh
index a20b161932385bb51d6b0b206749d3bdc722ab9d..05cf0e3e2ea91f280f09829da5ba88823985a879 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.5 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLViewer.hh,v 1.6 2001/02/23 15:43:09 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -19,7 +19,6 @@
 
 #include "G4VViewer.hh"
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 class G4OpenGLSceneHandler;
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
index fd2db95cca86eabd4173d9ec2f2b0ebc0111c95d..2d3ea78912f0616b551aa86a21c9233bbc1f6a68 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.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLWin32Viewer.hh,v 1.4 2001/02/23 15:43:09 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
@@ -20,7 +20,6 @@
 #include "G4VViewer.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 //Win32 includes?
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
index 222581504c665bbe1610f3984ddea7219dfa79fa..2e6bce8374c9f77ec492d237d755a86ed7624e3d 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.8 2000/05/22 08:06:50 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXViewer.hh,v 1.10 2001/02/23 15:43:10 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -21,7 +21,6 @@
 #include "G4VViewer.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
@@ -102,6 +101,9 @@ protected:
                                     iconName;
   char                              charViewName [100];
 
+private:
+  G4OpenGLXViewer (const G4OpenGLXViewer&);
+  G4OpenGLXViewer& operator = (const G4OpenGLXViewer&);
 };
 
 static const char* gouraudtriangleEPS[] =
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmBox.hh
index 93bd50070d6e4160145f41bd284956cd98124521..e964e515cc2581997192c0261db69ead1a4dc10a 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.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmBox.hh,v 1.5 2001/03/07 14:56:15 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Box container class
@@ -28,9 +28,9 @@ class G4OpenGLXmBox : public G4OpenGLXmVWidgetContainer
 {
 
 public:
-  G4OpenGLXmBox (char* = NULL,
+  G4OpenGLXmBox (const char* = NULL,
 		 G4bool = False);   //constructor
-  ~G4OpenGLXmBox ();  //destructor
+  virtual ~G4OpenGLXmBox ();  //destructor
 
   void AddChild (G4OpenGLXmVWidgetComponent*);
   void AddYourselfTo (G4OpenGLXmVWidgetShell*);
@@ -38,14 +38,18 @@ public:
   Widget* GetPointerToParent ();
   Widget* GetPointerToWidget ();
   
-  char* GetName ();
-  void SetName (char*);
+  const char* GetName ();
+  void SetName (const char*);
 
 protected:
-  char* name;
+  const char* name;
   Widget* parent;
   Widget box_row_col;
   G4bool radio;
+
+private:
+  G4OpenGLXmBox (const G4OpenGLXmBox&);
+  G4OpenGLXmBox& operator = (const G4OpenGLXmBox&);
 };
 
 #endif
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh b/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
index 1401256024096a2a2f57efa30d77a1d14e4e867e..fe7c7dbec7c188d8f27b40f493578ffe692567dd 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmConvenienceRoutines.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh b/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
index 325a2b1732a2acc39dbd68a5195f53ecc1aec3fa..771332dc7abb71024abc8e1add5da1e9a1833308 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.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmFourArrowButtons.hh,v 1.4 2001/02/03 18:39:09 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
@@ -24,7 +24,7 @@ class G4OpenGLXmFourArrowButtons : public G4OpenGLXmVWidgetComponent
 public:
   G4OpenGLXmFourArrowButtons (XtCallbackRec** = NULL); // array of 4 callbacks
                                                        //constructor
-  ~G4OpenGLXmFourArrowButtons ();                      //destructor
+  virtual ~G4OpenGLXmFourArrowButtons ();              //destructor
 
   void SetName (char*);
  
@@ -40,6 +40,10 @@ private:
   Widget arrow_form;
   Widget arrow;
   Widget* parent;
+
+private:
+  G4OpenGLXmFourArrowButtons (const G4OpenGLXmFourArrowButtons&);
+  G4OpenGLXmFourArrowButtons& operator = (const G4OpenGLXmFourArrowButtons&);
 };
 
 #endif
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
index f6f5cdbc6b1dd4580d30efb1b02951c2fd921e2f..d7529ae76d43330e017e986e5ddb92ec754daf0c 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.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmFramedBox.hh,v 1.5 2001/03/07 14:56:16 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Framed box container class
@@ -30,14 +30,16 @@ class G4OpenGLXmFramedBox : public G4OpenGLXmBox
 {
 
 public:
-  G4OpenGLXmFramedBox (char* = NULL, 
+  G4OpenGLXmFramedBox (const char* = NULL, 
 		       G4bool = False);   //constructor
-  ~G4OpenGLXmFramedBox ();               //destructor
+  virtual ~G4OpenGLXmFramedBox ();               //destructor
 
   void AddChild (G4OpenGLXmVWidgetComponent*);
   void AddYourselfTo (G4OpenGLXmVWidgetShell*);
 
 private:
+  G4OpenGLXmFramedBox (const G4OpenGLXmFramedBox&);
+  G4OpenGLXmFramedBox& operator = (const G4OpenGLXmFramedBox&);
   Widget frame;
 };
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
index 07edba9d11abd37bb9de0aa9331282315fc5eb28..1c687edcc14803b5a921b105608b4d41590a2fa5 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmMainMenubarCallbacks.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
index f20c634044ada54e438eabcf54263c6c91f2ff91..d594c93ca2e39228c095ad21a9dff2086aff3f26 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmPanningCallbacks.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
index 9fa543d205d2024f8855d2ea2b7544f85c552209..7e52ec3e634f1b1b54eeae98f982d3213fedacca 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.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmPushButton.hh,v 1.5 2001/03/07 15:16:27 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,12 +22,12 @@ class G4OpenGLXmPushButton : public G4OpenGLXmVWidgetComponent
 {
 
 public:
-  G4OpenGLXmPushButton (char* = NULL,
+  G4OpenGLXmPushButton (const char* = NULL,
 			XtCallbackRec* = NULL); //constructor
-  ~G4OpenGLXmPushButton ();                     //destructor
+  virtual ~G4OpenGLXmPushButton ();             //destructor
 
-  void SetName (char*);
-  char* GetName ();
+  void SetName (const char*);
+  const char* GetName ();
 
   void AddYourselfTo (G4OpenGLXmVWidgetContainer*);
 
@@ -35,7 +35,9 @@ public:
   Widget* GetPointerToWidget ();
 
 private:
-  char* name;
+  G4OpenGLXmPushButton (const G4OpenGLXmPushButton&);
+  G4OpenGLXmPushButton& operator = (const G4OpenGLXmPushButton&);
+  const char* name;
   XtCallbackRec* callback;
   Widget button;
   Widget* parent;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
index 8fb40913237cf205f178a6cbdccb5eea06968632..0697f581f83281deacd0923080693fd9ec629e1d 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.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmRadioButton.hh,v 1.5 2001/03/07 14:56:16 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,14 +22,14 @@ class G4OpenGLXmRadioButton : public G4OpenGLXmVWidgetComponent
 {
 
 public:
-  G4OpenGLXmRadioButton (char*,
+  G4OpenGLXmRadioButton (const char*,
 			 XtCallbackRec*,
 			 G4bool,
 			 G4int);                    //constructor
-  ~G4OpenGLXmRadioButton ();                        //destructor
+  virtual ~G4OpenGLXmRadioButton ();                //destructor
 
-  void SetName (char*);
-  char* GetName ();
+  void SetName (const char*);
+  const char* GetName ();
 
   void AddYourselfTo (G4OpenGLXmVWidgetContainer*);
 
@@ -37,7 +37,9 @@ public:
   Widget* GetPointerToWidget ();
 
 private:
-  char* name;
+  G4OpenGLXmRadioButton (const G4OpenGLXmRadioButton&);
+  G4OpenGLXmRadioButton& operator = (const G4OpenGLXmRadioButton&);
+  const char* name;
   XtCallbackRec* callback;
   Widget button;
   Widget* parent;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
index a5de733477ad6dd85290ac684521535ec4857078..6c23145e275f8a40ee8231912d6c738b7b94ab8f 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmResources.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4ddbf3c3f9c19556984cfec037da69b6dca74c0b..9409d52633b85b365f4e3815f407fb0e05ef68b3 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmRotationCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh b/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
index 9cb632cbea53d51cbf624205083b1346bb70c684..a38bd8ee9063ba67e20fb21dff8e1a42fd6ba98a 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmSeparator.hh,v 1.4 2001/02/03 18:39:14 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent
@@ -23,7 +23,7 @@ class G4OpenGLXmSeparator : public G4OpenGLXmVWidgetComponent
 
 public:
   G4OpenGLXmSeparator (unsigned char = XmSINGLE_LINE);           //constructor
-  ~G4OpenGLXmSeparator ();                                       //destructor
+  virtual ~G4OpenGLXmSeparator ();                               //destructor
 
   void AddYourselfTo (G4OpenGLXmVWidgetContainer*);
 
@@ -31,6 +31,8 @@ public:
   Widget* GetPointerToWidget ();
 
 private:
+  G4OpenGLXmSeparator (const G4OpenGLXmSeparator&);
+  G4OpenGLXmSeparator& operator = (const G4OpenGLXmSeparator&);
   unsigned char line_type;
   Widget line;
   Widget* parent;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh b/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
index 746f112cfb2947f0bb0d81b587f0a6a225827919..f29d46bff301a1b5d83184892402e6625aa236d6 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmSliderBar.hh,v 1.5 2001/03/07 14:56:17 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,7 +22,7 @@ class G4OpenGLXmSliderBar : public G4OpenGLXmVWidgetComponent
 {
 
 public:
-  G4OpenGLXmSliderBar (char* = NULL,           // name of slider bar
+  G4OpenGLXmSliderBar (const char* = NULL,     // name of slider bar
 		       XtCallbackRec* = NULL,  // callbacks for slider bar
 		       G4bool = False,         // show current value if True
 		       short = 0,              // decimal places for show value
@@ -32,9 +32,9 @@ public:
 		       unsigned char = XmHORIZONTAL,
 		       unsigned char = XmMAX_ON_RIGHT); 
                                                //constructor
-  ~G4OpenGLXmSliderBar ();                     //destructor
+  virtual ~G4OpenGLXmSliderBar ();             //destructor
 
-  void SetName (char*);
+  void SetName (const char*);
   void SetShow (G4bool);
   void SetDecimalPlaces (short);
   void SetInitialValue (G4double);
@@ -44,7 +44,7 @@ public:
   void SetDirection (unsigned char);
 
  
-  char* GetName ();
+  const char* GetName ();
   G4bool GetShow ();
   short GetDecimalPlaces ();
   G4double GetInitialValue ();
@@ -59,7 +59,9 @@ public:
   Widget* GetPointerToWidget ();
 
 private:
-  char* name;
+  G4OpenGLXmSliderBar (const G4OpenGLXmSliderBar&);
+  G4OpenGLXmSliderBar& operator = (const G4OpenGLXmSliderBar&);
+  const char* name;
   XtCallbackRec* callback;
   Widget sliderbar;
   Widget* parent;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
index 5f756299ee89688862d86986e4bb4afd6ecf15e6..df6c2999156045e3f38a819a9cb8c36f9d18a953 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmStyleCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh b/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
index 05e9907e36044f8b0ba99017779124d16a5f5aba..8908769aa5b994b2e23d6e9fd1437a59c2f584fe 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmTextField.hh,v 1.5 2001/03/07 14:56:17 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent
@@ -23,16 +23,16 @@ class G4OpenGLXmTextField : public G4OpenGLXmVWidgetComponent
 {
 
 public:
-  G4OpenGLXmTextField (char*,G4double*); //constructor
-  G4OpenGLXmTextField (char*,char*);     //constructor
-  ~G4OpenGLXmTextField ();               //destructor
+  G4OpenGLXmTextField (const char*,G4double*);   //constructor
+  G4OpenGLXmTextField (const char*,const char*); //constructor
+  virtual ~G4OpenGLXmTextField ();               //destructor
 
-  void SetName (char*);
-  char* GetName ();
+  void SetName (const char*);
+  const char* GetName ();
 
   void SetValue (G4double);
-  void SetValue (char*);
-  char* GetValue ();
+  void SetValue (const char*);
+  const char* GetValue ();
 
   void AddYourselfTo (G4OpenGLXmVWidgetContainer*);
 
@@ -40,7 +40,9 @@ public:
   Widget* GetPointerToWidget ();
 
 private:
-  char* name;
+  G4OpenGLXmTextField (const G4OpenGLXmTextField&);
+  G4OpenGLXmTextField& operator = (const G4OpenGLXmTextField&);
+  const char* name;
   void* value;
   G4bool text;
   char* initial;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
index b315c10205929edb312f81b5d9300301c9c6b9ad..2aefdbf49fcbcdadf17fbdee821dbb9caa8b15e8 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmTopLevelShell.hh,v 1.4 2001/02/03 18:39:19 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Top level shell class
@@ -25,7 +25,7 @@ class G4OpenGLXmTopLevelShell : public G4OpenGLXmVWidgetShell
 
 public:
   G4OpenGLXmTopLevelShell(G4OpenGLXmViewer*, char*);   //constructor
-  ~G4OpenGLXmTopLevelShell();  //destructor
+  virtual ~G4OpenGLXmTopLevelShell();  //destructor
 
   void AddChild (G4OpenGLXmVWidgetContainer*);
   void Realize ();
@@ -34,6 +34,8 @@ public:
   char* GetName ();
 
 private:
+  G4OpenGLXmTopLevelShell (const G4OpenGLXmTopLevelShell&);
+  G4OpenGLXmTopLevelShell& operator = (const G4OpenGLXmTopLevelShell&);
   char* name;
   Widget toplevel;
   Widget top_box;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
index 0fa8c727b9f0f1e0fec2a4ad1af23172dcebf5b3..e0b34d274e011784ef3e8bff9e41031f4eae6e7b 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmVWidgetComponent.hh,v 1.4 2001/02/03 18:39:20 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Base class for all Motif component widgets
@@ -24,8 +24,8 @@ class G4OpenGLXmVWidgetComponent : public G4OpenGLXmVWidgetObject
 {
 
 public:
-  G4OpenGLXmVWidgetComponent();   //constructor
-  ~G4OpenGLXmVWidgetComponent();  //destructor
+  G4OpenGLXmVWidgetComponent();           //constructor
+  virtual ~G4OpenGLXmVWidgetComponent();  //destructor
 
   virtual void AddYourselfTo (G4OpenGLXmVWidgetContainer*) = 0;
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
index 1840a752649a6820d338065399a500a571cd0b97..7b639c87f28d172e5583c79063b6927acc45ef09 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmVWidgetContainer.hh,v 1.4 2001/02/03 18:39:22 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Base class for all Motif container widgets
@@ -25,8 +25,8 @@ class G4OpenGLXmVWidgetContainer : public G4OpenGLXmVWidgetObject
 {
 
 public:
-  G4OpenGLXmVWidgetContainer();   //constructor
-  ~G4OpenGLXmVWidgetContainer();  //destructor
+  G4OpenGLXmVWidgetContainer();           //constructor
+  virtual ~G4OpenGLXmVWidgetContainer();  //destructor
 
   virtual void AddChild (G4OpenGLXmVWidgetComponent*) = 0;
   virtual void AddYourselfTo (G4OpenGLXmVWidgetShell*) = 0;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
index 142eaa784ab7fe3c05bdc2882fb1511f0f6b515c..65ff8928facc3712f0c249a83103bcd4ec0c202b 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmVWidgetObject.hh,v 1.4 2001/02/03 18:39:23 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Virtual base class for all Motif widgets.
@@ -26,13 +26,15 @@ class G4OpenGLXmVWidgetObject {
 
 public:
 
-  G4OpenGLXmVWidgetObject ();  //constructor
-  ~G4OpenGLXmVWidgetObject (); //destructor
+  G4OpenGLXmVWidgetObject ();          //constructor
+  virtual ~G4OpenGLXmVWidgetObject (); //destructor
   
   G4OpenGLXmViewer* GetView ();  //access to the pView
   void ProcesspView ();
 
 protected:
+  G4OpenGLXmVWidgetObject (const G4OpenGLXmVWidgetObject&);
+  G4OpenGLXmVWidgetObject& operator = (const G4OpenGLXmVWidgetObject&);
   G4OpenGLXmViewer* pView;
   Colormap cmap;
   Pixel borcol;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
index 9253c8f7bb161f36135b83b6c458d1cfd61eb4f3..e7cecc766dbe5d87cc19be04c73d319c73fe1de3 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmVWidgetShell.hh,v 1.4 2001/02/03 18:39:25 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 //Base class for all Motif window widgets (shells)
@@ -25,7 +25,7 @@ class G4OpenGLXmVWidgetShell : public G4OpenGLXmVWidgetObject
 
 public:
   G4OpenGLXmVWidgetShell();   //constructor
-  ~G4OpenGLXmVWidgetShell();  //destructor
+  virtual ~G4OpenGLXmVWidgetShell();  //destructor
 
   virtual Widget* GetPointerToWidget() = 0;
   virtual void AddChild (G4OpenGLXmVWidgetContainer*) = 0;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
index b4da7c4e8c55ac50b065ffd1159d9b0b40bd0e92..4a64cb7688035883e31faab7810f4f232378bd46 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.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmViewer.hh,v 1.5 2001/02/23 15:43:10 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -21,7 +21,6 @@
 #include "G4OpenGLXViewer.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include "globals.hh"
-#include "g4rw/tvordvec.h"
 
 #include <Xm/Xm.h>
 #include <Xm/MainW.h>
@@ -57,7 +56,7 @@ class G4OpenGLXmViewer: public G4OpenGLXViewer {
   
 public:
   G4OpenGLXmViewer (G4OpenGLSceneHandler& scene);
-  ~G4OpenGLXmViewer ();
+  virtual ~G4OpenGLXmViewer ();
   
 protected:
   virtual void ShowView ();
@@ -362,6 +361,10 @@ public:
   static G4int  get_int_userData (Widget w);
 
 friend class G4OpenGLXmVWidgetObject;
+
+private:
+  G4OpenGLXmViewer (const G4OpenGLXmViewer&);
+  G4OpenGLXmViewer& operator = (const G4OpenGLXmViewer&);
   
 };
 
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
index f4cd78a13704474775ac061f6390ed921d6e1f5f..945987bfc5cc78668b2fac87318807d4795c7428 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmWindowHandlingCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
index ad498f024ba9b9404c1cc05540aaccae92193f91..91564b1c119d3a1803e1957dcd8250d6aa3fd4b9 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1.3 1999/12/15 14:54:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
index 0bc952713f51ae77c6b3d14e363a1c8f6c91f0ca..bae34cc75a8d28f13194fd932d37374a3e0b8f81 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateViewer.cc,v 1.3 1999/12/15 14:54:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
index f69d68616dc97e5678611b18ce0d8c10723c8f11..b7f9a928bbc085162d25447ff3f597728085bfcd 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateWin32.cc,v 1.5 2000/08/19 18:34:26 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
index 0a4a2b149888d23b1d1c3891bb5beb4ea5c9d689..468a5778800a32d11e8273a2eb07c2f0371f16c3 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.2 1999/12/15 14:54:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 58969c5cc1eb46aba894f3ee607f7fd83975e7fb..7edabac1c3e7df37d71aa4a4f59ee269fc748021 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateX.cc,v 1.6 2000/08/19 18:34:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
index 4f761d2d9307f8e99f559c3d4d2afa2dc0cd71fb..f815b6bba567cbfbf1aca27cf21d883025ce07ac 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLImmediateXViewer.cc,v 1.4 2000/05/22 08:16:25 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
index eecb4b3160e2562af3b4926570756e9586305d5c..4c222791b12ae8a0f1e99275dd2050a72ea5a37d 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.5 2000/08/19 18:34:31 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLImmediateXm.cc,v 1.6 2001/02/03 18:39:29 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -31,6 +31,8 @@ G4OpenGLImmediateXm::G4OpenGLImmediateXm ():
 		     G4VisFeaturesOfOpenGLIXm (),
 		     G4VGraphicsSystem::threeD) {}
 
+G4OpenGLImmediateXm::~G4OpenGLImmediateXm () {}
+
 G4VSceneHandler* G4OpenGLImmediateXm::CreateSceneHandler (const G4String& name) {
   G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
   G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
index daf609dfe4849af3ff0ddc498491a4a06739b51d..04d55997e53cd3be0f6702702bff23e9d6fa7a52 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.3 2000/05/22 08:16:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLImmediateXmViewer.cc,v 1.4 2001/02/03 18:39:30 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -79,6 +79,8 @@ G4VViewer (scene, scene.IncrementViewCount (), name) {
   //  }
 }
 
+G4OpenGLImmediateXmViewer::~G4OpenGLImmediateXmViewer () {}
+
 void G4OpenGLImmediateXmViewer::DrawView () {
 
   // If a double buffer context has been forced upon us, ignore the
diff --git a/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
index baa6b54e6a16d461eb5a914caf3098a4ada265ba..ea6a71750829057ff02cdb06326737d88e72b9e5 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.5 2000/02/21 16:03:18 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLSceneHandler.cc,v 1.8 2001/01/25 15:28:09 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -56,6 +56,25 @@ G4OpenGLSceneHandler::~G4OpenGLSceneHandler ()
   ClearStore ();
 }
 
+const GLubyte G4OpenGLSceneHandler::fStippleMaskHashed [128] = {
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+  0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55
+};
+
 //Method for handling G4Polyline objects (from tracking or wireframe).
 void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line)
 {
@@ -83,7 +102,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line)
 void G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) {
   MarkerSizeType sizeType;
   G4double size = GetMarkerSize (text, sizeType);
-  G4cerr
+  G4cout
     << "G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) not implemented yet."
     << "\n  Called with text \"" << text.GetText ()
     << "\" at " << text.GetPosition ()
@@ -94,8 +113,20 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) {
 }
 
 void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
+  glEnable (GL_POINT_SMOOTH);
+  AddCircleSquare (circle, 24);
+}
+
+void G4OpenGLSceneHandler::AddPrimitive (const G4Square& square) {
+  glDisable (GL_POINT_SMOOTH);
+  AddCircleSquare (square, 4);
+}
+
+void G4OpenGLSceneHandler::AddCircleSquare
+(const G4VMarker& marker,
+ G4int nSides) {
 
-  const G4Colour& c = GetColour (circle);
+  const G4Colour& c = GetColour (marker);
   glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
   
   if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ())
@@ -104,7 +135,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
   
   glDisable (GL_LIGHTING);
   
-  G4VMarker::FillStyle style = circle.GetFillStyle();
+  G4VMarker::FillStyle style = marker.GetFillStyle();
   
   switch (style) {
   case G4VMarker::noFill: 
@@ -112,8 +143,16 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
     break;
     
   case G4VMarker::hashed:
-    glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
-    glLineStipple (1, 0x0101);
+    /*
+    G4cout << "Hashed fill style in G4OpenGLSceneHandler."
+	   << "\n  Not implemented.  Using G4VMarker::filled."
+	   << G4endl;
+    */
+    glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+    glPolygonStipple (fStippleMaskHashed);
+    // See also:
+    //   if (style == G4VMarker::filled || style == G4VMarker::hashed)...
+    // (twice) below.
     break;
     
   case G4VMarker::filled:
@@ -121,197 +160,165 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Circle& circle) {
     break;
     
   default:
-    G4cerr << "Unrecognised fill style for G4Circle in G4OpenGLSceneHandler."
-	 << "\nUsing G4VMarker::filled." << G4endl;
+    G4cout << "Unrecognised fill style in G4OpenGLSceneHandler."
+	   << "\n  Using G4VMarker::filled."
+	   << G4endl;
     glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
     break;
     
   }
-  
-  G4Point3D centre = circle.GetPosition();
- 
-  G4bool userSpecified = (circle.GetWorldSize() || circle.GetScreenSize());
-  
-  const G4VMarker& def = fpViewer -> GetViewParameters().GetDefaultMarker();
-  
-  //Make sure we Draw circles...
-  glEnable (GL_POINT_SMOOTH);
 
-  G4double size;
+  // A few useful quantities...
+  G4Point3D centre = marker.GetPosition();
+  G4bool userSpecified = (marker.GetWorldSize() || marker.GetScreenSize());
+  const G4VMarker& def = fpViewer -> GetViewParameters().GetDefaultMarker();
+  const G4Vector3D& viewpointDirection =
+    fpViewer -> GetViewParameters().GetViewpointDirection();
+  const G4Vector3D& up = fpViewer->GetViewParameters().GetUpVector();
   G4double scale = fpViewer -> GetViewParameters().GetGlobalMarkerScale();
-  if (size = scale * // Assignment intentional.
-      userSpecified ? circle.GetWorldSize() : def.GetWorldSize()) {
+  G4double size = scale *
+    userSpecified ? marker.GetWorldSize() : def.GetWorldSize();
 
-    // Draw in world coordinates...
+  // Find "size" of marker in world space (but see note below)...
+  G4double worldSize;
+  if (size) {  // Size specified in world coordinates.
+    worldSize = size;
+  }
+  else { // Size specified in screen (window) coordinates.
+
+    // Find window coordinates of centre...
+    GLdouble modelMatrix[16];
+    glGetDoublev (GL_MODELVIEW_MATRIX, modelMatrix);
+    G4double projectionMatrix[16];
+    glGetDoublev (GL_PROJECTION_MATRIX, projectionMatrix);
+    GLint viewport[4];
+    glGetIntegerv(GL_VIEWPORT,viewport);
     GLdouble winx, winy, winz;
-    GLdouble* model_matrix = new GLdouble[16];
-    GLdouble* proj_matrix = new GLdouble[16];
-    GLint* v_port = new GLint[4];
-    //    glPointSize (5.0); //Still have to work out correspondance between
-    //                       //world and screen units.
-    glGetDoublev (GL_MODELVIEW_MATRIX, model_matrix);
-    glGetDoublev (GL_PROJECTION_MATRIX, proj_matrix);
-    glGetIntegerv (GL_VIEWPORT, v_port);
-    gluProject (size, size, size,
-		model_matrix,
-		proj_matrix,
-		v_port,
-		&winx, &winy, &winz);
-    glPointSize (winx);
-    glBegin (GL_POINTS);
-    glVertex3d (centre.x(), centre.y(), centre.z());
-    glEnd ();
-    delete[] model_matrix;
-    delete[] proj_matrix;
-    delete[] v_port;
-
+    gluProject(centre.x(), centre.y(), centre.z(),
+	       modelMatrix, projectionMatrix, viewport,
+	       &winx, &winy, &winz);
+
+    // Determine ratio window:world...
+    const G4Vector3D inScreen = (up.cross(viewpointDirection)).unit();
+    const G4Vector3D p = centre + inScreen;
+    GLdouble winDx, winDy, winDz;
+    gluProject(p.x(), p.y(), p.z(),
+               modelMatrix, projectionMatrix, viewport,
+               &winDx, &winDy, &winDz);
+    G4double winWorldRatio = sqrt(pow(winx - winDx, 2) +
+				  pow(winy - winDy, 2));
+    G4double winSize = scale *
+      userSpecified ? marker.GetScreenSize() : def.GetScreenSize();
+    worldSize = winSize / winWorldRatio;
   }
-  else {
-    size = scale *
-      userSpecified ? circle.GetScreenSize() : def.GetScreenSize();
-
-    // Draw in screen coordinates...
-    //    G4double* projection_matrix = new G4double[16];
-    //    glGetDoublev (GL_MODELVIEW_MATRIX, projection_matrix);
 
-    //    HepMatrix proj(4, 4, 1);
-    //    for (col = 1; col < 5; col++) {
-    //      for (row = 1; row < 5; row++) {
-    //	proj (row, col) = projection_matrix[(col-1)*4 + (row-1)];
-    //      }
-    //    }
-
-    //    G4cout << "proj is : \n" << proj << G4endl;
-
-    //    proj.invert(ierr);
-
-    //    G4cout << "ierr is " << ierr << G4endl;
-    //    G4cout << "proj^-1 is : \n" << proj << G4endl;
-    
-    //    for (col = 1; col < 5; col++) {
-    //      for (row = 1; row < 5; row++) {
-    //	projection_matrix[(col-1)*4 + (row-1)] = proj (row, col);
-    //      }
-    //    }
-
-    //    glMultMatrixd (projection_matrix);
-
-    //    glTranslated (centre.x(), centre.y(), centre.z());
-    //    glBegin (GL_LINE_LOOP);
-    glPointSize (size);
-    glBegin (GL_POINTS);
-    //    for (G4int segment = 0; segment < num_sides; segment++) {
-    //      theta = d_theta * segment;
-    //      glVertex3d (sin(theta) * size,
-    //		  cos(theta) * size,
-    //		  0.);
-    //    }
-    glVertex3d (centre.x(), centre.y(), centre.z());
-    glEnd ();
-
-  }
+  // Draw...
+  DrawXYPolygon (worldSize, centre, nSides);
 }
 
-
-void G4OpenGLSceneHandler::AddPrimitive (const G4Square& Square) {
-
-  const G4Colour& c = GetColour (Square);
-  glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
-
-  if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ())
-    glDisable (GL_DEPTH_TEST);
-  else glEnable (GL_DEPTH_TEST);
-
-  glDisable (GL_LIGHTING);
-  
-  G4VMarker::FillStyle style = Square.GetFillStyle();
-  
-  switch (style) {
-  case G4VMarker::noFill: 
-    glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
-    break;
-    
-  case G4VMarker::hashed:
-    glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
-    glLineStipple (1, 0x0101);
-    break;
-    
-  case G4VMarker::filled:
-    glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-    break;
-    
-  default:
-    G4cerr << "Unrecognised fill style for G4Square in G4OpenGLSceneHandler."
-	 << "\nUsing G4VMarker::filled." << G4endl;
-    glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-    break;
-
-  }
-
-  G4Point3D centre = Square.GetPosition();
-  //  glTranslated (centre.x(), centre.y(), centre.z());
-
-  //  G4double a = Square.GetWorldSize ();
-  //  if (a <= 0.0) {
-  //    a = 1000.0;
-  //  }
-
-  //  glBegin (GL_LINE_LOOP);
-
-  //  glVertex3d ( a,  a, 0.);
-  //  glVertex3d (-a,  a, 0.);
-  //  glVertex3d (-a, -a, 0.);
-  //  glVertex3d ( a, -a, 0.);
-
-  //Make sure we Draw squares...
-  glDisable (GL_POINT_SMOOTH);
-
-  G4bool userSpecified = (Square.GetWorldSize() || Square.GetScreenSize());
-  
-  const G4VMarker& def = fpViewer -> GetViewParameters().GetDefaultMarker();
-  
-  G4double size;
-  G4double scale = fpViewer -> GetViewParameters().GetGlobalMarkerScale();
-  if (size = scale * // Assignment intentional.
-      userSpecified ? Square.GetWorldSize() : def.GetWorldSize()) {
-
-    //Draw in world coordinates...
-    GLdouble winx, winy, winz;
-    GLdouble* model_matrix = new GLdouble[16];
-    GLdouble* proj_matrix = new GLdouble[16];
-    GLint* v_port = new GLint[4];
-    //    glPointSize (5.0); //Still have to work out correspondance between
-    //                       //world and screen units.
-    glGetDoublev (GL_MODELVIEW_MATRIX, model_matrix);
-    glGetDoublev (GL_PROJECTION_MATRIX, proj_matrix);
-    glGetIntegerv (GL_VIEWPORT, v_port);
-    gluProject (size, size, size,
-		model_matrix,
-		proj_matrix,
-		v_port,
-		&winx, &winy, &winz);
-    glPointSize (winx);
-    //    glPointSize (5.0); //Still have to work out correspondance between
-    //                       //world units and screen units...
-    glBegin (GL_POINTS);
-    glVertex3d (centre.x(), centre.y(), centre.z());
-    glEnd ();
-    delete[] model_matrix;
-    delete[] proj_matrix;
-    delete[] v_port;
-
+/***************************************************
+Note: We have to do it this way round so that when a global
+transformation is applied, such as with /vis/viewer/set/viewpoint,
+the markers follow the world coordinates without having to
+recreate the display lists.  The down side is that the markers
+rotate.  The only way to avoid this is to play with the modelview
+and projection matrices of OpenGL - which I need to think about.
+For future reference, here is the code to draw in window
+coordinates; it's down side is tha markers do not follow global
+transformations.  Some clever stuff is needed.
+
+  ...
+  // Find window coordinates of centre...
+  GLdouble modelMatrix[16];
+  glGetDoublev (GL_MODELVIEW_MATRIX, modelMatrix);
+  G4double projectionMatrix[16];
+  glGetDoublev (GL_PROJECTION_MATRIX, projectionMatrix);
+  GLint viewport[4];
+  glGetIntegerv(GL_VIEWPORT,viewport);
+  GLdouble winx, winy, winz;
+  gluProject(centre.x(), centre.y(), centre.z(),
+             modelMatrix, projectionMatrix, viewport,
+             &winx, &winy, &winz);
+
+  // Find window size...
+  G4double winSize;
+  if (size) {  // Size specified in world coordinates.
+    // Determine size in window coordinates...
+    (Note: improve this by using an inScreen vector as above.)
+    GLdouble winx1, winy1, winz1;
+    gluProject(centre.x() + size, centre.y() + size, centre.z() + size,
+               modelMatrix, projectionMatrix, viewport,
+               &winx1, &winy1, &winz1);
+    winSize = sqrt((pow(winx - winx1, 2) +
+                    pow(winy - winy1, 2) +
+                    pow(winz - winz1, 2)) / 3.);
   }
   else {
-    size = scale *
-      userSpecified ? Square.GetScreenSize() : def.GetScreenSize();
-
-    // Draw in screen coordinates...
-    glPointSize (size);
-    glBegin (GL_POINTS);
-    glVertex3d (centre.x(), centre.y(), centre.z());
-    glEnd ();
+    winSize = scale *
+      userSpecified ? marker.GetScreenSize() : def.GetScreenSize();
+  }
 
+  // Prepare to draw in window coordinates...
+  glMatrixMode (GL_PROJECTION);
+  glPushMatrix();
+  glLoadIdentity();
+  gluOrtho2D(GLdouble(viewport[0]),
+             GLdouble(viewport[0] + viewport[2]),
+             GLdouble(viewport[1]),
+             GLdouble(viewport[1] + viewport[3]));
+  glMatrixMode (GL_MODELVIEW);
+  glPushMatrix();
+  glLoadIdentity();
+
+  // Draw in window coordinates...
+  DrawScreenPolygon (winSize, G4Point3D(winx, winy, winz), nSides);
+
+  // Re-instate matrices...
+  glMatrixMode (GL_PROJECTION);
+  glPopMatrix();
+  glMatrixMode (GL_MODELVIEW);
+  glPopMatrix();
+  ...
+
+void G4OpenGLSceneHandler::DrawScreenPolygon
+(G4double size,
+ const G4Point3D& centre,
+ G4int nSides) {
+  glBegin (GL_POLYGON);
+  const G4double dPhi = 2. * M_PI / nSides;
+  const G4double r = size / 2.;
+  G4double phi;
+  G4int i;
+  for (i = 0, phi = -dPhi / 2.; i < nSides; i++, phi += dPhi) {
+    G4double x, y, z;
+    x = centre.x() + r * cos(phi);
+    y = centre.y() + r * sin(phi);
+    z = centre.z();
+    glVertex3d (x, y, z);
   }
+  glEnd ();
+}
+**********************************************/
+
+void G4OpenGLSceneHandler::DrawXYPolygon
+(G4double size,
+ const G4Point3D& centre,
+ G4int nSides) {
+  const G4Vector3D& viewpointDirection =
+    fpViewer -> GetViewParameters().GetViewpointDirection();
+  const G4Vector3D& up = fpViewer->GetViewParameters().GetUpVector();
+  const G4double dPhi = 2. * M_PI / nSides;
+  const G4double radius = size / 2.;
+  G4Vector3D start = radius * (up.cross(viewpointDirection)).unit();
+  G4double phi;
+  G4int i;
+  glBegin (GL_POLYGON);
+  for (i = 0, phi = -dPhi / 2.; i < nSides; i++, phi += dPhi) {
+    G4Vector3D r = start; r.rotate(phi, viewpointDirection);
+    G4Vector3D p = centre + r;
+    glVertex3d (p.x(), p.y(), p.z());
+  }
+  glEnd ();
 }
 
 //Method for handling G4Polyhedron objects for drawing solids.
@@ -320,6 +327,8 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) {
   //Assume all facets are convex quadrilaterals.
   //Draw each G4Facet individually
   
+  if (polyhedron.GetNoFacets() == 0) return;
+
   G4ViewParameters::DrawingStyle drawing_style = GetDrawingStyle (polyhedron);
   
   //Get colour, etc..
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
index 86426db96c3bcc52c74008e94192151c549be825..421086f33cd9b555d00d65cfbf7b9ea40b3f3633 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.7 2000/04/12 13:09:07 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.9 2001/02/23 15:43:11 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -63,7 +63,8 @@ void G4OpenGLStoredSceneHandler::BeginPrimitives
   G4VSceneHandler::BeginPrimitives (objectTransformation);
 
   if (fMemoryForDisplayLists) {
-    if (!(fDisplayListId = glGenLists (1))) {  // Could pre-allocate?
+    fDisplayListId = glGenLists (1);
+    if (!fDisplayListId) {  // Could pre-allocate?
       G4cout << "********************* WARNING! ********************\n"
 	   <<"Unable to allocate any more display lists in OpenGL.\n "
 	   << "      Continuing drawing in IMMEDIATE MODE.\n"
@@ -73,8 +74,8 @@ void G4OpenGLStoredSceneHandler::BeginPrimitives
   }
   if (fMemoryForDisplayLists) {
     if (fReadyForTransients) {
-      fTODLList.append (fDisplayListId);
-      fTODLTransformList.append (objectTransformation);
+      fTODLList.push_back (fDisplayListId);
+      fTODLTransformList.push_back (objectTransformation);
       glDrawBuffer (GL_FRONT);
       glPushMatrix();
       G4OpenGLTransform3D oglt (objectTransformation);
@@ -82,8 +83,8 @@ void G4OpenGLStoredSceneHandler::BeginPrimitives
       glNewList (fDisplayListId, GL_COMPILE_AND_EXECUTE);
     }
     else {
-      fPODLList.append (fDisplayListId);
-      fPODLTransformList.append (objectTransformation);
+      fPODLList.push_back (fDisplayListId);
+      fPODLTransformList.push_back (objectTransformation);
       glNewList (fDisplayListId, GL_COMPILE);
     }
   } else {
@@ -113,16 +114,16 @@ void G4OpenGLStoredSceneHandler::ClearStore () {
   int i;
 
   // Delete OpenGL display lists.
-  for (i = 0; i < fPODLList.entries (); i++) {
-    if (fPODLList (i)) {
-      glDeleteLists (fPODLList (i), 1);
+  for (i = 0; i < fPODLList.size (); i++) {
+    if (fPODLList [i]) {
+      glDeleteLists (fPODLList [i], 1);
     } else {
       G4cerr << "Warning : NULL display List in fPODLList." << G4endl;
     }
   }
-  for (i = 0; i < fTODLList.entries (); i++) {
-    if (fTODLList (i)) {
-      glDeleteLists (fTODLList (i), 1);
+  for (i = 0; i < fTODLList.size (); i++) {
+    if (fTODLList [i]) {
+      glDeleteLists (fTODLList [i], 1);
     } else {
       G4cerr << "Warning : NULL display List in fTODLList." << G4endl;
     }
@@ -157,11 +158,11 @@ void G4OpenGLStoredSceneHandler::EndModeling () {
 //  }
 
   glNewList (fTopPODL, GL_COMPILE); {
-    for (int i = 0; i < fPODLList.entries (); i++) {
+    for (int i = 0; i < fPODLList.size (); i++) {
       glPushMatrix();
-      G4OpenGLTransform3D oglt (fPODLTransformList (i));
+      G4OpenGLTransform3D oglt (fPODLTransformList [i]);
       glMultMatrixd (oglt.GetGLMatrix ());
-      glCallList (fPODLList(i));
+      glCallList (fPODLList[i]);
       glPopMatrix();
     }
   }
@@ -187,8 +188,8 @@ void G4OpenGLStoredSceneHandler::RequestPrimitives (const G4VSolid& solid) {
     if (!(fpCurrentPV -> IsReplicated ()) &&
 	(fSolidMap.find (pSolid) != fSolidMap.end ())) {
       fDisplayListId = fSolidMap [pSolid];
-      fPODLList.append (fDisplayListId);
-      fPODLTransformList.append (*fpObjectTransformation);
+      fPODLList.push_back (fDisplayListId);
+      fPODLTransformList.push_back (*fpObjectTransformation);
     }
     else {
       G4VSceneHandler::RequestPrimitives (solid);
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
index ddf208cf664d85edbff47fe6f565cf8f35659388..ec331964e721d5e66d75b9e3d5e21c7d8b58202e 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.4 1999/12/15 14:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLStoredViewer.cc,v 1.5 2001/02/23 15:43:12 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -54,8 +54,8 @@ void G4OpenGLStoredViewer::KernelVisitDecision () {
       (lastVP.IsSection ()          != fVP.IsSection ())          ||
       // No need if section plane changes.
       (lastVP.IsCutaway ()          != fVP.IsCutaway ())          ||
-      (lastVP.GetCutawayPlanes ().entries () !=
-                              fVP.GetCutawayPlanes ().entries ()) ||
+      (lastVP.GetCutawayPlanes ().size () !=
+                                 fVP.GetCutawayPlanes ().size ()) ||
       // No need if cutaway planes change.
       (lastVP.IsExplode ()          != fVP.IsExplode ())          ||
       (lastVP.GetNoOfSides ()       != fVP.GetNoOfSides ())
@@ -81,12 +81,12 @@ void G4OpenGLStoredViewer::DrawDisplayLists () {
   
   if (fSceneHandler.fTopPODL) glCallList (fSceneHandler.fTopPODL);
   
-  G4int nTODLs = fSceneHandler.fTODLList.entries ();
+  G4int nTODLs = fSceneHandler.fTODLList.size ();
   for (int i = 0; i < nTODLs; i++) {
     glPushMatrix();
-    G4OpenGLTransform3D oglt (fSceneHandler.fTODLTransformList (i));
+    G4OpenGLTransform3D oglt (fSceneHandler.fTODLTransformList [i]);
     glMultMatrixd (oglt.GetGLMatrix ());
-    glCallList (fSceneHandler.fTODLList(i));
+    glCallList (fSceneHandler.fTODLList[i]);
     glPopMatrix();
   }
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
index d27c3762e59c873f753ccdac233029997c72644f..d5a948dd9835d20322f6528f5ea4cadd96c3408d 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredWin32.cc,v 1.5 2000/08/19 18:34:33 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
index 42a69c4f99248e0437798206919178b7b9dc0450..60e78759e125de1247d084ad539e30f64ada944a 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredWin32Viewer.cc,v 1.2 1999/12/15 14:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 bfe9d8b8a1bf18b114ad8175b1f405878a88c49f..d80b6ff24653faa2935de2ab012ec69262da1841 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredX.cc,v 1.6 2000/08/19 18:34:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
index f6cbe9b0df7fb85a8577551f384907d1b699d352..1c0e1a9f67c02a16ec2182669f0d5517b10d9b63 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredXViewer.cc,v 1.4 2000/05/22 08:16:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
index 79b864718e07d6d6f56b166ce7f70075c4866b73..84bdc3b64e34899471bd80fc86d12951258c2e51 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLStoredXm.cc,v 1.5 2000/08/19 18:34:38 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
index 8449fe80809bd12d5865fa9c67f18215aeb1d592..6de1bfc61f3b7ae3a7c4faeda7253ca8fa628b18 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.3 2000/05/22 08:16:42 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLStoredXmViewer.cc,v 1.4 2001/02/03 18:39:33 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -59,6 +59,8 @@ G4VViewer (scene, scene.IncrementViewCount (), name) {
   glShadeModel (GL_FLAT);
 }
 
+G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () {}
+
 void G4OpenGLStoredXmViewer::DrawView () {
 
   if (white_background == true) {
diff --git a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
index 3e5d587a9e8ec18c59648b4a1d64ab94f0181869..fa0a2122fcd163eedd4ff6e055e0ef493692de32 100644
--- a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLTransform3D.cc,v 1.3 1999/12/15 14:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  24th October 1996
diff --git a/source/visualization/OpenGL/src/G4OpenGLViewer.cc b/source/visualization/OpenGL/src/G4OpenGLViewer.cc
index a6b3922d4db62d8f1b1cadb97aa2dfce731f37a3..6b81c4712eba68fb358e6e58dc5aec52db3030c9 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.8 2000/05/22 08:09:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLViewer.cc,v 1.10 2001/02/04 20:24:38 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -49,6 +49,10 @@ transparency_enabled (False),
 antialiasing_enabled (False),
 haloing_enabled (False)
 {
+  // Make changes to view parameters for OpenGL...
+  fVP.SetAutoRefresh(true);
+  fDefaultVP.SetAutoRefresh(true);
+
   //  glClearColor (0.0, 0.0, 0.0, 0.0);
   //  glClearDepth (1.0);
   //  glDisable (GL_BLEND);
@@ -98,7 +102,7 @@ void G4OpenGLViewer::SetView () {
   
   // Get radius of scene, etc.
   // Note that this procedure properly takes into account zoom, dolly and pan.
-  const G4Point3D& targetPoint
+  const G4Point3D targetPoint
     = fSceneHandler.GetScene()->GetStandardTargetPoint()
     + fVP.GetCurrentTargetPoint ();
   G4double radius = fSceneHandler.GetScene()->GetExtent().GetExtentRadius();
diff --git a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
index 13dbe6a136b05851cc656fffa596e92fde5c038f..a710683c5f7a2def1d448b80dd22601840dd82d7 100644
--- a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLWin32Viewer.cc,v 1.2 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
diff --git a/source/visualization/OpenGL/src/G4OpenGLXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
index 46159e8360995a7ca891cc4b2e3822004528e9d6..4ae6f563196b716e406ea3019b04045eb279b18c 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.8 2000/05/22 08:07:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXViewer.cc,v 1.9 2001/02/03 18:39:37 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -260,14 +260,16 @@ vectored_ps (true)
 	   << G4endl;
   }
 
-  if (vi_immediate = vi_single_buffer) {
+  if (vi_single_buffer) {
+    vi_immediate = vi_single_buffer;
     attributeList = snglBuf_RGBA;
     doublebuffer = false;
   }
   
   if (!vi_immediate){
     // next try for a double buffered RGB, but Draw to top buffer
-    if (vi_immediate = vi_double_buffer) {
+    if (vi_double_buffer) {
+      vi_immediate = vi_double_buffer;
       attributeList = dblBuf_RGBA;
       doublebuffer = true;
     }
@@ -275,11 +277,19 @@ vectored_ps (true)
 
   // Now try for a visual suitable for OpenGLStored...
   // Try for a double buffered RGB window
-  if (vi_stored = vi_double_buffer) {
+  if (vi_double_buffer) {
+    vi_stored = vi_double_buffer;
     attributeList = dblBuf_RGBA;
     doublebuffer = true;
   }
 
+  if (!vi_immediate || !vi_stored) {
+    G4cout <<
+    "G4OpenGLXViewer::G4OpenGLXViewer: unable to get required visuals."
+	   << G4endl;
+    fViewId = -1;  // This flags an error.
+  }
+
   //  glClearColor (0., 0., 0., 0.);
   //  glClearDepth (1.);
   
@@ -681,8 +691,8 @@ extern "C"
   static int
   compare(const void *a, const void *b)
   {
-    DepthIndex *p1 = (DepthIndex *) a;
-    DepthIndex *p2 = (DepthIndex *) b;
+    const DepthIndex *p1 = (DepthIndex *) a;
+    const DepthIndex *p2 = (DepthIndex *) b;
     GLfloat diff = p2->depth - p1->depth;
 
     if (diff > 0.0) {
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmBox.cc b/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
index e0031e9c6d6ee5b76ec00818ab91c7583c3fa406..85d8d0f1caecf5fc4b60dbd1fa01638196600c27 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.3 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmBox.cc,v 1.4 2001/03/07 14:56:18 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Box container class
 
@@ -17,7 +17,7 @@
 #include "G4OpenGLXmVWidgetComponent.hh"
 #include "G4OpenGLXmVWidgetShell.hh"
 
-G4OpenGLXmBox::G4OpenGLXmBox (char* n, 
+G4OpenGLXmBox::G4OpenGLXmBox (const char* n, 
 			      G4bool r)
 {
   name = n;
@@ -76,12 +76,12 @@ Widget* G4OpenGLXmBox::GetPointerToWidget ()
   return &box_row_col;
 }
 
-char* G4OpenGLXmBox::GetName ()
+const char* G4OpenGLXmBox::GetName ()
 {
   return name;
 }
 
-void G4OpenGLXmBox::SetName (char* n)
+void G4OpenGLXmBox::SetName (const char* n)
 {
   name = n;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
index c8ebc0f58104c454eabc1c57c431f35e4e28cdd6..f4510e9adca6e0bd768bd585d43daa3eba2239b3 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
index 0e17bf334746ccaed215ab4980e3ee7ed0dc8f13..d78f17ba872ae4703a46239000cde51dc5a06892 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmFourArrowButtons.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 6fd51f07e28027af8ee64b76bd8bc9f8ea9e921d..7dc971296137113069dcc4358292604904984b3c 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.3 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmFramedBox.cc,v 1.4 2001/03/07 14:56:19 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Framed box container class
 
@@ -17,7 +17,7 @@
 #include "G4OpenGLXmVWidgetComponent.hh"
 #include "G4OpenGLXmVWidgetShell.hh"
 
-G4OpenGLXmFramedBox::G4OpenGLXmFramedBox (char* n, 
+G4OpenGLXmFramedBox::G4OpenGLXmFramedBox (const char* n, 
 					  G4bool r) :
 G4OpenGLXmBox (n, r)
 {
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
index a14d5c2357fc0d35703a52680dadbb0aab17bc18..8b218ac2317a01c6d8f742f6369b08355756a497 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.6 2000/05/02 10:09:04 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.7 2001/01/25 12:09:57 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -75,15 +75,17 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	rot_cb_list[0].closure = pView; 
 	rot_cb_list[1].callback = NULL;
 	
-	pView->fprotation_button1 = new G4OpenGLXmRadioButton ("Object",
-							       rot_cb_list,
-							       True,
-							       0);
-	
-	pView->fprotation_button2 = new G4OpenGLXmRadioButton ("Camera",
-							       rot_cb_list,
-							       False,
-							       1);
+	pView->fprotation_button1 = new G4OpenGLXmRadioButton
+	  ("Object",
+	   rot_cb_list,
+	   pView->GetViewParameters().GetLightsMoveWithCamera(),
+	   0);
+	
+	pView->fprotation_button2 = new G4OpenGLXmRadioButton
+	  ("Camera",
+	   rot_cb_list,
+	   !(pView->GetViewParameters().GetLightsMoveWithCamera()),
+	   1);
 	
 	pView->fprotation_button_box->AddChild (pView->fprotation_button1);
 	pView->fprotation_button_box->AddChild (pView->fprotation_button2);
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
index 71fefef5f4ae5d09144030c7a7156e6321857f53..4caed63575f76cda8c15c680233fc82a732b5d5d 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmPanningCallbacks.cc,v 1.4 2000/05/13 10:47:52 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
index 7cc5a75d60eceef8ef64e1a21f8e83c24b785431..77f0742949fe32a124387b96a64ba4d99fd2b454 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.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmPushButton.cc,v 1.4 2001/03/07 15:16:28 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent
 
@@ -18,7 +18,7 @@
 #include <X11/Intrinsic.h>
 #include "globals.hh"
 
-G4OpenGLXmPushButton::G4OpenGLXmPushButton (char* n,
+G4OpenGLXmPushButton::G4OpenGLXmPushButton (const char* n,
 					    XtCallbackRec* c) 
 {
   name = n;
@@ -28,17 +28,17 @@ G4OpenGLXmPushButton::G4OpenGLXmPushButton (char* n,
 G4OpenGLXmPushButton::~G4OpenGLXmPushButton ()
 {}
 
-void G4OpenGLXmPushButton::SetName (char* n) 
+void G4OpenGLXmPushButton::SetName (const char* n) 
 {
   name = n;
-  XmString button_string = XmStringCreateLocalized (name);
+  XmString button_string = XmStringCreateLocalized ((char*)name);
   XtVaSetValues (button,
 		 XmNlabelString, button_string,
 		 NULL);
   XmStringFree (button_string);
 }
 
-char* G4OpenGLXmPushButton::GetName () 
+const char* G4OpenGLXmPushButton::GetName () 
 {
   return name;
 }
@@ -50,7 +50,7 @@ void G4OpenGLXmPushButton::AddYourselfTo (G4OpenGLXmVWidgetContainer* container)
   ProcesspView ();
   parent = container->GetPointerToWidget ();
 
-  XmString button_str = XmStringCreateLocalized (name);
+  XmString button_str = XmStringCreateLocalized ((char*)name);
   button = XtVaCreateManagedWidget 
     (name,
      xmPushButtonWidgetClass,
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
index d4b1ee309a3212a3d0ae224d3fa962f42f6ecf65..874e02dc753c6ee6e275558b3847c16828f783a9 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.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmRadioButton.cc,v 1.4 2001/03/07 14:56:19 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent
 
@@ -18,7 +18,7 @@
 #include <X11/Intrinsic.h>
 #include "globals.hh"
 
-G4OpenGLXmRadioButton::G4OpenGLXmRadioButton (char* n,
+G4OpenGLXmRadioButton::G4OpenGLXmRadioButton (const char* n,
 					      XtCallbackRec* c,
 					      G4bool d,
 					      G4int num) 
@@ -32,17 +32,17 @@ G4OpenGLXmRadioButton::G4OpenGLXmRadioButton (char* n,
 G4OpenGLXmRadioButton::~G4OpenGLXmRadioButton ()
 {}
 
-void G4OpenGLXmRadioButton::SetName (char* n) 
+void G4OpenGLXmRadioButton::SetName (const char* n) 
 {
   name = n;
-  XmString button_string = XmStringCreateLocalized (name);
+  XmString button_string = XmStringCreateLocalized ((char*)name);
   XtVaSetValues (button,
 		 XmNlabelString, button_string,
 		 NULL);
   XmStringFree (button_string);
 }
 
-char* G4OpenGLXmRadioButton::GetName () 
+const char* G4OpenGLXmRadioButton::GetName () 
 {
   return name;
 }
@@ -53,7 +53,7 @@ void G4OpenGLXmRadioButton::AddYourselfTo (G4OpenGLXmVWidgetContainer* container
   pView = container->GetView ();
   ProcesspView ();
   parent = container->GetPointerToWidget ();
-  XmString button_string = XmStringCreateLocalized (name);
+  XmString button_string = XmStringCreateLocalized ((char*)name);
   button = XtVaCreateManagedWidget (name,
 				    xmToggleButtonWidgetClass,
 				    *parent,
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
index ceca194d50e0c36b95994b448d78a590e3fc1ed5..0234c67057e64d23fb4475158d30d9d01ee7c701 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.7 2000/05/13 10:48:03 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.8 2001/01/25 12:09:57 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -62,13 +62,12 @@ void G4OpenGLXmViewer::rotate_in_theta (XtPointer clientData,
   delta_theta *= deg;
   // Rotates by fixed azimuthal angle delta_theta.
 
-  G4Vector3D vp = pView->fVP.GetViewpointDirection ().unit ();
-  G4Vector3D up = pView->fVP.GetUpVector ().unit ();
-  G4Vector3D& zprime = up;
+  const G4Vector3D& vp = pView->fVP.GetViewpointDirection ().unit ();
+  const G4Vector3D& up = pView->fVP.GetUpVector ().unit ();
+  const G4Vector3D& zprime = up;
   G4double cosalpha = up.dot (vp);
   G4double sinalpha = sqrt (1. - pow (cosalpha, 2));
-  G4Vector3D viewPoint = pView->fVP.GetViewpointDirection ().unit ();
-  G4Vector3D yprime = (zprime.cross (viewPoint)).unit ();
+  G4Vector3D yprime = (zprime.cross (vp)).unit ();
   G4Vector3D xprime = yprime.cross (zprime);
   // Projection of vp on plane perpendicular to up...
   G4Vector3D a1 = sinalpha * xprime;
@@ -78,7 +77,7 @@ void G4OpenGLXmViewer::rotate_in_theta (XtPointer clientData,
   // Required Increment vector...
   G4Vector3D delta = a2 - a1;
   // So new viewpoint is...
-  viewPoint += delta;
+  G4Vector3D viewPoint = vp + delta;
 
   pView->fVP.SetViewAndLights (viewPoint);  
 
@@ -132,10 +131,10 @@ void G4OpenGLXmViewer::rotate_in_phi (XtPointer clientData,
 
   delta_alpha *= deg;
 
-  G4Vector3D vp = pView->fVP.GetViewpointDirection ().unit ();
-  G4Vector3D up = pView->fVP.GetUpVector ().unit ();
+  const G4Vector3D& vp = pView->fVP.GetViewpointDirection ().unit ();
+  const G4Vector3D& up = pView->fVP.GetUpVector ().unit ();
 
-  G4Vector3D xprime = vp;
+  const G4Vector3D& xprime = vp;
   G4Vector3D yprime = (up.cross(xprime)).unit();
   G4Vector3D zprime = (xprime.cross(yprime)).unit();
 
@@ -143,6 +142,11 @@ void G4OpenGLXmViewer::rotate_in_phi (XtPointer clientData,
 
   pView->fVP.SetViewAndLights (new_vp.unit());
 
+  if (pView->fVP.GetLightsMoveWithCamera()) {
+    G4Vector3D new_up = (new_vp.cross(yprime)).unit();
+    pView->fVP.SetUpVector(new_up);
+  }
+
   pView->SetView ();
   pView->ClearView ();
   pView->DrawView ();
@@ -228,8 +232,8 @@ void G4OpenGLXmViewer::wobble_timer_callback (XtPointer clientData,
 					    XtIntervalId*) 
 {
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
-  G4Vector3D up = pView->fVP.GetUpVector();
-  G4Vector3D vp = pView->fVP.GetViewpointDirection();
+  const G4Vector3D& up = pView->fVP.GetUpVector();
+  const G4Vector3D& vp = pView->fVP.GetViewpointDirection();
   G4Vector3D third_axis = up.cross(pView->original_vp);
   G4double pi_div_by_ten = M_PI / 10.0;
   G4Vector3D d_up = 0.1 * (sin ((G4double)pView->frameNo * pi_div_by_ten * 2.)) * up;
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
index a44b8f346273c19c0178d780c4cd1d2e3bb7242a..e2c10c60d17ffa15341a00365910b0535b5dd4fc 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmSeparator.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc b/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
index 48004b38271bccb096f13e3e4e1c1eb3ea091f2f..014b97fbc393b2504490e2a50f0696f71868ec76 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.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmSliderBar.cc,v 1.4 2001/03/07 14:56:20 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
 
@@ -19,7 +19,7 @@
 #include <Xm/Scale.h>
 #include "globals.hh"
 
-G4OpenGLXmSliderBar::G4OpenGLXmSliderBar (char* n,
+G4OpenGLXmSliderBar::G4OpenGLXmSliderBar (const char* n,
 					  XtCallbackRec* c,
 					  G4bool s,
 					  short dp,
@@ -43,7 +43,7 @@ G4OpenGLXmSliderBar::G4OpenGLXmSliderBar (char* n,
 G4OpenGLXmSliderBar::~G4OpenGLXmSliderBar ()
 {}
 
-char* G4OpenGLXmSliderBar::GetName () 
+const char* G4OpenGLXmSliderBar::GetName () 
 {
   return name;
 }
@@ -83,10 +83,10 @@ unsigned char G4OpenGLXmSliderBar::GetDirection ()
   return direction;
 }
 
-void G4OpenGLXmSliderBar::SetName (char* n) 
+void G4OpenGLXmSliderBar::SetName (const char* n) 
 {
   name = n;
-  XmString sliderbar_string = XmStringCreateLocalized (name);
+  XmString sliderbar_string = XmStringCreateLocalized ((char*)name);
   XtVaSetValues (sliderbar,
 		 XmNlabelString, sliderbar_string,
 		 NULL);
@@ -163,7 +163,7 @@ void G4OpenGLXmSliderBar::AddYourselfTo (G4OpenGLXmVWidgetContainer* container)
   ProcesspView ();
 
   parent = container->GetPointerToWidget ();
-  XmString name_string = XmStringCreateLocalized (name);
+  XmString name_string = XmStringCreateLocalized ((char*)name);
   sliderbar = XtVaCreateManagedWidget (name,
 				       xmScaleWidgetClass,
 				       *parent,
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
index d0437b62d0ebb8ed4e74dcb908d71ab0d82d0f23..9ea47da687e5dd5b5c36e9ba0897e038e0fbc030 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  16th April 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc b/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
index 89794b7f8873c5c31a73a70161733745cca3b12e..102d362649fdcba55240c43633d81566879447ed 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.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmTextField.cc,v 1.4 2001/03/07 14:56:20 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent
 
@@ -18,7 +18,7 @@
 #include <X11/Intrinsic.h>
 #include "globals.hh"
 
-G4OpenGLXmTextField::G4OpenGLXmTextField (char* n,
+G4OpenGLXmTextField::G4OpenGLXmTextField (const char* n,
 					  G4double* val)
 {
   name = n;
@@ -28,8 +28,8 @@ G4OpenGLXmTextField::G4OpenGLXmTextField (char* n,
   text=false;
 }
 
-G4OpenGLXmTextField::G4OpenGLXmTextField (char* n,
-					  char* val)
+G4OpenGLXmTextField::G4OpenGLXmTextField (const char* n,
+					  const char* val)
 {
   name = n;
   initial = new char[50];
@@ -44,17 +44,17 @@ G4OpenGLXmTextField::~G4OpenGLXmTextField ()
   delete[] initial;
 }
 
-void G4OpenGLXmTextField::SetName (char* n) 
+void G4OpenGLXmTextField::SetName (const char* n) 
 {
   name = n;
-  XmString text_string = XmStringCreateLocalized (name);
+  XmString text_string = XmStringCreateLocalized ((char*)name);
   XtVaSetValues (text_label,
 		 XmNlabelString, text_string,
 		 NULL);
   XmStringFree (text_string);
 }
 
-char* G4OpenGLXmTextField::GetName () 
+const char* G4OpenGLXmTextField::GetName () 
 {
   return name;
 }
@@ -69,7 +69,7 @@ void G4OpenGLXmTextField::SetValue (G4double val)
   
 }
 
-void G4OpenGLXmTextField::SetValue (char* val)
+void G4OpenGLXmTextField::SetValue (const char* val)
 {
   sprintf (initial, "%s", val);
   //  strcpy (initial, val);
@@ -80,7 +80,7 @@ void G4OpenGLXmTextField::SetValue (char* val)
   
 }
 
-char* G4OpenGLXmTextField::GetValue ()
+const char* G4OpenGLXmTextField::GetValue ()
 {
   return initial;
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
index 4258682f2ebf0f9037b8fb0f8bd29e09ad27bcea..2130460483a5b5dcc79b119bad20b9a8d2cb8401 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmTopLevelShell.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //Top level shell class
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
index 9062f42e8879fef16a6c5cb0b5555770d51b836d..17d645632b17bf872af87afea0e240085f3f6b1a 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmVWidgetComponent.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 eeffc3d6e774721690aaeed1ac76afec90206785..07f3a6c8cb11147e228be52078b138e36c577727 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmVWidgetContainer.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 89a65e0067a5a74da155d4490cc24fa871580b68..fa54bf7002131de0e7360357516ab24b7bf3f14e 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmVWidgetObject.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 cd38ba0fd707afe641008468aa276afceab0256d..c92ac4b156ab9d30b81ee3c6bf2c410f92c891be 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmVWidgetShell.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 a8a400f39c77cdf32f224fb8747ffd562cbdcae9..d5f8df7ba016347447c51216d3830e0f211620c0 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.4 2000/05/22 08:14:00 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenGLXmViewer.cc,v 1.6 2001/03/07 15:29:50 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -73,7 +73,7 @@ void G4OpenGLXmViewer::GetXmConnection () {
   }
 
   // Better to put this in an X11 resource file !!!
-  interactorManager->PutStringInResourceDatabase ("\
+  interactorManager->PutStringInResourceDatabase ((char*)"\
 *glxarea*width: 500\n\
 *glxarea*height: 500\n\
 *frame*x: 10\n\
@@ -140,13 +140,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
 				      NULL);
 
   //*********Create a menu bar for the window********
-  style_str = XmStringCreateLocalized ("Style");
-  actions_str = XmStringCreateLocalized ("Actions");
-  misc_str = XmStringCreateLocalized ("Miscellany");
-  spec_str = XmStringCreateLocalized ("Special");
+  style_str = XmStringCreateLocalized ((char*)"Style");
+  actions_str = XmStringCreateLocalized ((char*)"Actions");
+  misc_str = XmStringCreateLocalized ((char*)"Miscellany");
+  spec_str = XmStringCreateLocalized ((char*)"Special");
 
   menubar = XmVaCreateSimpleMenuBar (main_win,
-				     "menubar",
+				     (char*)"menubar",
 				     XmVaCASCADEBUTTON, style_str, 'S',
 				     XmVaCASCADEBUTTON, actions_str, 'A',
 				     XmVaCASCADEBUTTON, misc_str, 'M',
@@ -167,13 +167,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
 
 
   //*********Create style pulldown menu on menubar*********
-  rep_str = XmStringCreateLocalized ("Representation");
-  draw_str = XmStringCreateLocalized ("Drawing");
-  bgnd_str = XmStringCreateLocalized ("Background color");
+  rep_str = XmStringCreateLocalized ((char*)"Representation");
+  draw_str = XmStringCreateLocalized ((char*)"Drawing");
+  bgnd_str = XmStringCreateLocalized ((char*)"Background color");
 
   style_cascade = XmVaCreateSimplePulldownMenu
     (menubar,
-     "style",
+     (char*)"style",
      0,
      NULL,
      XmVaCASCADEBUTTON, rep_str, 'R',
@@ -193,12 +193,12 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   //  G4cout << "Created Style pulldown menu" << G4endl;
 
   //Add Representation pullright menu to style cascade...
-  polyhedron_str = XmStringCreateLocalized ("Polyhedron");
-  nurbs_str = XmStringCreateLocalized ("NURBS");
+  polyhedron_str = XmStringCreateLocalized ((char*)"Polyhedron");
+  nurbs_str = XmStringCreateLocalized ((char*)"NURBS");
 
   rep_style_pullright = XmVaCreateSimplePulldownMenu 
     (style_cascade,
-     "rep_style",
+     (char*)"rep_style",
      0,
      G4OpenGLXmViewer::rep_style_callback,
      XmVaRADIOBUTTON, polyhedron_str, 'P', NULL, NULL,
@@ -235,14 +235,14 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   //  G4cout << "Created Representation pulldown menu" << G4endl;
 
   //Add Drawing pullright menu to style cascade...
-  wireframe_str = XmStringCreateLocalized ("Wireframe");
-  hlr_str = XmStringCreateLocalized ("Hidden line removal");
-  hsr_str = XmStringCreateLocalized ("Hidden surface removal");
-  hlhsr_str = XmStringCreateLocalized ("Hidden line and surface removal");
+  wireframe_str = XmStringCreateLocalized ((char*)"Wireframe");
+  hlr_str = XmStringCreateLocalized ((char*)"Hidden line removal");
+  hsr_str = XmStringCreateLocalized ((char*)"Hidden surface removal");
+  hlhsr_str = XmStringCreateLocalized ((char*)"Hidden line and surface removal");
 
   drawing_style_pullright = XmVaCreateSimplePulldownMenu 
     (style_cascade,
-     "drawing_style",
+     (char*)"drawing_style",
      1,
      G4OpenGLXmViewer::drawing_style_callback,
      XmVaRADIOBUTTON, wireframe_str, 'W', NULL, NULL,
@@ -290,12 +290,12 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   //  G4cout << "Created Drawing pullright menu" << G4endl;
 
   //Add Drawing pullright menu to style cascade...
-  white_str = XmStringCreateLocalized ("White");
-  black_str = XmStringCreateLocalized ("Black");
+  white_str = XmStringCreateLocalized ((char*)"White");
+  black_str = XmStringCreateLocalized ((char*)"Black");
 
   background_color_pullright = XmVaCreateSimplePulldownMenu 
     (style_cascade,
-     "background_color",
+     (char*)"background_color",
      2,
      G4OpenGLXmViewer::background_color_callback,
      XmVaRADIOBUTTON, white_str, 'W', NULL, NULL,
@@ -330,13 +330,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   //  G4cout << "Created Background color pullright menu" << G4endl;
 
   //*********Create actions pulldown menu on menubar*********
-  rot_str = XmStringCreateLocalized ("Rotation control panel");
-  pan_str = XmStringCreateLocalized ("Panning control panel");
-  set_str = XmStringCreateLocalized ("Set control panel limits");
+  rot_str = XmStringCreateLocalized ((char*)"Rotation control panel");
+  pan_str = XmStringCreateLocalized ((char*)"Panning control panel");
+  set_str = XmStringCreateLocalized ((char*)"Set control panel limits");
 
   actions_cascade = XmVaCreateSimplePulldownMenu
     (menubar,
-     "actions",
+     (char*)"actions",
      1,
      G4OpenGLXmViewer::actions_callback,
      XmVaPUSHBUTTON, rot_str, 'R', NULL, NULL,
@@ -355,14 +355,14 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (set_str);
   G4cout << "Created Actions pulldown menu" << G4endl;
 
-  misc_str = XmStringCreateLocalized ("Miscellany control panel");
-  exit_str = XmStringCreateLocalized ("Exit to G4Vis>");
-  print_str = XmStringCreateLocalized ("Create .eps file");
+  misc_str = XmStringCreateLocalized ((char*)"Miscellany control panel");
+  exit_str = XmStringCreateLocalized ((char*)"Exit to G4Vis>");
+  print_str = XmStringCreateLocalized ((char*)"Create .eps file");
 
   //*********Create miscellany pulldown menu on menubar*********
   misc_cascade = XmVaCreateSimplePulldownMenu
     (menubar,
-     "miscellany",
+     (char*)"miscellany",
      2,
      G4OpenGLXmViewer::misc_callback,
      XmVaPUSHBUTTON, misc_str, 'M', NULL, NULL,
@@ -381,14 +381,14 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   XmStringFree (print_str);
   G4cout << "Created Miscellany pulldown menu" << G4endl;
 
-  trans_str = XmStringCreateLocalized ("Transparency");
-  anti_str = XmStringCreateLocalized ("Antialiasing");
-  halo_str = XmStringCreateLocalized ("Haloing");
+  trans_str = XmStringCreateLocalized ((char*)"Transparency");
+  anti_str = XmStringCreateLocalized ((char*)"Antialiasing");
+  halo_str = XmStringCreateLocalized ((char*)"Haloing");
 
   //*********Create special pulldown menu on menubar*********
   spec_cascade = XmVaCreateSimplePulldownMenu
     (menubar,
-     "special",
+     (char*)"special",
      3,
      NULL,
      XmVaCASCADEBUTTON, trans_str, 'T',
@@ -408,12 +408,12 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   //  G4cout << "Created Special pulldown menu" << G4endl;
 
   //Add Transparency pullright menu to special cascade...
-  off_str = XmStringCreateLocalized ("Off");
-  on_str = XmStringCreateLocalized ("On");
+  off_str = XmStringCreateLocalized ((char*)"Off");
+  on_str = XmStringCreateLocalized ((char*)"On");
 
   transparency_pullright = XmVaCreateSimplePulldownMenu 
     (spec_cascade,
-     "transparency",
+     (char*)"transparency",
      0,
      G4OpenGLXmViewer::transparency_callback,
      XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
@@ -445,7 +445,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   //Add antialias pullright menu to special cascade...
   antialias_pullright = XmVaCreateSimplePulldownMenu 
     (spec_cascade,
-     "antialias",
+     (char*)"antialias",
      1,
      G4OpenGLXmViewer::antialias_callback,
      XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
@@ -477,7 +477,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   //Add Haloing pullright menu to special cascade...
   haloing_pullright = XmVaCreateSimplePulldownMenu 
     (spec_cascade,
-     "haloing",
+     (char*)"haloing",
      2,
      G4OpenGLXmViewer::haloing_callback,
      XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
@@ -507,7 +507,8 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   }
 
   XtManageChild (menubar);
-  frame = XtVaCreateManagedWidget ("frame", xmFrameWidgetClass, main_win,
+  frame = XtVaCreateManagedWidget ((char*)"frame",
+				   xmFrameWidgetClass, main_win,
 				   XtNvisual, vi -> visual, 
 				   XtNdepth, vi -> depth, 
 				   XtNcolormap, cmap, 
@@ -515,7 +516,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
 				   XtNbackground, bgnd,
 				   NULL);
 
-  glxarea = XtVaCreateManagedWidget ("glxarea", 
+  glxarea = XtVaCreateManagedWidget ((char*)"glxarea", 
 				     xmDrawingAreaWidgetClass,
 				     frame,
 				     XtNvisual, vi -> visual, 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
index f71b2aba13bae2a1eaef84a416f2ba752c9e5b75..ddb958f3088b950dbb36d74a123c1c44f894bdbf 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.3 1999/12/15 14:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  16th June 1997
diff --git a/source/visualization/OpenInventor/include/G4OpenInventor.hh b/source/visualization/OpenInventor/include/G4OpenInventor.hh
index aca0d65e461a94a7346bcca3e01dbfa0a5eb5b17..9046e64a8b5527bfc6a093b6e2c1b9934885c13b 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventor.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventor.hh,v 1.5 1999/12/15 14:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2714e0bb22f01223b4fa8201e9d53a5e87f64980..ea7c87d37188fe228e1aa957e32aecfb1c50ac69 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorSceneHandler.hh,v 1.9 2000/08/19 18:34:42 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // J Kallenbach  27th Aug 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
index 98cdbb16787d521936b1a1934c7cb980864e796b..9acdef0ac76347225162a9410a0d28ba1922c5fc 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
+++ b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorSceneHandler.icc,v 1.3 1999/12/16 17:25:10 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // J Kallenbach  27th Aug 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
index 7f8d722691f6fb1e38206a860bd618368747bc1f..477c92cb8ccdab9ccb304735ffca96dc1d1b3319 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorTransform3D.hh,v 1.3 1999/12/15 14:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // jck  17 Dec 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh b/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh
index 4de27315837780398a4764a98ea9daada213b5cb..981d540697083737af8e0a24eb17d73ade7a6e09 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.6 1999/12/15 14:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenInventorViewer.hh,v 1.7 2001/02/23 15:43:12 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
@@ -17,8 +17,6 @@
 
 #ifdef G4VIS_BUILD_OI_DRIVER
 
-#include "g4rw/tvordvec.h"
-
 #include <Inventor/Xt/SoXt.h>
 
 #include "G4VViewer.hh"
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
index 8bf6f96263100dbd861428f93d7324bbf3df44e6..65c6e3679b475adffcc60102657a34c734305172 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorWin32.hh,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // OpenInventor graphics system factory.
 
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorX.hh b/source/visualization/OpenInventor/include/G4OpenInventorX.hh
index 7b9d23508dcba70f2082df78d570b32ed9516a11..3bd422d1a09b632e890a5cfc167e33cdbe1458b6 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorX.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorX.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorX.hh,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenInventor/src/G4OpenInventor.cc b/source/visualization/OpenInventor/src/G4OpenInventor.cc
index 43ba24195c6b784c3ebc46422ee085aec88ca734..fd3c2c2af8022d636b9a292f357c5d3ec3ab01d7 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventor.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventor.cc,v 1.7 2000/08/19 18:34:44 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifdef G4VIS_BUILD_OI_DRIVER
 
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc b/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
index 764b1c6330d02f37295cfe91c11563d8c83614e7..300693fd3ded1c2660814c0c41c1aa67c48a8e92 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.8 2000/05/28 13:42:34 barrand Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenInventorSceneHandler.cc,v 1.9 2001/01/25 15:28:10 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
@@ -277,6 +277,7 @@ void G4OpenInventorSceneHandler::AddPrimitive (const G4Square& Square) {
 //
 void G4OpenInventorSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) {
   if(currentSeparator==NULL) return;
+  if (polyhedron.GetNoFacets() == 0) return;
 #define MAXPOLYH	32767
   //
   // Assume all facets are convex quadrilaterals.
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
index 411263ff625f2d270c973cad3c84b7dc8fa5d444..65717bb87c295cfed6bb993d219949b14bbe6c44 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorTransform3D.cc,v 1.3 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // jck 17 Dec 1996
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc b/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
index dd348740fa9b868223daf86f61ae8404c1bf18ea..d0ace1c8018bc16dea98e0201c7f7586df5b043f 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.3 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4OpenInventorViewer.cc,v 1.4 2001/02/23 15:43:13 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 /*
  * jck 05 Feb 1997 - Initial Implementation
@@ -87,8 +87,8 @@ void G4OpenInventorViewer::KernelVisitDecision () {
       (lastVP.IsSection ()          != fVP.IsSection ())          ||
 
       (lastVP.IsCutaway ()          != fVP.IsCutaway ())          ||
-      (lastVP.GetCutawayPlanes ().entries () !=
-                              fVP.GetCutawayPlanes ().entries ()) ||
+      (lastVP.GetCutawayPlanes ().size () !=
+                                 fVP.GetCutawayPlanes ().size ()) ||
 
       (lastVP.IsExplode ()          != fVP.IsExplode ())          ||
       (lastVP.GetNoOfSides ()       != fVP.GetNoOfSides ())
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc b/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
index e4afafe873c1a403e029fe88118ddd38e9d2977c..c1f97c2f533883924e9f315a9a8b011bd5576744 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorWin32.cc,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // OpenInventor graphics system factory.
 
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorX.cc b/source/visualization/OpenInventor/src/G4OpenInventorX.cc
index 04bc0f0dd03b8a9c6c8f5ad36b7f138eeff049dd..8c238e6051ec1b55e7699127e9eb1393d6020ede 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorX.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorX.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4OpenInventorX.cc,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
diff --git a/source/visualization/RayTracer/include/G4RTJpeg.hh b/source/visualization/RayTracer/include/G4RTJpeg.hh
index a628b666670312a274774802bdfdb452e43083cb..62a17dca77e34c217263aeb7bac732049ae2ff2f 100644
--- a/source/visualization/RayTracer/include/G4RTJpeg.hh
+++ b/source/visualization/RayTracer/include/G4RTJpeg.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTJpeg.hh,v 1.4 2000/03/09 17:38:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTJpegCoder.hh b/source/visualization/RayTracer/include/G4RTJpegCoder.hh
index a9233e8fdb3536ec8628395afd9f3974c6516973..172fe356ca05aa8c508e2c95e4451ac632dd2f97 100644
--- a/source/visualization/RayTracer/include/G4RTJpegCoder.hh
+++ b/source/visualization/RayTracer/include/G4RTJpegCoder.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTJpegCoder.hh,v 1.4 2000/03/09 17:38:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh b/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh
index ecb804ff4c5a769f934ad6ba1b51a9000c0be1df..ec0f314263a2ece3ce2f8c36969d4177859d503c 100644
--- a/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh
+++ b/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTJpegCoderTables.hh,v 1.4 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description:
diff --git a/source/visualization/RayTracer/include/G4RTJpegMaker.hh b/source/visualization/RayTracer/include/G4RTJpegMaker.hh
index d208080b31721d9278aa60788cb0d3d0cf9e3878..6ccdfb7cb7fbf31113efe3354d4811e2a2997fb3 100644
--- a/source/visualization/RayTracer/include/G4RTJpegMaker.hh
+++ b/source/visualization/RayTracer/include/G4RTJpegMaker.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTJpegMaker.hh,v 1.4 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTMessenger.hh b/source/visualization/RayTracer/include/G4RTMessenger.hh
index b941a95ff23c26f20a3aa5c8768c1982d2527e99..f10da94e886f34a250846849fa0cf73fcdbf64e4 100644
--- a/source/visualization/RayTracer/include/G4RTMessenger.hh
+++ b/source/visualization/RayTracer/include/G4RTMessenger.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTMessenger.hh,v 1.3 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTOutBitStream.hh b/source/visualization/RayTracer/include/G4RTOutBitStream.hh
index 86955d143d98227fe137d11b1fdf7a67447ed512..a1b23599403a8e40d9e5d9cc2cfdc2cc2f892712 100644
--- a/source/visualization/RayTracer/include/G4RTOutBitStream.hh
+++ b/source/visualization/RayTracer/include/G4RTOutBitStream.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTOutBitStream.hh,v 1.5 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTSteppingAction.hh b/source/visualization/RayTracer/include/G4RTSteppingAction.hh
index 519cd9f4587e95e3d9a31bc309d78fb2923b1267..45a3d2c62885922372fde0eabba55a4c8637c5cd 100644
--- a/source/visualization/RayTracer/include/G4RTSteppingAction.hh
+++ b/source/visualization/RayTracer/include/G4RTSteppingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTSteppingAction.hh,v 1.3 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTTrackingAction.hh b/source/visualization/RayTracer/include/G4RTTrackingAction.hh
index 04ac3f47be8b184154a7a15ff1c3ed277509cabd..1210b93f78b2c95fd5f5925d54ad07f768c3ed2f 100644
--- a/source/visualization/RayTracer/include/G4RTTrackingAction.hh
+++ b/source/visualization/RayTracer/include/G4RTTrackingAction.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTTrackingAction.hh,v 1.3 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RayShooter.hh b/source/visualization/RayTracer/include/G4RayShooter.hh
index 3d15145a31c00396a5c8c68aae51ac3a1973a084..f5c0b4cd17f6b60b405e3f969454fedc63264362 100644
--- a/source/visualization/RayTracer/include/G4RayShooter.hh
+++ b/source/visualization/RayTracer/include/G4RayShooter.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayShooter.hh,v 1.2 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description:
diff --git a/source/visualization/RayTracer/include/G4RayTracer.hh b/source/visualization/RayTracer/include/G4RayTracer.hh
index 4c4145bfba4d17a2b523c23d6230fc207451a732..b9d7979b3844b70f77304a5097120f00cde54e05 100644
--- a/source/visualization/RayTracer/include/G4RayTracer.hh
+++ b/source/visualization/RayTracer/include/G4RayTracer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTracer.hh,v 1.5 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RayTracerFeatures.hh b/source/visualization/RayTracer/include/G4RayTracerFeatures.hh
index bd87a6220107ddcf7c70180aebf7f4c25cb918ca..e0899baadeca976cc32db70885aef0a3fa5c2f8e 100644
--- a/source/visualization/RayTracer/include/G4RayTracerFeatures.hh
+++ b/source/visualization/RayTracer/include/G4RayTracerFeatures.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTracerFeatures.hh,v 1.2 2000/03/09 15:36:35 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh b/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh
index 5a7392c0a41847123e3213d22360b92c905dc0d3..e33b0ca867f188efba4b6c75251c7acaa9e1d4a2 100644
--- a/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh
+++ b/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTracerSceneHandler.hh,v 1.3 2000/08/19 18:34:47 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // John Allison  17th March 2000
 
diff --git a/source/visualization/RayTracer/include/G4RayTracerViewer.hh b/source/visualization/RayTracer/include/G4RayTracerViewer.hh
index 22ae284696f22faa1105bb8b75f3bb55448e1ad3..a2fcf1112681632c47319b2b7b759eeac0bec21a 100644
--- a/source/visualization/RayTracer/include/G4RayTracerViewer.hh
+++ b/source/visualization/RayTracer/include/G4RayTracerViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTracerViewer.hh,v 1.2 2000/02/28 15:19:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // John Allison  17th March 2000
 
diff --git a/source/visualization/RayTracer/include/G4RayTrajectory.hh b/source/visualization/RayTracer/include/G4RayTrajectory.hh
index 388513ad6bdc311fba5dc24a0ffd559c52103c17..e8476cbee35d75c6aea7b2a24e4cdfc966125fff 100644
--- a/source/visualization/RayTracer/include/G4RayTrajectory.hh
+++ b/source/visualization/RayTracer/include/G4RayTrajectory.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RayTrajectory.hh,v 1.5 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4RayTrajectory.hh,v 1.7 2001/02/23 15:43:13 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
@@ -30,7 +30,7 @@ class G4Step;
 #include "G4VTrajectory.hh"
 #include "G4Allocator.hh"
 #include <stdlib.h>
-#include <g4rw/tpordvec.h>
+#include "g4std/vector"
 #include "globals.hh"
 #include "G4Track.hh"
 #include "G4RayTrajectoryPoint.hh"
@@ -51,7 +51,7 @@ class G4RayTrajectory : public G4VTrajectory
    virtual void AppendStep(const G4Step*);
    virtual void ShowTrajectory() const;
    virtual void DrawTrajectory(G4int i_mode=0) const {;}
-   virtual int GetPointEntries() const {return positionRecord->entries();}
+   virtual int GetPointEntries() const {return positionRecord->size();}
    virtual G4VTrajectoryPoint* GetPoint(G4int i) const 
    { return (*positionRecord)[i]; }
    G4RayTrajectoryPoint* GetPointC(G4int i) const 
@@ -60,7 +60,7 @@ class G4RayTrajectory : public G4VTrajectory
 
    private:
 
-   G4RWTPtrOrderedVector<G4RayTrajectoryPoint>* positionRecord;
+   G4std::vector<G4RayTrajectoryPoint*>* positionRecord;
 };
 
 
diff --git a/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh b/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh
index e2a5ad1a6bcd540217888bccb74ed049e42a9b81..d7e9e8a109e2d5e3fcbb38de7c16ec35ab0fa45d 100644
--- a/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh
+++ b/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTrajectoryPoint.hh,v 1.3 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4VFigureFileMaker.hh b/source/visualization/RayTracer/include/G4VFigureFileMaker.hh
index e106cfca551a354db950090f92a65f10bfe5d491..31204e1e405f0efcd5a5186d7bb2e5866881c014 100644
--- a/source/visualization/RayTracer/include/G4VFigureFileMaker.hh
+++ b/source/visualization/RayTracer/include/G4VFigureFileMaker.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VFigureFileMaker.hh,v 1.3 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
diff --git a/source/visualization/RayTracer/src/G4RTJpegCoder.cc b/source/visualization/RayTracer/src/G4RTJpegCoder.cc
index 2c91257b6e1480002b44700d2c62f6bbef44c65c..a34d49025f15673f8cac4f97458a69c18db0f847 100644
--- a/source/visualization/RayTracer/src/G4RTJpegCoder.cc
+++ b/source/visualization/RayTracer/src/G4RTJpegCoder.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTJpegCoder.cc,v 1.3 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTJpegMaker.cc b/source/visualization/RayTracer/src/G4RTJpegMaker.cc
index 3486b5ce92a4826693714cc1522849192f374719..78d6aba06334c58b27882820a604c28474902fcd 100644
--- a/source/visualization/RayTracer/src/G4RTJpegMaker.cc
+++ b/source/visualization/RayTracer/src/G4RTJpegMaker.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTJpegMaker.cc,v 1.4 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTMessenger.cc b/source/visualization/RayTracer/src/G4RTMessenger.cc
index 05aab87372754b32ba8890fe409eb5ed751c859d..a68f23c03717db11d0cde61ed9263f076c3b5270 100644
--- a/source/visualization/RayTracer/src/G4RTMessenger.cc
+++ b/source/visualization/RayTracer/src/G4RTMessenger.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTMessenger.cc,v 1.4 2000/06/07 02:52:45 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTOutBitStream.cc b/source/visualization/RayTracer/src/G4RTOutBitStream.cc
index c91be0a5071ac612897dab1d3bd1dfa85a391379..739fdd55e900e68ecee8593eb0062d7770d77f57 100644
--- a/source/visualization/RayTracer/src/G4RTOutBitStream.cc
+++ b/source/visualization/RayTracer/src/G4RTOutBitStream.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTOutBitStream.cc,v 1.3 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTSteppingAction.cc b/source/visualization/RayTracer/src/G4RTSteppingAction.cc
index 30dfdea7c1d0eb53b41feabf67f52341a18fdd93..c31ef3e23aa36fc39cd529e10d0b7e1c96f30ffe 100644
--- a/source/visualization/RayTracer/src/G4RTSteppingAction.cc
+++ b/source/visualization/RayTracer/src/G4RTSteppingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTSteppingAction.cc,v 1.5 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTTrackingAction.cc b/source/visualization/RayTracer/src/G4RTTrackingAction.cc
index 5b97e7da0182bc7d7bd3229c9bb596cf1553a15d..6fdc6ab068c8719c4ce4954a5768dbea9e2b6871 100644
--- a/source/visualization/RayTracer/src/G4RTTrackingAction.cc
+++ b/source/visualization/RayTracer/src/G4RTTrackingAction.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RTTrackingAction.cc,v 1.2 2000/03/09 15:36:38 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RayShooter.cc b/source/visualization/RayTracer/src/G4RayShooter.cc
index ee676fd041bc6d954af021423336d9291178e3f4..686e16cc4eb65e462fbf3f3a69598ac8e2985659 100644
--- a/source/visualization/RayTracer/src/G4RayShooter.cc
+++ b/source/visualization/RayTracer/src/G4RayShooter.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayShooter.cc,v 1.1 2000/01/29 00:44:53 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 #include "G4RayShooter.hh"
diff --git a/source/visualization/RayTracer/src/G4RayTracer.cc b/source/visualization/RayTracer/src/G4RayTracer.cc
index ed09e5ec2ca17cdaa7a9863d4cf37b12d688abd2..95d7ce3ec69f3ade25973e8c2fdfdb2289b6b8a0 100644
--- a/source/visualization/RayTracer/src/G4RayTracer.cc
+++ b/source/visualization/RayTracer/src/G4RayTracer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTracer.cc,v 1.7 2000/08/19 18:34:51 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc b/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc
index 53b7ff79aa4c5aea59550527cc638944c639147e..6cf5f1aa52c59569482d87b705c0c6ebf00e462f 100644
--- a/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc
+++ b/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTracerSceneHandler.cc,v 1.1 2000/02/23 16:03:53 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G4RayTracerSceneHandler.hh"
 
diff --git a/source/visualization/RayTracer/src/G4RayTracerViewer.cc b/source/visualization/RayTracer/src/G4RayTracerViewer.cc
index 36fecefa38bf77cba4c3c144d6cb5eb847b8c616..a6736f6208ea295ebeca6c90a6b70a5c6adfbec9 100644
--- a/source/visualization/RayTracer/src/G4RayTracerViewer.cc
+++ b/source/visualization/RayTracer/src/G4RayTracerViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTracerViewer.cc,v 1.6 2000/05/13 10:55:56 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G4RayTracerViewer.hh"
 
diff --git a/source/visualization/RayTracer/src/G4RayTrajectory.cc b/source/visualization/RayTracer/src/G4RayTrajectory.cc
index 9fa6c060ec6e0393569696e3f4314e4179997fe2..2e95aebffc45dc8bfddf5e885fd583962a33fb4a 100644
--- a/source/visualization/RayTracer/src/G4RayTrajectory.cc
+++ b/source/visualization/RayTracer/src/G4RayTrajectory.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4RayTrajectory.cc,v 1.4 2000/03/09 15:36:38 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4RayTrajectory.cc,v 1.6 2001/02/23 15:43:14 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
@@ -31,23 +31,26 @@ G4Allocator<G4RayTrajectory> G4RayTrajectoryAllocator;
 
 G4RayTrajectory :: G4RayTrajectory()
 {
-  positionRecord = new G4RWTPtrOrderedVector<G4RayTrajectoryPoint>;
+  positionRecord = new G4std::vector<G4RayTrajectoryPoint*>;
 }
 
 G4RayTrajectory :: G4RayTrajectory(G4RayTrajectory & right)
 {
-  positionRecord = new G4RWTPtrOrderedVector<G4RayTrajectoryPoint>;
-  for(int i=0;i<right.positionRecord->entries();i++)
+  positionRecord = new G4std::vector<G4RayTrajectoryPoint*>;
+  for(int i=0;i<right.positionRecord->size();i++)
   {
     G4RayTrajectoryPoint* rightPoint = (G4RayTrajectoryPoint*)
 				((*(right.positionRecord))[i]);
-    positionRecord->insert(new G4RayTrajectoryPoint(*rightPoint));
+    positionRecord->push_back(new G4RayTrajectoryPoint(*rightPoint));
   }
 }
 
 G4RayTrajectory :: ~G4RayTrajectory()
 {
-  positionRecord->clearAndDestroy();
+  //positionRecord->clearAndDestroy();
+  for(int i=0;i<positionRecord->size();i++)
+  { delete (*positionRecord)[i]; }
+  positionRecord->clear();
   delete positionRecord;
 }
 
@@ -90,7 +93,7 @@ void G4RayTrajectory::AppendStep(const G4Step* aStep)
   }
   trajectoryPoint->SetPostStepAtt(postVisAtt);
 
-  positionRecord->append(trajectoryPoint);
+  positionRecord->push_back(trajectoryPoint);
 }
 
 void G4RayTrajectory::ShowTrajectory() const
@@ -103,6 +106,7 @@ void G4RayTrajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
   G4RayTrajectory* seco = (G4RayTrajectory*)secondTrajectory;
   G4int ent = seco->GetPointEntries();
   for(G4int i=0;i<ent;i++)
-  { positionRecord->append(seco->positionRecord->removeAt(0)); }
+  { positionRecord->push_back((G4RayTrajectoryPoint*)seco->GetPoint(i)); }
+  seco->positionRecord->clear();
 }
 
diff --git a/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc b/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc
index 55f750df19bba031ff0f1d0e14457e2e487d6311..ecc30f6147ab05252b19f184bed2e7bb6676455d 100644
--- a/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc
+++ b/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4RayTrajectoryPoint.cc,v 1.2 2000/03/09 15:36:38 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 //
diff --git a/source/visualization/VRML/g4vrmlview/g4mini.java b/source/visualization/VRML/g4vrmlview/g4mini.java
index 698394b9e60af5a8ab1fccb11a45c7aabde07d98..a8d06511c355f8235f39dae13d869892f2f6bb42 100644
--- a/source/visualization/VRML/g4vrmlview/g4mini.java
+++ b/source/visualization/VRML/g4vrmlview/g4mini.java
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: g4mini.java,v 1.2 1999/12/15 14:54:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 import java.io.*;
 import java.net.*;
diff --git a/source/visualization/VRML/g4vrmlview/g4vrmlview.java b/source/visualization/VRML/g4vrmlview/g4vrmlview.java
index 7dc504f0b537e0fea88ba6d20a8ec69903f2399e..bc2e8958399855be38218db28aba453d7df03f81 100644
--- a/source/visualization/VRML/g4vrmlview/g4vrmlview.java
+++ b/source/visualization/VRML/g4vrmlview/g4vrmlview.java
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: g4vrmlview.java,v 1.2 1999/12/15 14:54:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 import java.io.*;
 import java.net.*;
diff --git a/source/visualization/VRML/include/FRClient.h b/source/visualization/VRML/include/FRClient.h
index 5906032073cf5195101a5c9387ece0a76847074e..dcef4039e3582ed9f1e3fab2eab86650e88452d9 100644
--- a/source/visualization/VRML/include/FRClient.h
+++ b/source/visualization/VRML/include/FRClient.h
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: FRClient.h,v 1.2 1999/12/15 14:54:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // FRClient.h
 // FukuiRenderer Client
diff --git a/source/visualization/VRML/include/G4FRClient.hh b/source/visualization/VRML/include/G4FRClient.hh
index 3a37e9a6334762cfeabe3f464602755e1966d674..93bc547eb97cba33b97bab75c8c2bf23bc4039de 100644
--- a/source/visualization/VRML/include/G4FRClient.hh
+++ b/source/visualization/VRML/include/G4FRClient.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRClient.hh,v 1.4 1999/12/27 07:49:11 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4FRClient.hh
 // Yasuhide Sawada and Satoshi Tanaka
diff --git a/source/visualization/VRML/include/G4VRML1.hh b/source/visualization/VRML/include/G4VRML1.hh
index 12763363f3647b2edfe23ccd4324e9bfa967c8ab..cad292d0d28b4f44a0839e7a4fb5ec8fdf5b7bb9 100644
--- a/source/visualization/VRML/include/G4VRML1.hh
+++ b/source/visualization/VRML/include/G4VRML1.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5370cdd505755eed2519f4c6ac2fc83306bf421c..3e2e594cdc6190e313782ba91af6b58821a041fb 100644
--- a/source/visualization/VRML/include/G4VRML1File.hh
+++ b/source/visualization/VRML/include/G4VRML1File.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1File.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1File.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
index 8105f1995d6677e64143decb0a47cdad509b8d0f..89548ac1d0a40ddd54ea2c706fb23870665ebac8 100644
--- a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1FileSceneHandler.hh,v 1.6 1999/12/16 17:25:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1FileSceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML1FileViewer.hh b/source/visualization/VRML/include/G4VRML1FileViewer.hh
index c98216ee7bf40396cd572ca20b11bfad8d277962..db9602711e594ad4ce5c9bc524d767aa463f27fd 100644
--- a/source/visualization/VRML/include/G4VRML1FileViewer.hh
+++ b/source/visualization/VRML/include/G4VRML1FileViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1FileViewer.hh,v 1.4 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 eb09dda5f5925c7de065635f68a8b14dd522e25c..fee18a2600e4b3894d2b9c3717624e39886221ce 100644
--- a/source/visualization/VRML/include/G4VRML1SceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML1SceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1SceneHandler.hh,v 1.6 1999/12/16 17:25:12 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1SceneHandler.hh
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/include/G4VRML1Viewer.hh b/source/visualization/VRML/include/G4VRML1Viewer.hh
index 872a633f38041fb4df74ad717ea1b1ffb3ca86ae..174fd48ebcd43caae022ac04130a273733ff1c43 100644
--- a/source/visualization/VRML/include/G4VRML1Viewer.hh
+++ b/source/visualization/VRML/include/G4VRML1Viewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1Viewer.hh,v 1.4 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1Viewer.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2.hh b/source/visualization/VRML/include/G4VRML2.hh
index 6ccc84b1e85d817dcb6ee7d49e4fb5ae42eed7b9..480183bec072b5069aaeb5bc4ec9fc5c91ac3fda 100644
--- a/source/visualization/VRML/include/G4VRML2.hh
+++ b/source/visualization/VRML/include/G4VRML2.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2b1155f35b795eae3a1049ffb695130ce6d598aa..c1aedfcc5e03037db3217da692fc3189217d3053 100644
--- a/source/visualization/VRML/include/G4VRML2File.hh
+++ b/source/visualization/VRML/include/G4VRML2File.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2File.hh,v 1.6 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2File.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
index c02d4883d5ce6312ef2ed215b2ced9ff350a721c..fc1a5e44388644355a7ad8c591234637f94c6882 100644
--- a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2FileSceneHandler.hh,v 1.5 1999/12/16 17:25:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2FileSceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2FileViewer.hh b/source/visualization/VRML/include/G4VRML2FileViewer.hh
index 89f8d25aac5c775d00e86dd59648cddd33f0acb9..fb2f1c01267034e5ed8398b7b57ff707c4825ae5 100644
--- a/source/visualization/VRML/include/G4VRML2FileViewer.hh
+++ b/source/visualization/VRML/include/G4VRML2FileViewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2FileViewer.hh,v 1.4 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2FileViewer.hh
 // Satoshi Tanaka and Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2SceneHandler.hh b/source/visualization/VRML/include/G4VRML2SceneHandler.hh
index 5050d82d53a5f2d7041dc3665f2325b2bfbb32d5..ace8e1f8a8210fe1c6105da07d035604cae8a033 100644
--- a/source/visualization/VRML/include/G4VRML2SceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML2SceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2SceneHandler.hh,v 1.5 1999/12/16 17:25:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2SceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2Viewer.hh b/source/visualization/VRML/include/G4VRML2Viewer.hh
index abfc7d665f62b947e0190fc9382eef39b6461e9c..8d69d322109335d5ec06aeea11ba1dfdbdafa7e2 100644
--- a/source/visualization/VRML/include/G4VRML2Viewer.hh
+++ b/source/visualization/VRML/include/G4VRML2Viewer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2Viewer.hh,v 1.4 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2Viewer.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRMLNetConfig.hh b/source/visualization/VRML/include/G4VRMLNetConfig.hh
index 76aa6868d437381de45fb94cedc556bd3dda8c19..62159158052333ece525fd82b744c57222954139 100644
--- a/source/visualization/VRML/include/G4VRMLNetConfig.hh
+++ b/source/visualization/VRML/include/G4VRMLNetConfig.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRMLNetConfig.hh,v 1.3 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRMLNetConfig.hh
 // Satoshi Tanaka
diff --git a/source/visualization/VRML/src/FRClient.cc b/source/visualization/VRML/src/FRClient.cc
index 352701bc20ddcd82c7917ae2e3003e8cbbd52efa..ac779e37186e19df707b7d594676c8f649a7c933 100644
--- a/source/visualization/VRML/src/FRClient.cc
+++ b/source/visualization/VRML/src/FRClient.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: FRClient.cc,v 1.3 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // FRClient.cc
 // FukuiRenderer Client
diff --git a/source/visualization/VRML/src/G4FRClient.cc b/source/visualization/VRML/src/G4FRClient.cc
index c9bc81ee11413f86a0bfdc2e4f7d4ecb704e7b1f..1b56a8e6de7c84ee45146c685fc72e6a18d96129 100644
--- a/source/visualization/VRML/src/G4FRClient.cc
+++ b/source/visualization/VRML/src/G4FRClient.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FRClient.cc,v 1.4 1999/12/27 07:49:22 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4FRClient.cc
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML1.cc b/source/visualization/VRML/src/G4VRML1.cc
index 5473470b262c78d978c6f956e5735c9f13e9bd98..317ceff8e5f1c69e5b0c17f9e8b79e1856c2c10d 100644
--- a/source/visualization/VRML/src/G4VRML1.cc
+++ b/source/visualization/VRML/src/G4VRML1.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1.cc,v 1.5 2000/08/19 18:34:54 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1.cc
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML1File.cc b/source/visualization/VRML/src/G4VRML1File.cc
index c9b782340920422fa3ac9f2b72c2037f06a0d35b..d7b40dc43f8095371f3a6ad957e98de265f49b27 100644
--- a/source/visualization/VRML/src/G4VRML1File.cc
+++ b/source/visualization/VRML/src/G4VRML1File.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1File.cc,v 1.5 2000/08/19 18:34:57 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1File.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
index 0b09938d1fb03e9a602582a9d0b2d6ae9649f81d..eaf46ad5d2b9543a6f50d38a2e73dad5b5888ae6 100644
--- a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1FileSceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1FileSceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML1FileViewer.cc b/source/visualization/VRML/src/G4VRML1FileViewer.cc
index c152fa42dee8fee7621f736d4bb40d34fe2db6fa..444cad1f10035247048b3433c49627004dcd4c7d 100644
--- a/source/visualization/VRML/src/G4VRML1FileViewer.cc
+++ b/source/visualization/VRML/src/G4VRML1FileViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1FileViewer.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRMLView.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML1SceneHandler.cc b/source/visualization/VRML/src/G4VRML1SceneHandler.cc
index 15eabb6f38a47a40e9fd8efe607259f397f68906..f0fb84a404d44aee0ebe3ce3dda2f747dd1d45ee 100644
--- a/source/visualization/VRML/src/G4VRML1SceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML1SceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1SceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1SceneHandler.cc
 // Yasuhide Sawada and Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
index ce038895895c89b5d1b3e70e6f0668c1393360a8..6c9999563b78a5c5ac17f95310e388ec12411673 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.5 1999/12/27 07:49:22 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VRML1SceneHandlerFunc.icc,v 1.6 2001/01/25 15:28:11 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML1SceneHandlerFunc.icc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -251,6 +251,9 @@ void G4VRML1SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 #if defined DEBUG_SCENE_FUNC
 	G4cerr << "***** AddPrimitive(G4Polyhedron)" << "\n";
 #endif
+
+	if (polyhedron.GetNoFacets() == 0) return;
+
 	VRMLBeginModeling () ;
 
 	fDest << "Separator {" << "\n";
diff --git a/source/visualization/VRML/src/G4VRML1Viewer.cc b/source/visualization/VRML/src/G4VRML1Viewer.cc
index 32115e7a9597305e41021698982e6657c92bac03..47e3e0f3410b0e28c9a059d82578b4bdb6ff65c9 100644
--- a/source/visualization/VRML/src/G4VRML1Viewer.cc
+++ b/source/visualization/VRML/src/G4VRML1Viewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML1Viewer.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRMLView.cc
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML2.cc b/source/visualization/VRML/src/G4VRML2.cc
index 9acdd2a0d0a9ead2cdff41f8d90c525668e785d5..e09177772fde353bb4618289ffa2da62cee1f0c7 100644
--- a/source/visualization/VRML/src/G4VRML2.cc
+++ b/source/visualization/VRML/src/G4VRML2.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2.cc,v 1.5 2000/08/19 18:34:59 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2File.cc b/source/visualization/VRML/src/G4VRML2File.cc
index 3627b5c4b2bac33e97c97706866b4f22a009acd5..4d0f0d3d6660c951b7582afbc60f2fde350dffed 100644
--- a/source/visualization/VRML/src/G4VRML2File.cc
+++ b/source/visualization/VRML/src/G4VRML2File.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2File.cc,v 1.5 2000/08/19 18:35:02 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2File.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
index ff500ee3ca3ae698c412d6d34a974e1e386dbb17..4718ef897be90c1eb70d0c93ab68d5c12b917a97 100644
--- a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2FileSceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2FileSceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2FileViewer.cc b/source/visualization/VRML/src/G4VRML2FileViewer.cc
index 87678d6b49c209c7d56c985606a5fcf3978b2782..00563a1b5c7e85bd789203ffcfbe357290ddefc6 100644
--- a/source/visualization/VRML/src/G4VRML2FileViewer.cc
+++ b/source/visualization/VRML/src/G4VRML2FileViewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2FileViewer.cc,v 1.5 2000/05/13 10:55:30 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2FileViewer.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2SceneHandler.cc b/source/visualization/VRML/src/G4VRML2SceneHandler.cc
index c4947299a1519818a22787ee93b05537b3c2725e..9a1aba614c12f05bd0b6e5d64233807edced2d18 100644
--- a/source/visualization/VRML/src/G4VRML2SceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML2SceneHandler.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2SceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2SceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
index 594d3987d189faeacbb6002582137eacc6656168..534dbc0697e7ba3646a5a8d2345c670c1957ecd5 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.5 1999/12/27 07:49:22 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VRML2SceneHandlerFunc.icc,v 1.6 2001/01/25 15:28:13 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2SceneHandlerFunc.icc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -153,6 +153,8 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyhedron& polyhedron)
 	G4cerr << "***** AddPrimitive(G4Polyhedron)" << "\n";
 #endif
 
+	if (polyhedron.GetNoFacets() == 0) return;
+
 	VRMLBeginModeling () ;
 
 	// Transparency checking: If completely transparent, skip drawing 
diff --git a/source/visualization/VRML/src/G4VRML2Viewer.cc b/source/visualization/VRML/src/G4VRML2Viewer.cc
index 1f8acfc24d3679269d3cee0ec76b4c34ec4e89db..a03f86f878363efe956f2e7dbc33df3a4960b15a 100644
--- a/source/visualization/VRML/src/G4VRML2Viewer.cc
+++ b/source/visualization/VRML/src/G4VRML2Viewer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VRML2Viewer.cc,v 1.6 2000/05/13 10:55:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // G4VRML2Viewer.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/management/include/G4GraphicsSystemList.hh b/source/visualization/management/include/G4GraphicsSystemList.hh
index cd239aaaad10d8a414fc7289272f83ab85c370fe..9790d439012e27dc2c09c8b77128051f33f0f70b 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.4 1999/12/15 14:54:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4GraphicsSystemList.hh,v 1.6 2001/03/07 14:37:40 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  2nd April 1996
@@ -14,10 +14,17 @@
 #ifndef G4GRAPHICSSYSTEMLIST_HH
 #define G4GRAPHICSSYSTEMLIST_HH
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "G4VGraphicsSystem.hh"
 
-class G4GraphicsSystemList: public G4RWTPtrOrderedVector<G4VGraphicsSystem> {
+class G4GraphicsSystemList: public G4std::vector<G4VGraphicsSystem*> {
+public:
+  void remove(G4VGraphicsSystem*);
 };
 
+typedef G4std::vector<G4VGraphicsSystem*>::iterator
+        G4GraphicsSystemListIterator;
+typedef G4std::vector<G4VGraphicsSystem*>::const_iterator
+        G4GraphicsSystemListConstIterator;
+
 #endif
diff --git a/source/visualization/management/include/G4Scene.hh b/source/visualization/management/include/G4Scene.hh
index 3e0e5a6f4ab1335f0dafde5566b572527f3eca20..d422314598cc86049d84e671566e33cf65f8fbd9 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.7 1999/12/15 14:54:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Scene.hh,v 1.8 2001/02/23 15:43:15 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Scene  John Allison  19th July 1996.
@@ -26,7 +26,7 @@ class G4VPhysicalVolume;
 #include "G4VisExtent.hh"
 #include "G4Point3D.hh"
 #include "G4VModel.hh"
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 class G4Scene {
 
@@ -52,11 +52,11 @@ public: // With description
 
   G4bool IsEmpty () const;
 
-  const G4RWTPtrOrderedVector <G4VModel>& GetRunDurationModelList () const;
+  const G4std::vector<G4VModel*>& GetRunDurationModelList () const;
   // Contains models which are expected to last for the duration of
   // the run, for example geometry volumes.
 
-  const G4RWTPtrOrderedVector <G4VModel>& GetEndOfEventModelList () const;
+  const G4std::vector<G4VModel*>& GetEndOfEventModelList () const;
   // Contains models which are described at the end of event when the
   // scene is current.
 
@@ -85,10 +85,10 @@ public: // With description
   // the scene is current.
   // Returns false if model is already in the list.
 
-  G4RWTPtrOrderedVector <G4VModel>& SetRunDurationModelList ();
+  G4std::vector<G4VModel*>& SetRunDurationModelList ();
   // Allows you to change the model list - do with care!
 
-  G4RWTPtrOrderedVector <G4VModel>& SetEndOfEventModelList ();
+  G4std::vector<G4VModel*>& SetEndOfEventModelList ();
   // Allows you to change the model list - do with care!
 
   void Clear ();
@@ -96,8 +96,8 @@ public: // With description
 
 private:
   G4String fName;
-  G4RWTPtrOrderedVector <G4VModel> fRunDurationModelList;
-  G4RWTPtrOrderedVector <G4VModel> fEndOfEventModelList;
+  G4std::vector<G4VModel*> fRunDurationModelList;
+  G4std::vector<G4VModel*> fEndOfEventModelList;
   G4VisExtent fExtent;
   G4Point3D   fStandardTargetPoint;
 };
diff --git a/source/visualization/management/include/G4Scene.icc b/source/visualization/management/include/G4Scene.icc
index 699a1fdbc30501bce744a6058c21cf91515e38d3..a29252c31f5aee749445213a654432e083d2a829 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.6 2000/05/22 08:25:34 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Scene.icc,v 1.7 2001/02/23 15:43:15 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Scene data  John Allison  19th July 1996.
@@ -20,15 +20,15 @@ inline const G4String& G4Scene::GetName () const {
 }
 
 inline G4bool G4Scene::IsEmpty () const {
-  return fRunDurationModelList.entries () == 0;
+  return fRunDurationModelList.size () == 0;
 }
 
-inline const G4RWTPtrOrderedVector <G4VModel>&
+inline const G4std::vector<G4VModel*>&
 G4Scene::GetRunDurationModelList () const {
   return fRunDurationModelList;
 }
 
-inline const G4RWTPtrOrderedVector <G4VModel>&
+inline const G4std::vector<G4VModel*>&
 G4Scene::GetEndOfEventModelList () const {
   return fEndOfEventModelList;
 }
@@ -41,12 +41,12 @@ inline const G4Point3D& G4Scene::GetStandardTargetPoint () const {
   return fStandardTargetPoint;
 }
 
-inline G4RWTPtrOrderedVector <G4VModel>& G4Scene::SetRunDurationModelList ()
+inline G4std::vector<G4VModel*>& G4Scene::SetRunDurationModelList ()
 {
   return fRunDurationModelList;
 }
 
-inline G4RWTPtrOrderedVector <G4VModel>& G4Scene::SetEndOfEventModelList ()
+inline G4std::vector<G4VModel*>& G4Scene::SetEndOfEventModelList ()
 {
   return fRunDurationModelList;
 }
diff --git a/source/visualization/management/include/G4SceneHandlerList.hh b/source/visualization/management/include/G4SceneHandlerList.hh
index 910900be28b5524d7db1cb7ba06b0087cefec87d..a0ba6fc25c146e8059b24cb6e0603953e1482925 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.3 1999/12/15 14:54:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SceneHandlerList.hh,v 1.5 2001/03/07 14:37:41 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  May 1996
@@ -14,10 +14,16 @@
 #ifndef G4SCENEHANDLERLIST_HH
 #define G4SCENEHANDLERLIST_HH
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "G4VSceneHandler.hh"
 
-class G4SceneHandlerList: public G4RWTPtrOrderedVector<G4VSceneHandler> {
+class G4SceneHandlerList: public G4std::vector<G4VSceneHandler*> {
+public:
+  void remove(G4VSceneHandler*);
 };
 
+typedef G4std::vector<G4VSceneHandler*>::iterator G4SceneHandlerListIterator;
+typedef G4std::vector<G4VSceneHandler*>::const_iterator
+        G4SceneHandlerListConstIterator;
+
 #endif
diff --git a/source/visualization/management/include/G4SceneList.hh b/source/visualization/management/include/G4SceneList.hh
index e20079cbf2b69b71b07cf7f4fb671a16b8055dd0..886ef1e6889f53e9cd5d0e8d1076e363bd4deaff 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.5 1999/12/15 14:54:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4SceneList.hh,v 1.7 2001/03/07 14:37:42 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  9th August 1998
@@ -15,8 +15,14 @@
 #define G4SCENELIST_HH
 
 #include "G4Scene.hh"
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
-class G4SceneList: public G4RWTPtrOrderedVector <G4Scene> {};
+class G4SceneList: public G4std::vector <G4Scene*> {
+public:
+  void remove(G4Scene*);
+};
+
+typedef G4std::vector<G4Scene*>::iterator G4SceneListIterator;
+typedef G4std::vector<G4Scene*>::const_iterator G4SceneListConstIterator;
 
 #endif
diff --git a/source/visualization/management/include/G4VGraphicsSystem.hh b/source/visualization/management/include/G4VGraphicsSystem.hh
index f15d34594870d565600b8d8514b6e18987ab1299..a6ce013fcba831501808bf0eebd2e8c8d450da57 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.6 1999/12/15 14:54:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VGraphicsSystem.hh,v 1.7 2001/02/23 15:43:16 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -50,9 +50,6 @@ public: // With description
 
   virtual ~G4VGraphicsSystem ();
 
-  // For G4RWTPtrOrderedVector...
-  G4bool operator == (const G4VGraphicsSystem& system) const;
-
   virtual G4VSceneHandler* CreateSceneHandler (const G4String& name) = 0;
 
   virtual G4VViewer* CreateViewer (G4VSceneHandler&, const G4String& name) = 0;
diff --git a/source/visualization/management/include/G4VGraphicsSystem.icc b/source/visualization/management/include/G4VGraphicsSystem.icc
index 18b18d86727b0df676e328dcde5a7d9df4f18b3d..5ba0ab1da06dc180d029d1b8a7acea4d6e9f188d 100644
--- a/source/visualization/management/include/G4VGraphicsSystem.icc
+++ b/source/visualization/management/include/G4VGraphicsSystem.icc
@@ -5,18 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VGraphicsSystem.icc,v 1.4 1999/12/15 14:54:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VGraphicsSystem.icc,v 1.5 2001/02/23 15:43:17 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  27th March 1996
 // Abstract interface class for graphics systems.
 
-inline G4bool
-G4VGraphicsSystem::operator == (const G4VGraphicsSystem& system) const {
-  return this == &system;
-}
-
 inline const G4String& G4VGraphicsSystem::GetName () const {
   return fName;
 }
diff --git a/source/visualization/management/include/G4VSceneHandler.hh b/source/visualization/management/include/G4VSceneHandler.hh
index dc0748db749214014f73c7311da3bede444f70c1..a372667e5091745cea96a87608599a9f9f53b33d 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.11 2000/05/02 09:49:27 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VSceneHandler.hh,v 1.13 2001/02/23 15:43:17 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  19th July 1996.
@@ -50,9 +50,6 @@ public: // With description
 
   virtual ~G4VSceneHandler ();
 
-  // For G4RWTPtrOrderedVector...
-  G4bool operator == (const G4VSceneHandler& scene) const;
-
   //////////////////////////////////////////////////////////////
   // Functions for adding raw GEANT4 objects, if the graphics system
   // can can understand them (optional on the part of the graphics
@@ -256,6 +253,9 @@ protected:
 
 private:
 
+  G4VSceneHandler (const G4VSceneHandler&);
+  G4VSceneHandler& operator = (const G4VSceneHandler&);
+
   //////////////////////////////////////////////////////////////
   // Friend function accessed only by views of this scene.
 
diff --git a/source/visualization/management/include/G4VSceneHandler.icc b/source/visualization/management/include/G4VSceneHandler.icc
index ade1aae843631ec153c2cc6bce4cb3a230508905..01d46985b2feca2c009337f368843a6948a331ca 100644
--- a/source/visualization/management/include/G4VSceneHandler.icc
+++ b/source/visualization/management/include/G4VSceneHandler.icc
@@ -5,17 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VSceneHandler.icc,v 1.8 2000/05/02 09:49:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VSceneHandler.icc,v 1.9 2001/02/23 15:43:17 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  19th July 1996.
 
-inline G4bool G4VSceneHandler::operator ==
-(const G4VSceneHandler& scene) const {
-  return this == &scene;
-}
-
 inline G4VGraphicsSystem* G4VSceneHandler::GetGraphicsSystem () const {
   return &fSystem;
 }
diff --git a/source/visualization/management/include/G4VViewer.hh b/source/visualization/management/include/G4VViewer.hh
index e304dd504f70d202f0167af5730e8bfcacc9bd3b..b1b8572d014e2a617508db2f54e5acd705d5a562 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.7 2000/05/02 09:51:22 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VViewer.hh,v 1.9 2001/02/23 15:43:18 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -33,9 +33,6 @@ public: // With description
   G4VViewer (G4VSceneHandler& scene, G4int id, const G4String& name = "");
   virtual ~G4VViewer ();
 
-  // For G4RWTPtrOrderedVector...
-  G4bool operator == (const G4VViewer& view) const;
-
   //////////////////////////////////////////////////////////////
   // View manipulation functions.
 
@@ -68,8 +65,10 @@ public: // With description
   void                    SetName           (const G4String&);
   G4int                   GetViewId         () const;
   G4VSceneHandler*        GetSceneHandler   () const;
-  const G4ViewParameters& GetViewParameters () const;
-  void SetViewParameters  (const G4ViewParameters& vp);
+  const G4ViewParameters& GetViewParameters        () const;
+  const G4ViewParameters& GetDefaultViewParameters () const;
+  void SetViewParameters         (const G4ViewParameters& vp);
+  void SetDefaultViewParameters  (const G4ViewParameters& vp);
 
   //////////////////////////////////////////////////////////////
   // Public utility functions.
@@ -95,7 +94,8 @@ protected:
   G4int            fViewId;    // Id of this instance.
   G4String         fName;
   G4String         fShortName; // Up to first ' ' character, if any.
-  G4ViewParameters fVP;        // Viewing parameters.
+  G4ViewParameters fVP;        // View parameters.
+  G4ViewParameters fDefaultVP; // Default view parameters.
 
   //////////////////////////////////////////////////////////////
   // Other parameters.
diff --git a/source/visualization/management/include/G4VViewer.icc b/source/visualization/management/include/G4VViewer.icc
index e26c1910639668d6cd7ee1d0ed683cd02a6c3b3a..a9ab0e20919f009900d365f48684757a5df1bce2 100644
--- a/source/visualization/management/include/G4VViewer.icc
+++ b/source/visualization/management/include/G4VViewer.icc
@@ -5,16 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VViewer.icc,v 1.4 2000/05/02 09:51:22 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VViewer.icc,v 1.7 2001/02/23 15:43:18 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  30th December 1996
 
-inline G4bool G4VViewer::operator == (const G4VViewer& view) const{
-  return this == &view;
-}
-
 inline G4int G4VViewer::GetViewId () const {
   return fViewId;
 }
@@ -35,8 +31,14 @@ inline const G4ViewParameters& G4VViewer::GetViewParameters () const {
   return fVP;
 }
 
+inline const G4ViewParameters& G4VViewer::GetDefaultViewParameters () const {
+  return fDefaultVP;
+}
+
+inline void G4VViewer::SetDefaultViewParameters (const G4ViewParameters& vp) {
+  fDefaultVP = vp;
+}
+
 inline void G4VViewer::SetNeedKernelVisit () {
   fNeedKernelVisit = true;
 }
-
-inline void G4VViewer::FinishView () {}
diff --git a/source/visualization/management/include/G4VVisCommand.hh b/source/visualization/management/include/G4VVisCommand.hh
index 332c7de2fd8638b99a9c2b381b2700add54ef058..05f80e08358cf59a80d82613120c024e43109ce2 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.6 1999/12/16 17:19:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VVisCommand.hh,v 1.10 2001/03/28 14:11:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-03-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 "G4ThreeVector.hh"
 #include "g4std/vector"
 
 class G4VisManager;
@@ -27,6 +28,18 @@ public:
   G4VVisCommand ();
   virtual ~G4VVisCommand ();
   static void SetVisManager (G4VisManager*);
+  static G4double ValueOf(G4String unitName);
+  static G4String ConvertToString(G4bool blValue);
+  static G4String ConvertToString(G4double x, G4double y,
+				  const char * unitName);
+  static G4String ConvertToString(const G4ThreeVector& vec);
+  static G4bool        GetNewBoolValue(const G4String& paramString);
+  static G4int         GetNewIntValue(const G4String& paramString);
+  static G4double      GetNewDoubleValue(const G4String& paramString);
+  static G4ThreeVector GetNew3VectorValue(const G4String& paramString);
+  static void          GetNewDoublePairValue(const G4String& paramString,
+					     G4double& xval,
+					     G4double& yval);
 protected:
   static G4VisManager* fpVisManager;
   static  G4std::vector<G4UIcommand*> sceneNameCommands;
diff --git a/source/visualization/management/include/G4VVisCommand.icc b/source/visualization/management/include/G4VVisCommand.icc
index b98ab4d6c353d0b683b877b34ee60dc61b876ddf..d69e2b0de139fc46e1541ecdfd31d4f38b9e921a 100644
--- a/source/visualization/management/include/G4VVisCommand.icc
+++ b/source/visualization/management/include/G4VVisCommand.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VVisCommand.icc,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4d7b9cf34e3c3385ab833479028336af5fe457dd..3c2b0aaa9051ac96acc4cb856ce7286e4c1b3f68 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.8 2000/05/13 10:51:31 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ViewParameters.hh,v 1.12 2001/03/07 14:30:12 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  19th July 1996
@@ -56,21 +56,19 @@
 #ifndef G4VIEWPARAMETERS_HH
 #define G4VIEWPARAMETERS_HH
 
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 #include "G4Vector3D.hh"
 #include "G4Point3D.hh"
 #include "G4Plane3D.hh"
 #include "G4VisAttributes.hh"
 #include "G4VMarker.hh"
 
-typedef G4RWTValOrderedVector<G4Plane3D> G4Planes;
+typedef G4std::vector<G4Plane3D> G4Planes;
 
 class G4ViewParameters {
 
 public: // With description
 
-  friend G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v);
-
   enum DrawingStyle {
     wireframe,  // Draw edges    - no hidden line removal.
     hlr,        // Draw edges    - hidden lines removed.
@@ -83,6 +81,12 @@ public: // With description
     nurbs       // Use G4NURBS.
   };
 
+  friend G4std::ostream& operator << (G4std::ostream&,
+				      const DrawingStyle&);
+
+  friend G4std::ostream& operator << (G4std::ostream&,
+				      const G4ViewParameters&);
+
   G4ViewParameters ();
   ~G4ViewParameters ();
 
@@ -125,6 +129,7 @@ public: // With description
         G4bool           IsMarkerNotHidden       () const;
         G4int            GetWindowSizeHintX      () const;
         G4int            GetWindowSizeHintY      () const;
+        G4bool           IsAutoRefresh           () const;
 
   // Here Follow functions to evaluate the above algorithms as a
   // function of the radius of the Bounding Sphere of the object being
@@ -166,6 +171,8 @@ public: // With description
   void IncrementDolly          (G4double dollyIncrement);
   void SetLightpointDirection  (const G4Vector3D& lightpointDirection);
   void SetLightsMoveWithCamera (G4bool moves);
+  void SetPan                  (G4double right, G4double up);
+  void IncrementPan            (G4double right, G4double up);
   void SetViewGeom             ();
   void UnsetViewGeom           ();
   void SetViewHits             ();
@@ -179,11 +186,7 @@ public: // With description
   void SetMarkerHidden         ();
   void SetMarkerNotHidden      ();
   void SetWindowSizeHint       (G4int xHint, G4int yHint);
-
-  void Pan                     (G4double right, G4double up);
-  // Note: the result of above "pan"operation is always an Increment
-  // relative to the current target point and also depends on the
-  // veiwpoint and up directions.
+  void SetAutoRefresh          (G4bool);
 
   void PrintDifferences (const G4ViewParameters& v) const;
 
@@ -228,6 +231,7 @@ private:
   // removed.
   G4int        fWindowSizeHintX; // Size hints for pixel-based window systems.
   G4int        fWindowSizeHintY;
+  G4bool       fAutoRefresh;     // ...after change of view parameters.
 };
 
 #include "G4ViewParameters.icc"
diff --git a/source/visualization/management/include/G4ViewParameters.icc b/source/visualization/management/include/G4ViewParameters.icc
index 99c8c9c38392e7a20447857a737d13d0f4867979..71b3d745599ff9455beaa1bc60a705f0c24fe93d 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.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ViewParameters.icc,v 1.4 2001/02/04 20:23:04 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  20th October 1996
@@ -143,6 +143,10 @@ inline G4int G4ViewParameters::GetWindowSizeHintY () const {
   return fWindowSizeHintY;
 }
 
+inline G4bool G4ViewParameters::IsAutoRefresh () const {
+  return fAutoRefresh;
+}
+
 inline void
 G4ViewParameters::SetDrawingStyle (G4ViewParameters::DrawingStyle style) {
   fDrawingStyle = style;
@@ -282,3 +286,7 @@ inline void G4ViewParameters::SetWindowSizeHint (G4int xHint, G4int yHint) {
   fWindowSizeHintX = xHint;
   fWindowSizeHintY = yHint;
 }
+
+inline void G4ViewParameters::SetAutoRefresh (G4bool state) {
+  fAutoRefresh = state;
+}
diff --git a/source/visualization/management/include/G4ViewerList.hh b/source/visualization/management/include/G4ViewerList.hh
index 639f7ba673d1ccd0bf052e11beeb10a3b6ed622b..8f438dddcf1d452b3eb4a092056154d8c5d7e58c 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.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ViewerList.hh,v 1.5 2001/03/07 14:37:43 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  May 1996
@@ -14,9 +14,15 @@
 #ifndef G4VIEWERLIST_HH
 #define G4VIEWERLIST_HH
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "G4VViewer.hh"
 
-class G4ViewerList: public G4RWTPtrOrderedVector<G4VViewer> {};
+class G4ViewerList: public G4std::vector<G4VViewer*> {
+public:
+  void remove(G4VViewer*);
+};
+
+typedef G4std::vector<G4VViewer*>::iterator G4ViewerListIterator;
+typedef G4std::vector<G4VViewer*>::const_iterator G4ViewerListConstIterator;
 
 #endif
diff --git a/source/visualization/management/include/G4VisCommandTemplates.hh b/source/visualization/management/include/G4VisCommandTemplates.hh
index c306a160b90e33af4e4a50cae6291ea6af7443cf..b806f59cbe14fefa9c2efef91d7069f16a21dbe9 100644
--- a/source/visualization/management/include/G4VisCommandTemplates.hh
+++ b/source/visualization/management/include/G4VisCommandTemplates.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandTemplates.hh,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Visualization Command Messenger Templates.
diff --git a/source/visualization/management/include/G4VisCommandTemplates.icc b/source/visualization/management/include/G4VisCommandTemplates.icc
index 72b2e4d02c550251f3c8bb5de4960a25b3b046b5..273d75a0a85dabdfac520d943ec292fb0e86eb6d 100644
--- a/source/visualization/management/include/G4VisCommandTemplates.icc
+++ b/source/visualization/management/include/G4VisCommandTemplates.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandTemplates.icc,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Command Messenger Templates.
diff --git a/source/visualization/management/include/G4VisCommands.hh b/source/visualization/management/include/G4VisCommands.hh
new file mode 100644
index 0000000000000000000000000000000000000000..26b434ea3d7db649e5e1009136a874a6027467fc
--- /dev/null
+++ b/source/visualization/management/include/G4VisCommands.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: G4VisCommands.hh,v 1.1 2001/02/23 15:04:02 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+
+// /vis/ top level commands - John Allison  5th February 2001
+
+#ifndef G4VISCOMMANDS_HH
+#define G4VISCOMMANDS_HH
+
+#include "G4VVisCommand.hh"
+
+class G4UIcmdWithABool;
+class G4UIcmdWithAnInteger;
+class G4UIcmdWithoutParameter;
+
+class G4VisCommandEnable: public G4VVisCommand {
+public:
+  G4VisCommandEnable ();
+  virtual ~G4VisCommandEnable ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandEnable (const G4VisCommandEnable&);
+  G4VisCommandEnable& operator = (const G4VisCommandEnable&);
+  G4UIcmdWithABool* fpCommand;
+  G4UIcmdWithoutParameter* fpCommand1;
+};
+
+class G4VisCommandVerbose: public G4VVisCommand {
+public:
+  G4VisCommandVerbose ();
+  virtual ~G4VisCommandVerbose ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandVerbose (const G4VisCommandVerbose&);
+  G4VisCommandVerbose& operator = (const G4VisCommandVerbose&);
+  G4UIcmdWithAnInteger* fpCommand;
+};
+
+#endif
diff --git a/source/visualization/management/include/G4VisCommandsCamera.hh b/source/visualization/management/include/G4VisCommandsCamera.hh
index fe4fd4cafdb8e5710fbadd7c2025882ea13dfe3f..b29cf2d102d8cf6d576e20e9827ca9e9424473f5 100644
--- a/source/visualization/management/include/G4VisCommandsCamera.hh
+++ b/source/visualization/management/include/G4VisCommandsCamera.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandsCamera.hh,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/camera/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCameraMessengers.hh b/source/visualization/management/include/G4VisCommandsCameraMessengers.hh
deleted file mode 100644
index 2a8a28eb642370eb248e89d5f6e8a726702f2394..0000000000000000000000000000000000000000
--- a/source/visualization/management/include/G4VisCommandsCameraMessengers.hh
+++ /dev/null
@@ -1,32 +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: G4VisCommandsCameraMessengers.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-// 
-// Messengers for /vis~/camera commands - John Allison  6th April 1998.
-
-#ifndef G4VISCOMMANDSCAMERAMESSENGERS_HH
-#define G4VISCOMMANDSCAMERAMESSENGERS_HH
-
-#include "globals.hh"
-#include "G4UImessenger.hh"
-
-class G4UIcommand;
-
-class G4VisCommandsCameraSetMessenger: public G4UImessenger {
-public:
-  G4VisCommandsCameraSetMessenger ();
-  ~G4VisCommandsCameraSetMessenger ();
-  G4String GetCurrentValue(G4UIcommand * command);
-  void SetNewValue (G4UIcommand* command, G4String newValues);
-private:
-  G4UIcommand* fpCommand;
-};
-
-#endif
diff --git a/source/visualization/management/include/G4VisCommandsClear.hh b/source/visualization/management/include/G4VisCommandsClear.hh
index 84e61ac3649fda86790d873a109ac4f55985c668..188b5061c05ba16f8b6a761a515b2a0333ed4d0c 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.4 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsClear.hh,v 1.5 2001/02/05 02:33:48 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/clear/ commands
@@ -67,6 +67,7 @@ public:
     return "Clears visible window of current view.";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/clear\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> IsValidView ()) {
       pVMan -> ClearView ();    
diff --git a/source/visualization/management/include/G4VisCommandsCompound.hh b/source/visualization/management/include/G4VisCommandsCompound.hh
index 4eac9128c3e5ff47ef03fdb2f91500c190511429..95f0ac190844b8ab4a9860307044d84cae0585fa 100644
--- a/source/visualization/management/include/G4VisCommandsCompound.hh
+++ b/source/visualization/management/include/G4VisCommandsCompound.hh
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCompound.hh,v 1.2 2000/05/15 11:49:02 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsCompound.hh,v 1.5 2001/02/05 02:33:50 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // Compound /vis/ commands - John Allison  15th May 2000
 
@@ -15,33 +15,47 @@
 
 #include "G4VVisCommand.hh"
 
+class G4VisCommandDrawView: public G4VVisCommand {
+public:
+  G4VisCommandDrawView ();
+  virtual ~G4VisCommandDrawView ();
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandDrawView (const G4VisCommandDrawView&);
+  G4VisCommandDrawView& operator = (const G4VisCommandDrawView&);
+  G4UIcommand* fpCommand;
+};
+
 class G4VisCommandDrawVolume: public G4VVisCommand {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandDrawVolume ();
-  ~G4VisCommandDrawVolume ();
+  virtual ~G4VisCommandDrawVolume ();
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandDrawVolume (const G4VisCommandDrawVolume&);
+  G4VisCommandDrawVolume& operator = (const G4VisCommandDrawVolume&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandOpen: public G4VVisCommand {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandOpen ();
-  ~G4VisCommandOpen ();
+  virtual ~G4VisCommandOpen ();
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
-  G4UIcmdWithAString* fpCommand;
+  G4VisCommandOpen (const G4VisCommandOpen&);
+  G4VisCommandOpen& operator = (const G4VisCommandOpen&);
+  G4UIcommand* fpCommand;
 };
 
 class G4VisCommandSpecify: public G4VVisCommand {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSpecify ();
-  ~G4VisCommandSpecify ();
+  virtual ~G4VisCommandSpecify ();
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSpecify (const G4VisCommandSpecify&);
+  G4VisCommandSpecify& operator = (const G4VisCommandSpecify&);
   G4UIcmdWithAString* fpCommand;
 };
 
diff --git a/source/visualization/management/include/G4VisCommandsCopy.hh b/source/visualization/management/include/G4VisCommandsCopy.hh
index 95e2a8f613223aacb79e18e41d146588da2a4643..13fc69e69b3ec3f128fe7c38a28a6c5eae90eeb5 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.4 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsCopy.hh,v 1.5 2001/02/05 02:33:51 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/copy/ commands
@@ -98,6 +98,7 @@ public:
       "  WARNING: this overwrites the current view parameters.";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/set/all\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> IsValidView ()) {
       pVMan -> CopyViewParameters ();
diff --git a/source/visualization/management/include/G4VisCommandsCreateScene.hh b/source/visualization/management/include/G4VisCommandsCreateScene.hh
index a5a8ad627564788b1fa625260d0b3aff7c0b4139..db80fa2683c015fe630a67c5dee9448dc958ccbb 100644
--- a/source/visualization/management/include/G4VisCommandsCreateScene.hh
+++ b/source/visualization/management/include/G4VisCommandsCreateScene.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandsCreateScene.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/create_scene/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCreateView.hh b/source/visualization/management/include/G4VisCommandsCreateView.hh
index e461d2d99c408dd85c9b32b91720d14c50e757ef..61f7da8734d39f3cf0fa5086e8219574017335ea 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.4 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsCreateView.hh,v 1.5 2001/02/05 02:33:53 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/create_view/ commands
@@ -41,6 +41,7 @@ public:
     return "Creates a new scene and a new view; both become current.";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/create\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> IsValidView ()) {
       pVMan -> CreateSceneHandler ();
diff --git a/source/visualization/management/include/G4VisCommandsDelete.hh b/source/visualization/management/include/G4VisCommandsDelete.hh
index fb9529b2adbfe4db6583b71755a03aadd6568d61..461b718918c78722de78a31e018aa37a8b627a02 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.4 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsDelete.hh,v 1.5 2001/02/05 02:33:55 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/delete/ commands
@@ -42,6 +42,8 @@ public:
     return "Deletes the current scene and its views.";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/scene/remove\" and/or \"/vis/sceneHandler/remove\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> GetVerboseLevel () > 1) {
       pVMan -> PrintCurrentView ();
@@ -64,6 +66,7 @@ public:
     return "Deletes the current view.";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/remove\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> GetVerboseLevel () > 1) {
       pVMan -> PrintCurrentView ();
diff --git a/source/visualization/management/include/G4VisCommandsDraw.hh b/source/visualization/management/include/G4VisCommandsDraw.hh
index 130e4ed70dc0b20110b6a88166f791871671ae1a..e1833e575e482803aab6fc8f1969649902ad3341 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.3 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsDraw.hh,v 1.4 2001/02/05 02:33:56 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/draw/ commands
@@ -44,6 +44,8 @@ public:
       "view parameters.";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/refresh\" or \"/vis/scene/notifyHandlers\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> IsValidView ()) {
       if (pVMan -> GetVerboseLevel () > 1) {
diff --git a/source/visualization/management/include/G4VisCommandsLights.hh b/source/visualization/management/include/G4VisCommandsLights.hh
index 60b17f73dd9588c3f3322346b68b8bcf011c057d..ef6095e996db95aaf54a1a3e9452aa4dc817d4fe 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.4 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsLights.hh,v 1.6 2001/02/05 02:33:58 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/lights/ commands
@@ -47,14 +47,14 @@ public:
       GetLightsMoveWithCamera ();
   }
   void SetValue (G4bool value) {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/set/lightsMove\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     pVMan -> SetCurrentViewParameters ().SetLightsMoveWithCamera (value);
     G4VViewer* pView = pVMan -> GetCurrentViewer ();
     if (pView) {
       // Copy current view parameters into current view.
       pView -> SetViewParameters (pVMan -> GetCurrentViewParameters ());
-      // Recalculate projection matrices, etc.
-      pView -> SetView ();
     }
     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 9f89176a2a78771ed29e07ef1f60b384aad65659..45fd30bb94ccc4ae4b0fcaa5866ff3a868df420e 100644
--- a/source/visualization/management/include/G4VisCommandsPrint.hh
+++ b/source/visualization/management/include/G4VisCommandsPrint.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandsPrint.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/print/ commands
diff --git a/source/visualization/management/include/G4VisCommandsRefresh.hh b/source/visualization/management/include/G4VisCommandsRefresh.hh
index ec10c22f77b4032b0028bfa98a9b209a67c69886..616ecf78574101c8687bb9e03c18eb5d95c81ab2 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.3 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsRefresh.hh,v 1.4 2001/02/05 02:33:59 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/refresh/ commands
@@ -43,6 +43,7 @@ public:
       "double buffer and graphical database, if any.";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/refresh\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> IsValidView ()) {
       pVMan -> RefreshCurrentView ();
diff --git a/source/visualization/management/include/G4VisCommandsScene.hh b/source/visualization/management/include/G4VisCommandsScene.hh
index 218c4c99725f15a48c497ec52db9d4a12e5a935b..e3982e63912a7256e0210eadef07ced00142bc02 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.8 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsScene.hh,v 1.9 2001/02/03 18:39:44 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -21,23 +21,26 @@ class G4UIcmdWithoutParameter;
 
 class G4VVisCommandScene: public G4VVisCommand {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VVisCommandScene ();
-  ~G4VVisCommandScene ();
+  virtual ~G4VVisCommandScene ();
 protected:
   G4String CurrentSceneName ();
   void UpdateCandidateLists ();
   void UpdateVisManagerScene (const G4String& sceneName = "");
+private:
+  G4VVisCommandScene (const G4VVisCommandScene&);
+  G4VVisCommandScene& operator = (const G4VVisCommandScene&);
 };
 
 class G4VisCommandSceneCreate: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneCreate ();
-  ~G4VisCommandSceneCreate ();
+  virtual ~G4VisCommandSceneCreate ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneCreate (const G4VisCommandSceneCreate&);
+  G4VisCommandSceneCreate& operator = (const G4VisCommandSceneCreate&);
   G4String NextName ();
   G4UIcmdWithAString* fpCommand;
   G4int fId;
@@ -45,56 +48,62 @@ private:
 
 class G4VisCommandSceneEdit: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneEdit ();
-  ~G4VisCommandSceneEdit ();
+  virtual ~G4VisCommandSceneEdit ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneEdit (const G4VisCommandSceneEdit&);
+  G4VisCommandSceneEdit& operator = (const G4VisCommandSceneEdit&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandSceneList: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneList ();
-  ~G4VisCommandSceneList ();
+  virtual ~G4VisCommandSceneList ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneList (const G4VisCommandSceneList&);
+  G4VisCommandSceneList& operator = (const G4VisCommandSceneList&);
   G4UIcommand* fpCommand;
 };
 
 class G4VisCommandSceneNotifyHandlers: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneNotifyHandlers ();
-  ~G4VisCommandSceneNotifyHandlers ();
+  virtual ~G4VisCommandSceneNotifyHandlers ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneNotifyHandlers (const G4VisCommandSceneNotifyHandlers&);
+  G4VisCommandSceneNotifyHandlers& operator =
+  (const G4VisCommandSceneNotifyHandlers&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandSceneRemove: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneRemove ();
-  ~G4VisCommandSceneRemove ();
+  virtual ~G4VisCommandSceneRemove ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneRemove (const G4VisCommandSceneRemove&);
+  G4VisCommandSceneRemove& operator = (const G4VisCommandSceneRemove&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandSceneSelect: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneSelect ();
-  ~G4VisCommandSceneSelect ();
+  virtual ~G4VisCommandSceneSelect ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneSelect (const G4VisCommandSceneSelect&);
+  G4VisCommandSceneSelect& operator = (const G4VisCommandSceneSelect&);
   G4UIcmdWithAString* fpCommand;
 };
 
diff --git a/source/visualization/management/include/G4VisCommandsSceneAdd.hh b/source/visualization/management/include/G4VisCommandsSceneAdd.hh
index f59b940144c7b1a8768a04c739ceb66d92e9eb37..a1ef9204496966997c21addc81b74b93320c5b74 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.5 2000/05/19 09:17:42 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsSceneAdd.hh,v 1.6 2001/02/03 18:39:46 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -17,56 +17,64 @@
 
 class G4VisCommandSceneAddGhosts: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneAddGhosts ();
-  ~G4VisCommandSceneAddGhosts ();
+  virtual ~G4VisCommandSceneAddGhosts ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneAddGhosts (const G4VisCommandSceneAddGhosts&);
+  G4VisCommandSceneAddGhosts& operator =
+  (const G4VisCommandSceneAddGhosts&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandSceneAddHits: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneAddHits ();
-  ~G4VisCommandSceneAddHits ();
+  virtual ~G4VisCommandSceneAddHits ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneAddHits (const G4VisCommandSceneAddHits&);
+  G4VisCommandSceneAddHits& operator = (const G4VisCommandSceneAddHits&);
   G4UIcmdWithoutParameter* fpCommand;
 };
 
 class G4VisCommandSceneAddLogicalVolume: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneAddLogicalVolume ();
-  ~G4VisCommandSceneAddLogicalVolume ();
+  virtual ~G4VisCommandSceneAddLogicalVolume ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneAddLogicalVolume (const G4VisCommandSceneAddLogicalVolume&);
+  G4VisCommandSceneAddLogicalVolume& operator =
+  (const G4VisCommandSceneAddLogicalVolume&);
   G4UIcommand* fpCommand;
 };
 
 class G4VisCommandSceneAddTrajectories: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneAddTrajectories ();
-  ~G4VisCommandSceneAddTrajectories ();
+  virtual ~G4VisCommandSceneAddTrajectories ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneAddTrajectories (const G4VisCommandSceneAddTrajectories&);
+  G4VisCommandSceneAddTrajectories& operator =
+  (const G4VisCommandSceneAddTrajectories&);
   G4UIcmdWithoutParameter* fpCommand;
 };
 
 class G4VisCommandSceneAddVolume: public G4VVisCommandScene {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandSceneAddVolume ();
-  ~G4VisCommandSceneAddVolume ();
+  virtual ~G4VisCommandSceneAddVolume ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandSceneAddVolume (const G4VisCommandSceneAddVolume&);
+  G4VisCommandSceneAddVolume& operator = (const G4VisCommandSceneAddVolume&);
   G4UIcommand* fpCommand;
 };
 
diff --git a/source/visualization/management/include/G4VisCommandsSceneHandler.hh b/source/visualization/management/include/G4VisCommandsSceneHandler.hh
index fe844e64e8009345da9d71fe967548ea84ff82d7..0c911cceb9db90789e5986b0bd3c205b54a7122b 100644
--- a/source/visualization/management/include/G4VisCommandsSceneHandler.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneHandler.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandsSceneHandler.hh,v 1.5 1999/12/16 17:19:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/sceneHandler commands - John Allison  10th October 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsSceneInclude.hh b/source/visualization/management/include/G4VisCommandsSceneInclude.hh
index 807eb0c48b951f27ec3c9cccaf660c16980c4ef7..ea26c33b7b5a3958f7be62345303e9aee2bd7c39 100644
--- a/source/visualization/management/include/G4VisCommandsSceneInclude.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneInclude.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandsSceneInclude.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ca2f3e30cf364113d03f0b0bcf49a13b7e378f89..ab9f7e741b8f10dcba13c2b20273cbd21e246f5c 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.4 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsSet.hh,v 1.6 2001/02/05 02:34:01 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/set/ commands
@@ -47,14 +47,13 @@ public:
       IsCulling ();
   }
   void SetValue (G4bool value) {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/set/culling\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     pVMan -> SetCurrentViewParameters ().SetCulling (value);
     G4VViewer* pView = pVMan -> GetCurrentViewer ();
     if (pView) {
       // Copy current view parameters into current view.
       pView -> SetViewParameters (pVMan -> GetCurrentViewParameters ());
-      // Recalculate projection matrices, etc.
-      pView -> SetView ();
     }
     G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
@@ -76,6 +75,7 @@ public:
       IsCullingCovered ();
   }
   void SetValue (G4bool value) {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/set/culling\".");
     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."
@@ -86,8 +86,6 @@ public:
     if (pView) {
       // Copy current view parameters into current view.
       pView -> SetViewParameters (pVMan -> GetCurrentViewParameters ());
-      // Recalculate projection matrices, etc.
-      pView -> SetView ();
     }
     G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
@@ -109,14 +107,13 @@ public:
       IsCullingInvisible ();
   }
   void SetValue (G4bool value) {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/set/culling\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     pVMan -> SetCurrentViewParameters ().SetCullingInvisible (value);
     G4VViewer* pView = pVMan -> GetCurrentViewer ();
     if (pView) {
       // Copy current view parameters into current view.
       pView -> SetViewParameters (pVMan -> GetCurrentViewParameters ());
-      // Recalculate projection matrices, etc.
-      pView -> SetView ();
     }
     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 249fdf6af592cc64befb5dfde0e34288d2c3db93..60fd42d23d2b23fd9050b4c36cafaaa8c7068242 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.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsShow.hh,v 1.4 2001/02/05 02:34:03 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // /vis~/show/ commands
@@ -45,6 +45,7 @@ public:
       "graphics systems which use such techniques).";
   }
   void SetValue () {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/update\".");
     G4VisManager* pVMan = G4VisManager::GetInstance ();
     if (pVMan -> IsValidView ()) {
       if (pVMan -> GetVerboseLevel () > 1) {
diff --git a/source/visualization/management/include/G4VisCommandsViewer.hh b/source/visualization/management/include/G4VisCommandsViewer.hh
index 314156fd989d215ce5232027c866eb0cde003db7..44b34c80bc4a01104ec895e236912b2b47bb871e 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.9 2000/06/07 08:43:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsViewer.hh,v 1.13 2001/02/05 02:34:04 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/viewer commands - John Allison  25th October 1998
 
@@ -15,96 +15,195 @@
 
 #include "G4VVisCommand.hh"
 
+class G4VViewer;
+class G4ViewParameters;
 class G4UIcommand;
 class G4UIcmdWithAString;
+class G4UIcmdWithADouble;
+class G4UIcmdWithADoubleAndUnit;
 
 class G4VVisCommandViewer: public G4VVisCommand {
 public:
-  // Uses compiler defaults for destructor, copy constructor and assignment.
   G4VVisCommandViewer ();
-  ~G4VVisCommandViewer ();
+  virtual ~G4VVisCommandViewer ();
 protected:
+  void SetViewParameters(G4VViewer*, const G4ViewParameters&);
   void UpdateCandidateLists ();
+private:
+  G4VVisCommandViewer (const G4VVisCommandViewer&);
+  G4VVisCommandViewer& operator = (const G4VVisCommandViewer&);
+};
+
+class G4VisCommandViewerClear: public G4VVisCommandViewer {
+public:
+  G4VisCommandViewerClear ();
+  virtual ~G4VisCommandViewerClear ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandViewerClear (const G4VisCommandViewerClear&);
+  G4VisCommandViewerClear& operator = (const G4VisCommandViewerClear&);
+  G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandViewerCreate: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandViewerCreate ();
-  ~G4VisCommandViewerCreate ();
+  virtual ~G4VisCommandViewerCreate ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandViewerCreate (const G4VisCommandViewerCreate&);
+  G4VisCommandViewerCreate& operator = (const G4VisCommandViewerCreate&);
   G4String NextName ();
   G4UIcommand* fpCommand;
   G4int fId;
 };
 
+class G4VisCommandViewerDolly: public G4VVisCommandViewer {
+public:
+  G4VisCommandViewerDolly ();
+  virtual ~G4VisCommandViewerDolly ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandViewerDolly (const G4VisCommandViewerDolly&);
+  G4VisCommandViewerDolly& operator = (const G4VisCommandViewerDolly&);
+  G4UIcmdWithADoubleAndUnit* fpCommandDolly;
+  G4UIcmdWithADoubleAndUnit* fpCommandDollyTo;
+  G4double fDollyIncrement;
+  G4double fDollyTo;
+};
+
+class G4VisCommandViewerLights: public G4VVisCommandViewer {
+public:
+  G4VisCommandViewerLights ();
+  virtual ~G4VisCommandViewerLights ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandViewerLights (const G4VisCommandViewerLights&);
+  G4VisCommandViewerLights& operator = (const G4VisCommandViewerLights&);
+  G4UIcommand* fpCommandLightsThetaPhi;
+  G4UIcommand* fpCommandLightsVector;
+  G4ThreeVector fLightsVector;
+};
+
 class G4VisCommandViewerList: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandViewerList ();
-  ~G4VisCommandViewerList ();
+  virtual ~G4VisCommandViewerList ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandViewerList (const G4VisCommandViewerList&);
+  G4VisCommandViewerList& operator = (const G4VisCommandViewerList&);
   G4UIcommand* fpCommand;
 };
 
+class G4VisCommandViewerPan: public G4VVisCommandViewer {
+public:
+  G4VisCommandViewerPan ();
+  virtual ~G4VisCommandViewerPan ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandViewerPan (const G4VisCommandViewerPan&);
+  G4VisCommandViewerPan& operator = (const G4VisCommandViewerPan&);
+  G4UIcommand* fpCommandPan;
+  G4UIcommand* fpCommandPanTo;
+  G4double fPanIncrementRight, fPanIncrementUp;
+  G4double fPanToRight, fPanToUp;
+};
+
 class G4VisCommandViewerRefresh: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandViewerRefresh ();
-  ~G4VisCommandViewerRefresh ();
+  virtual ~G4VisCommandViewerRefresh ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandViewerRefresh (const G4VisCommandViewerRefresh&);
+  G4VisCommandViewerRefresh& operator = (const G4VisCommandViewerRefresh&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandViewerRemove: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandViewerRemove ();
-  ~G4VisCommandViewerRemove ();
+  virtual ~G4VisCommandViewerRemove ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandViewerRemove (const G4VisCommandViewerRemove&);
+  G4VisCommandViewerRemove& operator = (const G4VisCommandViewerRemove&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandViewerReset: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandViewerReset ();
-  ~G4VisCommandViewerReset ();
+  virtual ~G4VisCommandViewerReset ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandViewerReset (const G4VisCommandViewerReset&);
+  G4VisCommandViewerReset& operator = (const G4VisCommandViewerReset&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandViewerSelect: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandViewerSelect ();
-  ~G4VisCommandViewerSelect ();
+  virtual ~G4VisCommandViewerSelect ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandViewerSelect (const G4VisCommandViewerSelect&);
+  G4VisCommandViewerSelect& operator = (const G4VisCommandViewerSelect&);
   G4UIcmdWithAString* fpCommand;
 };
 
 class G4VisCommandViewerUpdate: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandViewerUpdate ();
-  ~G4VisCommandViewerUpdate ();
+  virtual ~G4VisCommandViewerUpdate ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
+  G4VisCommandViewerUpdate (const G4VisCommandViewerUpdate&);
+  G4VisCommandViewerUpdate& operator = (const G4VisCommandViewerUpdate&);
   G4UIcmdWithAString* fpCommand;
   G4UIcmdWithAString* fpCommand1;
 };
 
+class G4VisCommandViewerViewpoint: public G4VVisCommandViewer {
+public:
+  G4VisCommandViewerViewpoint ();
+  virtual ~G4VisCommandViewerViewpoint ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandViewerViewpoint (const G4VisCommandViewerViewpoint&);
+  G4VisCommandViewerViewpoint& operator = (const G4VisCommandViewerViewpoint&);
+  G4UIcommand* fpCommandViewpointThetaPhi;
+  G4UIcommand* fpCommandViewpointVector;
+  G4ThreeVector fViewpointVector;
+};
+
+class G4VisCommandViewerZoom: public G4VVisCommandViewer {
+public:
+  G4VisCommandViewerZoom ();
+  virtual ~G4VisCommandViewerZoom ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandViewerZoom (const G4VisCommandViewerZoom&);
+  G4VisCommandViewerZoom& operator = (const G4VisCommandViewerZoom&);
+  G4UIcmdWithADouble* fpCommandZoom;
+  G4UIcmdWithADouble* fpCommandZoomTo;
+  G4double fZoomMultiplier;
+  G4double fZoomTo;
+};
+
 #endif
diff --git a/source/visualization/management/include/G4VisCommandsViewerSet.hh b/source/visualization/management/include/G4VisCommandsViewerSet.hh
index c7216f6115ec8240765a2630a8c037e95ad47d8d..30e5e447c40bb6dc01d196822883f42aa831cacb 100644
--- a/source/visualization/management/include/G4VisCommandsViewerSet.hh
+++ b/source/visualization/management/include/G4VisCommandsViewerSet.hh
@@ -5,37 +5,43 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsViewerSet.hh,v 1.3 2000/05/19 09:17:47 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsViewerSet.hh,v 1.8 2001/02/06 23:36:52 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
 
 #ifndef G4VISCOMMANDSVIEWERSET_HH
 #define G4VISCOMMANDSVIEWERSET_HH
 
-#include "G4VVisCommand.hh"
+#include "G4VisCommandsViewer.hh"
 
 #include "g4std/vector"
 
 class G4UIcommand;
 class G4UIcmdWithAString;
 class G4UIcmdWithABool;
+class G4UIcmdWithAnInteger;
 
-class G4VisCommandsViewerSet: public G4VVisCommand {
+class G4VisCommandsViewerSet: public G4VVisCommandViewer {
 public:
-  // Uses compiler defaults for copy constructor and assignment.
   G4VisCommandsViewerSet ();
-  ~G4VisCommandsViewerSet ();
+  virtual ~G4VisCommandsViewerSet ();
   G4String GetCurrentValue (G4UIcommand* command);
   void SetNewValue (G4UIcommand* command, G4String newValue);
 private:
-  G4String ConvertToString(G4bool blValue);
-  G4bool GetNewBoolValue(const G4String& paramString);
-  G4UIcmdWithAString* fpCommandAll;
-  G4UIcmdWithAString* fpCommandStyle;
-  G4UIcmdWithABool* fpCommandEdge;
-  G4UIcmdWithABool* fpCommandHiddenEdge;
-  G4UIcommand* fpCommandCulling;
+  G4VisCommandsViewerSet (const G4VisCommandsViewerSet&);
+  G4VisCommandsViewerSet& operator = (const G4VisCommandsViewerSet&);
+  G4UIcmdWithAString*   fpCommandAll;
+  G4UIcmdWithABool*     fpCommandAutoRefresh;
+  G4UIcommand*          fpCommandCulling;
+  G4UIcmdWithABool*     fpCommandEdge;
+  G4UIcmdWithABool*     fpCommandHiddenEdge;
+  G4UIcmdWithABool*     fpCommandHiddenMarker;
+  G4UIcmdWithAnInteger* fpCommandLineSegments;
+  G4UIcmdWithAString*   fpCommandLightsMove;
+  G4UIcommand*          fpCommandProjection;
+  G4UIcommand*          fpCommandSectionPlane;
+  G4UIcmdWithAString*   fpCommandStyle;
 };
 
 #endif
diff --git a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
index 0983fe400f978a4c89f3cc927f37ff7c9f762020..9366aeeaf1f6b5d8a7fa35f19da17c24d07ae40c 100644
--- a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisFeaturesOfDAWNFILE.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #ifndef G4VISFEATURESOFDAWNFILE_HH
 #define G4VISFEATURESOFDAWNFILE_HH
diff --git a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
index c1e88dd4e66ae70a9e4d9200e89dd6f848558b36..9d114dd5d1dbf6417fd35557b46b17e1d8ebdc1d 100644
--- a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisFeaturesOfFukuiRenderer.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
index cac918530fbbf89316852598ffd9bc5152a2dd5f..e9db7f33ae433e87ba1d07df92db081a635b0cd8 100644
--- a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisFeaturesOfOpenGL.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
index 0a43b93df2534e7704e11cdd9783544d22115519..ea4b5b71977804737884b3679bf61f0720275555 100644
--- a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisFeaturesOfOpenInventor.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisManMessenger.hh b/source/visualization/management/include/G4VisManMessenger.hh
index cd6329cfd1275b93a203b419146712c8cab3ca27..a0e2146d93d6ced0f42cc3516fa00048b2757b81 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.4 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessenger.hh,v 1.6 2001/02/23 15:43:19 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -16,8 +16,7 @@
 
 #include "G4UImessenger.hh"
 #include "globals.hh"
-
-#include "g4rw/tpordvec.h"
+#include "g4std//vector"
 
 class G4VisManager;
 class G4UIcommand;
@@ -25,10 +24,12 @@ class G4UIcommand;
 class G4VisManMessenger: public G4UImessenger {
 public:
   G4VisManMessenger (G4VisManager* pVMan);
-  ~G4VisManMessenger ();
+  virtual ~G4VisManMessenger ();
   void SetNewValue (G4UIcommand* command, G4String newValues);
   G4String GetCurrentValue (G4UIcommand* command);
 private:
+  G4VisManMessenger (const G4VisManMessenger&);
+  G4VisManMessenger& operator = (const G4VisManMessenger&);
   void AddCommandCamera      ();
   //  void AddCommandClear       ();
   //  void AddCommandCopy        ();
@@ -56,7 +57,7 @@ private:
   G4bool ViewValid ();
   void RotateViewpointAboutUpVectorBy (G4double dbeta);
   G4VisManager* fpVMan;
-  G4RWTPtrOrderedVector <G4UIcommand> fCommandList;
+  G4std::vector<G4UIcommand*> fCommandList;
 };
 
 #endif
diff --git a/source/visualization/management/include/G4VisManager.hh b/source/visualization/management/include/G4VisManager.hh
index 4ddd6c54d4549f58b21282a839ae76b2335c8a92..8c9b24917fd29aa994ef9ac551c98d772126d0e0 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.13 2000/05/02 09:57:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManager.hh,v 1.17 2001/02/23 15:43:20 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
@@ -71,8 +71,8 @@
 #include "G4Transform3D.hh"
 #include "G4UImessenger.hh"
 
-#include "g4rw/tpordvec.h"
 #include "g4std/iostream"
+#include "g4std/vector"
 
 class G4VisManMessenger;
 class G4VPhysicalVolume;
@@ -148,6 +148,11 @@ public: // With description
 
 private:
 
+  // Private copy constructor and assigment operator - copying and
+  // assignment not allowed.  Keeps CodeWizard happy.
+  G4VisManager (const G4VisManager&);
+  G4VisManager& operator = (const G4VisManager&);
+
   static G4VisManager* GetInstance ();
   // Returns pointer to itself.  Throws a G4Exception if called before
   // instantiation.  Private so that only friends can use; the normal
@@ -258,6 +263,10 @@ public: // With description
   /////////////////////////////////////////////////////////////////////
   // Access functions.
 
+  void Enable();
+  void Disable();
+  // Global enable/disable functions.
+
   G4VGraphicsSystem*           GetCurrentGraphicsSystem    () const;
   G4Scene*                     GetCurrentScene             () const;
   G4VSceneHandler*             GetCurrentSceneHandler      () const;
@@ -296,6 +305,9 @@ public: // With description
   G4bool IsValidView ();
   // True if view is valid.  Prints messages and sanitises varoius data.
 
+  static void PrintCommandDeprecation(const G4String&);
+  // Temporary deprecation printing.
+
 protected:
 
   virtual void RegisterGraphicsSystems () = 0;
@@ -316,7 +328,7 @@ protected:
   G4ViewParameters      fVP;                // Current viewing parameters.
   G4int                 fVerbose;           // Verbosity level 0-10.
   G4VisManMessenger*    fpMessenger;        // Pointer to messenger.
-  G4RWTPtrOrderedVector <G4UImessenger> fMessengerList;
+  G4std::vector<G4UImessenger*> fMessengerList;
   G4VisStateDependent*  fpStateDependent;   // Friend state dependent class.
 
 };
diff --git a/source/visualization/management/include/G4VisManager.icc b/source/visualization/management/include/G4VisManager.icc
index e44e804a317f8c324c15006b4e116b40355ac8df..c7b83a191f0db07a23c47761c1972aee9ac99d6d 100644
--- a/source/visualization/management/include/G4VisManager.icc
+++ b/source/visualization/management/include/G4VisManager.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisManager.icc,v 1.5 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 5ce6bd25adf91c40bcf3f2e94caa8f1a9b36873a..0adb410d6e524e5701ee25d707fdc16db915c3d4 100644
--- a/source/visualization/management/include/G4VisStateDependent.hh
+++ b/source/visualization/management/include/G4VisStateDependent.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisStateDependent.hh,v 1.3 1999/12/15 14:54:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 4ee834deaf5d01d826465acfb0b3db701af2ad66..341a61aae9cee8817269161eee9d8a42e6e663f0 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.4 1999/12/15 14:54:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisToOldVisCommands.hh,v 1.5 2001/02/23 15:43:20 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Implements some /vis/ commands as /vis~/ temporarily.
@@ -18,8 +18,6 @@
 #include "G4UImessenger.hh"
 #include "globals.hh"
 
-#include "g4rw/tpordvec.h"
-
 class G4VisToOldVisCommands: public G4UImessenger {
 public:
   G4VisToOldVisCommands ();
diff --git a/source/visualization/management/include/MyVisManager.cc b/source/visualization/management/include/MyVisManager.cc
index ae276e44a487acd1b15ff76f7ea8dc12614ed235..bbeb549db1fe0fce4a71a21d367f6be8a13c9ae9 100644
--- a/source/visualization/management/include/MyVisManager.cc
+++ b/source/visualization/management/include/MyVisManager.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: MyVisManager.cc,v 1.5 2000/01/29 00:43:10 asaim Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/source/visualization/management/include/MyVisManager.hh b/source/visualization/management/include/MyVisManager.hh
index 7c55d510ea92ddc88be51f47688872eb76ac320b..56c08480eea9a8d65b5ce001bcd19d6b0327f194 100644
--- a/source/visualization/management/include/MyVisManager.hh
+++ b/source/visualization/management/include/MyVisManager.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: MyVisManager.hh,v 1.4 1999/12/15 14:54:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/source/visualization/management/src/G4GraphicsSystemList.cc b/source/visualization/management/src/G4GraphicsSystemList.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ebe5c53cd9dd10448214c473e72fcb7f8fb2fe58
--- /dev/null
+++ b/source/visualization/management/src/G4GraphicsSystemList.cc
@@ -0,0 +1,19 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4GraphicsSystemList.cc,v 1.2 2001/03/07 14:37:45 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+
+#include "G4GraphicsSystemList.hh"
+
+void G4GraphicsSystemList::remove(G4VGraphicsSystem* graphicsSystem) {
+  G4GraphicsSystemListIterator iGS;
+  for (iGS = begin(); iGS != end(); ++iGS) {
+    if (*iGS == graphicsSystem) break;
+  }
+  if (iGS != end()) erase(iGS);
+}
diff --git a/source/visualization/management/src/G4Scene.cc b/source/visualization/management/src/G4Scene.cc
index c159dc0af0d3aa6710a853a6c962718330b0479e..9e15e80f617484352994a39f495d34f1f6492ad0 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.5 1999/12/15 14:54:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Scene.cc,v 1.6 2001/02/23 15:43:22 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Scene data  John Allison  19th July 1996.
@@ -26,7 +26,7 @@ G4Scene::G4Scene (const G4String& name):
 G4Scene::~G4Scene () {}
 
 G4bool G4Scene::AddRunDurationModel (G4VModel* pModel) {
-  G4int i, nModels = fRunDurationModelList.entries ();
+  G4int i, nModels = fRunDurationModelList.size ();
   for (i = 0; i < nModels; i++) {
     if (pModel -> GetGlobalDescription () ==
 	fRunDurationModelList [i] -> GetGlobalDescription ()) break;
@@ -40,8 +40,8 @@ G4bool G4Scene::AddRunDurationModel (G4VModel* pModel) {
 	   << G4endl;
     return false;
   }
-  fRunDurationModelList.append (pModel);
-  nModels = fRunDurationModelList.entries ();  // ...has increased by 1...
+  fRunDurationModelList.push_back (pModel);
+  nModels = fRunDurationModelList.size ();  // ...has increased by 1...
   G4BoundingSphereScene boundingSphereScene;
   for (i = 0; i < nModels; i++) {
     const G4VisExtent& thisExtent =
@@ -88,7 +88,7 @@ G4bool G4Scene::AddWorldIfEmpty () {
 }
 
 G4bool G4Scene::AddEndOfEventModel (G4VModel* pModel) {
-  G4int i, nModels = fEndOfEventModelList.entries ();
+  G4int i, nModels = fEndOfEventModelList.size ();
   for (i = 0; i < nModels; i++) {
     if (pModel -> GetGlobalDescription () ==
 	fEndOfEventModelList [i] -> GetGlobalDescription ()) break;
@@ -102,13 +102,18 @@ G4bool G4Scene::AddEndOfEventModel (G4VModel* pModel) {
 	   << G4endl;
     return false;
   }
-  fEndOfEventModelList.append (pModel);
+  fEndOfEventModelList.push_back (pModel);
   return true;
 }
 
 void G4Scene::Clear () {
-  fRunDurationModelList.clearAndDestroy ();
-  fEndOfEventModelList.clearAndDestroy ();
+  int i;
+  for (i = 0; i < fRunDurationModelList.size(); ++i) {
+    delete fRunDurationModelList[i];
+  }
+  for (i = 0; i < fEndOfEventModelList.size(); ++i) {
+    delete fEndOfEventModelList[i];
+  }
 }
 
 G4std::ostream& operator << (G4std::ostream& os, const G4Scene& d) {
@@ -116,12 +121,12 @@ G4std::ostream& operator << (G4std::ostream& os, const G4Scene& d) {
   os << "Scene data:";
 
   os << "\n  Run-duration model list:";
-  for (int i = 0; i < d.fRunDurationModelList.entries (); i++) {
+  for (int i = 0; i < d.fRunDurationModelList.size (); i++) {
     os << "\n  " << *(d.fRunDurationModelList[i]);
   }
 
   os << "\n  End-of-event model list:";
-  for (int ii = 0; ii < d.fEndOfEventModelList.entries (); ii++) {
+  for (int ii = 0; ii < d.fEndOfEventModelList.size (); ii++) {
     os << "\n  " << *(d.fEndOfEventModelList[ii]);
   }
 
@@ -134,13 +139,13 @@ G4std::ostream& operator << (G4std::ostream& os, const G4Scene& d) {
 
 G4bool G4Scene::operator != (const G4Scene& s) const {
   if (
-      (fRunDurationModelList.entries () !=
-       s.fRunDurationModelList.entries ())              ||
+      (fRunDurationModelList.size () !=
+       s.fRunDurationModelList.size ())              ||
       (fExtent               != s.fExtent)              ||
       !(fStandardTargetPoint == s.fStandardTargetPoint)
       ) return true;
 
-  for (int i = 0; i < fRunDurationModelList.entries (); i++) {
+  for (int i = 0; i < fRunDurationModelList.size (); i++) {
     if (fRunDurationModelList[i] != s.fRunDurationModelList[i])
       return true;
   }
diff --git a/source/visualization/management/src/G4SceneHandlerList.cc b/source/visualization/management/src/G4SceneHandlerList.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8465111bab6de5f4893ead1707dab52b4c896bff
--- /dev/null
+++ b/source/visualization/management/src/G4SceneHandlerList.cc
@@ -0,0 +1,19 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4SceneHandlerList.cc,v 1.2 2001/03/07 14:37:47 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+
+#include "G4SceneHandlerList.hh"
+
+void G4SceneHandlerList::remove(G4VSceneHandler* sceneHandler) {
+  G4SceneHandlerListIterator iSceneHandler;
+  for (iSceneHandler = begin(); iSceneHandler != end(); ++iSceneHandler) {
+    if (*iSceneHandler == sceneHandler) break;
+  }
+  if (iSceneHandler != end()) erase(iSceneHandler);
+}
diff --git a/source/visualization/management/src/G4SceneList.cc b/source/visualization/management/src/G4SceneList.cc
new file mode 100644
index 0000000000000000000000000000000000000000..789a34f62813f3dcb3d0b242c8d7a9647352426d
--- /dev/null
+++ b/source/visualization/management/src/G4SceneList.cc
@@ -0,0 +1,19 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4SceneList.cc,v 1.4 2001/03/07 14:37:48 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+
+#include "G4SceneList.hh"
+
+void G4SceneList::remove(G4Scene* scene) {
+  G4SceneListIterator iScene;
+  for (iScene = begin(); iScene != end(); ++iScene) {
+    if (*iScene == scene) break;
+  }
+  if (iScene != end()) erase(iScene);
+}
diff --git a/source/visualization/management/src/G4VGraphicsSystem.cc b/source/visualization/management/src/G4VGraphicsSystem.cc
index e70f43247ed43d0e9eabbaa9b76e03f66259c76e..ffbbf2fbba8203fb0712b16d08b466b0d4d9d1db 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.5 1999/12/15 14:54:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VGraphicsSystem.cc,v 1.6 2001/02/23 15:43:24 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -54,7 +54,7 @@ G4std::ostream& operator << (G4std::ostream& os, const G4VGraphicsSystem& gs) {
   }
   os << "\n  Functionality: " << gs.GetFunctionality ();
   if (pVMan -> GetVerboseLevel () > 1) {
-    G4int nScenes = scenes.entries ();
+    G4int nScenes = scenes.size ();
     if (nScenes) {
       G4int nScenesOfThisSystem = 0;
       for (int i = 0; i < nScenes; i++) {
diff --git a/source/visualization/management/src/G4VSceneHandler.cc b/source/visualization/management/src/G4VSceneHandler.cc
index 9d5613103eee3ed73ca8e5913a5f1d13c8c22ee5..6355809468216050557665b1a2456f324004886b 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.11 2000/05/22 08:27:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VSceneHandler.cc,v 1.12 2001/02/23 15:43:24 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  19th July 1996
@@ -76,7 +76,10 @@ G4VSceneHandler::G4VSceneHandler (G4VGraphicsSystem& system, G4int id, const G4S
 }
 
 G4VSceneHandler::~G4VSceneHandler () {
-  fViewerList.clearAndDestroy ();
+  G4ViewerListIterator i;
+  for (i = fViewerList.begin(); i != fViewerList.end(); ++i) {
+    delete *i;
+  }
 }
 
 void G4VSceneHandler::EndModeling () {}
@@ -154,7 +157,7 @@ void G4VSceneHandler::AddThis (const G4VSolid& solid) {
 }
 
 void G4VSceneHandler::AddViewerToList (G4VViewer* pViewer) {
-  fViewerList.append (pViewer);
+  fViewerList.push_back (pViewer);
 }
 
 void G4VSceneHandler::EstablishSpecials (G4PhysicalVolumeModel& pvModel) {
@@ -220,14 +223,15 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) {
 }
 
 void G4VSceneHandler::RemoveViewerFromList (G4VViewer* pViewer) {
-  fViewerList.remove (pViewer);
+  fViewerList.remove(pViewer);
 }
 
 void G4VSceneHandler::SetScene (G4Scene* pScene) {
   fpScene = pScene;
   // Notify all viewers that a kernel visit is required.
-  for (int i = 0; i < fViewerList.entries (); i++) {
-    fViewerList [i] -> SetNeedKernelVisit ();
+  G4ViewerListIterator i;
+  for (i = fViewerList.begin(); i != fViewerList.end(); i++) {
+    (*i) -> SetNeedKernelVisit ();
   }
 }
 
@@ -288,13 +292,13 @@ void G4VSceneHandler::ProcessScene (G4VViewer& view) {
 
   // Traverse geometry tree and send drawing primitives to window(s).
 
-  const G4RWTPtrOrderedVector <G4VModel>& runDurationModelList =
+  const G4std::vector<G4VModel*>& runDurationModelList =
     fpScene -> GetRunDurationModelList ();
 
-  if (runDurationModelList.entries ()) {
+  if (runDurationModelList.size ()) {
     G4cout << "Traversing scene data..." << G4endl;
     G4ModelingParameters* pMP = CreateModelingParameters ();
-    for (int i = 0; i < runDurationModelList.entries (); i++) {
+    for (int i = 0; i < runDurationModelList.size (); i++) {
       G4VModel* pModel = runDurationModelList[i];
       const G4ModelingParameters* tempMP =
 	pModel -> GetModelingParameters ();
@@ -471,8 +475,8 @@ G4double G4VSceneHandler::GetMarkerSize (const G4VMarker& marker,
 G4std::ostream& operator << (G4std::ostream& os, const G4VSceneHandler& s) {
 
   os << "Scene " << s.fName << " has "
-     << s.fViewerList.entries () << " viewers:";
-  for (int i = 0; i < s.fViewerList.entries (); i++) {
+     << s.fViewerList.size () << " viewers:";
+  for (int i = 0; i < s.fViewerList.size (); i++) {
     os << "\n  " << *(s.fViewerList [i]);
   }
 
diff --git a/source/visualization/management/src/G4VViewer.cc b/source/visualization/management/src/G4VViewer.cc
index 2ad85004982c8b8c5a71ac7a149546a4ae8dcf9b..2f8c9c22109d9dfd41c8564f6376b2918c2731be 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.9 2000/05/13 10:52:51 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VViewer.cc,v 1.11 2001/02/23 15:43:25 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  27th March 1996
@@ -63,12 +63,15 @@ const G4VisAttributes* G4VViewer::GetApplicableVisAttributes
 
 void G4VViewer::NeedKernelVisit () {
   // Notify all views that a kernel visit is required.
-  const G4ViewerList& viewList = fSceneHandler.GetViewerList ();
-  for (int i = 0; i < viewList.entries (); i++) {
-    viewList [i] -> SetNeedKernelVisit ();
+  const G4ViewerList& viewerList = fSceneHandler.GetViewerList ();
+  G4ViewerListConstIterator i;
+  for (i = viewerList.begin(); i != viewerList.end(); i++) {
+    (*i) -> SetNeedKernelVisit ();
   }
 }
 
+void G4VViewer::FinishView () {}
+
 void G4VViewer::ShowView () {}
 
 void G4VViewer::ProcessView () {
diff --git a/source/visualization/management/src/G4VVisCommand.cc b/source/visualization/management/src/G4VVisCommand.cc
index 4c26bf9d49981e706488950f8c22693f604dc263..33e873b26aca9ec3ec79a269d95ad23fda3f0adc 100644
--- a/source/visualization/management/src/G4VVisCommand.cc
+++ b/source/visualization/management/src/G4VVisCommand.cc
@@ -5,14 +5,17 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VVisCommand.cc,v 1.6 1999/12/16 17:19:31 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VVisCommand.cc,v 1.8 2001/02/06 23:36:55 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // Base class for visualization commands - John Allison  9th August 1998
 // It is really a messenger - we have one command per messenger.
 
 #include "G4VVisCommand.hh"
 
+#include "G4UnitsTable.hh"
+#include "g4std/strstream"
+
 G4VVisCommand::~G4VVisCommand () {}
 
 G4VisManager* G4VVisCommand::fpVisManager = 0;
@@ -22,3 +25,96 @@ G4std::vector <G4UIcommand*> G4VVisCommand::sceneNameCommands;
 G4std::vector <G4UIcommand*> G4VVisCommand::sceneHandlerNameCommands;
 
 G4std::vector <G4UIcommand*> G4VVisCommand::viewerNameCommands;
+
+G4double G4VVisCommand::ValueOf(G4String unitName) {
+   return G4UnitDefinition::GetValueOf(unitName);
+}
+
+G4String G4VVisCommand::ConvertToString(G4bool blValue)
+{
+  G4String vl = "false";
+  if(blValue) vl = "true";
+  return vl;
+}
+
+G4String G4VVisCommand::ConvertToString
+(G4double x, G4double y, const char * unitName)
+{
+  G4double uv = ValueOf(unitName);
+  
+  char st[50];
+  G4std::ostrstream os(st,50);
+  os << x/uv << " " << y/uv << " " << unitName << G4std::ends;
+  G4String vl = st;
+  return vl;
+}
+
+G4String G4VVisCommand::ConvertToString(const G4ThreeVector& vec)
+{
+  char st[100];
+  G4std::ostrstream os(st,100);
+  os << vec.x() << " " << vec.y() << " " << vec.z() << G4std::ends;
+  G4String vl = st;
+  return vl;
+}
+
+G4bool G4VVisCommand::GetNewBoolValue(const G4String& paramString)
+{
+  G4String v = paramString;
+  v.toUpper();
+  G4bool vl = false;
+  if( v=="Y" || v=="YES" || v=="1" || v=="T" || v=="TRUE" )
+  { vl = true; }
+  return vl;
+}
+
+G4int G4VVisCommand::GetNewIntValue(const G4String& paramString)
+{
+  G4int vl;
+  const char* t = paramString;
+  G4std::istrstream is((char*)t);
+  is >> vl;
+  return vl;
+}
+
+G4double G4VVisCommand::GetNewDoubleValue(const G4String& paramString)
+{
+  G4double vl;
+  char unts[30];
+  
+  const char* t = paramString;
+  G4std::istrstream is((char*)t);
+  is >> vl >> unts;
+  G4String unt = unts;
+  
+  return (vl*ValueOf(unt));
+}
+
+G4ThreeVector G4VVisCommand::GetNew3VectorValue(const G4String& paramString)
+{
+  G4double vx;
+  G4double vy;
+  G4double vz;
+  const char* t = paramString;
+  G4std::istrstream is((char*)t);
+  is >> vx >> vy >> vz;
+  return G4ThreeVector(vx,vy,vz);
+}
+
+void G4VVisCommand::GetNewDoublePairValue(const G4String& paramString,
+					  G4double& xval,
+					  G4double& yval)
+{
+  G4double x, y;
+  char unts[30];
+  
+  const char* t = paramString;
+  G4std::istrstream is((char*)t);
+  is >> x >> y >> unts;
+  G4String unt = unts;
+
+  xval = x*ValueOf(unt);
+  yval = y*ValueOf(unt);
+
+  return;
+}
diff --git a/source/visualization/management/src/G4ViewParameters.cc b/source/visualization/management/src/G4ViewParameters.cc
index 8ea6af4283c0b2cd6b3ac3dfd135599ead2e1535..4da73d3a26742e1095b80b77af3218b248993f6c 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.7 2000/07/03 10:36:33 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4ViewParameters.cc,v 1.11 2001/02/23 15:47:24 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  19th July 1996
@@ -51,7 +51,8 @@ G4ViewParameters::G4ViewParameters ():
   fGlobalMarkerScale (1.),
   fMarkerNotHidden (true),
   fWindowSizeHintX (600),
-  fWindowSizeHintY (600)
+  fWindowSizeHintY (600),
+  fAutoRefresh (false)
 {
   fDefaultMarker.SetScreenSize (5.);
   // Markers are 5 pixels radius, 10 pixels diameter.
@@ -116,8 +117,8 @@ G4double G4ViewParameters::GetFrontHalfHeight (G4double nearDistance,
 
 void G4ViewParameters::AddCutawayPlane (const G4Plane3D& cutawayPlane) {
   fCutaway = true;
-  if (fCutawayPlanes.entries () < 3 ) {
-    fCutawayPlanes.insert (cutawayPlane);
+  if (fCutawayPlanes.size () < 3 ) {
+    fCutawayPlanes.push_back (cutawayPlane);
   }
   else {
     G4cerr << "A maximum of 3 cutaway planes supported." << G4endl;
@@ -180,7 +181,13 @@ void G4ViewParameters::SetLightpointDirection
   SetViewAndLights (fViewpointDirection);
 }
 
-void G4ViewParameters::Pan (G4double right, G4double up) {
+void G4ViewParameters::SetPan (G4double right, G4double up) {
+  G4Vector3D unitRight = (fUpVector.cross (fViewpointDirection)).unit();
+  G4Vector3D unitUp    = (fViewpointDirection.cross (unitRight)).unit();
+  fCurrentTargetPoint  = right * unitRight + up * unitUp;
+}
+
+void G4ViewParameters::IncrementPan (G4double right, G4double up) {
   G4Vector3D unitRight = (fUpVector.cross (fViewpointDirection)).unit();
   G4Vector3D unitUp    = (fViewpointDirection.cross (unitRight)).unit();
   fCurrentTargetPoint += right * unitRight + up * unitUp;
@@ -220,7 +227,8 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const {
       (fDefaultMarker        != v.fDefaultMarker)        ||
       (fGlobalMarkerScale    != v.fGlobalMarkerScale)    ||
       (fMarkerNotHidden      != v.fMarkerNotHidden)      ||
-      (fWindowSizeHintY      != v.fWindowSizeHintY))
+      (fWindowSizeHintY      != v.fWindowSizeHintY)      ||
+      (fAutoRefresh          != v.fAutoRefresh))
     G4cout << "Difference in 1st batch." << G4endl;
 
   if (fSection) {
@@ -229,12 +237,12 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const {
   }
 
   if (fCutaway) {
-    if (fCutawayPlanes.entries () != v.fCutawayPlanes.entries ()) {
+    if (fCutawayPlanes.size () != v.fCutawayPlanes.size ()) {
       G4cout << "Difference in no of cutaway planes." << G4endl;
     }
     else {
-      for (int i = 0; i < fCutawayPlanes.entries (); i++) {
-	if (!(fCutawayPlanes (i) == v.fCutawayPlanes (i)))
+      for (int i = 0; i < fCutawayPlanes.size (); i++) {
+	if (!(fCutawayPlanes[i] == v.fCutawayPlanes[i]))
 	  G4cout << "Difference in cutaway plane no. " << i << G4endl;
       }
     }
@@ -246,11 +254,9 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const {
   }
 }
 
-G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v) {
-  os << "View parameters and options:";
-
-  os << "\n  Drawing style: ";
-  switch (v.fDrawingStyle) {
+G4std::ostream& operator << (G4std::ostream& os,
+			     const G4ViewParameters::DrawingStyle& style) {
+  switch (style) {
   case G4ViewParameters::wireframe:
     os << "wireframe"; break;
   case G4ViewParameters::hlr:
@@ -261,6 +267,13 @@ G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v) {
     os << "hlhsr - hidden line, hidden surface removed"; break;
   default: os << "unrecognised"; break;
   }
+  return os;
+}
+
+G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v) {
+  os << "View parameters and options:";
+
+  os << "\n  Drawing style: " << v.fDrawingStyle;
 
   os << "\n  Representation style: ";
   switch (v.fRepStyle) {
@@ -297,7 +310,7 @@ G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v) {
   os << "\n  Cutaway flag: ";
   if (v.fCutaway) {
     os << "true, cutaway planes: ";
-    for (int i = 0; i < v.fCutawayPlanes.entries (); i++) {
+    for (int i = 0; i < v.fCutawayPlanes.size (); i++) {
       os << ' ' << v.fCutawayPlanes[i];
     }
   }
@@ -378,6 +391,10 @@ G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v) {
   os << "\n  Window size hint: "
      << v.fWindowSizeHintX << 'x'<< v.fWindowSizeHintX;
 
+  os << "\n  Auto refresh: ";
+  if (v.fAutoRefresh) os << "true";
+  else os << "false";
+
   return os;
 }
 
@@ -415,7 +432,8 @@ G4bool G4ViewParameters::operator != (const G4ViewParameters& v) const {
       (fGlobalMarkerScale    != v.fGlobalMarkerScale)    ||
       (fMarkerNotHidden      != v.fMarkerNotHidden)      ||
       (fWindowSizeHintX      != v.fWindowSizeHintX)      ||
-      (fWindowSizeHintY      != v.fWindowSizeHintY))
+      (fWindowSizeHintY      != v.fWindowSizeHintY)      ||
+      (fAutoRefresh          != v.fAutoRefresh))
     return true;
 
   if (fDensityCulling &&
@@ -425,11 +443,11 @@ G4bool G4ViewParameters::operator != (const G4ViewParameters& v) const {
       (!(fSectionPlane == v.fSectionPlane))) return true;
 
   if (fCutaway) {
-    if (fCutawayPlanes.entries () != v.fCutawayPlanes.entries ())
+    if (fCutawayPlanes.size () != v.fCutawayPlanes.size ())
       return true;
     else {
-      for (int i = 0; i < fCutawayPlanes.entries (); i++) {
-	if (!(fCutawayPlanes (i) == v.fCutawayPlanes (i))) return true;
+      for (int i = 0; i < fCutawayPlanes.size (); i++) {
+	if (!(fCutawayPlanes[i] == v.fCutawayPlanes[i])) return true;
       }
     }
   }
diff --git a/source/visualization/management/src/G4ViewerList.cc b/source/visualization/management/src/G4ViewerList.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d3143f96dd714268380738395fbd5aa88007e50b
--- /dev/null
+++ b/source/visualization/management/src/G4ViewerList.cc
@@ -0,0 +1,19 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ViewerList.cc,v 1.2 2001/03/07 14:37:50 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+
+#include "G4ViewerList.hh"
+
+void G4ViewerList::remove(G4VViewer* viewer) {
+  G4ViewerListIterator iViewer;
+  for (iViewer = begin(); iViewer != end(); ++iViewer) {
+    if (*iViewer == viewer) break;
+  }
+  if (iViewer != end()) erase(iViewer);
+}
diff --git a/source/visualization/management/src/G4VisCommandTemplates.cc b/source/visualization/management/src/G4VisCommandTemplates.cc
index 008571f0248db70cbbfada2b718fe157c33932da..01bac976a78d0c03791c9d41d99996776b94c0ca 100644
--- a/source/visualization/management/src/G4VisCommandTemplates.cc
+++ b/source/visualization/management/src/G4VisCommandTemplates.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandTemplates.cc,v 1.4 1999/12/15 14:54:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Visualization Command Messenger Template private functions.
diff --git a/source/visualization/management/src/G4VisCommands.cc b/source/visualization/management/src/G4VisCommands.cc
new file mode 100644
index 0000000000000000000000000000000000000000..29bc0606fa1a688152822aa8acda5978fa94616a
--- /dev/null
+++ b/source/visualization/management/src/G4VisCommands.cc
@@ -0,0 +1,78 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4VisCommands.cc,v 1.1 2001/02/23 15:04:04 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
+
+// /vis/ top level commands - John Allison  5th February 2001
+
+#include "G4VisCommands.hh"
+
+#include "G4VisManager.hh"
+#include "G4UIcmdWithABool.hh"
+#include "G4UIcmdWithAnInteger.hh"
+#include "G4UIcmdWithoutParameter.hh"
+
+////////////// /vis/enable ///////////////////////////////////////
+
+G4VisCommandEnable::G4VisCommandEnable () {
+  G4bool omitable;
+
+  fpCommand = new G4UIcmdWithABool("/vis/enable", this);
+  fpCommand -> SetGuidance("/vis/enable [true|false]");
+  fpCommand -> SetGuidance("Enables/disables visualization system.");
+  fpCommand -> SetParameterName("enabled", omitable=true);
+  fpCommand -> SetDefaultValue(true);
+
+  fpCommand1 = new G4UIcmdWithoutParameter("/vis/disable", this);
+  fpCommand1 -> SetGuidance("Disables visualization system.");
+}
+
+G4VisCommandEnable::~G4VisCommandEnable () {
+  delete fpCommand;
+  delete fpCommand1;
+}
+
+G4String G4VisCommandEnable::GetCurrentValue (G4UIcommand* command) {
+  return G4String();
+}
+
+void G4VisCommandEnable::SetNewValue (G4UIcommand* command,
+				      G4String newValue) {
+  if (command == fpCommand) {
+    G4bool enable (GetNewBoolValue(newValue));
+    if (enable) fpVisManager->Enable();  // Printing is in vis manager.
+    else fpVisManager->Disable();        // Printing is in vis manager.
+  } else fpVisManager->Disable();        // Printing is in vis manager.
+}
+
+////////////// /vis/verbose ///////////////////////////////////////
+
+G4VisCommandVerbose::G4VisCommandVerbose () {
+  G4bool omitable;
+
+  fpCommand = new G4UIcmdWithAnInteger("/vis/verbose", this);
+  fpCommand -> SetGuidance("/vis/verbose [<verbosity>]");
+  fpCommand -> SetGuidance("0 = minimum, 10 = maximum verbosity.");
+  fpCommand -> SetParameterName("verbosity", omitable=true);
+  fpCommand -> SetDefaultValue(0);
+}
+
+G4VisCommandVerbose::~G4VisCommandVerbose () {
+  delete fpCommand;
+}
+
+G4String G4VisCommandVerbose::GetCurrentValue (G4UIcommand* command) {
+  return G4String();
+}
+
+void G4VisCommandVerbose::SetNewValue (G4UIcommand* command,
+				       G4String newValue) {
+  G4int verbosity (GetNewIntValue(newValue));
+  fpVisManager->SetVerboseLevel(verbosity);
+  G4cout << "Visualization verbosity changed to " << verbosity << G4endl;
+}
diff --git a/source/visualization/management/src/G4VisCommandsCamera.cc b/source/visualization/management/src/G4VisCommandsCamera.cc
index e0fd47235473e78e16efe5a1e2bcb13efb2e7108..9eb10edce831ec9afc50d55dd8122ab791e49c89 100644
--- a/source/visualization/management/src/G4VisCommandsCamera.cc
+++ b/source/visualization/management/src/G4VisCommandsCamera.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisCommandsCamera.cc,v 1.7 2000/05/13 10:52:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisCommandsCameraMessengers.cc b/source/visualization/management/src/G4VisCommandsCameraMessengers.cc
deleted file mode 100644
index e1a5dfafdeae13c1ee1e7afc5043007d22e58a1b..0000000000000000000000000000000000000000
--- a/source/visualization/management/src/G4VisCommandsCameraMessengers.cc
+++ /dev/null
@@ -1,34 +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: G4VisCommandsCameraMessengers.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
-//
-// 
-// Messengers for /vis~/camera commands - John Allison  6th April 1998.
-
-#include "G4VisCommandsCameraMessengers.hh"
-
-#include "G4UIcommand.hh"
-
-G4VisCommandsCameraSetMessenger::G4VisCommandsCameraSetMessenger () {
-  fpCommand = new G4UIcommand ("/new_vis/camera/set", this);
-  fpCommand -> SetGuidance
-    ("Sets and updates view parameters of current view.");
-}
-
-G4VisCommandsCameraSetMessenger::~G4VisCommandsCameraSetMessenger () {
-  delete fpCommand;
-}
-
-G4String G4VisCommandsCameraSetMessenger::GetCurrentValue
-(G4UIcommand * command) {
-  return "";
-}
-
-void G4VisCommandsCameraSetMessenger::SetNewValue (G4UIcommand* command, G4String newValues) {
-}
diff --git a/source/visualization/management/src/G4VisCommandsCompound.cc b/source/visualization/management/src/G4VisCommandsCompound.cc
index ff81f9b2d5211c28ed23a5a4245bb49f0b74184f..5a2247b468b44ae2edd771e7f3a2f8ad21b3a1c8 100644
--- a/source/visualization/management/src/G4VisCommandsCompound.cc
+++ b/source/visualization/management/src/G4VisCommandsCompound.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsCompound.cc,v 1.6 2000/10/18 14:02:35 allison Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsCompound.cc,v 1.10 2001/02/23 15:43:26 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // Compound /vis/ commands - John Allison  15th May 2000
 
@@ -16,12 +16,95 @@
 #include "G4UImanager.hh"
 #include "G4UIcmdWithAString.hh"
 
+////////////// /vis/drawView ///////////////////////////////////////
+
+G4VisCommandDrawView::G4VisCommandDrawView() {
+  G4bool omitable;
+  fpCommand = new G4UIcommand("/vis/drawView", this);
+  fpCommand->SetGuidance
+    ("/vis/drawView [<theta-deg>] [<phi-deg>] [<pan-right>] [<pan-up>]"
+     " [<pan-unit>] [<zoom-factor>] [<dolly>] [<dolly-unit>]");
+  fpCommand->SetGuidance("Default: 0 0 0 0 cm 1 0 cm");
+  G4UIparameter* parameter;
+  parameter = new G4UIparameter("theta-deg", 'd', omitable = true);
+  parameter -> SetDefaultValue(0.);
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("phi-deg", 'd', omitable = true);
+  parameter -> SetDefaultValue(0.);
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("pan-right", 'd', omitable = true);
+  parameter -> SetDefaultValue(0.);
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("pan-up", 'd', omitable = true);
+  parameter -> SetDefaultValue(0.);
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("pan-unit", 's', omitable = true);
+  parameter -> SetDefaultValue("cm");
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("zoom-factor", 'd', omitable = true);
+  parameter -> SetDefaultValue(1.);
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("dolly", 'd', omitable = true);
+  parameter -> SetDefaultValue(0.);
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("dolly-unit", 's', omitable = true);
+  parameter -> SetDefaultValue("cm");
+  fpCommand -> SetParameter (parameter);
+}
+
+G4VisCommandDrawView::~G4VisCommandDrawView() {
+  delete fpCommand;
+}
+
+void G4VisCommandDrawView::SetNewValue
+(G4UIcommand* command, G4String newValue) {
+
+  G4VViewer* currentViewer = fpVisManager->GetCurrentViewer();
+  if (!currentViewer) {
+    G4cout << "G4VisCommandsDrawView::SetNewValue: no current viewer."
+           << G4endl;
+    return;
+  }
+
+  G4String thetaDeg;
+  G4String phiDeg;
+  G4String panRight;
+  G4String panUp;
+  G4String panUnit;
+  G4String zoomFactor;
+  G4String dolly;
+  G4String dollyUnit;
+  const char* t = newValue;
+  G4std::istrstream is((char*)t);
+  is >> thetaDeg >> phiDeg >> panRight >> panUp >> panUnit
+     >> zoomFactor >> dolly >> dollyUnit;
+  
+  G4UImanager* UImanager = G4UImanager::GetUIpointer();
+  G4int keepVerbose = UImanager->GetVerboseLevel();
+  UImanager->SetVerboseLevel(2);
+  G4ViewParameters vp = currentViewer->GetViewParameters();
+  G4bool keepAutoRefresh = vp.IsAutoRefresh();
+  vp.SetAutoRefresh(false);
+  currentViewer->SetViewParameters(vp);
+  UImanager->ApplyCommand
+    ("/vis/viewer/viewpointThetaPhi " + thetaDeg + " " + phiDeg + " deg");
+  UImanager->ApplyCommand
+    ("/vis/viewer/panTo " + panRight + " " + panUp + " " + panUnit);
+  UImanager->ApplyCommand
+    ("/vis/viewer/zoomTo " + zoomFactor);
+  vp = currentViewer->GetViewParameters();
+  vp.SetAutoRefresh(keepAutoRefresh);
+  currentViewer->SetViewParameters(vp);
+  UImanager->ApplyCommand
+    ("/vis/viewer/dollyTo " + dolly + " " + dollyUnit);
+  UImanager->SetVerboseLevel(keepVerbose);
+}
+
 ////////////// /vis/drawVolume ///////////////////////////////////////
 
 G4VisCommandDrawVolume::G4VisCommandDrawVolume() {
   G4bool omitable;
   fpCommand = new G4UIcmdWithAString("/vis/drawVolume", this);
-  fpCommand->AvailableForStates(Idle, GeomClosed);
   fpCommand->SetGuidance("/vis/drawVolume [<physical-volume-name>]");
   fpCommand->SetGuidance("Default: world volume");
   fpCommand->SetGuidance
@@ -52,19 +135,21 @@ void G4VisCommandDrawVolume::SetNewValue
 
 G4VisCommandOpen::G4VisCommandOpen() {
   G4bool omitable;
-  fpCommand = new G4UIcmdWithAString("/vis/open", this);
-  fpCommand->SetGuidance("/vis/open <graphics-system-name>");
+  fpCommand = new G4UIcommand("/vis/open", this);
+  fpCommand->SetGuidance("/vis/open [<graphics-system-name>] [<pixels>]");
   fpCommand->SetGuidance
     ("For this graphics system, creates a scene handler ready for drawing.");
   fpCommand->SetGuidance("The scene handler becomes current.");
   fpCommand->SetGuidance("The scene handler name is auto-generated.");
-  fpCommand->SetParameterName("graphics-system-name", omitable = false);
-  const G4GraphicsSystemList& gslist =
+  fpCommand->SetGuidance("The 2nd parameter is the window size hint.");
+  G4UIparameter* parameter;
+  parameter = new G4UIparameter("graphics-system-name", 's', omitable = false);
+   const G4GraphicsSystemList& gslist =
     fpVisManager->GetAvailableGraphicsSystems();
   G4String candidates;
-  for (int igslist = 0; igslist < gslist.entries(); igslist++) {
-    const G4String& name = gslist(igslist)->GetName();
-    const G4String& nickname = gslist(igslist)->GetNickname();
+  for (int igslist = 0; igslist < gslist.size(); igslist++) {
+    const G4String& name = gslist[igslist]->GetName();
+    const G4String& nickname = gslist[igslist]->GetNickname();
     if (nickname.isNull()) {
       candidates += name;
     }
@@ -74,7 +159,11 @@ G4VisCommandOpen::G4VisCommandOpen() {
     candidates += " ";
   }
   candidates = candidates.strip();
-  fpCommand->SetCandidates(candidates);
+  parameter->SetParameterCandidates(candidates);
+  fpCommand->SetParameter(parameter);
+  parameter = new G4UIparameter("pixels", 'i', omitable = true);
+  parameter->SetDefaultValue(600);
+  fpCommand->SetParameter(parameter);
 }
 
 G4VisCommandOpen::~G4VisCommandOpen() {
@@ -82,11 +171,15 @@ G4VisCommandOpen::~G4VisCommandOpen() {
 }
 
 void G4VisCommandOpen::SetNewValue (G4UIcommand* command, G4String newValue) {
+  G4String systemName, windowSizeHint;
+  const char* t = newValue;
+  G4std::istrstream is((char*)t);
+  is >> systemName >> windowSizeHint;
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
   G4int keepVerbose = UImanager->GetVerboseLevel();
   UImanager->SetVerboseLevel(2);
-  UImanager->ApplyCommand("/vis/sceneHandler/create " + newValue);
-  UImanager->ApplyCommand("/vis/viewer/create");
+  UImanager->ApplyCommand("/vis/sceneHandler/create " + systemName);
+  UImanager->ApplyCommand("/vis/viewer/create ! ! " + windowSizeHint);
   UImanager->SetVerboseLevel(keepVerbose);
 }
 
@@ -95,7 +188,6 @@ void G4VisCommandOpen::SetNewValue (G4UIcommand* command, G4String newValue) {
 G4VisCommandSpecify::G4VisCommandSpecify() {
   G4bool omitable;
   fpCommand = new G4UIcmdWithAString("/vis/specify", this);
-  fpCommand->AvailableForStates(Idle, GeomClosed);
   fpCommand->SetGuidance("/vis/specify <logical-volume-name>");
   fpCommand->SetGuidance
     ("Creates a scene consisting of this logical volume and asks the"
diff --git a/source/visualization/management/src/G4VisCommandsScene.cc b/source/visualization/management/src/G4VisCommandsScene.cc
index 18c4bc03a8c2114871c0655c5cf6c7518081382d..d3e4bbbf1ee7b93c8091176a9c67a5a5094a5706 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.15 2000/05/29 09:21:40 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsScene.cc,v 1.16 2001/02/23 15:43:27 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -36,7 +36,7 @@ G4String G4VVisCommandScene::CurrentSceneName () {
 void G4VVisCommandScene::UpdateCandidateLists () {
 
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   G4String nameList;
   for (iScene = 0; iScene < nScenes; iScene++) {
     nameList += sceneList [iScene] -> GetName () + " ";
@@ -51,7 +51,7 @@ void G4VVisCommandScene::UpdateCandidateLists () {
 void G4VVisCommandScene::UpdateVisManagerScene
 (const G4String& sceneName) {
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   for (iScene = 0; iScene < nScenes; iScene++) {
     if (sceneList [iScene] -> GetName () == sceneName) break;
   }
@@ -101,7 +101,7 @@ void G4VisCommandSceneCreate::SetNewValue (G4UIcommand* command,
   if (newName == nextName) fId++;
 
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   for (iScene = 0; iScene < nScenes; iScene++) {
     if (sceneList [iScene] -> GetName () == newName) break;
   }
@@ -110,7 +110,7 @@ void G4VisCommandSceneCreate::SetNewValue (G4UIcommand* command,
   }
   else {
 
-    sceneList.append (new G4Scene (newName));
+    sceneList.push_back (new G4Scene (newName));
     // Adds empty scene data object to list.
 
     UpdateVisManagerScene (newName);
@@ -149,7 +149,7 @@ void G4VisCommandSceneEdit::SetNewValue (G4UIcommand* command,
   is >> sceneName;
 
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   G4Scene* pScene;
   for (iScene = 0; iScene < nScenes; iScene++) {
     pScene = sceneList [iScene];
@@ -216,7 +216,7 @@ void G4VisCommandSceneList::SetNewValue (G4UIcommand* command,
   is >> name >> verbosity;
 
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   G4bool found = false;
   for (iScene = 0; iScene < nScenes; iScene++) {
     G4Scene* pScene = sceneList [iScene];
@@ -229,7 +229,7 @@ void G4VisCommandSceneList::SetNewValue (G4UIcommand* command,
     if (verbosity == 1) {
       G4int i;
       G4cout << "\n  Run-duration models:";
-      G4int nRunModels = pScene -> GetRunDurationModelList ().entries ();
+      G4int nRunModels = pScene -> GetRunDurationModelList ().size ();
       if (nRunModels == 0) {
 	G4cout << " none.";
       }
@@ -238,7 +238,7 @@ void G4VisCommandSceneList::SetNewValue (G4UIcommand* command,
 	G4cout << "\n    " << pModel -> GetGlobalDescription ();
       }
       G4cout << "\n  End-of-event models:";
-      G4int nEOEModels = pScene -> GetEndOfEventModelList ().entries ();
+      G4int nEOEModels = pScene -> GetEndOfEventModelList ().size ();
       if (nEOEModels == 0) {
 	G4cout << " none.";
       }
@@ -295,7 +295,7 @@ void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand* command,
     fpVisManager -> SetAvailableSceneHandlers ();
 
   // Check scene name.
-  const G4int nScenes = sceneList.entries ();
+  const G4int nScenes = sceneList.size ();
   G4int iScene;
   for (iScene = 0; iScene < nScenes; iScene++) {
     G4Scene* scene = sceneList [iScene];
@@ -314,7 +314,7 @@ void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand* command,
   // For each scene handler, if it contains the scene, clear and
   // rebuild the graphical database, then for each viewer set (make
   // current), clear, (re)draw, and show.
-  const G4int nSceneHandlers = sceneHandlerList.entries ();
+  const G4int nSceneHandlers = sceneHandlerList.size ();
   for (G4int iSH = 0; iSH < nSceneHandlers; iSH++) {
     G4VSceneHandler* aSceneHandler = sceneHandlerList [iSH];
     G4Scene* aScene = aSceneHandler -> GetScene ();
@@ -324,7 +324,7 @@ void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand* command,
 	aSceneHandler -> ClearStore ();
 	aSceneHandler -> ClearTransientStore ();
 	G4ViewerList& viewerList = aSceneHandler -> SetViewerList ();
-	const G4int nViewers = viewerList.entries ();
+	const G4int nViewers = viewerList.size ();
 	for (G4int iV = 0; iV < nViewers; iV++) {
 	  G4VViewer* aViewer = viewerList [iV];
 	  aViewer -> ClearView ();
@@ -378,16 +378,16 @@ void G4VisCommandSceneRemove::SetNewValue (G4UIcommand* command,
   const G4String& currentSceneName =
     fpVisManager -> GetCurrentScene () -> GetName ();
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  G4int iScene, nScenes = sceneList.entries ();
-  for (iScene = 0; iScene < nScenes; iScene++) {
-    if (sceneList [iScene] -> GetName () == removeName) break;
+  G4SceneListIterator iScene;
+  for (iScene = sceneList.begin(); iScene != sceneList.end(); ++iScene) {
+    if ((*iScene) -> GetName () == removeName) break;
   }
-  if (iScene < nScenes) {
-    delete sceneList [iScene];
-    sceneList.removeAt (iScene);
+  if (iScene != sceneList.end()) {
+    delete *iScene;
+    sceneList.erase (iScene);
     G4cout << "Scene \"" << removeName << "\" removed." << G4endl;
     UpdateCandidateLists ();
-    if (sceneList.isEmpty ()) {
+    if (sceneList.empty ()) {
       UpdateVisManagerScene ();
       G4cout << "No scenes left.  Please create a new one." << G4endl;
     }
@@ -437,7 +437,7 @@ void G4VisCommandSceneSelect::SetNewValue (G4UIcommand* command,
 					   G4String newValue) {
   G4String& selectName = newValue;
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   for (iScene = 0; iScene < nScenes; iScene++) {
     if (sceneList [iScene] -> GetName () == selectName) break;
   }
diff --git a/source/visualization/management/src/G4VisCommandsSceneAdd.cc b/source/visualization/management/src/G4VisCommandsSceneAdd.cc
index 1760119569c43938c5f6da4486492eb2f18b87b6..90d34690ad78897a919eaf86fe9073a5fa320198 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.11 2000/05/19 09:17:56 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsSceneAdd.cc,v 1.14 2001/02/23 15:43:27 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -38,7 +38,6 @@
 G4VisCommandSceneAddGhosts::G4VisCommandSceneAddGhosts () {
   G4bool omitable;
   fpCommand = new G4UIcmdWithAString ("/vis/scene/add/ghosts", this);
-  fpCommand -> AvailableForStates (Idle, GeomClosed);
   fpCommand -> SetGuidance
     ("/vis/scene/add/ghosts [<particle-name>]");
   fpCommand -> SetGuidance
@@ -63,7 +62,7 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
   const G4String& currentSceneName = pCurrentScene -> GetName ();
 
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  if (sceneList.isEmpty ()) {
+  if (sceneList.empty ()) {
     G4cout << "No scenes - please create one before adding anything."
 	   << G4endl;
     return;
@@ -122,7 +121,6 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
 
 G4VisCommandSceneAddHits::G4VisCommandSceneAddHits () {
   fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/add/hits", this);
-  fpCommand -> AvailableForStates (Idle, GeomClosed);
   fpCommand -> SetGuidance
     ("Adds hits to current scene.");
   fpCommand -> SetGuidance
@@ -141,7 +139,7 @@ G4String G4VisCommandSceneAddHits::GetCurrentValue (G4UIcommand* command) {
 void G4VisCommandSceneAddHits::SetNewValue (G4UIcommand* command,
 						G4String newValue) {
   G4SceneList& list = fpVisManager -> SetSceneList ();
-  if (list.isEmpty ()) {
+  if (list.empty ()) {
     G4cout << "No scenes - please create one before adding anything."
 	   << G4endl;
     return;
@@ -161,7 +159,6 @@ void G4VisCommandSceneAddHits::SetNewValue (G4UIcommand* command,
 G4VisCommandSceneAddLogicalVolume::G4VisCommandSceneAddLogicalVolume () {
   G4bool omitable;
   fpCommand = new G4UIcommand ("/vis/scene/add/logicalVolume", this);
-  fpCommand -> AvailableForStates (Idle, GeomClosed);
   fpCommand -> SetGuidance
     ("/vis/scene/add/logicalVolume <logical-volume-name>"
      " [<depth-of-descending>]");
@@ -191,7 +188,7 @@ G4String G4VisCommandSceneAddLogicalVolume::GetCurrentValue (G4UIcommand*) {
 void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand* command,
 						     G4String newValue) {
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  if (sceneList.isEmpty ()) {
+  if (sceneList.empty ()) {
     G4cout << "No scenes - please create one before adding anything."
 	   << G4endl;
     return;
@@ -237,7 +234,6 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand* command,
 G4VisCommandSceneAddTrajectories::G4VisCommandSceneAddTrajectories () {
   fpCommand = new G4UIcmdWithoutParameter
     ("/vis/scene/add/trajectories", this);
-  fpCommand -> AvailableForStates (Idle, GeomClosed);
   fpCommand -> SetGuidance
     ("Adds trajectories to current scene.");
   fpCommand -> SetGuidance
@@ -256,7 +252,7 @@ G4String G4VisCommandSceneAddTrajectories::GetCurrentValue (G4UIcommand* command
 void G4VisCommandSceneAddTrajectories::SetNewValue (G4UIcommand* command,
 					      G4String newValue) {
   G4SceneList& list = fpVisManager -> SetSceneList ();
-  if (list.isEmpty ()) {
+  if (list.empty ()) {
     G4cout << "No scenes - please create one before adding anything."
 	   << G4endl;
     return;
@@ -276,10 +272,10 @@ void G4VisCommandSceneAddTrajectories::SetNewValue (G4UIcommand* command,
 G4VisCommandSceneAddVolume::G4VisCommandSceneAddVolume () {
   G4bool omitable;
   fpCommand = new G4UIcommand ("/vis/scene/add/volume", this);
-  fpCommand -> AvailableForStates (Idle, GeomClosed);
   fpCommand -> SetGuidance
     ("/vis/scene/add/volume [<physical-volume-name>] [<copy-no>] [<depth-of-descending>]");
   fpCommand -> SetGuidance ("Adds a physical volume to the current scene.");
+  fpCommand -> SetGuidance ("Note: adds first occurence only.");
   fpCommand -> SetGuidance
     ("1st parameter: volume name (default \"world\").");
   //  fpCommand -> SetGuidance  // Not implemented - should be in geom?
@@ -312,7 +308,7 @@ G4String G4VisCommandSceneAddVolume::GetCurrentValue (G4UIcommand* command) {
 void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
 					      G4String newValue) {
   G4SceneList& sceneList = fpVisManager -> SetSceneList ();
-  if (sceneList.isEmpty ()) {
+  if (sceneList.empty ()) {
     G4cout << "No scenes - please create one before adding anything."
 	   << G4endl;
     return;
@@ -357,14 +353,13 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
     // OK, what have we got...?
     foundVolume = searchScene.GetFoundVolume ();
     foundDepth = searchScene.GetFoundDepth ();
-    //const G4Transform3D&
-    //  transformation = searchScene.GetFoundTransformation ();
-    // Note: a physical volume carries its own transformation and
-    // does not need an additional model transformation.
+    const G4Transform3D&
+      transformation = searchScene.GetFoundTransformation ();
 
     if (foundVolume) {
       model = new G4PhysicalVolumeModel (foundVolume,
-					 requestedDepthOfDescent);
+					 requestedDepthOfDescent,
+					 transformation);
     }
     else {
       G4cout << "Volume \"" << name << "\", copy no. " << copyNo
diff --git a/source/visualization/management/src/G4VisCommandsSceneHandler.cc b/source/visualization/management/src/G4VisCommandsSceneHandler.cc
index f059066e664db8c75bebcbc511e4de57eadc3199..34060e753c5fa1fb55050786a15333333449124a 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.13 2000/05/18 13:45:45 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsSceneHandler.cc,v 1.15 2001/02/23 15:43:28 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/sceneHandler commands - John Allison  10th October 1998
 
@@ -31,7 +31,7 @@ void G4VVisCommandSceneHandler::UpdateCandidateLists () {
     fpVisManager -> GetAvailableSceneHandlers ();
 
   G4String sceneHandlerNameList;
-  for (int iScene = 0; iScene < list.entries (); iScene++) {
+  for (int iScene = 0; iScene < list.size (); iScene++) {
     G4VSceneHandler* sceneHandler = list [iScene];
     sceneHandlerNameList += sceneHandler -> GetName () + " ";
   }
@@ -96,14 +96,14 @@ void G4VisCommandSceneHandlerAttach::SetNewValue (G4UIcommand* command,
   G4SceneList& sceneList =
     fpVisManager -> SetSceneList ();
 
-  if (sceneList.isEmpty ()) {
+  if (sceneList.empty ()) {
     G4cout <<
       "No valid scenes available yet.  Please create one."
 	   << G4endl;
     return;
   }
 
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   for (iScene = 0; iScene < nScenes; iScene++) {
     if (sceneList [iScene] -> GetName () == sceneName) break;
   }
@@ -130,7 +130,7 @@ G4VisCommandSceneHandlerCreate::G4VisCommandSceneHandlerCreate (): fId (0) {
   fpCommand -> SetGuidance
     ("/vis/sceneHandler/create");
   fpCommand -> SetGuidance
-    ("     <graphics-system-name> [<scene-handler-name>]");
+    ("     [<graphics-system-name>] [<scene-handler-name>]");
   fpCommand -> SetGuidance
     ("Creates an scene handler for a specific graphics system.");
   fpCommand -> SetGuidance
@@ -145,13 +145,14 @@ G4VisCommandSceneHandlerCreate::G4VisCommandSceneHandlerCreate (): fId (0) {
     ("This scene handler becomes current.");
   G4UIparameter* parameter;
   parameter = new G4UIparameter ("graphics-system-name",
-				 's', omitable = false);
+				 's', omitable = true);
+  parameter -> SetDefaultValue("error");
   const G4GraphicsSystemList& gslist =
     fpVisManager -> GetAvailableGraphicsSystems ();
   G4String candidates;
-  for (int igslist = 0; igslist < gslist.entries (); igslist++) {
-    const G4String& name = gslist (igslist) -> GetName ();
-    const G4String& nickname = gslist (igslist) -> GetNickname ();
+  for (int igslist = 0; igslist < gslist.size (); igslist++) {
+    const G4String& name = gslist [igslist] -> GetName ();
+    const G4String& nickname = gslist [igslist] -> GetNickname ();
     if (nickname.isNull ()) {
       candidates += name;
     }
@@ -192,7 +193,7 @@ G4String G4VisCommandSceneHandlerCreate::GetCurrentValue
   else {
     const G4GraphicsSystemList& gslist =
       fpVisManager -> GetAvailableGraphicsSystems ();
-    if (gslist.entries ()) {
+    if (gslist.size ()) {
       graphicsSystemName = gslist [0] -> GetName ();
     }
     else {
@@ -211,7 +212,7 @@ void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
 
   const G4GraphicsSystemList& gsl =
     fpVisManager -> GetAvailableGraphicsSystems ();
-  int nSystems = gsl.entries ();
+  int nSystems = gsl.size ();
   if (nSystems <= 0) {
     G4cout << "G4VisCommandSceneHandlerCreate::SetNewValue:"
       " no graphics systems available."
@@ -254,7 +255,7 @@ void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
 
   const G4SceneHandlerList& list = fpVisManager -> GetAvailableSceneHandlers ();
   int iScene;
-  for (iScene = 0; iScene < list.entries (); iScene++) {
+  for (iScene = 0; iScene < list.size (); iScene++) {
     G4VSceneHandler* sceneHandler = list [iScene];
     if (sceneHandler -> GetName () == newName) {
       G4cout << "Scene handler \"" << newName << "\" already exists." << G4endl;
@@ -317,7 +318,7 @@ void G4VisCommandSceneHandlerList::SetNewValue (G4UIcommand* command,
 
   const G4SceneHandlerList& list = fpVisManager -> GetAvailableSceneHandlers ();
   G4bool found = false;
-  for (int iSH = 0; iSH < list.entries (); iSH++) {
+  for (int iSH = 0; iSH < list.size (); iSH++) {
     if (name != "all") {
       if (name != list [iSH] -> GetName ()) continue;
     }
@@ -379,12 +380,12 @@ void G4VisCommandSceneHandlerRemove::SetNewValue (G4UIcommand* command,
   }
 
   G4SceneHandlerList& list = fpVisManager -> SetAvailableSceneHandlers ();
-  G4int iSH;
-  for (iSH = 0; iSH < list.entries (); iSH++) {
-    if (list [iSH] -> GetName () == removeName) break;
+  G4SceneHandlerListIterator iSH;
+  for (iSH = list.begin(); iSH != list.end(); ++iSH) {
+    if ((*iSH) -> GetName () == removeName) break;
   }
 
-  if (iSH >= list.entries ()) {
+  if (iSH = list.end()) {
     G4cout << "Scene handler \"" << removeName
 	   << "\" not found - \"/vis/sceneHandler/list\" to see possibilities."
 	   << G4endl;
@@ -396,7 +397,7 @@ void G4VisCommandSceneHandlerRemove::SetNewValue (G4UIcommand* command,
     fpVisManager -> DeleteCurrentSceneHandler ();
   }
   else {
-    list.remove (list [iSH]);
+    list.erase (iSH);
     G4cout << "Current scene handler unchanged." << G4endl;
   }
 
@@ -440,10 +441,10 @@ void G4VisCommandSceneHandlerSelect::SetNewValue (G4UIcommand* command,
   const G4SceneHandlerList& list = fpVisManager -> GetAvailableSceneHandlers ();
   G4cout << "Scene handler \"" << selectName << "\"";
   G4int iSH;
-  for (iSH = 0; iSH < list.entries (); iSH++) {
+  for (iSH = 0; iSH < list.size (); iSH++) {
     if (list [iSH] -> GetName () == selectName) break;
   }
-  if (iSH < list.entries ()) {
+  if (iSH < list.size ()) {
     if (fpVisManager -> GetCurrentSceneHandler () -> GetName () == selectName) {
       G4cout << " already selected." << G4endl;
     }
diff --git a/source/visualization/management/src/G4VisCommandsSceneInclude.cc b/source/visualization/management/src/G4VisCommandsSceneInclude.cc
index 950eb0953887970d8e180f8824c670671723e25a..9deda3eae9e7c952dada4aa582d3ba722cea0230 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.5 2000/05/19 09:18:01 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsSceneInclude.cc,v 1.7 2001/01/18 12:20:00 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -21,14 +21,8 @@
 
 G4VisCommandSceneIncludeHits::G4VisCommandSceneIncludeHits () {
   fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/include/hits", this);
-  fpCommand -> AvailableForStates (Idle, GeomClosed);
   fpCommand -> SetGuidance
-    ("Deprecated command - please use /vis/scene/add/hits.");
-  fpCommand -> SetGuidance
-    ("Includes hits in current scene.");
-  fpCommand -> SetGuidance
-    ("Hits are drawn at end of event when the scene in which"
-     " they are included is current.");
+    ("Replaced by /vis/scene/add/hits.");
 }
 
 G4VisCommandSceneIncludeHits::~G4VisCommandSceneIncludeHits () {
@@ -42,23 +36,8 @@ G4String G4VisCommandSceneIncludeHits::GetCurrentValue (G4UIcommand* command) {
 void G4VisCommandSceneIncludeHits::SetNewValue (G4UIcommand* command,
 						G4String newValue) {
   G4cout <<
-    "/vis/scene/include/hits is a deprecated command - please use"
-    " /vis/scene/add/hits."
-	 << G4endl;
-
-  G4SceneList& list = fpVisManager -> SetSceneList ();
-  if (list.isEmpty ()) {
-    G4cout << "No scenes - please create one before adding anything."
-	   << G4endl;
-    return;
-  }
-
-  G4HitsModel* model = new G4HitsModel;
-  G4Scene* pCurrentScene = fpVisManager -> GetCurrentScene ();
-  const G4String& currentSceneName = pCurrentScene -> GetName ();
-  pCurrentScene -> AddEndOfEventModel (model);
-  G4cout << "Hits will be drawn in scene \""
-	 << currentSceneName << "\"."
+    " **** /vis/scene/include/hits has been replaced - \n"
+    "  please use the equivalent command /vis/scene/add/hits."
 	 << G4endl;
 }
 
@@ -68,13 +47,7 @@ G4VisCommandSceneIncludeTrajectories::G4VisCommandSceneIncludeTrajectories () {
   fpCommand = new G4UIcmdWithoutParameter
     ("/vis/scene/include/trajectories", this);
   fpCommand -> SetGuidance
-    ("Deprecated command - please use /vis/scene/add/trajectories.");
-  fpCommand -> AvailableForStates (Idle, GeomClosed);
-  fpCommand -> SetGuidance
-    ("Includes trajectories in current scene.");
-  fpCommand -> SetGuidance
-    ("Trajectories are drawn at end of event when the scene in which"
-     " they are included is current.");
+    ("Replaced by /vis/scene/add/trajectories.");
 }
 
 G4VisCommandSceneIncludeTrajectories::~G4VisCommandSceneIncludeTrajectories () {
@@ -88,22 +61,7 @@ G4String G4VisCommandSceneIncludeTrajectories::GetCurrentValue (G4UIcommand* com
 void G4VisCommandSceneIncludeTrajectories::SetNewValue (G4UIcommand* command,
 					      G4String newValue) {
   G4cout <<
-    "/vis/scene/include/trajectories is a deprecated command - please use"
-    "\n  /vis/scene/add/trajectories."
-	 << G4endl;
-
-  G4SceneList& list = fpVisManager -> SetSceneList ();
-  if (list.isEmpty ()) {
-    G4cout << "No scenes - please create one before adding anything."
-	   << G4endl;
-    return;
-  }
-
-  G4TrajectoriesModel* model = new G4TrajectoriesModel;
-  G4Scene* pCurrentScene = fpVisManager -> GetCurrentScene ();
-  const G4String& currentSceneName = pCurrentScene -> GetName ();
-  pCurrentScene -> AddEndOfEventModel (model);
-  G4cout << "Trajectories will be drawn in scene \""
-	 << currentSceneName << "\"."
+    " **** /vis/scene/include/trajectories has been replaced - \n"
+    "  please use the equivalent command /vis/scene/add/trajectories."
 	 << G4endl;
 }
diff --git a/source/visualization/management/src/G4VisCommandsViewer.cc b/source/visualization/management/src/G4VisCommandsViewer.cc
index b9d3ea5f96dfc57298ccd9513a0547b956802e15..cd994f8d026c4482fc26fccec60c0a695ba39d7c 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.19 2000/06/07 08:43:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsViewer.cc,v 1.25 2001/04/02 10:08:46 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/viewer commands - John Allison  25th October 1998
 
@@ -15,8 +15,11 @@
 #include "G4VisManager.hh"
 #include "G4GraphicsSystemList.hh"
 #include "G4VisCommandsScene.hh"
+#include "G4UImanager.hh"
 #include "G4UIcommand.hh"
 #include "G4UIcmdWithAString.hh"
+#include "G4UIcmdWithADouble.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
 #include "G4UnitsTable.hh"
 #include "G4ios.hh"
 #include "g4std/strstream"
@@ -25,17 +28,30 @@ G4VVisCommandViewer::G4VVisCommandViewer () {}
 
 G4VVisCommandViewer::~G4VVisCommandViewer () {}
 
+void G4VVisCommandViewer::SetViewParameters
+(G4VViewer* viewer, const G4ViewParameters& viewParams) {
+  viewer->SetViewParameters(viewParams);
+  if (viewParams.IsAutoRefresh()) {
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/refresh");
+  }
+  else {
+    G4cout << "Issue /vis/viewer/refresh to see effect." << G4endl;
+  }
+  // For now...
+  fpVisManager->SetCurrentViewParameters() = viewParams;
+}
+
 void G4VVisCommandViewer::UpdateCandidateLists () {
 
   const G4SceneHandlerList& sceneHandlerList =
     fpVisManager -> GetAvailableSceneHandlers ();
-  G4int nHandlers = sceneHandlerList.entries ();
+  G4int nHandlers = sceneHandlerList.size ();
 
   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++) {
+    for (int iViewer = 0; iViewer < viewerList.size (); iViewer++) {
       viewerNameList += viewerList [iViewer] -> GetShortName () + " ";
     }
   }
@@ -46,13 +62,62 @@ void G4VVisCommandViewer::UpdateCandidateLists () {
   }
 }
 
+////////////// /vis/viewer/clear ///////////////////////////////////////
+
+G4VisCommandViewerClear::G4VisCommandViewerClear () {
+  G4bool omitable, currentAsDefault;
+  fpCommand = new G4UIcmdWithAString ("/vis/viewer/clear", this);
+  fpCommand -> SetGuidance ("/vis/viewer/clear [<viewer-name>]");
+  fpCommand -> SetGuidance ("Clears 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);
+}
+
+G4VisCommandViewerClear::~G4VisCommandViewerClear () {
+  delete fpCommand;
+}
+
+G4String G4VisCommandViewerClear::GetCurrentValue (G4UIcommand* command) {
+  G4VViewer* viewer = fpVisManager -> GetCurrentViewer ();
+  if (viewer) {
+    return viewer -> GetName ();
+  }
+  else {
+    return "none";
+  }
+}
+
+void G4VisCommandViewerClear::SetNewValue (G4UIcommand* command,
+					    G4String newValue) {
+  G4String& clearName = newValue;
+  G4VViewer* viewer = fpVisManager -> GetViewer (clearName);
+  if (!viewer) {
+    G4cout << "Viewer \"" << clearName
+	   << "\" not found - \"/vis/viewer/list\" to see possibilities."
+	   << G4endl;
+    return;
+  }
+
+  viewer->ClearView();
+  if (fpVisManager->GetVerboseLevel() > 0) {
+    G4cout << "Viewer \"" << clearName << "\" cleared." << G4endl;
+  }
+
+}
+
 ////////////// /vis/viewer/create ///////////////////////////////////////
 
 G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) {
   G4bool omitable;
   fpCommand = new G4UIcommand ("/vis/viewer/create", this);
   fpCommand -> SetGuidance
-    ("/vis/viewer/create  [<scene-handler>] [<viewer-name>]");
+    ("/vis/viewer/create  [<scene-handler>] [<viewer-name>] [<pixels>]");
   fpCommand -> SetGuidance
     ("Creates an viewer for a specific scene handler.");
   fpCommand -> SetGuidance
@@ -63,6 +128,8 @@ G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) {
     ("to the name for identification - only the characters up to the first");
   fpCommand -> SetGuidance
     ("blank are used for removing, selecting, etc.)");
+  fpCommand -> SetGuidance
+    ("The 3rd parameter is a window size hint.");
   fpCommand -> SetGuidance ("This scene handler and viewer become current.");
   G4UIparameter* parameter;
   parameter = new G4UIparameter ("scene-handler", 's', omitable = true);
@@ -71,6 +138,9 @@ G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) {
   parameter = new G4UIparameter ("viewer-name", 's', omitable = true);
   parameter -> SetCurrentAsDefault (true);
   fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter ("pixels", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommand -> SetParameter (parameter);
   viewerNameCommands.push_back (fpCommand);
 }
 
@@ -109,17 +179,7 @@ G4String G4VisCommandViewerCreate::GetCurrentValue (G4UIcommand* command) {
   currentValue += NextName ();
   currentValue += '"';
 
-  /* Replaces currentValue += NextName ();
-  // Now need to handle the possibility that NextName contains
-  // embedded blanks.
-  currentValue += '"';
-  const int charLength = 100;
-  char nextName [charLength];
-  strncpy (nextName, NextName (), charLength);
-  for (int i = 0; nextName[i]; i++) {
-    currentValue += nextName[i];
-  }
-  */
+  currentValue += " 600";  // Default number of pixels for window size hint.
 
   return currentValue;
 }
@@ -127,18 +187,30 @@ G4String G4VisCommandViewerCreate::GetCurrentValue (G4UIcommand* command) {
 void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
 					   G4String newValue) {
   G4String sceneHandlerName, newName;
+  G4int windowSizeHint;
   G4std::istrstream is ((char*)newValue.data());
   is >> sceneHandlerName;
+
   // Now need to handle the possibility that the second string
-  // contains embedded blanks within quotation marks.
+  // contains embedded blanks within quotation marks...
   char c;
-  while (is.get (c)) newName += c;
+  while (is.get(c) && c == ' ');
+  if (c == '"') {
+    while (is.get(c) && c != '"') newName += c;
+  }
+  else {
+    newName += c;
+    while (is.get(c) && c != ' ') newName += c;
+  }
   newName = newName.strip (G4String::both, ' ');
   newName = newName.strip (G4String::both, '"');
 
+  // Now get number of pixels...
+  is >> windowSizeHint;
+
   const G4SceneHandlerList& sceneHandlerList =
     fpVisManager -> GetAvailableSceneHandlers ();
-  G4int nHandlers = sceneHandlerList.entries ();
+  G4int nHandlers = sceneHandlerList.size ();
   if (nHandlers <= 0) {
     G4cout << "G4VisCommandViewerCreate::SetNewValue: no scene handlers."
       "\n  Create a scene handler with \"/vis/sceneHandler/create\""
@@ -178,7 +250,7 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
   for (iHandler = 0; iHandler < nHandlers; iHandler++) {
     G4VSceneHandler* sceneHandler = sceneHandlerList [iHandler];
     const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
-    for (int iViewer = 0; iViewer < viewerList.entries (); iViewer++) {
+    for (int iViewer = 0; iViewer < viewerList.size (); iViewer++) {
       if (viewerList [iViewer] -> GetShortName () == newShortName ) {
 	G4cout << "Viewer \"" << newShortName << "\" already exists."
 	       << G4endl;
@@ -187,6 +259,12 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
     }
   }
 
+  fpVisManager->SetCurrentViewParameters().SetWindowSizeHint
+    (windowSizeHint, windowSizeHint);
+  // Currently the viewer does not pick up the above.  So a viewer
+  // picks up a default set of view parameters adn thus, the default
+  // window size for the moment.
+
   // Create viewer.
   fpVisManager -> CreateViewer (newName);
   if (fpVisManager -> GetCurrentViewer () -> GetName () == newName) {
@@ -195,6 +273,171 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
   }
 }
 
+////////////// /vis/viewer/dolly and dollyTo ////////////////////////////
+
+G4VisCommandViewerDolly::G4VisCommandViewerDolly ():
+  fDollyIncrement  (0.),
+  fDollyTo (0.)
+{
+  G4bool omitable, currentAsDefault;
+
+  fpCommandDolly = new G4UIcmdWithADoubleAndUnit
+    ("/vis/viewer/dolly", this);
+  fpCommandDolly -> SetGuidance
+    ("/vis/viewer/dolly [<increment>] [<unit>]");
+  fpCommandDolly -> SetGuidance
+    ("Moves the camera incrementally in by this distance.");
+  fpCommandDolly -> SetParameterName("increment",
+				     omitable=true,
+				     currentAsDefault=true);
+  fpCommandDolly -> SetDefaultUnit("m");
+
+  fpCommandDollyTo = new G4UIcmdWithADoubleAndUnit
+    ("/vis/viewer/dollyTo", this);
+  fpCommandDollyTo -> SetGuidance
+    ("/vis/viewer/dollyTo [<distance>] [<unit>]");
+  fpCommandDollyTo -> SetGuidance
+    ("Moves the camera in this distance relative to standard target point.");
+  fpCommandDollyTo -> SetParameterName("distance",
+				       omitable=true,
+				       currentAsDefault=true);
+  fpCommandDollyTo -> SetDefaultUnit("m");
+}
+
+G4VisCommandViewerDolly::~G4VisCommandViewerDolly () {
+  delete fpCommandDolly;
+  delete fpCommandDollyTo;
+}
+
+G4String G4VisCommandViewerDolly::GetCurrentValue (G4UIcommand* command) {
+  G4String currentValue;
+  if (command == fpCommandDolly) {
+    currentValue = fpCommandDolly->ConvertToString(fDollyIncrement, "m");
+  }
+  else if (command == fpCommandDollyTo) {
+    currentValue = fpCommandDollyTo->ConvertToString(fDollyTo, "m");
+  }
+  return currentValue;
+}
+
+void G4VisCommandViewerDolly::SetNewValue (G4UIcommand* command,
+					   G4String newValue) {
+
+  G4VViewer* currentViewer = fpVisManager->GetCurrentViewer();
+  if (!currentViewer) {
+    G4cout << "G4VisCommandsViewerDolly::SetNewValue: no current viewer."
+           << G4endl;
+    return;
+  }
+
+  G4ViewParameters vp = currentViewer->GetViewParameters();
+
+  if (command == fpCommandDolly) {
+    fDollyIncrement = fpCommandDolly->GetNewDoubleValue(newValue);
+    vp.IncrementDolly(fDollyIncrement);
+  }
+  else if (command == fpCommandDollyTo) {
+    fDollyTo = fpCommandDolly->GetNewDoubleValue(newValue);
+    vp.SetDolly(fDollyTo);
+  }
+
+  if (fpVisManager->GetVerboseLevel() > 0) {
+    G4cout << "Dolly distance changed to " << vp.GetDolly() << G4endl;
+  }
+
+  SetViewParameters(currentViewer, vp);
+}
+
+//////// /vis/viewer/lightsThetaPhi and lightsVector /////////////
+
+G4VisCommandViewerLights::G4VisCommandViewerLights ():
+  fLightsVector (G4ThreeVector(0.,0.,1.))
+{
+  G4bool omitable;
+
+  fpCommandLightsThetaPhi = new G4UIcommand
+    ("/vis/viewer/lightsThetaPhi", this);
+  fpCommandLightsThetaPhi -> SetGuidance
+    ("/vis/viewer/lightsThetaPhi  [<theta>] [<phi>] [deg|rad]");
+  fpCommandLightsThetaPhi -> SetGuidance
+    ("Set direction from target to lights.");
+  G4UIparameter* parameter;
+  parameter = new G4UIparameter("theta", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandLightsThetaPhi -> SetParameter (parameter);
+  parameter = new G4UIparameter("phi", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandLightsThetaPhi -> SetParameter (parameter);
+  parameter = new G4UIparameter ("unit", 's', omitable = true);
+  parameter -> SetDefaultValue ("deg");
+  fpCommandLightsThetaPhi -> SetParameter (parameter);
+
+  fpCommandLightsVector = new G4UIcommand
+    ("/vis/viewer/lightsVector", this);
+  fpCommandLightsVector -> SetGuidance
+    ("/vis/viewer/lightsVector  [<x>] [<y>] [<z>]");
+  fpCommandLightsVector -> SetGuidance
+    ("Set direction from target to lights.");
+  parameter = new G4UIparameter("x", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandLightsVector -> SetParameter (parameter);
+  parameter = new G4UIparameter("y", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandLightsVector -> SetParameter (parameter);
+  parameter = new G4UIparameter ("z", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandLightsVector -> SetParameter (parameter);
+}
+
+G4VisCommandViewerLights::~G4VisCommandViewerLights () {
+  delete fpCommandLightsThetaPhi;
+  delete fpCommandLightsVector;
+}
+
+G4String G4VisCommandViewerLights::GetCurrentValue (G4UIcommand* command) {
+  G4String currentValue;
+  if (command == fpCommandLightsThetaPhi) {
+    currentValue = ConvertToString(fLightsVector.theta(),
+			   fLightsVector.phi(), "deg");
+  }
+  else if (command == fpCommandLightsVector) {
+    currentValue = ConvertToString(fLightsVector);
+  }
+  return currentValue;
+}
+
+void G4VisCommandViewerLights::SetNewValue (G4UIcommand* command,
+					   G4String newValue) {
+
+  G4VViewer* currentViewer = fpVisManager->GetCurrentViewer();
+  if (!currentViewer) {
+    G4cout << "G4VisCommandsViewerLights::SetNewValue: no current viewer."
+           << G4endl;
+    return;
+  }
+
+  G4ViewParameters vp = currentViewer->GetViewParameters();
+
+  if (command == fpCommandLightsThetaPhi) {
+    G4double theta, phi;
+    GetNewDoublePairValue(newValue, theta, phi);
+    G4double x = sin (theta) * cos (phi);
+    G4double y = sin (theta) * sin (phi);
+    G4double z = cos (theta);
+    fLightsVector = G4Vector3D (x, y, z);
+  }
+  else if (command == fpCommandLightsVector) {
+    fLightsVector = GetNew3VectorValue(newValue);
+  }
+  vp.SetLightpointDirection(fLightsVector);
+
+  if (fpVisManager->GetVerboseLevel() > 0) {
+    G4cout << "Lights direction set to " << fLightsVector << G4endl;
+  }
+
+  SetViewParameters(currentViewer, vp);
+}
+
 ////////////// /vis/viewer/list ///////////////////////////////////////
 
 G4VisCommandViewerList::G4VisCommandViewerList () {
@@ -245,7 +488,7 @@ void G4VisCommandViewerList::SetNewValue (G4UIcommand* command,
   }
 
   const G4SceneHandlerList& sceneHandlerList = fpVisManager -> GetAvailableSceneHandlers ();
-  G4int nHandlers = sceneHandlerList.entries ();
+  G4int nHandlers = sceneHandlerList.size ();
   G4bool found = false;
   G4bool foundCurrent = false;
   for (int iHandler = 0; iHandler < nHandlers; iHandler++) {
@@ -254,7 +497,7 @@ void G4VisCommandViewerList::SetNewValue (G4UIcommand* command,
     const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
     G4cout << "Scene handler \"" << sceneHandler -> GetName ()
 	   << "\", scene \"" << pScene -> GetName () << "\":";
-    G4int nViewers = viewerList.entries ();
+    G4int nViewers = viewerList.size ();
     if (nViewers == 0) {
       G4cout << "\n            No viewers for this scene handler." << G4endl;
     }
@@ -298,6 +541,96 @@ void G4VisCommandViewerList::SetNewValue (G4UIcommand* command,
   }
 }
 
+////////////// /vis/viewer/pan and panTo ////////////////////////////
+
+G4VisCommandViewerPan::G4VisCommandViewerPan ():
+  fPanIncrementRight  (0.),
+  fPanIncrementUp  (0.),
+  fPanToRight (0.),
+  fPanToUp (0.)
+{
+  G4bool omitable;
+
+  fpCommandPan = new G4UIcommand
+    ("/vis/viewer/pan", this);
+  fpCommandPan -> SetGuidance
+    ("/vis/viewer/pan [<right-increment>] [<up-increment>] [<unit>]");
+  fpCommandPan -> SetGuidance
+    ("Moves the camera incrementally right and up by these amounts.");
+  G4UIparameter* parameter;
+  parameter = new G4UIparameter("right-increment", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandPan -> SetParameter (parameter);
+  parameter = new G4UIparameter("up-increment", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandPan -> SetParameter (parameter);
+  parameter = new G4UIparameter ("unit", 's', omitable = true);
+  parameter -> SetDefaultValue ("m");
+  fpCommandPan -> SetParameter (parameter);
+
+  fpCommandPanTo = new G4UIcommand
+    ("/vis/viewer/panTo", this);
+  fpCommandPanTo -> SetGuidance
+    ("/vis/viewer/panTo [<right>] [<up>] [<unit>]");
+  fpCommandPanTo -> SetGuidance
+    ("Moves the camera to this position right and up relative to standard"
+     "target point (as seen from viewpoint direction).");
+  parameter = new G4UIparameter("right", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandPanTo -> SetParameter (parameter);
+  parameter = new G4UIparameter("up", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandPanTo -> SetParameter (parameter);
+  parameter = new G4UIparameter ("unit", 's', omitable = true);
+  parameter -> SetDefaultValue ("m");
+  fpCommandPanTo -> SetParameter (parameter);
+}
+
+G4VisCommandViewerPan::~G4VisCommandViewerPan () {
+  delete fpCommandPan;
+  delete fpCommandPanTo;
+}
+
+G4String G4VisCommandViewerPan::GetCurrentValue (G4UIcommand* command) {
+  G4String currentValue;
+  if (command == fpCommandPan) {
+    currentValue = ConvertToString(fPanIncrementRight, fPanIncrementUp, "m");
+  }
+  else if (command == fpCommandPanTo) {
+    currentValue = ConvertToString(fPanToRight, fPanToUp, "m");
+  }
+  return currentValue;
+}
+
+void G4VisCommandViewerPan::SetNewValue (G4UIcommand* command,
+					   G4String newValue) {
+
+  G4VViewer* currentViewer = fpVisManager->GetCurrentViewer();
+  if (!currentViewer) {
+    G4cout << "G4VisCommandsViewerPan::SetNewValue: no current viewer."
+           << G4endl;
+    return;
+  }
+
+  G4ViewParameters vp = currentViewer->GetViewParameters();
+
+  if (command == fpCommandPan) {
+    GetNewDoublePairValue(newValue, fPanIncrementRight, fPanIncrementUp);
+    vp.IncrementPan(fPanIncrementRight, fPanIncrementUp);
+  }
+  else if (command == fpCommandPanTo) {
+    GetNewDoublePairValue(newValue, fPanToRight, fPanToUp);
+    vp.SetPan(fPanToRight, fPanToUp);
+  }
+
+  if (fpVisManager->GetVerboseLevel() > 0) {
+    G4cout << "Current target point now " << vp.GetCurrentTargetPoint()
+	   << G4endl;
+  }
+
+  SetViewParameters(currentViewer, vp);
+}
+
 ////////////// /vis/viewer/refresh ///////////////////////////////////////
 
 G4VisCommandViewerRefresh::G4VisCommandViewerRefresh () {
@@ -335,19 +668,38 @@ void G4VisCommandViewerRefresh::SetNewValue (G4UIcommand* command,
 					   G4String newValue) {
   G4String& refreshName = newValue;
   G4VViewer* viewer = fpVisManager -> GetViewer (refreshName);
-  if (viewer) {
-    G4cout << "Refreshing viewer \"" << viewer -> GetName () << "\"..."
+  if (!viewer) {
+    G4cout << "Viewer \"" << refreshName << "\"" <<
+      " not found - \"/vis/viewer/list\"\n  to see possibilities."
 	   << G4endl;
-    viewer -> ClearView ();
-    viewer -> DrawView ();
-    G4cout << "Viewer \"" << viewer -> GetName () << "\"" << " refreshed."
-	   "\n  (You might also need \"/vis/viewer/update\".)" << G4endl;
+    return;
   }
-  else {
+
+  G4VSceneHandler* sceneHandler = viewer->GetSceneHandler();
+  if (!sceneHandler) {
     G4cout << "Viewer \"" << refreshName << "\"" <<
-      " not found - \"/vis/viewer/list\"\n  to see possibilities."
+      " has no scene handler - report serious bug."
 	   << G4endl;
+    return;
   }
+
+  G4Scene* scene = sceneHandler->GetScene();
+  if (!scene) {
+    G4cout << "SceneHandler \"" << sceneHandler->GetName()
+	   << "\", to which viewer \"" << refreshName << "\"" <<
+      "\n  is attached, has no scene - \"/vis/scene/create\" and"
+      "\"/vis/sceneHandler/attach\""
+      "\n  (or use compound command \"/vis/drawVolume\")."
+	   << G4endl;
+    return;
+  }
+
+  G4cout << "Refreshing viewer \"" << viewer -> GetName () << "\"..."
+	 << G4endl;
+  viewer -> ClearView ();
+  viewer -> DrawView ();
+  G4cout << "Viewer \"" << viewer -> GetName () << "\"" << " refreshed."
+    "\n  (You might also need \"/vis/viewer/update\".)" << G4endl;
 }
 
 ////////////// /vis/viewer/remove ///////////////////////////////////////
@@ -407,7 +759,8 @@ void G4VisCommandViewerRemove::SetNewValue (G4UIcommand* command,
   }
   else {
     G4VSceneHandler* sceneHandler = viewer -> GetSceneHandler ();
-    sceneHandler -> SetViewerList ().remove (viewer);
+    G4ViewerList& viewerList = sceneHandler -> SetViewerList ();
+    viewerList.remove (viewer);
     G4cout << "Current viewer is unchanged (\""
 	   << currentViewer -> GetName () << "\")." << G4endl;
   }
@@ -457,14 +810,7 @@ void G4VisCommandViewerReset::SetNewValue (G4UIcommand* command,
     return;
   }
 
-  if (fpVisManager -> IsValidView ()) {
-    G4ViewParameters vp;  // Default view parameters.
-    viewer->SetViewParameters(vp);
-    G4cout << "Viewer \"" << viewer -> GetName () << "\" reset.";
-    G4cout << "\nIssue \"/vis/viewer/refresh\" to see effect." << G4endl;
-    // For now...
-    fpVisManager->SetCurrentViewParameters() = vp;
-  }
+  SetViewParameters(viewer, viewer->GetDefaultViewParameters());
 }
 
 ////////////// /vis/viewer/select ///////////////////////////////////////
@@ -582,3 +928,172 @@ void G4VisCommandViewerUpdate::SetNewValue (G4UIcommand* command,
       "\n  to see possibilities." << G4endl;
   }
 }
+
+//////// /vis/viewer/viewpointThetaPhi and viewpointVector /////////////
+
+G4VisCommandViewerViewpoint::G4VisCommandViewerViewpoint ():
+  fViewpointVector (G4ThreeVector(0.,0.,1.))
+{
+  G4bool omitable;
+
+  fpCommandViewpointThetaPhi = new G4UIcommand
+    ("/vis/viewer/viewpointThetaPhi", this);
+  fpCommandViewpointThetaPhi -> SetGuidance
+    ("/vis/viewer/viewpointThetaPhi  [<theta>] [<phi>] [deg|rad]");
+  fpCommandViewpointThetaPhi -> SetGuidance
+    ("Set direction from target to camera.  Also changes lightpoint direction"
+     "\nif lights are set to move with camera.");
+  G4UIparameter* parameter;
+  parameter = new G4UIparameter("theta", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandViewpointThetaPhi -> SetParameter (parameter);
+  parameter = new G4UIparameter("phi", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandViewpointThetaPhi -> SetParameter (parameter);
+  parameter = new G4UIparameter ("unit", 's', omitable = true);
+  parameter -> SetDefaultValue ("deg");
+  fpCommandViewpointThetaPhi -> SetParameter (parameter);
+
+  fpCommandViewpointVector = new G4UIcommand
+    ("/vis/viewer/viewpointVector", this);
+  fpCommandViewpointVector -> SetGuidance
+    ("/vis/viewer/viewpointVector  [<x>] [<y>] [<z>]");
+  fpCommandViewpointVector -> SetGuidance
+    ("Set direction from target to camera.  Also changes lightpoint direction"
+     "\nif lights are set to move with camera.");
+  parameter = new G4UIparameter("x", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandViewpointVector -> SetParameter (parameter);
+  parameter = new G4UIparameter("y", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandViewpointVector -> SetParameter (parameter);
+  parameter = new G4UIparameter ("z", 'd', omitable = true);
+  parameter -> SetCurrentAsDefault (true);
+  fpCommandViewpointVector -> SetParameter (parameter);
+}
+
+G4VisCommandViewerViewpoint::~G4VisCommandViewerViewpoint () {
+  delete fpCommandViewpointThetaPhi;
+  delete fpCommandViewpointVector;
+}
+
+G4String G4VisCommandViewerViewpoint::GetCurrentValue (G4UIcommand* command) {
+  G4String currentValue;
+  if (command == fpCommandViewpointThetaPhi) {
+    currentValue = ConvertToString(fViewpointVector.theta(),
+			   fViewpointVector.phi(), "deg");
+  }
+  else if (command == fpCommandViewpointVector) {
+    currentValue = ConvertToString(fViewpointVector);
+  }
+  return currentValue;
+}
+
+void G4VisCommandViewerViewpoint::SetNewValue (G4UIcommand* command,
+					   G4String newValue) {
+
+  G4VViewer* currentViewer = fpVisManager->GetCurrentViewer();
+  if (!currentViewer) {
+    G4cout << "G4VisCommandsViewerViewpoint::SetNewValue: no current viewer."
+           << G4endl;
+    return;
+  }
+
+  G4ViewParameters viewParams = currentViewer->GetViewParameters();
+
+  if (command == fpCommandViewpointThetaPhi) {
+    G4double theta, phi;
+    GetNewDoublePairValue(newValue, theta, phi);
+    G4double x = sin (theta) * cos (phi);
+    G4double y = sin (theta) * sin (phi);
+    G4double z = cos (theta);
+    fViewpointVector = G4Vector3D (x, y, z);
+  }
+  else if (command == fpCommandViewpointVector) {
+    fViewpointVector = GetNew3VectorValue(newValue);
+  }
+  viewParams.SetViewAndLights(fViewpointVector);
+
+  if (fpVisManager->GetVerboseLevel() > 0) {
+    G4cout << "Viewpoint direction set to " << fViewpointVector << G4endl;
+    if (viewParams.GetLightsMoveWithCamera ()) {
+      G4cout << "Lightpoint direction set to "
+             << viewParams.GetActualLightpointDirection () << G4endl;
+    }
+  }
+
+  SetViewParameters(currentViewer, viewParams);
+}
+
+////////////// /vis/viewer/zoom and zoomTo ////////////////////////////
+
+G4VisCommandViewerZoom::G4VisCommandViewerZoom ():
+  fZoomMultiplier (1.),
+  fZoomTo         (1.)
+{
+  G4bool omitable, currentAsDefault;
+
+  fpCommandZoom = new G4UIcmdWithADouble
+    ("/vis/viewer/zoom", this);
+  fpCommandZoom -> SetGuidance
+    ("/vis/viewer/zoom [<multiplier>]");
+  fpCommandZoom -> SetGuidance
+    ("Multiplies magnification by this factor.");
+  fpCommandZoom -> SetParameterName("multiplier",
+				     omitable=true,
+				     currentAsDefault=true);
+
+  fpCommandZoomTo = new G4UIcmdWithADouble
+    ("/vis/viewer/zoomTo", this);
+  fpCommandZoomTo -> SetGuidance
+    ("/vis/viewer/zoomTo [<factor>]");
+  fpCommandZoomTo -> SetGuidance
+    ("Magnifies by this factor relative to standard view.");
+  fpCommandZoomTo -> SetParameterName("factor",
+				       omitable=true,
+				       currentAsDefault=true);
+}
+
+G4VisCommandViewerZoom::~G4VisCommandViewerZoom () {
+  delete fpCommandZoom;
+  delete fpCommandZoomTo;
+}
+
+G4String G4VisCommandViewerZoom::GetCurrentValue (G4UIcommand* command) {
+  G4String currentValue;
+  if (command == fpCommandZoom) {
+    currentValue = fpCommandZoom->ConvertToString(fZoomMultiplier);
+  }
+  else if (command == fpCommandZoomTo) {
+    currentValue = fpCommandZoomTo->ConvertToString(fZoomTo);
+  }
+  return currentValue;
+}
+
+void G4VisCommandViewerZoom::SetNewValue (G4UIcommand* command,
+					   G4String newValue) {
+
+  G4VViewer* currentViewer = fpVisManager->GetCurrentViewer();
+  if (!currentViewer) {
+    G4cout << "G4VisCommandsViewerZoom::SetNewValue: no current viewer."
+           << G4endl;
+    return;
+  }
+
+  G4ViewParameters vp = currentViewer->GetViewParameters();
+
+  if (command == fpCommandZoom) {
+    fZoomMultiplier = fpCommandZoom->GetNewDoubleValue(newValue);
+    vp.MultiplyZoomFactor(fZoomMultiplier);
+  }
+  else if (command == fpCommandZoomTo) {
+    fZoomTo = fpCommandZoom->GetNewDoubleValue(newValue);
+    vp.SetZoomFactor(fZoomTo);
+  }
+
+  if (fpVisManager->GetVerboseLevel() > 0) {
+    G4cout << "Zoom factor changed to " << vp.GetZoomFactor() << G4endl;
+  }
+
+  SetViewParameters(currentViewer, vp);
+}
diff --git a/source/visualization/management/src/G4VisCommandsViewerSet.cc b/source/visualization/management/src/G4VisCommandsViewerSet.cc
index d35cb6f50af1eacc9b487e5dbe4772fda10cf0e6..70e59a4a34a293d63ddebd68ec978a30900dce14 100644
--- a/source/visualization/management/src/G4VisCommandsViewerSet.cc
+++ b/source/visualization/management/src/G4VisCommandsViewerSet.cc
@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisCommandsViewerSet.cc,v 1.3 2000/05/19 09:18:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisCommandsViewerSet.cc,v 1.10 2001/03/29 13:46:18 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
 
@@ -15,26 +15,9 @@
 #include "G4UIcommand.hh"
 #include "G4UIcmdWithAString.hh"
 #include "G4UIcmdWithABool.hh"
-#include "G4VisManager.hh"
+#include "G4UIcmdWithAnInteger.hh"
 #include "G4UnitsTable.hh"
-#include "g4std/strstream"
-
-G4String G4VisCommandsViewerSet::ConvertToString(G4bool blValue)
-{
-  G4String vl = "false";
-  if(blValue) vl = "true";
-  return vl;
-}
-
-G4bool G4VisCommandsViewerSet::GetNewBoolValue(const G4String& paramString)
-{
-  G4String v = paramString;
-  v.toUpper();
-  G4bool vl = false;
-  if( v=="Y" || v=="YES" || v=="1" || v=="T" || v=="TRUE" )
-  { vl = true; }
-  return vl;
-}
+#include "G4VisManager.hh"
 
 G4VisCommandsViewerSet::G4VisCommandsViewerSet () {
   G4bool omitable;
@@ -47,21 +30,14 @@ G4VisCommandsViewerSet::G4VisCommandsViewerSet () {
   fpCommandAll->SetParameterName ("from-viewer-name",omitable = false);
   viewerNameCommands.push_back (fpCommandAll);
 
-  fpCommandStyle = new G4UIcmdWithAString ("/vis/viewer/set/style",this);
-  fpCommandStyle->SetGuidance ("/vis/viewer/set/style wireframe|surface");
-  fpCommandStyle->SetParameterName ("style",omitable = false);
-  fpCommandStyle->SetCandidates("wireframe surface");
-
-  fpCommandEdge = new G4UIcmdWithABool("/vis/viewer/set/edge",this);
-  fpCommandEdge->SetGuidance("/vis/viewer/set/edge [true|false]");
-  fpCommandEdge->SetParameterName("edge",omitable = true);
-  fpCommandEdge->SetDefaultValue(true);
-
-  fpCommandHiddenEdge =
-    new G4UIcmdWithABool("/vis/viewer/set/hiddenEdge",this);
-  fpCommandHiddenEdge->SetGuidance("/vis/viewer/set/edge [true|false]");
-  fpCommandHiddenEdge->SetParameterName("hidden-edge",omitable = true);
-  fpCommandHiddenEdge->SetDefaultValue(true);
+  fpCommandAutoRefresh = new G4UIcmdWithABool
+    ("/vis/viewer/set/autorefresh",this);
+  fpCommandAutoRefresh->SetGuidance
+    ("/vis/viewer/set/autorefresh [true|false]");
+  fpCommandAutoRefresh->SetGuidance
+    ("View is automatically refreshed after a change of view parameters.");
+  fpCommandAutoRefresh->SetParameterName("auto-refresh",omitable = true);
+  fpCommandAutoRefresh->SetDefaultValue(false);
 
   fpCommandCulling = new G4UIcommand("/vis/viewer/set/culling",this);
   fpCommandCulling->SetGuidance
@@ -84,14 +60,122 @@ G4VisCommandsViewerSet::G4VisCommandsViewerSet () {
   parameter = new G4UIparameter("unit",'s',omitable = true);
   parameter->SetDefaultValue("g/cm3");
   fpCommandCulling->SetParameter(parameter);
+
+  fpCommandEdge = new G4UIcmdWithABool("/vis/viewer/set/edge",this);
+  fpCommandEdge->SetGuidance("/vis/viewer/set/edge [true|false]");
+  fpCommandEdge->SetParameterName("edge",omitable = true);
+  fpCommandEdge->SetDefaultValue(true);
+
+  fpCommandHiddenEdge =
+    new G4UIcmdWithABool("/vis/viewer/set/hiddenEdge",this);
+  fpCommandHiddenEdge->SetGuidance("/vis/viewer/set/edge [true|false]");
+  fpCommandHiddenEdge->SetParameterName("hidden-edge",omitable = true);
+  fpCommandHiddenEdge->SetDefaultValue(true);
+
+  fpCommandHiddenMarker =
+    new G4UIcmdWithABool("/vis/viewer/set/hiddenMarker",this);
+  fpCommandHiddenMarker->SetGuidance
+    ("/vis/viewer/set/hiddenMarker [true|false]");
+  fpCommandHiddenMarker->SetParameterName("hidden-marker",omitable = true);
+  fpCommandHiddenMarker->SetDefaultValue(true);
+
+  fpCommandLightsMove = new G4UIcmdWithAString
+    ("/vis/viewer/set/lightsMove",this);
+  fpCommandLightsMove->SetGuidance
+    ("/vis/viewer/set/lightsMove with-camera|with-object");
+  fpCommandLightsMove->SetGuidance
+    ("Note: parameter will be parsed for \"cam\" or \"obj\".");
+  fpCommandLightsMove->SetParameterName("lightsMove",omitable = false);
+  // fpCommandLightsMove->SetCandidates("move-with-camera move-with-object");
+  // Own parsing.
+
+  fpCommandLineSegments = new G4UIcmdWithAnInteger
+    ("/vis/viewer/set/lineSegmentsPerCircle",this);
+  fpCommandLineSegments->SetGuidance
+    ("/vis/viewer/set/lineSegmentsPerCircle  [<number-of-sides-per-circle>]");
+  fpCommandLineSegments->SetGuidance
+    ("  Number of sides per circle in polygon/polyhedron graphical"
+     "\nrepresentation of objects with curved lines/surfaces.");
+  fpCommandLineSegments->SetParameterName("line-segments",omitable = true);
+  fpCommandLineSegments->SetDefaultValue(24);
+
+  fpCommandProjection = new G4UIcommand("/vis/viewer/set/projection",this);
+  fpCommandProjection->SetGuidance
+    ("/vis/viewer/set/projection"
+     " o[rthogonal]|p[erspective] [<field-half-angle>] [deg|rad]");
+  fpCommandProjection->SetGuidance
+    ("Note: 1st parameter will be parsed for first character \"o\" or \"p\".");
+  fpCommandProjection->SetGuidance("Default: orthogonal 30 deg");
+  parameter = new G4UIparameter("projection",'s',omitable = true);
+  parameter->SetDefaultValue("orthogonal");
+  fpCommandProjection->SetParameter(parameter);
+  parameter = new G4UIparameter("field-half-angle",'d',omitable = true);
+  parameter->SetDefaultValue(30.);
+  fpCommandProjection->SetParameter(parameter);
+  parameter = new G4UIparameter("unit",'s',omitable = true);
+  parameter->SetDefaultValue("deg");
+  fpCommandProjection->SetParameter(parameter);
+
+  fpCommandSectionPlane = new G4UIcommand 
+    ("/vis/viewer/set/section_plane",this);
+  fpCommandSectionPlane -> SetGuidance
+    (
+     "Set plane for drawing section (DCUT).  Specify plane by"
+     "\nx y z units nx ny nz, e.g., for a y-z plane at x = 1 cm:"
+     "\n/vis~/set/section_plane on 1 0 0 cm 1 0 0"
+     );
+  parameter  =  new G4UIparameter("Selector",'c',true);
+  parameter  -> SetDefaultValue  ("?");
+  fpCommandSectionPlane->SetParameter(parameter);
+  parameter  =  new G4UIparameter("x",'d',omitable = true);
+  parameter  -> SetDefaultValue  (0);
+  parameter  -> SetGuidance      ("Coordinate of point on the plane.");
+  fpCommandSectionPlane->SetParameter(parameter);
+  parameter  =  new G4UIparameter("y",'d',omitable = true);
+  parameter  -> SetDefaultValue  (0);
+  parameter  -> SetGuidance      ("Coordinate of point on the plane.");
+  fpCommandSectionPlane->SetParameter(parameter);
+  parameter  =  new G4UIparameter("z",'d',omitable = true);
+  parameter  -> SetDefaultValue  (0);
+  parameter  -> SetGuidance      ("Coordinate of point on the plane.");
+  fpCommandSectionPlane->SetParameter(parameter);
+  parameter  =  new G4UIparameter("unit",'s',omitable = true);
+  parameter  -> SetDefaultValue  ("cm");
+  parameter  -> SetGuidance      ("Unit of point on the plane.");
+  fpCommandSectionPlane->SetParameter(parameter);
+  parameter  =  new G4UIparameter("nx",'d',omitable = true);
+  parameter  -> SetDefaultValue  (1);
+  parameter  -> SetGuidance      ("Component of plane normal.");
+  fpCommandSectionPlane->SetParameter(parameter);
+  parameter  =  new G4UIparameter("ny",'d',omitable = true);
+  parameter  -> SetDefaultValue  (0);
+  parameter  -> SetGuidance      ("Component of plane normal.");
+  fpCommandSectionPlane->SetParameter(parameter);
+  parameter  =  new G4UIparameter("nz",'d',omitable = true);
+  parameter  -> SetDefaultValue  (0);
+  parameter  -> SetGuidance      ("Component of plane normal.");
+  fpCommandSectionPlane->SetParameter(parameter);
+
+  fpCommandStyle = new G4UIcmdWithAString ("/vis/viewer/set/style",this);
+  fpCommandStyle->SetGuidance ("/vis/viewer/set/style wireframe|surface");
+  fpCommandStyle->SetGuidance
+    ("Note: parameter will be parsed for first character \"w\" or \"s\".");
+  fpCommandStyle->SetParameterName ("style",omitable = false);
+  // fpCommandStyle->SetCandidates("wireframe surface");  // Own parsing.
 }
 
 G4VisCommandsViewerSet::~G4VisCommandsViewerSet() {
   delete fpCommandAll;
-  delete fpCommandStyle;
+  delete fpCommandAutoRefresh;
+  delete fpCommandCulling;
   delete fpCommandEdge;
   delete fpCommandHiddenEdge;
-  delete fpCommandCulling;
+  delete fpCommandHiddenMarker;
+  delete fpCommandLineSegments;
+  delete fpCommandLightsMove;
+  delete fpCommandProjection;
+  delete fpCommandSectionPlane;
+  delete fpCommandStyle;
 }
 
 G4String G4VisCommandsViewerSet::GetCurrentValue(G4UIcommand* command) {
@@ -132,52 +216,116 @@ void G4VisCommandsViewerSet::SetNewValue
 	   << G4endl;
   }
 
-  else if (command == fpCommandStyle) {
+  else if (command == fpCommandAutoRefresh) {
+    G4bool autoRefresh = GetNewBoolValue(newValue);
+    vp.SetAutoRefresh(autoRefresh);
+    G4cout << "Views will ";
+    if (!vp.IsAutoRefresh()) G4cout << "not ";
+    G4cout << "be automatically refreshed after a change of view parameters."
+	   << G4endl;
+  }
+
+  else if (command == fpCommandCulling) {
+    G4String cullingOption, stringFlag, unit;
+    G4double density;
+    G4bool boolFlag;
+    G4std::istrstream is ((char*)newValue.data());
+    is >> cullingOption >> stringFlag >> density >> unit;
+    boolFlag = GetNewBoolValue(stringFlag);
+    if (cullingOption == "global") {
+      vp.SetCulling(boolFlag);
+      G4cout <<
+	"G4VisCommandsViewerSet::SetNewValue: culling: global culling flag"
+	" set to " << ConvertToString(boolFlag) <<
+	".\n  Does not change specific culling flags."
+	     << G4endl;
+    }
+    else if (cullingOption == "coveredDaughters") {
+      vp.SetCullingCovered(boolFlag);
+      G4cout <<
+	"G4VisCommandsViewerSet::SetNewValue: culling: culling covered"
+	"\n  daughters flag set to "
+	     << ConvertToString(boolFlag) <<
+	".  Daughters covered by opaque mothers"
+	"\n  will be culled, i.e., not drawn, if this flag is true."
+	"\n  Note: this is only effective in surface drawing style,"
+	"\n  and then only if the volumes are visible and opaque, and then"
+	"\n  only if no sections or cutways are in operation."
+	     << G4endl;
+    }
+    else if (cullingOption == "invisible") {
+      vp.SetCullingInvisible(boolFlag);
+      G4cout <<
+	"G4VisCommandsViewerSet::SetNewValue: culling: culling invisible"
+	"\n  flag set to "
+	     << boolFlag << ConvertToString(boolFlag) <<
+	".  Volumes marked invisible will be culled,"
+	"\n  i.e., not drawn, if this flag is true."
+	     << G4endl;
+    }
+    else if (cullingOption == "density") {
+      vp.SetDensityCulling(boolFlag);
+      if (boolFlag) {
+	density *= G4UnitDefinition::GetValueOf(unit);
+	vp.SetVisibleDensity(density);
+      }
+      else {
+	density = vp.GetVisibleDensity();
+      }
+      G4cout <<
+	"G4VisCommandsViewerSet::SetNewValue: culling: culling by density"
+	"\n  flag set to " << ConvertToString(boolFlag) <<
+	".  Volumes with density less than " <<
+	G4BestUnit(density,"Volumic Mass") <<
+	"\n  will be culled, i.e., not drawn, if this flag is true."
+	     << G4endl;
+    }
+    else {
+      G4cout <<
+	"G4VisCommandsViewerSet::SetNewValue: culling: option not recognised."
+	     << G4endl;
+    }
+  }
+
+  else if (command == fpCommandEdge) {
     G4ViewParameters::DrawingStyle existingStyle = vp.GetDrawingStyle();
-    if (newValue == "wireframe") {
+    if (GetNewBoolValue(newValue)) {
       switch (existingStyle) {
       case G4ViewParameters::wireframe:
 	break;
       case G4ViewParameters::hlr:
 	break;
       case G4ViewParameters::hsr:
-	vp.SetDrawingStyle(G4ViewParameters::wireframe);
+	vp.SetDrawingStyle(G4ViewParameters::hlhsr);
         break;
       case G4ViewParameters::hlhsr:
-	vp.SetDrawingStyle(G4ViewParameters::hlr);
         break;
       }
     }
-    else if (newValue == "surface") {
+    else {
       switch (existingStyle) {
       case G4ViewParameters::wireframe:
-	vp.SetDrawingStyle(G4ViewParameters::hsr);
 	break;
       case G4ViewParameters::hlr:
-	vp.SetDrawingStyle(G4ViewParameters::hlhsr);
 	break;
       case G4ViewParameters::hsr:
 	break;
       case G4ViewParameters::hlhsr:
+	vp.SetDrawingStyle(G4ViewParameters::hsr);
 	break;
       }
     }
-    else {
-      G4cout <<
-	"G4VisCommandsViewerSet::SetNewValue: style: unrecognised style."
-	     << G4endl;
-      return;
-    }
     G4cout << "Drawing style of viewer \"" << currentViewer->GetName()
 	   << "\" set to " << vp.GetDrawingStyle()
 	   << G4endl;
   }
 
-  else if (command == fpCommandEdge) {
+  else if (command == fpCommandHiddenEdge) {
     G4ViewParameters::DrawingStyle existingStyle = vp.GetDrawingStyle();
     if (GetNewBoolValue(newValue)) {
       switch (existingStyle) {
       case G4ViewParameters::wireframe:
+	vp.SetDrawingStyle(G4ViewParameters::hlr);
 	break;
       case G4ViewParameters::hlr:
 	break;
@@ -193,6 +341,7 @@ void G4VisCommandsViewerSet::SetNewValue
       case G4ViewParameters::wireframe:
 	break;
       case G4ViewParameters::hlr:
+	vp.SetDrawingStyle(G4ViewParameters::wireframe);
 	break;
       case G4ViewParameters::hsr:
 	break;
@@ -206,109 +355,164 @@ void G4VisCommandsViewerSet::SetNewValue
 	   << G4endl;
   }
 
-  else if (command == fpCommandHiddenEdge) {
+  else if (command == fpCommandHiddenMarker) {
+    G4bool hidden = GetNewBoolValue(newValue);
+    if (hidden) vp.SetMarkerHidden();
+    else vp.SetMarkerNotHidden();
+    G4cout << "Markers will ";
+    if (vp.IsMarkerNotHidden()) G4cout << "not ";
+    G4cout << "be hidden under solid objects." << G4endl;
+  }
+
+  else if (command == fpCommandLightsMove) {
+    G4String s (newValue);
+    if (s.find("cam") != G4String::npos) vp.SetLightsMoveWithCamera(true);
+    else if(s.find("obj") != G4String::npos) vp.SetLightsMoveWithCamera(false);
+    else {
+      G4cout << "\"" << newValue << "\" not recognised."
+	"  Looking for \"cam\" or \"obj\" in string." << G4endl;
+    }
+    G4cout << "Lights move with ";
+    if (vp.GetLightsMoveWithCamera())
+      G4cout << "camera (object appears to rotate).";
+    else G4cout << "object (the viewer appears to be moving).";
+    G4cout << G4endl;
+  }
+
+  else if (command == fpCommandLineSegments) {
+    G4int nSides = GetNewIntValue(newValue);
+    G4cout <<
+      "Number of line segements per circle in polygon approximation is "
+	   << nSides << G4endl;
+    vp.SetNoOfSides(nSides);
+  }
+
+  else if (command == fpCommandProjection) {
+    G4double fieldHalfAngle;
+    size_t iPos = 0;
+    if (newValue[iPos] == 'o') {  // "orthogonal"
+      fieldHalfAngle = 0.;
+    }
+    else if (newValue[iPos] == 'p') {  // "perspective"
+      G4String dummy;
+      G4String unit;
+      G4std::istrstream is ((char*)newValue.data());
+      is >> dummy >> fieldHalfAngle >> unit;
+      fieldHalfAngle *= ValueOf(unit);
+      if (fieldHalfAngle > 89.5 * deg || fieldHalfAngle <= 0.0) {
+	G4cout << "Field half angle should be 0 < angle <= 89.5 degrees.";
+	G4cout << G4endl;
+	return;
+      }
+    }
+    else {
+      G4cout << "\"" << newValue << "\" not recognised."
+	"  Looking for 'o' or 'p' first character." << G4endl;
+      return;
+    }
+    vp.SetFieldHalfAngle(fieldHalfAngle);
+    G4cout << "Projection style of viewer \"" << currentViewer->GetName()
+	   << "\" set to ";
+    if (fieldHalfAngle == 0.) {
+      G4cout << "orthogonal.";
+    }
+    else {
+      G4cout << "perspective\n  with half angle " << fieldHalfAngle / deg
+	     << " degrees.";
+    }
+    G4cout << G4endl;
+  }
+
+  else if (command == fpCommandSectionPlane) {
+    G4String choice, unit;
+    G4double x, y, z, nx, ny, nz;
+    const char* t = newValue;
+    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)." << G4endl;
+      G4cout << "Section drawing is currently: ";
+      if (vp.IsSection ()) G4cout << "on";
+      else                    G4cout << "off";
+      G4cout << ".\nSection plane is currently: "
+           << vp.GetSectionPlane ();
+      G4cout << G4endl;
+      return;
+    }
+
+    G4double F;
+    switch (iSelector) {
+    case 0:
+      vp.UnsetSectionPlane();
+      break;
+    case 1:
+      F = ValueOf(unit);
+      x *= F; y *= F; z *= F;
+      vp.SetSectionPlane(G4Plane3D(G4Normal3D(nx,ny,nz),
+				   G4Point3D(x,y,z)));
+      vp.SetViewpointDirection(G4Normal3D(nx,ny,nz));
+      break;
+    default: G4cout << "Choice not recognised (on/off).\n"; break;
+    }
+
+    G4cout << "Section drawing is now: ";
+    if (vp.IsSection ()) G4cout << "on";
+    else                    G4cout << "off";
+    G4cout << ".\nSection plane is now: "
+           << vp.GetSectionPlane ();
+    G4cout << G4endl;
+  }
+
+  else if (command == fpCommandStyle) {
     G4ViewParameters::DrawingStyle existingStyle = vp.GetDrawingStyle();
-    if (GetNewBoolValue(newValue)) {
+    size_t iPos = 0;
+    if (newValue[iPos] == 'w') {  // "wireframe"
       switch (existingStyle) {
       case G4ViewParameters::wireframe:
-	vp.SetDrawingStyle(G4ViewParameters::hlr);
 	break;
       case G4ViewParameters::hlr:
 	break;
       case G4ViewParameters::hsr:
-	vp.SetDrawingStyle(G4ViewParameters::hlhsr);
+	vp.SetDrawingStyle(G4ViewParameters::wireframe);
         break;
       case G4ViewParameters::hlhsr:
+	vp.SetDrawingStyle(G4ViewParameters::hlr);
         break;
       }
     }
-    else {
+    else if (newValue[iPos] == 's') {  // "surface"
       switch (existingStyle) {
       case G4ViewParameters::wireframe:
+	vp.SetDrawingStyle(G4ViewParameters::hsr);
 	break;
       case G4ViewParameters::hlr:
-	vp.SetDrawingStyle(G4ViewParameters::wireframe);
+	vp.SetDrawingStyle(G4ViewParameters::hlhsr);
 	break;
       case G4ViewParameters::hsr:
 	break;
       case G4ViewParameters::hlhsr:
-	vp.SetDrawingStyle(G4ViewParameters::hsr);
 	break;
       }
     }
+    else {
+      G4cout << "\"" << newValue << "\" not recognised."
+	"  Looking for 'w' or 's' first character." << G4endl;
+      return;
+    }
     G4cout << "Drawing style of viewer \"" << currentViewer->GetName()
 	   << "\" set to " << vp.GetDrawingStyle()
 	   << G4endl;
   }
 
-  else if (command == fpCommandCulling) {
-    G4String cullingOption, stringFlag, unit;
-    G4double density;
-    G4bool boolFlag;
-    G4std::istrstream is ((char*)newValue.data());
-    is >> cullingOption >> stringFlag >> density >> unit;
-    boolFlag = GetNewBoolValue(stringFlag);
-    if (cullingOption == "global") {
-      vp.SetCulling(boolFlag);
-      G4cout <<
-	"G4VisCommandsViewerSet::SetNewValue: culling: global culling flag"
-	" set to " << ConvertToString(boolFlag) <<
-	".\n  Does not change specific culling flags."
-	     << G4endl;
-    }
-    else if (cullingOption == "coveredDaughters") {
-      vp.SetCullingCovered(boolFlag);
-      G4cout <<
-	"G4VisCommandsViewerSet::SetNewValue: culling: culling covered"
-	"\n  daughters flag set to " << ConvertToString(boolFlag) <<
-	".  Daughters covered by opaque mothers"
-	"\n  will be culled, i.e., not drawn, if this flag is true."
-	"\n  Note: this is only effective in surface drawing style,"
-	"\n  and then only if the volumes are visible and opaque, and then"
-	"\n  only if no sections or cutways are in operation."
-	     << G4endl;
-    }
-    else if (cullingOption == "invisible") {
-      vp.SetCullingInvisible(boolFlag);
-      G4cout <<
-	"G4VisCommandsViewerSet::SetNewValue: culling: culling invisible"
-	"\n  flag set to " << boolFlag << ConvertToString(boolFlag) <<
-	".  Volumes marked invisible will be culled,"
-	"\n  i.e., not drawn, if this flag is true."
-	     << G4endl;
-    }
-    else if (cullingOption == "density") {
-      vp.SetDensityCulling(boolFlag);
-      if (boolFlag) {
-	density *= G4UnitDefinition::GetValueOf(unit);
-	vp.SetVisibleDensity(density);
-      }
-      else {
-	density = vp.GetVisibleDensity();
-      }
-      G4cout <<
-	"G4VisCommandsViewerSet::SetNewValue: culling: culling by density"
-	"\n  flag set to " << ConvertToString(boolFlag) <<
-	".  Volumes with density less than " <<
-	G4BestUnit(density,"Volumic Mass") <<
-	"\n  will be culled, i.e., not drawn, if this flag is true."
-	     << G4endl;
-    }
-    else {
-      G4cout <<
-	"G4VisCommandsViewerSet::SetNewValue: culling: option not recognised."
-	     << G4endl;
-    }
-  }
-
   else {
     G4cout << "G4VisCommandsViewerSet::SetNewValue: unrecognised command."
 	   << G4endl;
     return;
   }
 
-  currentViewer->SetViewParameters(vp);
-  G4cout << "Issue /vis/viewer/refresh to see effect." << G4endl;
-  // For now...
-  fpVisManager->SetCurrentViewParameters() = vp;
+  SetViewParameters(currentViewer,vp);
 }
diff --git a/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc b/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
index 8a8c7a699fcfbee61aa93914c713195e412780ff..ae77a4ab9985abe19e4b559ce6626ac5454d6903 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.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.4 2001/02/05 02:34:29 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 #include "G4VisFeaturesOfDAWNFILE.hh"
 
@@ -22,5 +22,6 @@ G4String G4VisFeaturesOfDAWNFILE () {
     "\n                   connection via g4.prim file to Fukui Renderer DAWN etc."
     "\n    Disadvantages: compute intensive, takes time (use a fast graphics"
     "\n                   system, such as OpenGL, to select view, then copy"
-    "\n                   to this renderer - /vis~/copy/view, /vis~/set/view).";
+    "\n                   view parameters to this renderer:"
+    "\n                   \"/vis/viewer/set/all <OpenGL-view>\".";
 }
diff --git a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
index 5a4bb1ff66219674ac3d817b7e2dfa2db984e43c..2467dd6d9d133f8b6317598ad4536bf1bb62b8ff 100644
--- a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
index 098c7501eccdc4170c4706bcb2b6a3bd9e56c099..04a520792c443e1793302057dc6cf7518d0bbd79 100644
--- a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisFeaturesOfOpenGL.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
index b65fa7fa67e6d2f3791597bb6ca766895e54ead6..c923890c1249fbe12c947568b534a25ee24e180a 100644
--- a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisFeaturesOfOpenInventor.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisManMessCamera.cc b/source/visualization/management/src/G4VisManMessCamera.cc
index 35ca8bf77c1508a4c72f3d5caaa8192c86dddaa6..da068f6a76b9b38efd70c701fb8d81e645bd0ee2 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.4 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessCamera.cc,v 1.8 2001/02/23 15:43:29 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -40,7 +40,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   -> SetDefaultValue (0.);
   param   -> SetGuidance ("world coordinates");
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/camera/orbit  ////
   //camera \hline
@@ -62,7 +62,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   -> SetGuidance ("degrees");
   param   -> SetDefaultValue (1.);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////  /vis~/camera/pan  ////
   //camera \hline
@@ -83,7 +83,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   -> SetDefaultValue (0.);
   param   -> SetGuidance ("world coordinates");
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   /////////////////////////////////////  /vis~/camera/projection_style  ////
   //camera \hline
@@ -100,7 +100,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   =  new G4UIparameter ("Perspective view half angle.", 'd', true);
   param   -> SetDefaultValue  (0.);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/camera/spin  ////
   //camera \hline
@@ -122,7 +122,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   -> SetGuidance ("degrees");
   param   -> SetDefaultValue (1.);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/camera/viewpoint  ////
   //camera \hline
@@ -145,7 +145,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   -> SetGuidance ("degrees");
   param   -> SetDefaultValue (0.0);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////  /vis~/camera/window_size_hint  ////
   //camera \hline
@@ -161,7 +161,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   =  new G4UIparameter ("Window size hint in pixels", 'i', true);
   param   -> SetDefaultValue  (600);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////  /vis~/camera/zoom  ////
   //camera \hline
@@ -178,7 +178,7 @@ void G4VisManMessenger::AddCommandCamera () {
   param   -> SetDefaultValue (1.);
   param   -> SetGuidance ("magnifies by this");
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
 }
 
@@ -187,6 +187,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 
   ///////////////////////////////  /vis~/camera/dolly ////
   if (commandPath == "/vis~/camera/dolly") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/dolly\".");
     if (ViewValid ()) {
       G4double in;
       const char* aString = newValues;
@@ -207,8 +208,6 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (fpVMan -> GetCurrentViewParameters ());
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -216,6 +215,8 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 
   ////////////////////////////////  /vis~/camera/orbit  ////
   if (commandPath  == "/vis~/camera/orbit") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       G4int nFrames;
       G4double dbeta;
@@ -234,12 +235,13 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 
   ///////////////////////////////  /vis~/camera/pan  ////
   if (commandPath == "/vis~/camera/pan") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/pan\".");
     if (ViewValid ()) {
       G4double right, up;
       const char* aString = newValues;
       G4std::istrstream is((char*) aString);is >> right >> up;
       G4cout << "Pan " << right << " right, " << up << " up." << G4endl;
-      fpVMan -> SetCurrentViewParameters ().Pan (right, up);
+      fpVMan -> SetCurrentViewParameters ().IncrementPan (right, up);
       if (fpVMan -> GetVerboseLevel () > 0) {
 	G4cout << "Current target point changed to "
 	     << fpVMan -> GetCurrentViewParameters ().GetCurrentTargetPoint ()
@@ -255,8 +257,6 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (fpVMan -> GetCurrentViewParameters ());
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -264,6 +264,8 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 
   /////////////////////////////////////  /vis~/camera/projection_style  ////
   if (commandPath == "/vis~/camera/projection_style") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/set/projection\".");
     G4int iStyle;
     G4double fieldHalfAngleDegrees;
     const char* aString = newValues;
@@ -320,8 +322,6 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (fpVMan -> GetCurrentViewParameters ());
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -329,6 +329,8 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 
   ////////////////////////////////  /vis~/camera/spin  ////
   if (commandPath  == "/vis~/camera/spin") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       G4int nFrames;
       G4double dbeta;
@@ -347,6 +349,9 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 
   ////////////////////////////////////////  /vis~/camera/viewpoint  ////
   if (commandPath == "/vis~/camera/viewpoint") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/viewpointThetaPhi\" or"
+       " \"/vis/viewer/viewpointVector\".");
     G4double theta, phi ;
     const char* aString = newValues;
     G4std::istrstream is((char*) aString) ; is >> theta >> phi;
@@ -377,14 +382,15 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
     if (pView) {
       // Copy current view parameters into current view.
       pView -> SetViewParameters (fpVMan -> GetCurrentViewParameters ());
-      // Recalculate projection matrices, etc.
-      pView -> SetView ();
     }
     G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
 
   ///////////////////////////////////////  /vis~/camera/window_size_hint  ////
   if (commandPath == "/vis~/camera/window_size_hint") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/create ! ! <pixels>\" or"
+       " \"/vis/open <system> <pixels>\".");
     G4int size;
     const char* aString = newValues;
     G4std::istrstream is((char*) aString) ; is >> size;
@@ -399,6 +405,7 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
 
   ////////////////////////////////  /vis~/camera/zoom  ////
   if (commandPath  == "/vis~/camera/zoom") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/zoom\".");
     if (ViewValid ()) {
       G4double zoomBy;
       const char* aString = newValues;
@@ -418,8 +425,6 @@ void G4VisManMessenger::DoCommandCamera (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (fpVMan -> GetCurrentViewParameters ());
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       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 7c38cd1c0207c49361a6ef58f9ea4b3fd2ad244d..ddf15467d22ebfa5407c3dd2a769c43b635d60bc 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.5 1999/12/15 14:54:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessCreateView.cc,v 1.7 2001/02/23 15:43:29 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -42,19 +42,19 @@ void G4VisManMessenger::AddCommandCreateView () {
   const G4GraphicsSystemList& gslist =
     fpVMan -> GetAvailableGraphicsSystems ();
   G4String candidates;
-  for (int igslist = 0; igslist < gslist.entries (); igslist++) {
-    G4String nickname = gslist (igslist) -> GetNickname ();
+  for (int igslist = 0; igslist < gslist.size (); igslist++) {
+    G4String nickname = gslist [igslist] -> GetNickname ();
     if (nickname . length () > 0) {
       candidates += nickname;
     }
     else {
-      candidates += gslist (igslist) -> GetName ();
+      candidates += gslist [igslist] -> GetName ();
     }
     candidates += " ";
   }
   param   -> SetParameterCandidates(candidates);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
 }
 
@@ -63,11 +63,13 @@ void G4VisManMessenger::DoCommandCreateView (const G4String& commandPath,
 
   ///////////////////  /vis~/create_view/new_graphics_system  /////
   if (commandPath == "/vis~/create_view/new_graphics_system") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/scenehandler/create\" or \"/vis/open\".");
     G4String selector;
     const char* aString = newValues;
     G4std::istrstream is ((char*) aString) ; is >> selector;
     const G4GraphicsSystemList& gsl = fpVMan -> GetAvailableGraphicsSystems ();
-    int nSystems = gsl.entries ();
+    int nSystems = gsl.size ();
     if (nSystems > 0) {
       int iGS;  // Selector index.
       for (iGS = 0; iGS < nSystems; iGS++) {
diff --git a/source/visualization/management/src/G4VisManMessDraw.cc b/source/visualization/management/src/G4VisManMessDraw.cc
index 807cc8853f060ce3a7fc71b4f2ab508c80139ad6..a52122ab3d1280350c3ecb68c5805d57a8fe1589 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.5 1999/12/15 14:54:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessDraw.cc,v 1.7 2001/02/23 15:43:29 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -60,7 +60,7 @@ void G4VisManMessenger::AddCommandDraw () {
   param   -> SetDefaultValue  ("mm");
   param   -> SetGuidance      ("mm, cm, or m.");
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////  /vis~/draw/text  /////
   //draw \hline
@@ -98,7 +98,7 @@ void G4VisManMessenger::AddCommandDraw () {
   param   =  new G4UIparameter ("text", 's', true);
   param   -> SetDefaultValue ("text");
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   //
   ////////////////////////////////////  /vis~/draw/ghosts  /////
@@ -110,7 +110,7 @@ void G4VisManMessenger::AddCommandDraw () {
   param   =  new G4UIparameter ("ParticleName", 's', true);
   param   -> SetDefaultValue ("all");
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
 
   /********************************  UNDER DEVELOPMENT ?????????????
@@ -132,7 +132,7 @@ void G4VisManMessenger::AddCommandDraw () {
   param   =  new G4UIparameter ("Physical volume name", 's', true);
   param   -> SetDefaultValue  ("__none__");
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
   **************************************************************/
 
 }
@@ -209,7 +209,9 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
 
   //////////////////////////  /vis~/draw/volume  /////
   if (commandPath == "/vis~/draw/volume") {
-    // Find physical_volume.
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/scene/add/volume\" or \"/vis/drawVolume\".");
+     // Find physical_volume.
     G4String name;
     const char* aString = newValues;
     G4std::istrstream is((char*) aString) ; is >> name;
@@ -220,6 +222,8 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
   }
   //////////////////////////  /vis~/draw/ghosts  /////
   if (commandPath == "/vis~/draw/ghosts") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/scene/add/ghosts\".");
     // preliminaries
     G4VisManager* theVisManager;
     if(!(theVisManager= G4VisManager::GetInstance())) {
diff --git a/source/visualization/management/src/G4VisManMessExpert.cc b/source/visualization/management/src/G4VisManMessExpert.cc
index c548d951fcad1690b9365be2312509b432e9896d..b61fc1d312741271aaa974e3ef1cad8ee4f46ef8 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.4 1999/12/15 14:54:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessExpert.cc,v 1.6 2001/02/23 15:43:30 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -49,7 +49,7 @@ void G4VisManMessenger::AddCommandExpert () {
     (
      "...menu of expert commands."
      );
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/expert/draw_circle  ////
   //expert \hline
@@ -69,7 +69,7 @@ void G4VisManMessenger::AddCommandExpert () {
   param   =  new G4UIparameter ("size", 'd', true);
   param   -> SetDefaultValue (10.);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/expert/draw_line  ////
   //expert \hline
@@ -95,7 +95,7 @@ void G4VisManMessenger::AddCommandExpert () {
   param   =  new G4UIparameter ("z1", 'd', true);
   param   -> SetDefaultValue (0.);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////  /vis~/expert/draw_marks_and_show  ////
   //expert \hline
@@ -115,7 +115,7 @@ void G4VisManMessenger::AddCommandExpert () {
   param   =  new G4UIparameter ("size", 'd', true);
   param   -> SetDefaultValue (10.);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   /***************************************
   ////////////////////////////////////  /vis~/expert/draw_physical_volume  ////
@@ -128,7 +128,7 @@ void G4VisManMessenger::AddCommandExpert () {
     (
      "A test of G4VisManager::Draw (const G4VPhysicalVolume&,..."
      );
-  fCommandList.append (command);
+  fCommandList.push_back (command);
   **************************************/
 
   ////////////////////////////////////////  /vis~/expert/draw_polymarkers  ////
@@ -144,7 +144,7 @@ void G4VisManMessenger::AddCommandExpert () {
   param   -> SetGuidance ("0/1/2/3 = line/dots/circles/squares");
   param   -> SetDefaultValue (0);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/expert/draw_spiral  ////
   //expert \hline
@@ -155,7 +155,7 @@ void G4VisManMessenger::AddCommandExpert () {
     (
      "Draws a G4Polyline in the form of a spiral."
      );
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/expert/draw_spirals  ////
   //expert \hline
@@ -169,7 +169,7 @@ void G4VisManMessenger::AddCommandExpert () {
   param   =  new G4UIparameter ("no. of spirals", 'i', true);
   param   -> SetDefaultValue (1);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ////////////////////////////////////////  /vis~/expert/draw_square  ////
   //expert \hline
@@ -189,7 +189,7 @@ void G4VisManMessenger::AddCommandExpert () {
   param   =  new G4UIparameter ("size", 'd', true);
   param   -> SetDefaultValue (10.);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
 }
 
@@ -198,6 +198,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 
   ///////////////////////////////////////  /vis~/expert/draw_circle  ////
   if (commandPath == "/vis~/expert/draw_circle") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       G4double x, y, z, worldSize;
       const char* aString = newValues;
@@ -213,6 +215,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 
   ///////////////////////////////////////  /vis~/expert/draw_line  ////
   if (commandPath == "/vis~/expert/draw_line") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       G4double x0, y0, z0;
       G4double x1, y1, z1;
@@ -232,6 +236,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 
   ////////////////////////////////////  /vis~/expert/draw_marks_and_show  ////
   if (commandPath == "/vis~/expert/draw_marks_and_show") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
 
     const G4int     num_each_marks = 100 ;
     const G4double  mark_step      = 1000.0 ;
@@ -281,6 +287,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
   /****************************************
   //////////////////////////////////  /vis~/expert/draw_physical_volume  ////
   if (commandPath == "/vis~/expert/draw_physical_volume") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
 
       // Given a physical volume...
@@ -328,6 +336,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 
   ///////////////////////////////////////  /vis~/expert/draw_polymarkers  ////
   if (commandPath == "/vis~/expert/draw_polymarkers") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       int nPolyMarkers, type;
       const char* aString = newValues;
@@ -371,6 +381,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 
   ///////////////////////////////////////  /vis~/expert/draw_spiral  ////
   if (commandPath == "/vis~/expert/draw_spiral") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       G4Polyline line;
       G4double t = 0., dt = M_PI / 50.;
@@ -385,6 +397,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 
   ///////////////////////////////////////  /vis~/expert/draw_spirals  ////
   if (commandPath == "/vis~/expert/draw_spirals") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       int nSpirals;
       const char* aString = newValues;
@@ -416,6 +430,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 
   ///////////////////////////////////////  /vis~/expert/draw_square  ////
   if (commandPath == "/vis~/expert/draw_square") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     if (ViewValid ()) {
       G4double x, y, z, worldSize;
       const char* aString = newValues;
diff --git a/source/visualization/management/src/G4VisManMessLights.cc b/source/visualization/management/src/G4VisManMessLights.cc
index f105741869acadb3fd2144195ed4ac3f5e6e4fde..64e011b112ecac17031db1459024743c671a9092 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.5 2000/08/19 18:23:37 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessLights.cc,v 1.7 2001/02/23 15:43:30 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -44,7 +44,7 @@ void G4VisManMessenger::AddCommandLights () {
   param   -> SetGuidance ("degrees");
   param   -> SetDefaultValue (0.0);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 }
 
 void G4VisManMessenger::DoCommandLights (const G4String& commandPath,
@@ -52,6 +52,8 @@ void G4VisManMessenger::DoCommandLights (const G4String& commandPath,
 
   ////////////////////////////////////////  /vis~/lights/direction  ////
   if (commandPath == "/vis~/lights/direction") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/lightsThetaPhi\" or \"/vis/viewer/lightsVector\".");
     G4double theta, phi ;
     const char* aString = newValues;
     G4std::istrstream is((char*) aString) ; is >> theta >> phi;
diff --git a/source/visualization/management/src/G4VisManMessSet.cc b/source/visualization/management/src/G4VisManMessSet.cc
index fe06c72e7b8b32d36b1825feb21030f91f7e7f8d..e9937c2ccd7ee5c0d3fb68af7f2fdd209a864b89 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.7 2000/05/02 09:58:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessSet.cc,v 1.11 2001/02/23 15:43:31 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -43,7 +43,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   =  new G4UIparameter ("density", 'd', true);
   param   -> SetDefaultValue  (0.01);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/drawing_style  ////
   //set \hline
@@ -57,7 +57,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   =  new G4UIparameter ("Style selector", 'i', true);
   param   -> SetDefaultValue  (-1);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/marker_choices  ////
   //set \hline
@@ -71,7 +71,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   =  new G4UIparameter ("Style selector", 'i', true);
   param   -> SetDefaultValue  (-1);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/rep_style  ////
   //set \hline
@@ -87,7 +87,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   =  new G4UIparameter ("Style selector", 'i', true);
   param   -> SetDefaultValue  (-1);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/scene  ////
   //set \hline
@@ -103,7 +103,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   =  new G4UIparameter ("Selector", 'i', true);
   param   -> SetDefaultValue  (-1);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/section_plane   ////
   //set \hline
@@ -149,7 +149,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   -> SetDefaultValue  (0);
   param   -> SetGuidance      ("Component of plane normal.");
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/sides  ////
   //set \hline
@@ -163,7 +163,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   =  new G4UIparameter ("No. of sides", 'i', true);
   param   -> SetDefaultValue  (24);
   command -> SetParameter     (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/verbose  //////
   //set \hline
@@ -178,7 +178,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   -> SetDefaultValue (-1);
   param   -> SetGuidance ("0: quiet, >0: verbose");
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   ///////////////////////////////////////////  /vis~/set/view  /////////
   //set  \hline
@@ -192,7 +192,7 @@ void G4VisManMessenger::AddCommandSet () {
   param   =  new G4UIparameter ("View selector", 'i', true);
   param   -> SetDefaultValue (-1);
   command -> SetParameter (param);
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 }
 
 void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
@@ -200,6 +200,8 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ///////////////////////////////////////////  /vis~/set/cull_by_density  ////
   if (commandPath == "/vis~/set/cull_by_density") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/set/culling\".");
     G4String choice;
     G4double density;  // Units in this section are g / cm3 - WARNING!!!
     const char* t = newValues;
@@ -240,8 +242,6 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (getVP);
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -249,6 +249,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ///////////////////////////////////////////  /vis~/set/drawing_style  ////
   if (commandPath == "/vis~/set/drawing_style") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/set/style\".");
     G4int iStyle;
     const char* aString = newValues;
     G4std::istrstream is((char*) aString) ; is >> iStyle;
@@ -344,8 +345,6 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (getVP);
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -353,6 +352,8 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ////////////////////////////////////////  /vis~/set/marker_choices  ////
   if (commandPath == "/vis~/set/marker_choices") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/set/hiddenMarker\".");
     G4int iChoice;
     const char* aString = newValues;
     G4std::istrstream is((char*) aString) ; is >> iChoice;
@@ -390,8 +391,6 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (getVP);
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -400,6 +399,8 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ///////////////////////////////////////////  /vis~/set/section_plane  ////
   if (commandPath == "/vis~/set/section_plane") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/set/section_plane\".");
     G4String choice, unit;
     G4double x, y, z, nx, ny, nz;
     const char* t = newValues;
@@ -445,8 +446,6 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (getVP);
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -454,16 +453,27 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ///////////////////////////////////////////  /vis~/set/sides  ////
   if (commandPath == "/vis~/set/sides") {
+    G4VisManager::PrintCommandDeprecation
+      ("Use \"/vis/viewer/set/lineSegmentsPerCircle\".");
     G4int nSides;
     const char* t = newValues;
     G4std::istrstream is ((char*)t); is >> nSides;
     G4cout << "Number of sides per circle in polygon approximation is "
 	 << nSides << G4endl;
     fpVMan -> SetCurrentViewParameters ().SetNoOfSides (nSides);
+    const G4ViewParameters& getVP = fpVMan -> GetCurrentViewParameters ();
+    G4VViewer* pView = fpVMan -> GetCurrentViewer ();
+    if (pView) {
+      // Copy current view parameters into current view.
+      pView -> SetViewParameters (getVP);
+    }
+    G4cout << "Issue Draw or refresh to see effect." << G4endl;
   }
 
   ///////////////////////////////////////////  /vis~/set/rep_style  ////
   if (commandPath == "/vis~/set/rep_style") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     G4int iStyle;
     const char* aString = newValues;
     G4std::istrstream is((char*) aString) ; is >> iStyle;
@@ -492,8 +502,6 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       if (pView) {
 	// Copy current view parameters into current view.
 	pView -> SetViewParameters (fpVMan -> GetCurrentViewParameters ());
-	// Recalculate projection matrices, etc.
-	pView -> SetView ();
       }
       G4cout << "Issue Draw or refresh to see effect." << G4endl;
     }
@@ -501,6 +509,8 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ///////////////////////////////////  /vis~/set/scene  ////
   if (commandPath == "/vis~/set/scene") {
+    G4VisManager::PrintCommandDeprecation
+      ("This command will no longer be maintained.");
     static G4int iState = 0;
     static G4int nOptions = 2;
     G4int iSelector;
@@ -616,6 +626,7 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ///////////////////////////////////////////  /vis~/set/verbose  //////
   if (commandPath == "/vis~/set/verbose") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/verbose\".");
     G4int vLevel;
     const char* t = newValues;
     G4std::istrstream is ((char*)t); is >> vLevel;
@@ -630,17 +641,18 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 
   ///////////////////////////////////////////  /vis~/set/view  /////////
   if (commandPath == "/vis~/set/view") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/viewer/select\".");
     // Make List of available views.
-    G4RWTPtrOrderedVector<G4VViewer> vList;
+    G4ViewerList vList;  // Keep temporary list of viewers.
     const G4SceneHandlerList& gml = fpVMan -> GetAvailableSceneHandlers ();
     G4int nViewTotal = 0;
-    G4int iGM, nScenes = gml.entries ();
+    G4int iGM, nScenes = gml.size ();
     for (iGM = 0; iGM < nScenes; iGM++) {
       const G4ViewerList& views = gml [iGM] -> GetViewerList ();
-      int nViews = views.entries ();
+      int nViews = views.size ();
       for (int iView = 0; iView < nViews; iView++) {
 	G4VViewer* pView = views [iView];
-	vList.append (pView);
+	vList.push_back (pView);
 	nViewTotal++;
       }
     }
diff --git a/source/visualization/management/src/G4VisManMessenger.cc b/source/visualization/management/src/G4VisManMessenger.cc
index 3afcf4515bde632a809d8a431cfcc79044afb951..ea7b204c8b7877d0e627fe78d56b74f6937df723 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.3 1999/12/15 14:54:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManMessenger.cc,v 1.4 2001/02/23 15:43:31 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -28,7 +28,7 @@ fpVMan (pVMan)
   /////////////////////////////////////////////////  /vis~/...  ////
   command = new G4UIcommand ("/vis~/", this);
   command -> SetGuidance ("Deprecated visualization commands.");
-  fCommandList.append (command);
+  fCommandList.push_back (command);
 
   //////////////////////////////////////////////  /vis~/*/...  ////
   AddCommandCamera ();      // Define the /vis~/camera/ sub-commands.
@@ -47,7 +47,12 @@ fpVMan (pVMan)
 }
 
 G4VisManMessenger::~G4VisManMessenger () {
-  fCommandList.clearAndDestroy ();
+  G4std::vector<G4UIcommand*>::iterator i;
+  for (i = fCommandList.begin();
+       i != fCommandList.end();
+       ++i) {
+    delete *i;
+  }
 }
 
 void G4VisManMessenger::SetNewValue (G4UIcommand* command, G4String newValues)
diff --git a/source/visualization/management/src/G4VisManager.cc b/source/visualization/management/src/G4VisManager.cc
index df3c4015c30ae08a8ec87adbd3e849864a1cba6b..864a747f20f300bb4d53494916293e08e134034d 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.17 2000/05/04 08:52:10 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManager.cc,v 1.21 2001/02/23 15:43:32 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // GEANT4 Visualization Manager - John Allison 02/Jan/1996.
@@ -72,12 +72,21 @@ G4VisManager::G4VisManager ():
 
 G4VisManager::~G4VisManager () {
   fpInstance = 0;
-  fSceneList.clearAndDestroy ();    
-  fAvailableSceneHandlers.clearAndDestroy ();    
-  fAvailableGraphicsSystems.clearAndDestroy ();
+  int i;
+  for (i = 0; i < fSceneList.size (); ++i) {
+    delete fSceneList[i];
+  }
+  for (i = 0; i < fAvailableSceneHandlers.size (); ++i) {
+    delete fAvailableSceneHandlers[i];
+  }
+  for (i = 0; i < fAvailableGraphicsSystems.size (); ++i) {
+    delete fAvailableGraphicsSystems[i];
+  }
   G4cout << "Graphics systems deleted." << G4endl;
   G4cout << "VisManager deleting." << G4endl;
-  fMessengerList.clearAndDestroy ();
+  for (i = 0; i < fMessengerList.size (); ++i) {
+    delete fMessengerList[i];
+  }
   delete fpMessenger;
 }
 
@@ -148,7 +157,7 @@ void G4VisManager::Initialise () {
   fpMessenger = new G4VisManMessenger (this);
 
   // TEMPORARY /vis/ -> /vis~/ equivalence.
-  fMessengerList.append (new G4VisToOldVisCommands);  
+  fMessengerList.push_back (new G4VisToOldVisCommands);  
 
   fInitialised = true;
 }
@@ -156,8 +165,28 @@ void G4VisManager::Initialise () {
 // void G4VisManager::RegisterMessengers () - see separate file,
 // G4VisManagerRegisterMessengers.cc.
 
+void G4VisManager::Enable() {
+  if (IsValidView ()) {
+    G4cout << "G4VisManager::Enable: visualization enabled." << G4endl;
+  }
+  else {
+    G4cout <<
+      "G4VisManager::Enable: visualization remains disabled for above reasons."
+      "\n  Rectifying with valid vis commands will automatically enable."
+	   << G4endl;
+  }
+}
+
+void G4VisManager::Disable() {
+  fpConcreteInstance = 0;
+  G4cout <<
+    "G4VisManager::Disable: visualization disabled."
+    "\n  Note that it will become enabled after some valid vis commands."
+	 << G4endl;
+}
+
 const G4GraphicsSystemList& G4VisManager::GetAvailableGraphicsSystems () {
-  G4int nSystems = fAvailableGraphicsSystems.entries ();
+  G4int nSystems = fAvailableGraphicsSystems.size ();
   if (nSystems == 0) {
     G4cout << "G4VisManager::GetAvailableGraphicsSystems: WARNING: no graphics"
       " system available!"
@@ -187,7 +216,7 @@ G4bool G4VisManager::RegisterGraphicsSystem (G4VGraphicsSystem* pSystem) {
     return false;
   }
   else {
-    fAvailableGraphicsSystems.append (pSystem);
+    fAvailableGraphicsSystems.push_back (pSystem);
     if (fVerbose > 0) {
       G4cout << "G4VisManager::RegisterGraphicsSystem: "
 	   << pSystem -> GetName ();
@@ -438,7 +467,7 @@ void G4VisManager::CreateSceneHandler (G4String name) {
       fpGraphicsSystem -> CreateSceneHandler (name);
     G4VViewer* pViewer;
     if (pSceneHandler) {
-      fAvailableSceneHandlers.append (pSceneHandler);
+      fAvailableSceneHandlers.push_back (pSceneHandler);
       fpSceneHandler = pSceneHandler;                         // Make current.
     }
     else {
@@ -510,10 +539,10 @@ void G4VisManager::DeleteCurrentSceneHandler () {
     delete fpSceneHandler;
   }
   const G4SceneHandlerList& sceneHandlerList = fAvailableSceneHandlers;
-  G4int nSH = sceneHandlerList.entries ();
+  G4int nSH = sceneHandlerList.size ();
   G4int iSH;
   for (iSH = 0; iSH < nSH; iSH++) {
-    if (sceneHandlerList [iSH] -> GetViewerList ().entries ()) break;
+    if (sceneHandlerList [iSH] -> GetViewerList ().size ()) break;
   }
   if (iSH < nSH) {
     fpSceneHandler = sceneHandlerList [iSH];
@@ -556,7 +585,7 @@ void G4VisManager::DeleteCurrentViewer () {
     delete fpViewer;
   }
   const G4ViewerList& viewerList = fpSceneHandler -> GetViewerList ();
-  if (viewerList.entries () > 0) {
+  if (viewerList.size () > 0) {
     fpViewer = viewerList [0];
     fpSceneHandler -> SetCurrentViewer (fpViewer);
     if (IsValidView ()) {
@@ -592,34 +621,33 @@ void G4VisManager::GeometryHasChanged () {
 
   // Check scenes.
   G4SceneList& sceneList = fSceneList;
-  G4int iScene, nScenes = sceneList.entries ();
+  G4int iScene, nScenes = sceneList.size ();
   for (iScene = 0; iScene < nScenes; iScene++) {
     G4Scene* pScene = sceneList [iScene];
-    G4RWTPtrOrderedVector <G4VModel>& modelList =
-      pScene -> SetRunDurationModelList ();
+    G4std::vector<G4VModel*>& modelList = pScene -> SetRunDurationModelList ();
 
-    G4int nModels, iModel;
     G4bool modelInvalid;
     do {  // Remove, if required, one at a time.
       modelInvalid = false;
-      nModels = modelList.entries ();
-      for (iModel = 0; iModel < nModels; iModel++) {
-	if (modelInvalid = !(modelList [iModel] -> Validate ())) {
+      G4std::vector<G4VModel*>::iterator iterModel;
+      for (iterModel = modelList.begin();
+	   iterModel != modelList.end();
+	   ++iterModel) {
+	if (modelInvalid = !((*iterModel) -> Validate ())) {
 	  // Model invalid - remove and break.
 	  G4cout << "  Model \""
-		 << modelList [iModel] -> GetGlobalDescription ()
+		 << (*iterModel) -> GetGlobalDescription ()
 		 <<
 	    "\" is no longer valid - being removed\n  from scene \""
 		 << pScene -> GetName () << "\""
 		 << G4endl;
-	  modelList.removeAt (iModel);
+	  modelList.erase (iterModel);
 	    break;
 	}
       }
     } while (modelInvalid);
 
-    nModels = modelList.entries ();
-    if (nModels == 0) {
+    if (modelList.size () == 0) {
       G4cout << "  No models left in this scene \""
 	     << pScene -> GetName ()
 	     << "\"."
@@ -628,7 +656,7 @@ void G4VisManager::GeometryHasChanged () {
   }
 
   // Check the manager's current scene...
-  if (fpScene && fpScene -> GetRunDurationModelList ().entries () == 0) {
+  if (fpScene && fpScene -> GetRunDurationModelList ().size () == 0) {
     G4cout << "  The current scene \""
 	   << fpScene -> GetName ()
 	   << "\" has no models left."
@@ -645,7 +673,7 @@ void G4VisManager::SetCurrentGraphicsSystemAndCreateViewer
   fpGraphicsSystem = pSystem;
   if (!fpScene) {
     fpScene = new G4Scene ("scene-vis~");
-    fSceneList.append (fpScene);
+    fSceneList.push_back (fpScene);
     G4cout << "G4VisManager::SetCurrentGraphicsSystemAndCreateViewer:"
       "\n  Empty scene \"scene-vis~\" created."
 	   << G4endl;
@@ -663,7 +691,7 @@ void G4VisManager::SetCurrentGraphicsSystem (G4VGraphicsSystem* pSystem) {
   // Or clear pointers.
   if (!(fpSceneHandler && fpSceneHandler -> GetGraphicsSystem () == pSystem)) {
     const G4SceneHandlerList& sceneHandlerList = fAvailableSceneHandlers;
-    G4int nSH = sceneHandlerList.entries ();  // No. of scene handlers.
+    G4int nSH = sceneHandlerList.size ();  // No. of scene handlers.
     G4int iSH;
     for (iSH = nSH - 1; iSH >= 0; iSH--) {
       if (sceneHandlerList [iSH] -> GetGraphicsSystem () == pSystem) break;
@@ -673,7 +701,7 @@ void G4VisManager::SetCurrentGraphicsSystem (G4VGraphicsSystem* pSystem) {
       G4cout << "\n  Scene Handler now "
 	     << fpSceneHandler -> GetName ();
       const G4ViewerList& viewerList = fpSceneHandler -> GetViewerList ();
-      if (viewerList.entries ()) {
+      if (viewerList.size ()) {
 	fpViewer = viewerList [0];
 	G4cout << "\n  Viewer now " << fpViewer -> GetName ();
       }
@@ -703,7 +731,7 @@ void G4VisManager::SetCurrentSceneHandler (G4VSceneHandler* pSceneHandler) {
 	   << fpGraphicsSystem -> GetName () << "\"";
   }
   const G4ViewerList& viewerList = fpSceneHandler -> GetViewerList ();
-  G4int nViewers = viewerList.entries ();
+  G4int nViewers = viewerList.size ();
   if (nViewers) {
     G4int iViewer;
     for (iViewer = 0; iViewer < nViewers; iViewer++) {
@@ -737,7 +765,7 @@ void G4VisManager::SetCurrentViewer (G4VViewer* pViewer) {
 
 void G4VisManager::PrintCurrentSystems () const {
   if (fpGraphicsSystem && fpSceneHandler && fpViewer) {
-    G4int nSystems = fAvailableGraphicsSystems.entries ();
+    G4int nSystems = fAvailableGraphicsSystems.size ();
     if (nSystems <= 0) {
       G4cout << "No graphics systems available yet." << G4endl;
     }
@@ -851,7 +879,7 @@ void G4VisManager::PrintInstalledGraphicsSystems () const {
 }
 
 void G4VisManager::PrintAvailableGraphicsSystems () const {
-  G4int nSystems = fAvailableGraphicsSystems.entries ();
+  G4int nSystems = fAvailableGraphicsSystems.size ();
   G4cout << "Current available graphics systems are:";
   if (nSystems) {
     for (int i = 0; i < nSystems; i++) {
@@ -895,10 +923,10 @@ void G4VisManager::EndOfEvent () {
   if (fpConcreteInstance && IsValidView ()) {
     G4ModelingParameters* pMP =
       fpSceneHandler -> CreateModelingParameters ();
-    const G4RWTPtrOrderedVector <G4VModel>& EOEModelList =
+    const G4std::vector<G4VModel*>& EOEModelList =
       fpScene -> GetEndOfEventModelList ();
     fpSceneHandler->ClearTransientStore(); //GB
-    for (int i = 0; i < EOEModelList.entries (); i++) {
+    for (int i = 0; i < EOEModelList.size (); i++) {
       G4VModel* pModel = EOEModelList [i];
       pModel -> SetModelingParameters (pMP);
       pModel -> DescribeYourselfTo (*fpSceneHandler);
@@ -916,7 +944,7 @@ G4String G4VisManager::ViewerShortName (const G4String& viewerName) const {
 
 G4VViewer* G4VisManager::GetViewer (const G4String& viewerName) const {
   G4String viewerShortName = ViewerShortName (viewerName);
-  G4int nHandlers = fAvailableSceneHandlers.entries ();
+  G4int nHandlers = fAvailableSceneHandlers.size ();
   G4int iHandler, iViewer;
   G4VSceneHandler* sceneHandler;
   G4VViewer* viewer;
@@ -924,7 +952,7 @@ G4VViewer* G4VisManager::GetViewer (const G4String& viewerName) const {
   for (iHandler = 0; iHandler < nHandlers; iHandler++) {
     sceneHandler = fAvailableSceneHandlers [iHandler];
     const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
-    for (iViewer = 0; iViewer < viewerList.entries (); iViewer++) {
+    for (iViewer = 0; iViewer < viewerList.size (); iViewer++) {
       viewer = viewerList [iViewer];
       if (viewerShortName == viewer -> GetShortName ()) {
 	found = true;
@@ -990,7 +1018,7 @@ G4bool G4VisManager::IsValidView () {
   }
 
   const G4ViewerList& viewerList = fpSceneHandler -> GetViewerList ();
-  if (viewerList.entries () == 0) {
+  if (viewerList.size () == 0) {
     G4cout << "G4VisManager::IsValidView (): the current scene handler\n  \""
 	   << fpSceneHandler -> GetName ()
 	   << "\" has no viewers.  Do /vis/viewer/create."
@@ -1023,6 +1051,14 @@ G4bool G4VisManager::IsValidView () {
   return isValid;
 }
 
+void G4VisManager::PrintCommandDeprecation(const G4String& message) {
+  G4cout <<
+    "**** DEPRECATED COMMAND ***"
+    "\n****  Will be discontinued as a \"/vis/\" command after Geant4 3.0."
+    "\n****  Will still be available as a \"/vis~/\" command for a while."
+    "\n****  " << message << G4endl;
+}
+
 // "No functionality" graphics systems to trap accidental attempt to
 // use unbuilt systems.
 
diff --git a/source/visualization/management/src/G4VisManagerRegisterMessengers.cc b/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
index 538d6499322c861ff04c25c1ac64012d088f68e7..c3329f2c97270269fb2b28508d9c21cb40c170a4 100644
--- a/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
+++ b/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
@@ -5,14 +5,15 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VisManagerRegisterMessengers.cc,v 1.21 2000/10/18 14:03:08 allison Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisManagerRegisterMessengers.cc,v 1.27 2001/02/23 15:43:32 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // G4VisManager::RegisterMessengers - John Allison 30/July/1998.
 
 #include "G4VisManager.hh"
 #include "G4VVisCommand.hh"
+#include "G4VisCommands.hh"
 #include "G4VisCommandsCompound.hh"
 #include "G4VisCommandsScene.hh"
 #include "G4VisCommandsSceneAdd.hh"
@@ -47,7 +48,7 @@ void G4VisManager::RegisterMessengers () {
 
 (Extract for working note.)
 
-* means "not implemented yet".
+NI means "not implemented yet".
 
 
 Introduction
@@ -97,7 +98,7 @@ The G4VisManager has a list of scenes.
   default:      current scene name
   This scene becomes current.
 
-* /vis/scene/edit
+NI /vis/scene/edit
 
 /vis/scene/remove <scene-name>
   Current scene can change or become invalid.
@@ -106,16 +107,16 @@ The G4VisManager has a list of scenes.
   default:                 all
   Adds to current scene.
 
-* /vis/scene/add/ghost [<particle>] [<physical-volume-name>]
-*                      [<copy-no>] [<depth>]
+NI /vis/scene/add/ghost [<particle>] [<physical-volume-name>]
+NI                      [<copy-no>] [<depth>]
 
 /vis/scene/add/logicalVolume <logical-volume-name> [<depth>] 
   default:                                             1
-  Adds to current scene.
+  Adds logical volume to current scene.
 
 /vis/scene/add/volume [<physical-volume-name>] [<copy-no>] [<depth>]
   default:                     world                0         -1
-  Adds to current scene.
+  Adds physical volume to current scene.
 
 /vis/scene/add/hits [<sensitive-volume-name>]
   default:              (argument not impl'd yet.)
@@ -127,26 +128,26 @@ The G4VisManager has a list of scenes.
   Causes trajectories, if any, to be drawn at the end of processiing an event.
   Adds to current scene.
 
-* /vis/scene/add/transientObjects
+NI /vis/scene/add/transientObjects
   Adds in current scene.
 
-* /vis/scene/set/hitOption accumulate|byEvent
+NI /vis/scene/set/hitOption accumulate|byEvent
   Affects current scene.
 
-* /vis/scene/set/notifyOption immediate|delayed
+NI /vis/scene/set/notifyOption immediate|delayed
   Affects current scene.
 
-* /vis/scene/set/modelingStyle [<modeling-style>]
+NI /vis/scene/set/modelingStyle [<modeling-style>]
   Affects current scene.
 
 /vis/scene/notifyHandlers
   Refreshes all viewers of current scene.
   Does not issue "update" (see /vis/viewer/update).
 
-* /vis/scene/add/axes
+NI /vis/scene/add/axes
   Adds to current scene.
 
-* /vis/scene/add/text
+NI /vis/scene/add/text
   Adds to current scene.
 
 
@@ -161,8 +162,9 @@ viewers.
 
 The G4VisManager has a list of scene handlers.
 
-/vis/sceneHandler/create <graphics-system-name> [<scene-handler-name>]
-  default:                                      auto-generated name
+/vis/sceneHandler/create [<graphics-system-name>] [<scene-handler-name>]
+  default:                     error               auto-generated name
+  (The first default simply triggers a list of possibilities.)
   This scene handler becomes current.
   The current scene, if any, is attached.
 
@@ -181,11 +183,11 @@ The G4VisManager has a list of scene handlers.
 /vis/sceneHandler/remove <scene-handler-name>
   Current scene handler can change or become invalid.
 
-* /vis/sceneHandler/processScene
+NI /vis/sceneHandler/processScene
   Refreshes all viewers of current scene handler.
   Does not issue "update" (see /vis/viewer/update).
 
-* /vis/sceneHandler/notifyEndOfProcessing
+NI /vis/sceneHandler/notifyEndOfProcessing
   Issues "update" for each viewer of current scene handler.
 
 
@@ -201,10 +203,10 @@ Most viewer commands respond to the viewer "short name", which is the
 name up to the first space character, if any.  Thus, a viewer name can
 contain spaces but must be unique up to the first space.
 
-* /vis/viewer/clear
+/vis/viewer/clear
   Affects current viewer.
 
-* /vis/viewer/clone
+NI /vis/viewer/clone
   Creates a clone.  Clone becomes current viewer.
 
 /vis/viewer/create [<scene-handler>]           [<viewer-name>]     [<pixels>]
@@ -212,10 +214,37 @@ contain spaces but must be unique up to the first space.
   Pixel size of square window (hint only).
   This viewer becomes current.
 
+/vis/viewer/dolly [<increment>] [<unit>]
+  default:        current-value    m
+  Moves the camera incrementally in by this distance.
+  Affects current viewer.
+
+/vis/viewer/dollyTo [<distance>] [<unit>]
+  default:         current-value    m
+  Moves the camera in this distance relative to standard target point.
+  Affects current viewer.
+
+/vis/viewer/lightsThetaPhi [<theta>] [<phi>] [deg|rad]
+  default: current as default.
+/vis/viewer/lightsVector [<x>] [<y>] [<z>]
+  default: current as default.
+  Affects current viewer.
+
 /vis/viewer/list   [<viewer-name>]    [<verbosity>]
   default:             all                  0
   Current viewer remains current.
 
+/vis/viewer/pan [<right-increment>] [<up-increment>] [<unit>]
+  default:                 0           0
+  Moves the camera incrementally right and up by these amounts.
+  Affects current viewer.
+
+/vis/viewer/panTo [<right>] [<up>] [<unit>]
+  default:                0     0
+  Moves the camera to this position right and up relative to standard target
+    point.
+  Affects current viewer.
+
 /vis/viewer/select <viewer-name>
   default:          no default
   This viewer becomes current.
@@ -235,9 +264,27 @@ contain spaces but must be unique up to the first space.
   Resets view parameters to defaults.
   This viewer becomes current.
 
+/vis/viewer/viewpointThetaPhi [<theta>] [<phi>] [deg|rad]
+  default: current as default.
+/vis/viewer/viewpointVector [<x>] [<y>] [<z>]
+  default: current as default.
+  Set direction from target to camera.  Also changes lightpoint direction if
+  lights are set to move with camera.
+  Affects current viewer.
+
+/vis/viewer/set/zoom [<factor>]
+  default:                 1
+  Multiplies magnification by this factor.
+  Affects current viewer.
+
+/vis/viewer/set/zoomTo [<factor>]
+  default:                   1
+  Magnifies by this factor relative to standard view.
+  Affects current viewer.
+
 (Now follow some viewer/set commands.  A possible syntax is:
 
-* /vis/viewer/set <parameter-name> <parameter-value> [<parameter-value>]...
+NI /vis/viewer/set <parameter-name> <parameter-value> [<parameter-value>]...
 
 but this would mean re-inventing parameter parsing which is already
 contained in many G4UIcommand subclasses.  To re-use this code we have
@@ -247,15 +294,9 @@ to know the type of the parameter, so we need separate commands.)
   Copies view parameters from from-viewer to current viewer.
   Affects current viewer.
 
-/vis/viewer/set/style w[ireframe]|s[urface]
-  Affects current viewer.
-
-/vis/viewer/set/edge [true|false]
-  default:              true
-  Affects current viewer.
-
-/vis/viewer/set/hiddenEdge  [true|false]
-  default:                       true
+/vis/viewer/set/autoRefresh [true|false]
+  default:                    false
+  View is automatically refreshed after a change of view parameters.
   Affects current viewer.
 
 /vis/viewer/set/culling
@@ -264,103 +305,59 @@ to know the type of the parameter, so we need separate commands.)
   default: none true 0.01 g/cm3
   Affects current viewer.
 
-* /vis/viewer/set/hiddenMarker  [true|false]
+NI /vis/viewer/set/cutawayPlane ...
+  Set plane(s) for cutaway views.
+  Affects current viewer.
+
+/vis/viewer/set/edge [true|false]
+  default:              true
+  Affects current viewer.
+
+/vis/viewer/set/hiddenEdge  [true|false]
   default:                       true
   Affects current viewer.
 
-* /vis/viewer/set/sectionPlane ...
-  Set plane for drawing section (DCUT).  Specify plane by x y z units nx ny nz,
-  e.g., for a y-z plane at x = 1 cm:
-  /vis/viewer/set/section_plane on 1 0 0 cm 1 0 0
+/vis/viewer/set/hiddenMarker  [true|false]
+  default:                       true
   Affects current viewer.
 
-* /vis/viewer/set/cutawayPlane ...
-  Set plane(s) for cutaway views.
+/vis/viewer/set/lightsMove with-camera|with-object
   Affects current viewer.
 
-* /vis/viewer/set/circleApproximationParameter [<number-of-sides-per-circle>]
-*or*              lineSegmentsPerCircle [<number-of-sides-per-circle>]
+/vis/viewer/set/lineSegmentsPerCircle        [<number-of-sides-per-circle>]
   default:                                         24
   Number of sides per circle in polygon/polyhedron graphical representation
     of objects with curved lines/surfaces.
   Affects current viewer.
 
-* /vis/viewer/set/dolly [<increment>]
-*or* /vis/viewer/dolly [<increment>]
-  default:                  0
-  Moves the camera incrementally in by this distance.
-  Affects current viewer.
-
-* /vis/viewer/set/dollyTo [<distance>]
-*or* /vis/viewer/dollyTo [<distance>]
-  default:                    0
-  Moves the camera in this distance relative to standard target point.
+/vis/viewer/set/projection
+  o[rthogonal]|p[erspective] [<field-half-angle>] [deg|rad]
+  default: none                       30             deg
   Affects current viewer.
 
-*special* /vis/viewer/set/orbit (parameters)
+#specialNI /vis/viewer/set/orbit (parameters)
   Orbits the scene about the up-vector, lights fixed to the scene.  Draws N
     frames, the camera rotated Delta-beta about the up-vector each frame.
   Affects current viewer.
 
-* /vis/viewer/set/pan [<x-increment>] [<y-increment>]
-*or*  /vis/viewer/pan [<x-increment>] [<y-increment>]
-  default:                 0           0
-  Moves the camera incrementatly right and up by these amounts.
-  Affects current viewer.
-
-* /vis/viewer/set/panTo [<x>] [<y>]
-*or*  /vis/viewer/panTo [<x>] [<y>]
-  default:                0     0
-  Moves the camera to this position right and up relative to standard target
-    point.
-  Affects current viewer.
-
-* /vis/viewer/set/projection_style
-  o[rthogonal]|p[erspective] [<field-angle>] [deg|rad]
-  default: none                    30           deg
-*or* /vis/viewer/set/orthgonal
-*or* /vis/viewer/set/perspective [<field-angle>] [deg|rad]
-  default:                           30          deg
+/vis/viewer/set/sectionPlane ...
+  Set plane for drawing section (DCUT).  Specify plane by x y z units nx ny nz,
+  e.g., for a y-z plane at x = 1 cm:
+  /vis/viewer/set/section_plane on 1 0 0 cm 1 0 0
   Affects current viewer.
 
-*special* /vis/viewer/set/spin (parameters)
-*or*      /vis/viewer/advanced?
+#specialNI /vis/viewer/set/spin (parameters)
+#orNI      /vis/viewer/advanced?
   Spins the scene about the up-vector, lights fixed to the camera.  Draws N
   frames, the scene rotated Delta-beta about the up-vector each frame.
   Affects current viewer.
 
-* /vis/viewer/set/viewpoint <theta> <phi> [deg|rad]
-  default:                     0     0     deg
-*or* /vis/viewer/set/viewpointVector [<x>] [<y>] [<z>]
-  default:                             0     0     1
-  Set direction from target to camera.  Also changes lightpoint direction if
-  lights are set to move with camera.
-  Affects current viewer.
-
-* /vis/viewer/set/zoom [<factor>]
-  default:                 1
-  Multiplies magnification by this factor.
-  Affects current viewer.
-
-* /vis/viewer/set/zoomTo [<factor>]
-  default:                   1
-  Magnifies by this factor relative to standard view.
-  Affects current viewer.
-
-* /vis/viewer/set/lights move-with-camera|move-with-object
-*or* /vis/viewer/set/lightsMoveWithCamera ) ( Opposites, i.e., one
-*or* /vis/viewer/set/lightsMoveWithObject ) ( negates the other.
-  Affects current viewer.
-
-* /vis/viewer/set/lights <theta> <phi> [deg|rad]
-  default:                   0     0    deg
-* /vis/viewer/set/lightsVector [<x>] [<y>] [<z>]
-  default:                       0     0     1
+/vis/viewer/set/style w[ireframe]|s[urface]
   Affects current viewer.
 
-* /vis/viewer/notifyOption immediate|delayed ?Issue of "update" after "set"?
+NI /vis/viewer/notifyOption immediate|delayed ?Issue of "update" after "set"?
 
-* /vis/viewer/notifyHandler ??
+NI /vis/viewer/notifyHandler ??
 
 /vis/viewer/update [<viewer-name>]
   default:     current viewer name
@@ -373,17 +370,17 @@ Attributes (nothing implemented yet)
 The G4VisManager also keeps a list of visualization attributes which can
 be created and changed and attributed to visualizable objects.
 
-* /vis/attributes/create [<vis-attributes-name>]
+NI /vis/attributes/create [<vis-attributes-name>]
   default:                 auto-generated name
   These attributes become current.
 
-* /vis/attributes/set/colour [<vis-attributes-name>] [<r>]  [<g>] [<b>] [<o>]
-* /vis/attributes/set/color  [<vis-attributes-name>] [<r>]  [<g>] [<b>] [<o>]
+NI /vis/attributes/set/colour [<vis-attributes-name>] [<r>]  [<g>] [<b>] [<o>]
+NI /vis/attributes/set/color  [<vis-attributes-name>] [<r>]  [<g>] [<b>] [<o>]
   default:                   current attributes name   1      1     1     1
   Sets colour (red, green, blue, opacity).
   Affects current vis attributes.
 
-* /vis/scene/set/attributes <logical-volume-name>
+NI /vis/scene/set/attributes <logical-volume-name>
   Associates current vis attributes with logical volume.  (Do we need to
     provide possibility of resetting to original attributes?)
   (Move to scene when implemented.)
@@ -392,34 +389,47 @@ be created and changed and attributed to visualizable objects.
 General Commands
 ================
 
-* /vis/verbose [<verbosity-integer>]
-  default:               0
-
-* /vis/activate [true|false]
+/vis/enable [true|false]
   default:       true
-  Activates/deactivates visualization system.
-  (Should this apply to user code only or all vis commands?)
+/vis/disable
+  Enables/disables visualization system.
+
+/vis/verbose [<verbosity-integer>]
+  default:               0
 
 
 Compound Commands
 =================
 
-/vis/open <graphics-system-name>       /vis/sceneHandler/create $1
-                                       /vis/viewer/create
-
-* /vis/draw <physical-volume-name> but this clashes with old /vis~/draw/, so...
-/vis/drawVolume <physical-volume-name> /vis/scene/create
-Default:             world             /vis/scene/add/volume $1
-                                       /vis/sceneHandler/attach
-                                       /vis/viewer/refresh
-                                       /vis/viewer/update
-
-/vis/specify <logical-volume-name>     /vis/scene/create
-                                       /vis/scene/add/logicalVolume $1
-                                       /vis/sceneHandler/attach
-                                       /vis/viewer/refresh
-                                       /vis/viewer/update
-                                       /geometry/print $1
+/vis/open [<graphics-system-name>] [<[pixels>]
+default:          error                600
+  /vis/sceneHandler/create $1
+  /vis/viewer/create ! ! $2
+
+NI /vis/draw <physical-volume-name> clashes with old /vis~/draw/, so...
+/vis/drawVolume [<physical-volume-name>]
+default:             world
+  /vis/scene/create
+  /vis/scene/add/volume $1
+  /vis/sceneHandler/attach
+  /vis/viewer/refresh
+
+/vis/drawView [<theta-deg>] [<phi-deg>]
+              [<pan-right>] [<pan-up>] [<pan-unit>]
+              [<zoom-factor>]
+              [<dolly>] [<dolly-unit>]
+default: 0 0 0 0 cm 1 0 cm
+  /vis/viewer/viewpointThetaPhi $1 $2 deg
+  /vis/viewer/panTo $3 $4 $5
+  /vis/viewer/zoomTo $6
+  /vis/viewer/dollyTo $7 $8
+
+/vis/specify <logical-volume-name>
+  /geometry/print $1
+  /vis/scene/create
+  /vis/scene/add/logicalVolume $1
+  /vis/sceneHandler/attach
+  /vis/viewer/refresh
 
   ******************************************************************/
 
@@ -431,139 +441,148 @@ Default:             world             /vis/scene/add/volume $1
   G4UIcommand* command;
   command = new G4UIdirectory ("/vis/");
   command -> SetGuidance ("Visualization commands.");
+  fMessengerList.push_back (new G4VisCommandEnable);
+  fMessengerList.push_back (new G4VisCommandVerbose);
 
   command = new G4UIdirectory ("/vis/scene/");
   command -> SetGuidance ("Operations on Geant4 scenes.");
-  fMessengerList.append (new G4VisCommandSceneCreate);
-  fMessengerList.append (new G4VisCommandSceneList);
-  fMessengerList.append (new G4VisCommandSceneNotifyHandlers);
-  fMessengerList.append (new G4VisCommandSceneSelect);
-  fMessengerList.append (new G4VisCommandSceneRemove);
+  fMessengerList.push_back (new G4VisCommandSceneCreate);
+  fMessengerList.push_back (new G4VisCommandSceneList);
+  fMessengerList.push_back (new G4VisCommandSceneNotifyHandlers);
+  fMessengerList.push_back (new G4VisCommandSceneSelect);
+  fMessengerList.push_back (new G4VisCommandSceneRemove);
 
   command = new G4UIdirectory ("/vis/scene/add/");
   command -> SetGuidance ("Add model to current scene.");
-  fMessengerList.append (new G4VisCommandSceneAddGhosts);
-  fMessengerList.append (new G4VisCommandSceneAddHits);
-  fMessengerList.append (new G4VisCommandSceneAddLogicalVolume);
-  fMessengerList.append (new G4VisCommandSceneAddTrajectories);
-  fMessengerList.append (new G4VisCommandSceneAddVolume);
+  fMessengerList.push_back (new G4VisCommandSceneAddGhosts);
+  fMessengerList.push_back (new G4VisCommandSceneAddHits);
+  fMessengerList.push_back (new G4VisCommandSceneAddLogicalVolume);
+  fMessengerList.push_back (new G4VisCommandSceneAddTrajectories);
+  fMessengerList.push_back (new G4VisCommandSceneAddVolume);
 
   command = new G4UIdirectory ("/vis/scene/include/");
   command -> SetGuidance ("Deprecated commands; now in /vis/scene/add/.");
-  fMessengerList.append (new G4VisCommandSceneIncludeHits);
-  fMessengerList.append (new G4VisCommandSceneIncludeTrajectories);
+  fMessengerList.push_back (new G4VisCommandSceneIncludeHits);
+  fMessengerList.push_back (new G4VisCommandSceneIncludeTrajectories);
 
   command = new G4UIdirectory ("/vis/sceneHandler/");
   command -> SetGuidance ("Operations on Geant4 scene handlers.");
-  fMessengerList.append (new G4VisCommandSceneHandlerAttach);
-  fMessengerList.append (new G4VisCommandSceneHandlerCreate);
-  fMessengerList.append (new G4VisCommandSceneHandlerList);
-  fMessengerList.append (new G4VisCommandSceneHandlerSelect);
-  fMessengerList.append (new G4VisCommandSceneHandlerRemove);
+  fMessengerList.push_back (new G4VisCommandSceneHandlerAttach);
+  fMessengerList.push_back (new G4VisCommandSceneHandlerCreate);
+  fMessengerList.push_back (new G4VisCommandSceneHandlerList);
+  fMessengerList.push_back (new G4VisCommandSceneHandlerSelect);
+  fMessengerList.push_back (new G4VisCommandSceneHandlerRemove);
 
   command = new G4UIdirectory ("/vis/viewer/");
   command -> SetGuidance ("Operations on Geant4 viewers.");
-  fMessengerList.append (new G4VisCommandViewerCreate);
-  fMessengerList.append (new G4VisCommandViewerList);
-  fMessengerList.append (new G4VisCommandViewerRefresh);
-  fMessengerList.append (new G4VisCommandViewerRemove);
-  fMessengerList.append (new G4VisCommandViewerReset);
-  fMessengerList.append (new G4VisCommandViewerSelect);
-  fMessengerList.append (new G4VisCommandViewerUpdate);
+  fMessengerList.push_back (new G4VisCommandViewerClear);
+  fMessengerList.push_back (new G4VisCommandViewerCreate);
+  fMessengerList.push_back (new G4VisCommandViewerDolly);
+  fMessengerList.push_back (new G4VisCommandViewerLights);
+  fMessengerList.push_back (new G4VisCommandViewerList);
+  fMessengerList.push_back (new G4VisCommandViewerPan);
+  fMessengerList.push_back (new G4VisCommandViewerRefresh);
+  fMessengerList.push_back (new G4VisCommandViewerRemove);
+  fMessengerList.push_back (new G4VisCommandViewerReset);
+  fMessengerList.push_back (new G4VisCommandViewerSelect);
+  fMessengerList.push_back (new G4VisCommandViewerUpdate);
+  fMessengerList.push_back (new G4VisCommandViewerViewpoint);
+  fMessengerList.push_back (new G4VisCommandViewerZoom);
 
   command = new G4UIdirectory ("/vis/viewer/set/");
   command -> SetGuidance ("Set view parameters of current viewer.");
-  fMessengerList.append (new G4VisCommandsViewerSet);
+  fMessengerList.push_back (new G4VisCommandsViewerSet);
 
   // Compound commands...
-  fMessengerList.append (new G4VisCommandOpen);
-  fMessengerList.append (new G4VisCommandDrawVolume);
-  fMessengerList.append (new G4VisCommandSpecify);
+  fMessengerList.push_back (new G4VisCommandDrawVolume);
+  fMessengerList.push_back (new G4VisCommandDrawView);
+  fMessengerList.push_back (new G4VisCommandOpen);
+  fMessengerList.push_back (new G4VisCommandSpecify);
 
   // Camera - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandCamera>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandCameraReset>);
 
   // Clear - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandClear>);
-//  fMessengerList.append
+//  fMessengerList.push_back
 //    (new G4VisSimpleCommandMessenger <G4VisCommandClearScene>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandClearView>);
-//  fMessengerList.append
+//  fMessengerList.push_back
 //    (new G4VisSimpleCommandMessenger <G4VisCommandClearViewAndScene>);
 
   // Copy - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandCopy>);
-//  fMessengerList.append
+//  fMessengerList.push_back
 //    (new G4VisSimpleCommandMessenger <G4VisCommandCopyAll>);
-//  fMessengerList.append
+//  fMessengerList.push_back
 //    (new G4VisSimpleCommandMessenger <G4VisCommandCopyScene>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandCopyView>);
 
   // Create Scene - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandCreateScene>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandCreateSceneClear>);
 
   // Create View - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandCreateView>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandCreateViewNewScene>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandCreateViewNewView>);
 
   // Delete - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandDelete>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandDeleteScene>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandDeleteView>);
 
   // Draw - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandDraw>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandDrawCurrent>);
 
   // Lights - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandLights>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisButtonCommandMessenger <G4VisCommandLightsMoveWithCamera>);
 
   // Print - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandPrint>);
 
   // Refresh - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandRefresh>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandRefreshView>);
 
   // Set - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandSet>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisButtonCommandMessenger <G4VisCommandSetCulling>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisButtonCommandMessenger <G4VisCommandSetCullCoveredDaughters>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisButtonCommandMessenger <G4VisCommandSetCullInvisible>);
 
   // Show - OLD STYLE!!
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisCommandDirectoryMessenger <G4VisCommandShow>);
-  fMessengerList.append
+  fMessengerList.push_back
     (new G4VisSimpleCommandMessenger <G4VisCommandShowView>);
 
 }
diff --git a/source/visualization/management/src/G4VisStateDependent.cc b/source/visualization/management/src/G4VisStateDependent.cc
index fc048c6e5ee01e33d3d07de0e2eb814d968e6568..a5848a2484787ca85f34266a2fe5270860e8964d 100644
--- a/source/visualization/management/src/G4VisStateDependent.cc
+++ b/source/visualization/management/src/G4VisStateDependent.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VisStateDependent.cc,v 1.2 1999/12/15 14:54:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 
 #include "G4VisStateDependent.hh"
 
diff --git a/source/visualization/management/src/G4VisToOldVisCommands.cc b/source/visualization/management/src/G4VisToOldVisCommands.cc
index a94850e67c576cf675b4f05e47d1fc3acbb261b9..d1dbcd209e8be24933eee0cccf342c322f968cec 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.4 1999/12/15 14:54:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VisToOldVisCommands.cc,v 1.5 2001/02/05 02:34:45 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // Implements some /vis/ commands as /vis~/ temporarily.
@@ -41,6 +41,12 @@ G4VisToOldVisCommands::G4VisToOldVisCommands () {
       // G4cout << "NewSubCommandPath: " << newCommandPath << G4endl;
       G4UIcommand* newCommand = new G4UIcommand (newCommandPath, this);
       newCommand -> SetRange (command -> GetRange ());
+      newCommand -> SetGuidance
+	("**** DEPRECATED COMMAND ****"
+	 "  Will be discontinued after Geant4 3.0.");
+      newCommand -> SetGuidance
+	("**** DEPRECATED COMMAND ****"
+	 "  Will still be available under /vis~/ for a while.");
       G4int nGuidances = command -> GetGuidanceEntries ();
       int k;
       for (k = 0; k < nGuidances; k++) {
diff --git a/source/visualization/modeling/History b/source/visualization/modeling/History
index 756298b98405a0f74e5283acc52312b85979bd7a..969ddffce3e7abaeb46a320d06d817df791d1064 100644
--- a/source/visualization/modeling/History
+++ b/source/visualization/modeling/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.7 2000/05/29 09:59:14 johna Exp $
+$Id: History,v 1.8 2001/02/03 18:39:56 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -20,6 +20,9 @@ committal in the CVS repository !
 History file for visualization/modeling
 ---------------------------------------
 
+3rd February 2001  John Allison  (vis-V03-00-02)
+- Tidied for CodeWizard.
+
 29th May 2000  John Allison
 - Moved code for maintaining depth, physical and logical volume
   pointers from VisitGeometryAndGetVisReps to DescribeAndDescend to
diff --git a/source/visualization/modeling/include/G4BoundingSphereScene.hh b/source/visualization/modeling/include/G4BoundingSphereScene.hh
index 806dd2e2d46aa8eaa26312a4bbd03ea4e44a1874..1fbcc35e73d8aee1d137b6a301b9b36a8400b345 100644
--- a/source/visualization/modeling/include/G4BoundingSphereScene.hh
+++ b/source/visualization/modeling/include/G4BoundingSphereScene.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BoundingSphereScene.hh,v 1.7 2000/05/15 11:08:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  7th June 1997
diff --git a/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh b/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
index 07ceedb80f82865500b6aecf3cc9816b8e6b31d8..9051e0023ab396ed41ab06ee034b4dd48f46945b 100644
--- a/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
+++ b/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FlavoredParallelWorldModel.hh,v 1.5 1999/12/15 14:54:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 15322b992bab272f4be7c4e6b4468a361301494b..4318f2fecc9527a0f3c4773525d998a5cbcbb232 100644
--- a/source/visualization/modeling/include/G4HitsModel.hh
+++ b/source/visualization/modeling/include/G4HitsModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HitsModel.hh,v 1.4 1999/12/15 14:54:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/include/G4HitsModel.icc b/source/visualization/modeling/include/G4HitsModel.icc
index 7a63382dd0c59f69de2261f072ade0dee2cfad05..841422bed0ed9d8ceea31b07b63123696791294f 100644
--- a/source/visualization/modeling/include/G4HitsModel.icc
+++ b/source/visualization/modeling/include/G4HitsModel.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HitsModel.icc,v 1.4 1999/12/15 14:54:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 ba2828a7dbb6984afe5e4e93f3596d2aac0b61ea..a018abaa48a187af640dfbd88edf6127791e0457 100644
--- a/source/visualization/modeling/include/G4LogicalVolumeModel.hh
+++ b/source/visualization/modeling/include/G4LogicalVolumeModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalVolumeModel.hh,v 1.4 2000/04/12 13:02:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  26th July 1999.
diff --git a/source/visualization/modeling/include/G4ModelingParameters.hh b/source/visualization/modeling/include/G4ModelingParameters.hh
index c4dfd78b28aced740df7fbe88e35ef1863576a27..5b1b747f9c529ed8c1b34eeaa1a4f621f59ae0eb 100644
--- a/source/visualization/modeling/include/G4ModelingParameters.hh
+++ b/source/visualization/modeling/include/G4ModelingParameters.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ModelingParameters.hh,v 1.5 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/include/G4ModelingParameters.icc b/source/visualization/modeling/include/G4ModelingParameters.icc
index d079665f29f58d76b5437f9eaff1c763db183a73..833ff1dfe2864d3f698976bdd189912f36965602 100644
--- a/source/visualization/modeling/include/G4ModelingParameters.icc
+++ b/source/visualization/modeling/include/G4ModelingParameters.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ModelingParameters.icc,v 1.3 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/include/G4NullModel.hh b/source/visualization/modeling/include/G4NullModel.hh
index 045cf5b30a8a54591030b543f26394e309498084..992499c7fe0816e9881ae8c346ca7253473939f0 100644
--- a/source/visualization/modeling/include/G4NullModel.hh
+++ b/source/visualization/modeling/include/G4NullModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NullModel.hh,v 1.4 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  4th April 1998.
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeModel.hh b/source/visualization/modeling/include/G4PhysicalVolumeModel.hh
index 3fbc042d8251d7ecd00f5e4b7ec0b08dda3cf22a..b7cab10a38a75f4b37ea80a577237be09610876e 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.9 2000/04/12 13:02:03 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicalVolumeModel.hh,v 1.11 2001/02/03 18:39:58 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -14,8 +14,8 @@
 // Class Description:
 //
 // Model for physical volumes.  It describes a physical volume and its
-// daughters to any desired depth.  Note: the "sought depth" is
-// specified in the modeling parameters.
+// daughters to any desired depth.  Note: the "requested depth" is
+// specified in the modeling parameters; enum {UNLIMITED = -1}.
 //
 // For access to base class information, e.g., modeling parameters,
 // use GetModelingParameters() inherited from G4VModel.  See Class
@@ -42,7 +42,7 @@ public: // With description
 
   G4PhysicalVolumeModel
   (G4VPhysicalVolume*,
-   G4int soughtDepth = UNLIMITED,
+   G4int requestedDepth = UNLIMITED,
    const G4Transform3D& modelTransformation = G4Transform3D::Identity,
    const G4ModelingParameters* = 0,
    G4bool useFullExtent = false);
@@ -81,12 +81,12 @@ public: // With description
 protected:
 
   void VisitGeometryAndGetVisReps (G4VPhysicalVolume*,
-				   G4int soughtDepth,
+				   G4int requestedDepth,
 				   const G4Transform3D&,
 				   G4VGraphicsScene&);
 
   void DescribeAndDescend (G4VPhysicalVolume*,
-			   G4int soughtDepth,
+			   G4int requestedDepth,
 			   G4LogicalVolume*,
 			   G4VSolid*,
 			   const G4Material*,
@@ -109,7 +109,8 @@ protected:
   G4VPhysicalVolume* fpTopPV;        // The physical volume.
   G4String           fTopPVName;     // ...of the physical volume.
   G4int              fTopPVCopyNo;   // ...of the physical volume.
-  G4int              fSoughtDepth;   // Sought depth of geom. hierarchy search.
+  G4int              fRequestedDepth;
+                     // Requested depth of geom. hierarchy search.
   G4int              fCurrentDepth;  // Current depth of geom. hierarchy.
   G4VPhysicalVolume* fpCurrentPV;    // Current physical volume.
   G4LogicalVolume*   fpCurrentLV;    // Current logical volume.
@@ -121,6 +122,12 @@ protected:
   G4VPhysicalVolume** fppCurrentPV;    // Current physical volume.
   G4LogicalVolume**   fppCurrentLV;    // Current logical volume.
 
+private:
+
+  // Private copy constructor and assigment operator - copying and
+  // assignment not allowed.  Keeps CodeWizard happy.
+  G4PhysicalVolumeModel (const G4PhysicalVolumeModel&);
+  G4PhysicalVolumeModel& operator = (const G4PhysicalVolumeModel&);
 };
 
 #endif
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
index a7990b50fd12ca04035023833445266ba6da62f8..16e99f4d9a05f4b38a463e84392e9069cf833d82 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
+++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicalVolumeSearchScene.hh,v 1.7 2000/05/22 07:36:57 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  10th August 1998.
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
index 064bcbcfa9d5c70da5fabd18b5694b4de2975735..87772c1e90413a790e817d4beb434f71701081e6 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
+++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicalVolumeSearchScene.icc,v 1.3 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  10th August 1998.
diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.hh b/source/visualization/modeling/include/G4TrajectoriesModel.hh
index c4073b3315ac91149999d2c714861e74c8fc5d19..cdfef43e8cb026f8902f789abe348f5eae7621ec 100644
--- a/source/visualization/modeling/include/G4TrajectoriesModel.hh
+++ b/source/visualization/modeling/include/G4TrajectoriesModel.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TrajectoriesModel.hh,v 1.4 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.icc b/source/visualization/modeling/include/G4TrajectoriesModel.icc
index 81c0e858b9ee914ff7e87951c7071b00038af644..ec6ae2ace72b2a7d3bc8fa138a887ef382598379 100644
--- a/source/visualization/modeling/include/G4TrajectoriesModel.icc
+++ b/source/visualization/modeling/include/G4TrajectoriesModel.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TrajectoriesModel.icc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 82c86920442914968d166d31afdf59603518f17b..69f28954658e4225c986978a8fd4288d248c7a6b 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.5 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VModel.hh,v 1.7 2001/02/23 15:43:33 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -40,13 +40,6 @@ public: // With description
    
   virtual ~G4VModel ();
 
-public: // Without description
-
-  G4bool operator == (const G4VModel&) const;
-  // For G4RWTPtrOrderedVector...
-
-public: // With description
-
   virtual void DescribeYourselfTo (G4VGraphicsScene&) = 0;
   // The main task of a model is to describe itself to the scene.
 
@@ -86,6 +79,12 @@ protected:
   G4VisExtent                 fExtent;
   G4Transform3D               fTransform;           
 
+private:
+
+  // Private copy constructor and assigment operator - copying and
+  // assignment not allowed.  Keeps CodeWizard happy.
+  G4VModel (const G4VModel&);
+  G4VModel& operator = (const G4VModel&);
 };
 
 #include "G4VModel.icc"
diff --git a/source/visualization/modeling/include/G4VModel.icc b/source/visualization/modeling/include/G4VModel.icc
index 0d6138d8d10d6b7c076c1d8d3bb55963904134f2..924c917d9e058c76c4215710a49814294061028c 100644
--- a/source/visualization/modeling/include/G4VModel.icc
+++ b/source/visualization/modeling/include/G4VModel.icc
@@ -5,17 +5,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VModel.icc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VModel.icc,v 1.6 2001/02/23 15:43:34 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
 // Base class for models.
 
-inline G4bool G4VModel::operator == (const G4VModel& model) const {
-  return this == &model;
-}
-
 inline const G4ModelingParameters* G4VModel::GetModelingParameters () const {
   return fpMP;
 }
@@ -28,18 +24,6 @@ inline const G4String& G4VModel::GetGlobalDescription () const {
   return fGlobalDescription;
 }
 
-inline G4String G4VModel::GetCurrentTag () const {
-  return "Default Current Tag";
-}
-
-inline G4String G4VModel::GetCurrentDescription () const {
-  return "Default Current Description";
-}
-
-inline G4bool G4VModel::Validate () {
-  return false;
-}
-
 inline const G4VisExtent& G4VModel::GetExtent () const {
   return fExtent;
 }
diff --git a/source/visualization/modeling/include/G4VTreeGraphicsScene.hh b/source/visualization/modeling/include/G4VTreeGraphicsScene.hh
index 7a3f1c323fd10fb61cbd9ff5e6d1ec79bb1278fc..f5dc6036951db8e5148f426791abb477093fec90 100644
--- a/source/visualization/modeling/include/G4VTreeGraphicsScene.hh
+++ b/source/visualization/modeling/include/G4VTreeGraphicsScene.hh
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VTreeGraphicsScene.hh,v 1.1 2000/05/22 07:39:25 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  18th May 2000
diff --git a/source/visualization/modeling/include/G4VTreeGraphicsScene.icc b/source/visualization/modeling/include/G4VTreeGraphicsScene.icc
index 56053f78d7487848fb3afbc52b384e0b145a7f71..0e866e8791614e0fe1c8dad9bac26426341c3fc3 100644
--- a/source/visualization/modeling/include/G4VTreeGraphicsScene.icc
+++ b/source/visualization/modeling/include/G4VTreeGraphicsScene.icc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VTreeGraphicsScene.icc,v 1.1 2000/05/22 07:39:32 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  18th May 2000
diff --git a/source/visualization/modeling/src/G4BoundingSphereScene.cc b/source/visualization/modeling/src/G4BoundingSphereScene.cc
index 6c3c5848d6e5bbcda009760aa608676154af90e1..4efa4c86471f9ebd9a53b82bf203893924b8061c 100644
--- a/source/visualization/modeling/src/G4BoundingSphereScene.cc
+++ b/source/visualization/modeling/src/G4BoundingSphereScene.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4BoundingSphereScene.cc,v 1.4 2000/05/15 11:09:32 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  7th June 1997
diff --git a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
index 8d817d1ddf412a81caba15ac96c5e066a596a9e2..b32090031dfc2d78fe42979fb333cfee513957ae 100644
--- a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
+++ b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4FlavoredParallelWorldModel.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-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 2893bb974d90087cb4d4b66cf81ee99758ea28db..a8c7112f5f6abf94a4376ad2df7c134c10d1e679 100644
--- a/source/visualization/modeling/src/G4HitsModel.cc
+++ b/source/visualization/modeling/src/G4HitsModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4HitsModel.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/src/G4LogicalVolumeModel.cc b/source/visualization/modeling/src/G4LogicalVolumeModel.cc
index f8f4ea0bb694468bc820cd8bbd9daebc091b7f97..e46e662ef1d491e3e4c111b29956b17cd0c4d12b 100644
--- a/source/visualization/modeling/src/G4LogicalVolumeModel.cc
+++ b/source/visualization/modeling/src/G4LogicalVolumeModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4LogicalVolumeModel.cc,v 1.5 2000/04/12 13:02:40 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  26th July 1999.
diff --git a/source/visualization/modeling/src/G4ModelingParameters.cc b/source/visualization/modeling/src/G4ModelingParameters.cc
index aa0f2f02f46dff114530ad44ef36e875549bf82a..76b7f7c95bb932e962e2d31d401e4f6ebeb94351 100644
--- a/source/visualization/modeling/src/G4ModelingParameters.cc
+++ b/source/visualization/modeling/src/G4ModelingParameters.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4ModelingParameters.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/src/G4NullModel.cc b/source/visualization/modeling/src/G4NullModel.cc
index c848073a4a4b72824706bd2fa1476c93d7e66044..388d4ee138473154d08bbc066df05c0b2da6de1c 100644
--- a/source/visualization/modeling/src/G4NullModel.cc
+++ b/source/visualization/modeling/src/G4NullModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4NullModel.cc,v 1.3 1999/12/15 14:54:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  4th April 1998.
diff --git a/source/visualization/modeling/src/G4PhysicalVolumeModel.cc b/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
index 8b7f45404905a4efcabb4e334eb3b3899674ec30..f0c5fb387726da593347ea9f0c6078dccbf9dca1 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.12 2000/10/18 13:57:45 allison Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4PhysicalVolumeModel.cc,v 1.14 2001/03/15 12:20:53 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -30,21 +30,21 @@
 
 G4PhysicalVolumeModel::G4PhysicalVolumeModel
 (G4VPhysicalVolume*          pVPV,
- G4int                       soughtDepth,
+ G4int                       requestedDepth,
  const G4Transform3D& modelTransformation,
  const G4ModelingParameters* pMP,
  G4bool useFullExtent):
-  G4VModel       (modelTransformation, pMP),
-  fpTopPV        (pVPV),
-  fTopPVName     (pVPV -> GetName ()),
-  fTopPVCopyNo   (pVPV -> GetCopyNo ()),
-  fSoughtDepth   (soughtDepth),
-  fCurrentDepth  (0),
-  fpCurrentPV    (0),
-  fpCurrentLV    (0),
-  fpCurrentDepth (0),
-  fppCurrentPV   (0),
-  fppCurrentLV   (0)
+  G4VModel        (modelTransformation, pMP),
+  fpTopPV         (pVPV),
+  fTopPVName      (pVPV -> GetName ()),
+  fTopPVCopyNo    (pVPV -> GetCopyNo ()),
+  fRequestedDepth (requestedDepth),
+  fCurrentDepth   (0),
+  fpCurrentPV     (0),
+  fpCurrentLV     (0),
+  fpCurrentDepth  (0),
+  fppCurrentPV    (0),
+  fppCurrentLV    (0)
 {
   const int len = 8; char a [len];
   G4std::ostrstream o (a, len); o.seekp (G4std::ios::beg);
@@ -94,7 +94,7 @@ void G4PhysicalVolumeModel::DescribeYourselfTo
     G4Transform3D startingTransformation = fTransform;
 
     VisitGeometryAndGetVisReps (fpTopPV,
-				fSoughtDepth,
+				fRequestedDepth,
 				startingTransformation,
 				sceneHandler);
 
@@ -142,14 +142,14 @@ void G4PhysicalVolumeModel::DefinePointersToWorkingSpace
 
 void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps
 (G4VPhysicalVolume* pVPV,
- G4int soughtDepth,
+ G4int requestedDepth,
  const G4Transform3D& theAT,
  G4VGraphicsScene& sceneHandler) {
 
-  // Visits geometry structure to a given depth (soughtDepth), starting
+  // Visits geometry structure to a given depth (requestedDepth), starting
   //   at given physical volume with given starting transformation and
   //   describes volumes to the scene handler.
-  // soughtDepth < 0 (default) implies full visit.
+  // requestedDepth < 0 (default) implies full visit.
   // theAT is the Accumulated Transformation.
 
   // Find corresponding logical volume and (later) solid, storing in
@@ -163,7 +163,7 @@ void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps
     // Non-replicated physical volume.
     pSol = pLV -> GetSolid ();
     pMaterial = pLV -> GetMaterial ();
-    DescribeAndDescend (pVPV, soughtDepth, pLV, pSol, pMaterial,
+    DescribeAndDescend (pVPV, requestedDepth, pLV, pSol, pMaterial,
 			theAT, sceneHandler);
   }
   else {
@@ -182,7 +182,7 @@ void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps
 	pP -> ComputeTransformation (n, pVPV);
 	pSol -> ComputeDimensions (pP, n, pVPV);
 	// pVPV -> SetCopyNo (n);  // Uncertain of effect of this.
-	DescribeAndDescend (pVPV, soughtDepth, pLV, pSol, pMaterial,
+	DescribeAndDescend (pVPV, requestedDepth, pLV, pSol, pMaterial,
 			    theAT, sceneHandler);
       }
     }
@@ -231,7 +231,7 @@ void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps
 	       << G4endl;
 	  break;
 	case kPhi:
-	  rotation.rotateZ (-(offset+n*width));
+	  rotation.rotateZ (-(offset+(n+0.5)*width));
 	  // Minus Sign because for the physical volume we need the
 	  // coordinate system rotation.
 	  pRotation = &rotation;
@@ -243,7 +243,7 @@ void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps
 	// dangerous.
 	pSol = pLV -> GetSolid ();
 	pMaterial = pLV -> GetMaterial ();
-	DescribeAndDescend (pVPV, soughtDepth, pLV, pSol, pMaterial,
+	DescribeAndDescend (pVPV, requestedDepth, pLV, pSol, pMaterial,
 			    theAT, sceneHandler);
       }
     }
@@ -254,7 +254,7 @@ void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps
 
 void G4PhysicalVolumeModel::DescribeAndDescend
 (G4VPhysicalVolume* pVPV,
- G4int soughtDepth,
+ G4int requestedDepth,
  G4LogicalVolume* pLV,
  G4VSolid* pSol,
  const G4Material* pMaterial,
@@ -272,7 +272,16 @@ void G4PhysicalVolumeModel::DescribeAndDescend
   const HepRotation* pObjectRotation = pVPV -> GetObjectRotation ();
   const Hep3Vector&  translation     = pVPV -> GetTranslation ();
   G4Transform3D theLT (G4Transform3D (*pObjectRotation, translation));
-  G4Transform3D theNewAT (theAT * theLT);
+
+  // Compute the accumulated transformation...
+  // Note that top volume's transformation relative to the world
+  // coordinate system is specified in theAT == startingTransformation
+  // = fTransform (see DescribeYourselfTo), so first time through the
+  // volume's own transformation, which is only relative to its
+  // mother, i.e., not relative to the world coordinate system, should
+  // not be accumulated.
+  G4Transform3D theNewAT (theAT);
+  if (fCurrentDepth != 0) theNewAT = theAT * theLT;
 
   /********************************************************
   G4cout << "G4PhysicalVolumeModel::DescribeAndDescend: "
@@ -316,7 +325,7 @@ void G4PhysicalVolumeModel::DescribeAndDescend
   G4bool cullDaughter = thisToBeDrawn && IsDaughterCulled (pLV);
   if (!cullDaughter) {
     // OK, now let's check for daughters...
-    if (soughtDepth != 0) {
+    if (requestedDepth != 0) {
       int nDaughters = pLV -> GetNoDaughters ();
       if (nDaughters) {
 	for (int iDaughter = 0; iDaughter < nDaughters; iDaughter++) {
@@ -324,7 +333,7 @@ void G4PhysicalVolumeModel::DescribeAndDescend
 	  // Descend the geometry structure recursively...
 	  fCurrentDepth++;
 	  VisitGeometryAndGetVisReps
-	    (pVPV, soughtDepth - 1, theNewAT, sceneHandler);
+	    (pVPV, requestedDepth - 1, theNewAT, sceneHandler);
 	  fCurrentDepth--;
 	}
       }
diff --git a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
index 2c24dbc0cecf421699cc6163a56cb8b9d91db614..72451268aaa9a55788a1262f557aea004a41d60a 100644
--- a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
+++ b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4PhysicalVolumeSearchScene.cc,v 1.4 1999/12/15 14:54:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  10th August 1998.
diff --git a/source/visualization/modeling/src/G4TrajectoriesModel.cc b/source/visualization/modeling/src/G4TrajectoriesModel.cc
index 8504dcb649e2d6fc362f3d29a4798e0c21e86347..28964754a67bbf22a37457f68a888f20727de4b9 100644
--- a/source/visualization/modeling/src/G4TrajectoriesModel.cc
+++ b/source/visualization/modeling/src/G4TrajectoriesModel.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4TrajectoriesModel.cc,v 1.6 1999/12/15 14:54:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/src/G4VModel.cc b/source/visualization/modeling/src/G4VModel.cc
index 92ce9ea1339267b8573c66411f6c43605018aa4b..0313c260d38da9152927adaddd91076752914d97 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.4 1999/12/15 14:54:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4VModel.cc,v 1.5 2001/02/03 18:40:04 johna Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  31st December 1997.
@@ -27,6 +27,18 @@ G4VModel::G4VModel (const G4Transform3D& modelTransformation,
 
 G4VModel::~G4VModel () {}
 
+G4String G4VModel::GetCurrentTag () const {
+  return G4String("Default Current Tag");
+}
+
+G4String G4VModel::GetCurrentDescription () const {
+  return G4String("Default Current Description");
+}
+
+G4bool G4VModel::Validate () {
+  return false;
+}
+
 G4std::ostream& operator << (G4std::ostream& os, const G4VModel& m) {
   os << m.fGlobalDescription;
   os << "\n  Modeling parameters:";
diff --git a/source/visualization/modeling/src/G4VTreeGraphicsScene.cc b/source/visualization/modeling/src/G4VTreeGraphicsScene.cc
index b1cb0b9fc27293db716b64945d3b0fc6b6a0e2ec..d2aa1cc0b63d04b4301e0405ff6bfe3491949a22 100644
--- a/source/visualization/modeling/src/G4VTreeGraphicsScene.cc
+++ b/source/visualization/modeling/src/G4VTreeGraphicsScene.cc
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VTreeGraphicsScene.cc,v 1.1 2000/05/22 07:39:41 johna Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 
 // John Allison  18th May 2000